diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-06 16:18:51 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-06 16:18:51 +0000 |
| commit | 9afbeb71219925d54b72b0170b2e3be76bad1e28 (patch) | |
| tree | d80c6bf0441de5412475859de320806b0e5a454c | |
| parent | 75eafe97f7df0d653bec67f3962214d7c357831f (diff) | |
| parent | ae6bdcc53584aaf20211ce1814bea97ece08a248 (diff) | |
| download | nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.gz nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.bz2 nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.lz nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.xz nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.zst nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.zip | |
Merge commit 'ae6bdcc53584aaf20211ce1814bea97ece08a248'
# Conflicts: # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
1002 files changed, 19604 insertions, 13022 deletions
diff --git a/nixpkgs/doc/languages-frameworks/android.section.md b/nixpkgs/doc/languages-frameworks/android.section.md index 9a5df2523a25..d76b590ede30 100644 --- a/nixpkgs/doc/languages-frameworks/android.section.md +++ b/nixpkgs/doc/languages-frameworks/android.section.md @@ -235,5 +235,5 @@ package manager uses. To update the expressions run the `generate.sh` script that is stored in the `pkgs/development/mobile/androidenv/` sub directory: ```bash -sh ./generate.sh +./generate.sh ``` diff --git a/nixpkgs/doc/languages-frameworks/haskell.section.md b/nixpkgs/doc/languages-frameworks/haskell.section.md index 944c17a137e7..54ba8e4786d5 100644 --- a/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -369,7 +369,7 @@ automatically select the right version of GHC and other build tools to build, test and execute apps in an existing project downloaded from somewhere on the Internet. Pass the `--nix` flag to any `stack` command to do so, e.g. ```shell -git clone --recursive https://github.com/yesodweb/wai +git clone --recurse-submodules https://github.com/yesodweb/wai.git cd wai stack --nix build ``` diff --git a/nixpkgs/doc/languages-frameworks/rust.section.md b/nixpkgs/doc/languages-frameworks/rust.section.md index 97dc9e2ff531..cec3373cbee6 100644 --- a/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/nixpkgs/doc/languages-frameworks/rust.section.md @@ -60,9 +60,9 @@ Nix depends on this file, so if it missing you can use `cargoPatches` to apply it in the `patchPhase`. Consider sending a PR upstream with a note to the maintainer describing why it's important to include in the application. -Unless `legacyCargoFetcher` is set to `true`, the fetcher will also verify that -the `Cargo.lock` file is in sync with the `src` attribute, and will compress the -vendor directory into a tar.gz archive. +The fetcher will verify that the `Cargo.lock` file is in sync with the `src` +attribute, and fail the build if not. It will also will compress the vendor +directory into a tar.gz archive. ### Building a crate for a different target diff --git a/nixpkgs/lib/generators.nix b/nixpkgs/lib/generators.nix index 240a19789b54..efe6ea6031d3 100644 --- a/nixpkgs/lib/generators.nix +++ b/nixpkgs/lib/generators.nix @@ -126,6 +126,59 @@ rec { # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; + /* Generate a git-config file from an attrset. + * + * It has two major differences from the regular INI format: + * + * 1. values are indented with tabs + * 2. sections can have sub-sections + * + * generators.toGitINI { + * url."ssh://git@github.com/".insteadOf = "https://github.com"; + * user.name = "edolstra"; + * } + * + *> [url "ssh://git@github.com/"] + *> insteadOf = https://github.com/ + *> + *> [user] + *> name = edolstra + */ + toGitINI = attrs: + with builtins; + let + mkSectionName = name: + let + containsQuote = libStr.hasInfix ''"'' name; + sections = libStr.splitString "." name; + section = head sections; + subsections = tail sections; + subsection = concatStringsSep "." subsections; + in if containsQuote || subsections == [ ] then + name + else + ''${section} "${subsection}"''; + + # generation for multiple ini values + mkKeyValue = k: v: + let mkKeyValue = mkKeyValueDefault { } " = " k; + in concatStringsSep "\n" (map (kv: "\t" + mkKeyValue kv) (lib.toList v)); + + # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI + gitFlattenAttrs = let + recurse = path: value: + if isAttrs value then + lib.mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value + else if length path > 1 then { + ${concatStringsSep "." (lib.reverseList (tail path))}.${head path} = value; + } else { + ${head path} = value; + }; + in attrs: lib.foldl lib.recursiveUpdate { } (lib.flatten (recurse [ ] attrs)); + + toINI_ = toINI { inherit mkKeyValue mkSectionName; }; + in + toINI_ (gitFlattenAttrs attrs); /* Generates JSON from an arbitrary (non-function) value. * For more information see the documentation of the builtin. diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix index e2f94e565ce2..e37eb57cff97 100644 --- a/nixpkgs/lib/licenses.nix +++ b/nixpkgs/lib/licenses.nix @@ -649,6 +649,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { 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; + free = false; + }; + tcltk = spdx { spdxId = "TCL"; fullName = "TCL/TK License"; diff --git a/nixpkgs/lib/modules.nix b/nixpkgs/lib/modules.nix index 6cbef5632bd7..c18fec66c705 100644 --- a/nixpkgs/lib/modules.nix +++ b/nixpkgs/lib/modules.nix @@ -93,7 +93,11 @@ rec { res set._definedNames else res; - result = { inherit options config; }; + result = { + inherit options; + config = removeAttrs config [ "_module" ]; + inherit (config) _module; + }; in result; # collectModules :: (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> [ Module ] @@ -410,10 +414,9 @@ rec { # Type-check the remaining definitions, and merge them. Or throw if no definitions. mergedValue = if isDefined then - foldl' (res: def: - if type.check def.value then res - else throw "The option value `${showOption loc}' in `${def.file}' is not of type `${type.description}'." - ) (type.merge loc defsFinal) defsFinal + if all (def: type.check def.value) defsFinal then type.merge loc defsFinal + else let firstInvalid = findFirst (def: ! type.check def.value) null defsFinal; + in throw "The option value `${showOption loc}' in `${firstInvalid.file}' is not of type `${type.description}'." else # (nixos-option detects this specific error message and gives it special # handling. If changed here, please change it there too.) diff --git a/nixpkgs/lib/options.nix b/nixpkgs/lib/options.nix index e5c0631a5437..71481c9250ab 100644 --- a/nixpkgs/lib/options.nix +++ b/nixpkgs/lib/options.nix @@ -159,7 +159,7 @@ rec { let ss = opt.type.getSubOptions opt.loc; in if ss != {} then optionAttrSetToDocList' opt.loc ss else []; in - [ docOption ] ++ subOptions) (collect isOption options); + [ docOption ] ++ optionals docOption.visible subOptions) (collect isOption options); /* This function recursively removes all derivation attributes from diff --git a/nixpkgs/lib/sources.nix b/nixpkgs/lib/sources.nix index 05519c3e392e..ed9bce485300 100644 --- a/nixpkgs/lib/sources.nix +++ b/nixpkgs/lib/sources.nix @@ -63,17 +63,14 @@ rec { # https://nixos.org/nix/manual/#builtin-filterSource # # name: Optional name to use as part of the store path. - # This defaults `src.name` or otherwise `baseNameOf src`. - # We recommend setting `name` whenever `src` is syntactically `./.`. - # Otherwise, you depend on `./.`'s name in the parent directory, - # which can cause inconsistent names, defeating caching. + # This defaults to `src.name` or otherwise `"source"`. # cleanSourceWith = { filter ? _path: _type: true, src, name ? null }: let isFiltered = src ? _isLibCleanSourceWith; origSrc = if isFiltered then src.origSrc else src; filter' = if isFiltered then name: type: filter name type && src.filter name type else filter; - name' = if name != null then name else if isFiltered then src.name else baseNameOf src; + name' = if name != null then name else if isFiltered then src.name else "source"; in { inherit origSrc; filter = filter'; diff --git a/nixpkgs/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix index 4ca932d17921..210674cc6399 100644 --- a/nixpkgs/lib/systems/default.nix +++ b/nixpkgs/lib/systems/default.nix @@ -65,6 +65,7 @@ rec { freebsd = "FreeBSD"; openbsd = "OpenBSD"; wasi = "Wasi"; + genode = "Genode"; }.${final.parsed.kernel.name} or null; # uname -p diff --git a/nixpkgs/lib/systems/doubles.nix b/nixpkgs/lib/systems/doubles.nix index 96e602d0e167..a839b3d3d573 100644 --- a/nixpkgs/lib/systems/doubles.nix +++ b/nixpkgs/lib/systems/doubles.nix @@ -26,9 +26,17 @@ let "riscv32-linux" "riscv64-linux" - "aarch64-none" "avr-none" "arm-none" "i686-none" "x86_64-none" "powerpc-none" "msp430-none" "riscv64-none" "riscv32-none" "vc4-none" + "arm-none" "armv6l-none" "aarch64-none" + "avr-none" + "i686-none" "x86_64-none" + "powerpc-none" + "msp430-none" + "riscv64-none" "riscv32-none" + "vc4-none" "js-ghcjs" + + "aarch64-genode" "x86_64-genode" ]; allParsed = map parse.mkSystemFromString all; @@ -62,6 +70,7 @@ in { unix = filterDoubles predicates.isUnix; wasi = filterDoubles predicates.isWasi; windows = filterDoubles predicates.isWindows; + genode = filterDoubles predicates.isGenode; embedded = filterDoubles predicates.isNone; diff --git a/nixpkgs/lib/systems/inspect.nix b/nixpkgs/lib/systems/inspect.nix index 01dcf0787dfa..90a1fb6d80c2 100644 --- a/nixpkgs/lib/systems/inspect.nix +++ b/nixpkgs/lib/systems/inspect.nix @@ -47,6 +47,7 @@ rec { isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; isWasi = { kernel = kernels.wasi; }; isGhcjs = { kernel = kernels.ghcjs; }; + isGenode = { kernel = kernels.genode; }; isNone = { kernel = kernels.none; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; diff --git a/nixpkgs/lib/systems/parse.nix b/nixpkgs/lib/systems/parse.nix index 6a02dbb51528..648e7c270240 100644 --- a/nixpkgs/lib/systems/parse.nix +++ b/nixpkgs/lib/systems/parse.nix @@ -279,6 +279,7 @@ rec { wasi = { execFormat = wasm; families = { }; }; windows = { execFormat = pe; families = { }; }; ghcjs = { execFormat = unknown; families = { }; }; + genode = { execFormat = elf; families = { }; }; } // { # aliases # 'darwin' is the kernel for all of them. We choose macOS by default. darwin = kernels.macos; @@ -395,6 +396,8 @@ rec { then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; } else if (elemAt l 2 == "ghcjs") then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; } + else if hasPrefix "genode" (elemAt l 2) + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } else throw "Target specification with 3 components is ambiguous"; "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; }; }.${toString (length l)} diff --git a/nixpkgs/lib/tests/modules.sh b/nixpkgs/lib/tests/modules.sh index 8cd632a439cd..e81cf016ee9a 100755 --- a/nixpkgs/lib/tests/modules.sh +++ b/nixpkgs/lib/tests/modules.sh @@ -185,6 +185,14 @@ checkConfigError 'The option .* defined in .* does not exist' config.enable ./di # Check that imports can depend on derivations checkConfigOutput "true" config.enable ./import-from-store.nix +# Check that configs can be conditional on option existence +checkConfigOutput true config.enable ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix +checkConfigOutput 360 config.value ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix +checkConfigOutput 7 config.value ./define-option-dependently.nix ./declare-int-positive-value.nix +checkConfigOutput true config.set.enable ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix +checkConfigOutput 360 config.set.value ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix +checkConfigOutput 7 config.set.value ./define-option-dependently-nested.nix ./declare-int-positive-value-nested.nix + # Check attrsOf and lazyAttrsOf. Only lazyAttrsOf should be lazy, and only # attrsOf should work with conditional definitions # In addition, lazyAttrsOf should honor an options emptyValue @@ -194,6 +202,11 @@ checkConfigOutput "true" config.conditionalWorks ./declare-attrsOf.nix ./attrsOf checkConfigOutput "false" config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix + +# Even with multiple assignments, a type error should be thrown if any of them aren't valid +checkConfigError 'The option value .* in .* is not of type .*' \ + config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix + cat <<EOF ====== module tests ====== $pass Pass diff --git a/nixpkgs/lib/tests/modules/declare-enable-nested.nix b/nixpkgs/lib/tests/modules/declare-enable-nested.nix new file mode 100644 index 000000000000..c8da8273cba1 --- /dev/null +++ b/nixpkgs/lib/tests/modules/declare-enable-nested.nix @@ -0,0 +1,14 @@ +{ lib, ... }: + +{ + options.set = { + enable = lib.mkOption { + default = false; + example = true; + type = lib.types.bool; + description = '' + Some descriptive text + ''; + }; + }; +} diff --git a/nixpkgs/lib/tests/modules/declare-int-positive-value-nested.nix b/nixpkgs/lib/tests/modules/declare-int-positive-value-nested.nix new file mode 100644 index 000000000000..72d2fb89fc3b --- /dev/null +++ b/nixpkgs/lib/tests/modules/declare-int-positive-value-nested.nix @@ -0,0 +1,9 @@ +{ lib, ... }: + +{ + options.set = { + value = lib.mkOption { + type = lib.types.ints.positive; + }; + }; +} diff --git a/nixpkgs/lib/tests/modules/define-option-dependently-nested.nix b/nixpkgs/lib/tests/modules/define-option-dependently-nested.nix new file mode 100644 index 000000000000..69ee4255534a --- /dev/null +++ b/nixpkgs/lib/tests/modules/define-option-dependently-nested.nix @@ -0,0 +1,16 @@ +{ lib, options, ... }: + +# Some modules may be distributed separately and need to adapt to other modules +# that are distributed and versioned separately. +{ + + # Always defined, but the value depends on the presence of an option. + config.set = { + value = if options ? set.enable then 360 else 7; + } + # Only define if possible. + // lib.optionalAttrs (options ? set.enable) { + enable = true; + }; + +} diff --git a/nixpkgs/lib/tests/modules/define-option-dependently.nix b/nixpkgs/lib/tests/modules/define-option-dependently.nix new file mode 100644 index 000000000000..6abce29366ae --- /dev/null +++ b/nixpkgs/lib/tests/modules/define-option-dependently.nix @@ -0,0 +1,16 @@ +{ lib, options, ... }: + +# Some modules may be distributed separately and need to adapt to other modules +# that are distributed and versioned separately. +{ + + # Always defined, but the value depends on the presence of an option. + config = { + value = if options ? enable then 360 else 7; + } + # Only define if possible. + // lib.optionalAttrs (options ? enable) { + enable = true; + }; + +} diff --git a/nixpkgs/lib/tests/systems.nix b/nixpkgs/lib/tests/systems.nix index 6f52912994df..ea6e337937f9 100644 --- a/nixpkgs/lib/tests/systems.nix +++ b/nixpkgs/lib/tests/systems.nix @@ -12,16 +12,17 @@ let expected = lib.sort lib.lessThan y; }; in with lib.systems.doubles; lib.runTests { - testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js); + testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js ++ genode); - testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; testmips = mseteq mips [ "mipsel-linux" ]; - testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; + testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]; testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ]; testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]; + testgenode = mseteq genode [ "aarch64-genode" "x86_64-genode" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ]; diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 993e5c2d46df..b59199bc767c 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -711,6 +711,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + atkinschang = { + email = "atkinschang+nixpkgs@gmail.com"; + github = "AtkinsChang"; + githubId = 5193600; + name = "Atkins Chang"; + }; atnnn = { email = "etienne@atnnn.com"; github = "atnnn"; @@ -1251,6 +1257,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"; @@ -1919,6 +1939,12 @@ githubId = 126339; name = "Domen Kozar"; }; + dominikh = { + email = "dominik@honnef.co"; + github = "dominikh"; + githubId = 39825; + name = "Dominik Honnef"; + }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; @@ -2748,6 +2774,12 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + gila = { + email = "jeffry.molanus@gmail.com"; + github = "gila"; + githubId = 15957973; + name = "Jeffry Molanus"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -3756,6 +3788,12 @@ github = "kampfschlaefer"; name = "Arnold Krille"; }; + karantan = { + name = "Gasper Vozel"; + email = "karantan@gmail.com"; + github = "karantan"; + githubId = 7062631; + }; karolchmist = { email = "info+nix@chmist.com"; name = "karolchmist"; @@ -3924,6 +3962,11 @@ githubId = 13721712; name = "Konrad Langenberg"; }; + kolbycrouch = { + email = "kjc.devel@gmail.com"; + github = "kolbycrouch"; + name = "Kolby Crouch"; + }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; @@ -4142,6 +4185,12 @@ github = "leonardoce"; name = "Leonardo Cecchi"; }; + leshainc = { + email = "leshainc@fomalhaut.me"; + github = "LeshaInc"; + githubId = 42153076; + name = "Alexey Nikashkin"; + }; lethalman = { email = "lucabru@src.gnome.org"; github = "lethalman"; @@ -4607,6 +4656,12 @@ githubId = 1269099; name = "Marius Bakke"; }; + mbaillie = { + email = "martin@baillie.email"; + github = "martinbaillie"; + githubId = 613740; + name = "Martin Baillie"; + }; mbbx6spp = { email = "me@susanpotter.net"; github = "mbbx6spp"; @@ -4811,12 +4866,24 @@ githubId = 3958340; name = "Eshin Kunishima"; }; + mikesperber = { + email = "sperber@deinprogramm.de"; + github = "mikesperber"; + githubId = 1387206; + name = "Mike Sperber"; + }; mildlyincompetent = { email = "nix@kch.dev"; github = "mildlyincompetent"; 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"; @@ -4830,7 +4897,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"; @@ -5919,6 +5991,12 @@ githubId = 37715; name = "Brian McKenna"; }; + puzzlewolf = { + email = "nixos@nora.pink"; + github = "puzzlewolf"; + githubId = 23097564; + name = "Nora Widdecke"; + }; pxc = { email = "patrick.callahan@latitudeengineering.com"; name = "Patrick Callahan"; @@ -5963,6 +6041,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"; @@ -6189,6 +6272,12 @@ githubId = 2507744; name = "Roland Koebler"; }; + rkrzr = { + email = "ops+nixpkgs@channable.com"; + github = "rkrzr"; + githubId = 82817; + name = "Robert Kreuzer"; + }; rlupton20 = { email = "richard.lupton@gmail.com"; github = "rlupton20"; @@ -7265,6 +7354,12 @@ githubId = 8547242; name = "Stefan Rohrbacher"; }; + "thelegy" = { + email = "mail+nixos@0jb.de"; + github = "thelegy"; + githubId = 3105057; + name = "Jan Beinke"; + }; thesola10 = { email = "thesola10@bobile.fr"; github = "thesola10"; @@ -8234,4 +8329,4 @@ }; } - + diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index f98bbeee912e..1d8b291978b3 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -21,4 +21,13 @@ with lib.maintainers; { members = [ jtojnar worldofpeace ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; }; + + gnome = { + members = [ + hedning + jtojnar + worldofpeace + ]; + scope = "Maintain GNOME desktop environment and platform."; + }; } diff --git a/nixpkgs/nixos/doc/manual/installation/installing.xml b/nixpkgs/nixos/doc/manual/installation/installing.xml index 4041b4ad163a..0dbfb39c32b2 100644 --- a/nixpkgs/nixos/doc/manual/installation/installing.xml +++ b/nixpkgs/nixos/doc/manual/installation/installing.xml @@ -24,8 +24,7 @@ </para> <para> - The NixOS manual is available on virtual console 8 (press Alt+F8 to access) - or by running <command>nixos-help</command>. + The NixOS manual is available by running <command>nixos-help</command>. </para> <para> diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml index 20f232c9110e..7674b0a5c0de 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml @@ -235,7 +235,7 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; <listitem> <para> The <literal>buildRustCrate</literal> infrastructure now produces <literal>lib</literal> outputs in addition to the <literal>out</literal> output. - This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output. + This has led to drastically reduced closure sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output. </para> </listitem> <listitem> @@ -641,6 +641,62 @@ auth required pam_succeed_if.so uid >= 1000 quiet The previous behavior can be restored by setting <literal>config.riot-web.conf = { disable_guests = false; piwik = true; }</literal>. </para> </listitem> + <listitem> + <para> + Stand-alone usage of <literal>Upower</literal> now requires + <option>services.upower.enable</option> instead of just installing into + <xref linkend="opt-environment.systemPackages"/>. + </para> + </listitem> + <listitem> + <para> + <package>nextcloud</package> has been updated to <literal>v18.0.2</literal>. This means + that users from NixOS 19.09 can't upgrade directly since you can only move one version + forward and 19.09 uses <literal>v16.0.8</literal>. + </para> + <para> + To provide a safe upgrade-path and to circumvent similar issues in the future, the following + measures were taken: + <itemizedlist> + <listitem> + <para> + The <package>pkgs.nextcloud</package>-attribute has been removed and replaced with + versioned attributes (currently <package>pkgs.nextcloud17</package> and + <package>pkgs.nextcloud18</package>). With this change major-releases can be backported + without breaking stuff and to make upgrade-paths easier. + </para> + </listitem> + <listitem> + <para> + Existing setups will be detected using + <link linkend="opt-system.stateVersion">system.stateVersion</link>: by default, + <package>nextcloud17</package> will be used, but will raise a warning which notes + that after that deploy it's recommended to update to the latest stable version + (<package>nextcloud18</package>) by declaring the newly introduced setting + <link linkend="opt-services.nextcloud.package">services.nextcloud.package</link>. + </para> + </listitem> + <listitem> + <para> + Users with an overlay (e.g. to use <package>nextcloud</package> at version + <literal>v18</literal> on <literal>19.09</literal>) will get an evaluation error + by default. This is done to ensure that our + <link linkend="opt-services.nextcloud.package">package</link>-option doesn't select an + older version by accident. It's recommended to use <package>pkgs.nextcloud18</package> + or to set <link linkend="opt-services.nextcloud.package">package</link> to + <package>pkgs.nextcloud</package> explicitly. + </para> + </listitem> + </itemizedlist> + </para> + <warning> + <para> + Please note that if you're comming from <literal>19.03</literal> or older, you have + to manually upgrade to <literal>19.09</literal> first to upgrade your server + to Nextcloud v16. + </para> + </warning> + </listitem> </itemizedlist> </section> @@ -760,7 +816,20 @@ auth required pam_succeed_if.so uid >= 1000 quiet </para></listitem> </itemizedlist> </para> - </listitem> + </listitem> + <listitem> + <para> + The <link linkend="opt-systemd.network.links">systemd.network.links</link> option is now respected + even when <link linkend="opt-systemd.network.enable">systemd-networkd</link> is disabled. + This mirrors the behaviour of systemd - It's udev that parses <literal>.link</literal> files, + not <command>systemd-networkd</command>. + </para> + </listitem> + <listitem> + <para> + <package>mongodb</package> has been updated to version <literal>3.4.24</literal>. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index 72474e5dbd4a..a9a6003d1e8a 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -86,6 +86,28 @@ }</programlisting> </para> </listitem> + <listitem> + <para> + The <link linkend="opt-services.supybot.enable">supybot</link> module now uses <literal>/var/lib/supybot</literal> + as its default <link linkend="opt-services.supybot.stateDir">stateDir</link> path if <literal>stateVersion</literal> + is 20.09 or higher. It also enables number of + <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Sandboxing">systemd sandboxing options</link> + which may possibly interfere with some plugins. If this is the case you can disable the options through attributes in + <option>systemd.services.supybot.serviceConfig</option>. + </para> + </listitem> + <listitem> + <para> + The <literal>security.duosec.skey</literal> option, which stored a secret in the + nix store, has been replaced by a new + <link linkend="opt-security.duosec.secretKeyFile">security.duosec.secretKeyFile</link> + option for better security. + </para> + <para> + <literal>security.duosec.ikey</literal> has been renamed to + <link linkend="opt-security.duosec.integrationKey">security.duosec.integrationKey</link>. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixpkgs/nixos/lib/eval-config.nix b/nixpkgs/nixos/lib/eval-config.nix index 9892d6f160f7..c8824c2690d3 100644 --- a/nixpkgs/nixos/lib/eval-config.nix +++ b/nixpkgs/nixos/lib/eval-config.nix @@ -61,7 +61,7 @@ in rec { args = extraArgs; specialArgs = { modulesPath = builtins.toString ../modules; } // specialArgs; - }) config options; + }) config options _module; # These are the extra arguments passed to every module. In # particular, Nixpkgs is passed through the "pkgs" argument. @@ -69,5 +69,5 @@ in rec { inherit baseModules extraModules modules; }; - inherit (config._module.args) pkgs; + inherit (_module.args) pkgs; } diff --git a/nixpkgs/nixos/lib/make-options-doc/default.nix b/nixpkgs/nixos/lib/make-options-doc/default.nix index eee8f612410d..e5813d9a3ef9 100644 --- a/nixpkgs/nixos/lib/make-options-doc/default.nix +++ b/nixpkgs/nixos/lib/make-options-doc/default.nix @@ -133,6 +133,7 @@ in { optionsJSON = pkgs.runCommand "options.json" { meta.description = "List of NixOS options in JSON format"; + buildInputs = [ pkgs.brotli ]; } '' # Export list of options in different format. @@ -141,8 +142,11 @@ in { cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix))} $dst/options.json + brotli -9 < $dst/options.json > $dst/options.json.br + mkdir -p $out/nix-support echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products + echo "file json-br $dst/options.json.br" >> $out/nix-support/hydra-build-products ''; # */ optionsDocBook = pkgs.runCommand "options-docbook.xml" {} '' diff --git a/nixpkgs/nixos/lib/test-driver/test-driver.py b/nixpkgs/nixos/lib/test-driver/test-driver.py index c27947bc610d..7825025893d3 100644 --- a/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/nixpkgs/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 @@ -115,6 +116,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 +141,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) @@ -739,6 +741,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() diff --git a/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix index 31e15537179a..36f3e7af873d 100644 --- a/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -8,10 +8,15 @@ in { imports = [ ../../../modules/virtualisation/amazon-image.nix ]; - # Required to provide good EBS experience, + # Amazon recomments setting this to the highest possible value for a good EBS + # experience, which prior to 4.15 was 255. # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes - # TODO change value to 4294967295 when kernel is updated to 4.15 or later - config.boot.kernelParams = [ "nvme_core.io_timeout=255" ]; + config.boot.kernelParams = + let timeout = + if pkgs.lib.versionAtLeast config.boot.kernelPackages.kernel.version "4.15" + then "4294967295" + else "255"; + in [ "nvme_core.io_timeout=${timeout}" ]; options.amazonImage = { name = mkOption { diff --git a/nixpkgs/nixos/modules/hardware/wooting.nix b/nixpkgs/nixos/modules/hardware/wooting.nix new file mode 100644 index 000000000000..ee550cbbf6b8 --- /dev/null +++ b/nixpkgs/nixos/modules/hardware/wooting.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + options.hardware.wooting.enable = + mkEnableOption "Enable support for Wooting keyboards"; + + config = mkIf config.hardware.wooting.enable { + environment.systemPackages = [ pkgs.wootility ]; + services.udev.packages = [ pkgs.wooting-udev-rules ]; + }; +} diff --git a/nixpkgs/nixos/modules/installer/tools/tools.nix b/nixpkgs/nixos/modules/installer/tools/tools.nix index 833865e99bb3..655d77db157d 100644 --- a/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -42,7 +42,10 @@ let inherit (config.system.nixos-generate-config) configuration; }; - nixos-option = pkgs.callPackage ./nixos-option { }; + nixos-option = + if lib.versionAtLeast (lib.getVersion pkgs.nix) "2.4pre" + then null + else pkgs.callPackage ./nixos-option { }; nixos-version = makeProg { name = "nixos-version"; @@ -184,10 +187,9 @@ in nixos-install nixos-rebuild nixos-generate-config - nixos-option nixos-version nixos-enter - ]; + ] ++ lib.optional (nixos-option != null) nixos-option; system.build = { inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; diff --git a/nixpkgs/nixos/modules/misc/documentation.nix b/nixpkgs/nixos/modules/misc/documentation.nix index d09afadd6097..7ad4be9a02e6 100644 --- a/nixpkgs/nixos/modules/misc/documentation.nix +++ b/nixpkgs/nixos/modules/misc/documentation.nix @@ -17,6 +17,7 @@ let inherit pkgs config; version = config.system.nixos.release; revision = "release-${version}"; + extraSources = cfg.nixos.extraModuleSources; options = let scrubbedEval = evalModules { @@ -163,6 +164,19 @@ in ''; }; + nixos.extraModuleSources = mkOption { + type = types.listOf (types.either types.path types.str); + default = [ ]; + description = '' + Which extra NixOS module paths the generated NixOS's documentation should strip + from options. + ''; + example = literalExample '' + # e.g. with options from modules in ''${pkgs.customModules}/nix: + [ pkgs.customModules ] + ''; + }; + }; }; @@ -204,9 +218,7 @@ in ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]); services.mingetty.helpLine = mkIf cfg.doc.enable ( - "\nRun `nixos-help` " - + optionalString config.services.nixosManual.showManual "or press <Alt-F${toString config.services.nixosManual.ttyNumber}> " - + "for the NixOS manual." + "\nRun 'nixos-help' for the NixOS manual." ); }) diff --git a/nixpkgs/nixos/modules/misc/nixpkgs.nix b/nixpkgs/nixos/modules/misc/nixpkgs.nix index 011d493c1538..4f5a9250eaae 100644 --- a/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -236,8 +236,8 @@ in let nixosExpectedSystem = if config.nixpkgs.crossSystem != null - then config.nixpkgs.crossSystem.system - else config.nixpkgs.localSystem.system; + then config.nixpkgs.crossSystem.system or (lib.systems.parse.doubleFromSystem (lib.systems.parse.mkSystemFromString config.nixpkgs.crossSystem.config)) + else config.nixpkgs.localSystem.system or (lib.systems.parse.doubleFromSystem (lib.systems.parse.mkSystemFromString config.nixpkgs.localSystem.config)); nixosOption = if config.nixpkgs.crossSystem != null then "nixpkgs.crossSystem" diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index 55d440434344..be52b56d054b 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -64,6 +64,7 @@ ./hardware/tuxedo-keyboard.nix ./hardware/usb-wwan.nix ./hardware/onlykey.nix + ./hardware/wooting.nix ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix @@ -470,7 +471,6 @@ ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix ./services/misc/nix-optimise.nix - ./services/misc/nixos-manual.nix ./services/misc/nix-ssh-serve.nix ./services/misc/novacomd.nix ./services/misc/nzbget.nix @@ -486,7 +486,6 @@ ./services/misc/redmine.nix ./services/misc/rippled.nix ./services/misc/ripple-data-api.nix - ./services/misc/rogue.nix ./services/misc/serviio.nix ./services/misc/safeeyes.nix ./services/misc/sickbeard.nix @@ -730,6 +729,7 @@ ./services/networking/syncthing.nix ./services/networking/syncthing-relay.nix ./services/networking/syncplay.nix + ./services/networking/tailscale.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix @@ -823,6 +823,7 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/frab.nix + ./services/web-apps/gerrit.nix ./services/web-apps/gotify-server.nix ./services/web-apps/grocy.nix ./services/web-apps/icingaweb2/icingaweb2.nix diff --git a/nixpkgs/nixos/modules/profiles/installation-device.nix b/nixpkgs/nixos/modules/profiles/installation-device.nix index 4596e163404c..d05c0c50e82c 100644 --- a/nixpkgs/nixos/modules/profiles/installation-device.nix +++ b/nixpkgs/nixos/modules/profiles/installation-device.nix @@ -26,10 +26,6 @@ with lib; # Show the manual. documentation.nixos.enable = mkForce true; - services.nixosManual.showManual = true; - - # Let the user play Rogue on TTY 8 during the installation. - #services.rogue.enable = true; # Use less privileged nixos user users.users.nixos = { diff --git a/nixpkgs/nixos/modules/programs/ssmtp.nix b/nixpkgs/nixos/modules/programs/ssmtp.nix index f794eac8af00..c7a947393496 100644 --- a/nixpkgs/nixos/modules/programs/ssmtp.nix +++ b/nixpkgs/nixos/modules/programs/ssmtp.nix @@ -14,8 +14,16 @@ in { imports = [ - (mkRenamedOptionModule [ "networking" "defaultMailServer" ] [ "services" "ssmtp" ]) - (mkRenamedOptionModule [ "services" "ssmtp" "directDelivery" ] [ "services" "ssmtp" "enable" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "directDelivery" ] [ "services" "ssmtp" "enable" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "hostName" ] [ "services" "ssmtp" "hostName" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "domain" ] [ "services" "ssmtp" "domain" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "root" ] [ "services" "ssmtp" "root" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "useTLS" ] [ "services" "ssmtp" "useTLS" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "useSTARTTLS" ] [ "services" "ssmtp" "useSTARTTLS" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "authUser" ] [ "services" "ssmtp" "authUser" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPass" ] [ "services" "ssmtp" "authPass" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPassFile" ] [ "services" "ssmtp" "authPassFile" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "setSendmail" ] [ "services" "ssmtp" "setSendmail" ]) ]; options = { diff --git a/nixpkgs/nixos/modules/security/duosec.nix b/nixpkgs/nixos/modules/security/duosec.nix index c686a6861d0f..71428b82f5da 100644 --- a/nixpkgs/nixos/modules/security/duosec.nix +++ b/nixpkgs/nixos/modules/security/duosec.nix @@ -9,8 +9,7 @@ let configFilePam = '' [duo] - ikey=${cfg.ikey} - skey=${cfg.skey} + ikey=${cfg.integrationKey} host=${cfg.host} ${optionalString (cfg.groups != "") ("groups="+cfg.groups)} failmode=${cfg.failmode} @@ -24,26 +23,12 @@ let motd=${boolToStr cfg.motd} accept_env_factor=${boolToStr cfg.acceptEnvFactor} ''; - - loginCfgFile = optionalAttrs cfg.ssh.enable { - "duo/login_duo.conf" = - { source = pkgs.writeText "login_duo.conf" configFileLogin; - mode = "0600"; - user = "sshd"; - }; - }; - - pamCfgFile = optional cfg.pam.enable { - "duo/pam_duo.conf" = - { source = pkgs.writeText "pam_duo.conf" configFilePam; - mode = "0600"; - user = "sshd"; - }; - }; in { imports = [ (mkRenamedOptionModule [ "security" "duosec" "group" ] [ "security" "duosec" "groups" ]) + (mkRenamedOptionModule [ "security" "duosec" "ikey" ] [ "security" "duosec" "integrationKey" ]) + (mkRemovedOptionModule [ "security" "duosec" "skey" ] "The insecure security.duosec.skey option has been replaced by a new security.duosec.secretKeyFile option. Use this new option to store a secure copy of your key instead.") ]; options = { @@ -60,14 +45,18 @@ in description = "If enabled, protect logins with Duo Security using PAM support."; }; - ikey = mkOption { + integrationKey = mkOption { type = types.str; description = "Integration key."; }; - skey = mkOption { - type = types.str; - description = "Secret key."; + secretKeyFile = mkOption { + type = types.path; + default = null; + description = '' + A file containing your secret key. The security of your Duo application is tied to the security of your secret key. + ''; + example = "/run/keys/duo-skey"; }; host = mkOption { @@ -195,21 +184,52 @@ in }; config = mkIf (cfg.ssh.enable || cfg.pam.enable) { - environment.systemPackages = [ pkgs.duo-unix ]; - - security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; - environment.etc = loginCfgFile // pamCfgFile; - - /* If PAM *and* SSH are enabled, then don't do anything special. - If PAM isn't used, set the default SSH-only options. */ - services.openssh.extraConfig = mkIf (cfg.ssh.enable || cfg.pam.enable) ( - if cfg.pam.enable then "UseDNS no" else '' - # Duo Security configuration - ForceCommand ${config.security.wrapperDir}/login_duo - PermitTunnel no - ${optionalString (!cfg.allowTcpForwarding) '' - AllowTcpForwarding no - ''} - ''); + environment.systemPackages = [ pkgs.duo-unix ]; + + security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; + + system.activationScripts = { + login_duo = mkIf cfg.ssh.enable '' + if test -f "${cfg.secretKeyFile}"; then + mkdir -m 0755 -p /etc/duo + + umask 0077 + conf="$(mktemp)" + { + cat ${pkgs.writeText "login_duo.conf" configFileLogin} + printf 'skey = %s\n' "$(cat ${cfg.secretKeyFile})" + } >"$conf" + + chown sshd "$conf" + mv -fT "$conf" /etc/duo/login_duo.conf + fi + ''; + pam_duo = mkIf cfg.pam.enable '' + if test -f "${cfg.secretKeyFile}"; then + mkdir -m 0755 -p /etc/duo + + umask 0077 + conf="$(mktemp)" + { + cat ${pkgs.writeText "login_duo.conf" configFilePam} + printf 'skey = %s\n' "$(cat ${cfg.secretKeyFile})" + } >"$conf" + + mv -fT "$conf" /etc/duo/pam_duo.conf + fi + ''; + }; + + /* If PAM *and* SSH are enabled, then don't do anything special. + If PAM isn't used, set the default SSH-only options. */ + services.openssh.extraConfig = mkIf (cfg.ssh.enable || cfg.pam.enable) ( + if cfg.pam.enable then "UseDNS no" else '' + # Duo Security configuration + ForceCommand ${config.security.wrapperDir}/login_duo + PermitTunnel no + ${optionalString (!cfg.allowTcpForwarding) '' + AllowTcpForwarding no + ''} + ''); }; } diff --git a/nixpkgs/nixos/modules/services/databases/mysql.nix b/nixpkgs/nixos/modules/services/databases/mysql.nix index 248bf0ebc915..f9e657f57742 100644 --- a/nixpkgs/nixos/modules/services/databases/mysql.nix +++ b/nixpkgs/nixos/modules/services/databases/mysql.nix @@ -10,16 +10,8 @@ let isMariaDB = lib.getName mysql == lib.getName pkgs.mariadb; - isMysqlAtLeast57 = - (lib.getName mysql == lib.getName pkgs.mysql57) - && (builtins.compareVersions mysql.version "5.7" >= 0); - mysqldOptions = "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}"; - # For MySQL 5.7+, --insecure creates the root user without password - # (earlier versions and MariaDB do this by default). - installOptions = - "${mysqldOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}"; settingsFile = pkgs.writeText "my.cnf" ( generators.toINI { listsAsDuplicateKeys = true; } cfg.settings + @@ -366,9 +358,14 @@ in pkgs.nettools ]; - preStart = '' + preStart = if isMariaDB then '' + if ! test -e ${cfg.dataDir}/mysql; then + ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions} + touch /tmp/mysql_init + fi + '' else '' if ! test -e ${cfg.dataDir}/mysql; then - ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${installOptions} + ${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure touch /tmp/mysql_init fi ''; diff --git a/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix index 55d5e703aa19..dfe4333a8adb 100644 --- a/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix +++ b/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix @@ -26,5 +26,7 @@ with lib; services.dbus.packages = [ pkgs.gnome3.rygel ]; systemd.packages = [ pkgs.gnome3.rygel ]; + + environment.etc."rygel.conf".source = "${pkgs.gnome3.rygel}/etc/rygel.conf"; }; } diff --git a/nixpkgs/nixos/modules/services/misc/nixos-manual.nix b/nixpkgs/nixos/modules/services/misc/nixos-manual.nix deleted file mode 100644 index ab73f49d4be5..000000000000 --- a/nixpkgs/nixos/modules/services/misc/nixos-manual.nix +++ /dev/null @@ -1,73 +0,0 @@ -# This module optionally starts a browser that shows the NixOS manual -# on one of the virtual consoles which is useful for the installation -# CD. - -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.nixosManual; - cfgd = config.documentation; -in - -{ - - options = { - - # TODO(@oxij): rename this to `.enable` eventually. - services.nixosManual.showManual = mkOption { - type = types.bool; - default = false; - description = '' - Whether to show the NixOS manual on one of the virtual - consoles. - ''; - }; - - services.nixosManual.ttyNumber = mkOption { - type = types.int; - default = 8; - description = '' - Virtual console on which to show the manual. - ''; - }; - - services.nixosManual.browser = mkOption { - type = types.path; - default = "${pkgs.w3m-nographics}/bin/w3m"; - description = '' - Browser used to show the manual. - ''; - }; - - }; - - - config = mkMerge [ - (mkIf cfg.showManual { - assertions = singleton { - assertion = cfgd.enable && cfgd.nixos.enable; - message = "Can't enable `services.nixosManual.showManual` without `documentation.nixos.enable`"; - }; - }) - (mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) { - console.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; - - systemd.services.nixos-manual = { - description = "NixOS Manual"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}"; - StandardInput = "tty"; - StandardOutput = "tty"; - TTYPath = "/dev/tty${toString cfg.ttyNumber}"; - TTYReset = true; - TTYVTDisallocate = true; - Restart = "always"; - }; - }; - }) - ]; - -} diff --git a/nixpkgs/nixos/modules/services/misc/rogue.nix b/nixpkgs/nixos/modules/services/misc/rogue.nix deleted file mode 100644 index d56d103b5f34..000000000000 --- a/nixpkgs/nixos/modules/services/misc/rogue.nix +++ /dev/null @@ -1,62 +0,0 @@ -# Execute the game `rogue' on tty 9. Mostly used by the NixOS -# installation CD. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.rogue; - -in - -{ - ###### interface - - options = { - - services.rogue.enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the Rogue game on one of the virtual - consoles. - ''; - }; - - services.rogue.tty = mkOption { - type = types.str; - default = "tty9"; - description = '' - Virtual console on which to run Rogue. - ''; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - console.extraTTYs = [ cfg.tty ]; - - systemd.services.rogue = - { description = "Rogue dungeon crawling game"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = - { ExecStart = "${pkgs.rogue}/bin/rogue"; - StandardInput = "tty"; - StandardOutput = "tty"; - TTYPath = "/dev/${cfg.tty}"; - TTYReset = true; - TTYVTDisallocate = true; - WorkingDirectory = "/tmp"; - Restart = "always"; - }; - }; - - }; - -} diff --git a/nixpkgs/nixos/modules/services/monitoring/graphite.nix b/nixpkgs/nixos/modules/services/monitoring/graphite.nix index dd147bb37930..64d9d61950da 100644 --- a/nixpkgs/nixos/modules/services/monitoring/graphite.nix +++ b/nixpkgs/nixos/modules/services/monitoring/graphite.nix @@ -39,8 +39,6 @@ let GRAPHITE_URL = cfg.seyren.graphiteUrl; } // cfg.seyren.extraConfig; - pagerConfig = pkgs.writeText "alarms.yaml" cfg.pager.alerts; - configDir = pkgs.buildEnv { name = "graphite-config"; paths = lists.filter (el: el != null) [ @@ -61,12 +59,10 @@ let carbonEnv = { PYTHONPATH = let - cenv = pkgs.python.buildEnv.override { - extraLibs = [ pkgs.python27Packages.carbon ]; + cenv = pkgs.python3.buildEnv.override { + extraLibs = [ pkgs.python3Packages.carbon ]; }; - cenvPack = "${cenv}/${pkgs.python.sitePackages}"; - # opt/graphite/lib contains twisted.plugins.carbon-cache - in "${cenvPack}/opt/graphite/lib:${cenvPack}"; + in "${cenv}/${pkgs.python3.sitePackages}"; GRAPHITE_ROOT = dataDir; GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; @@ -74,6 +70,10 @@ let in { + imports = [ + (mkRemovedOptionModule ["services" "graphite" "pager"] "") + ]; + ###### interface options.services.graphite = { @@ -132,7 +132,7 @@ in { finders = mkOption { description = "List of finder plugins to load."; default = []; - example = literalExample "[ pkgs.python27Packages.influxgraph ]"; + example = literalExample "[ pkgs.python3Packages.influxgraph ]"; type = types.listOf types.package; }; @@ -159,8 +159,8 @@ in { package = mkOption { description = "Package to use for graphite api."; - default = pkgs.python27Packages.graphite_api; - defaultText = "pkgs.python27Packages.graphite_api"; + default = pkgs.python3Packages.graphite_api; + defaultText = "pkgs.python3Packages.graphite_api"; type = types.package; }; @@ -344,49 +344,6 @@ in { }; }; - pager = { - enable = mkOption { - description = '' - Whether to enable graphite-pager service. For more information visit - <link xlink:href="https://github.com/seatgeek/graphite-pager"/> - ''; - default = false; - type = types.bool; - }; - - redisUrl = mkOption { - description = "Redis connection string."; - default = "redis://localhost:${toString config.services.redis.port}/"; - type = types.str; - }; - - graphiteUrl = mkOption { - description = "URL to your graphite service."; - default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}"; - type = types.str; - }; - - alerts = mkOption { - description = "Alerts configuration for graphite-pager."; - default = '' - alerts: - - target: constantLine(100) - warning: 90 - critical: 200 - name: Test - ''; - example = '' - pushbullet_key: pushbullet_api_key - alerts: - - target: stats.seatgeek.app.deal_quality.venue_info_cache.hit - warning: .5 - critical: 1 - name: Deal quality venue cache hits - ''; - type = types.lines; - }; - }; - beacon = { enable = mkEnableOption "graphite beacon"; @@ -409,7 +366,7 @@ in { environment = carbonEnv; serviceConfig = { RuntimeDirectory = name; - ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; @@ -431,7 +388,7 @@ in { environment = carbonEnv; serviceConfig = { RuntimeDirectory = name; - ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; @@ -447,7 +404,7 @@ in { environment = carbonEnv; serviceConfig = { RuntimeDirectory = name; - ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; @@ -457,19 +414,11 @@ in { (mkIf (cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay) { environment.systemPackages = [ - pkgs.pythonPackages.carbon + pkgs.python3Packages.carbon ]; }) - (mkIf cfg.web.enable (let - python27' = pkgs.python27.override { - packageOverrides = self: super: { - django = self.django_1_8; - django_tagging = self.django_tagging_0_4_3; - }; - }; - pythonPackages = python27'.pkgs; - in { + (mkIf cfg.web.enable ({ systemd.services.graphiteWeb = { description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; @@ -477,28 +426,27 @@ in { path = [ pkgs.perl ]; environment = { PYTHONPATH = let - penv = pkgs.python.buildEnv.override { + penv = pkgs.python3.buildEnv.override { extraLibs = [ - pythonPackages.graphite-web - pythonPackages.pysqlite + pkgs.python3Packages.graphite-web ]; }; - penvPack = "${penv}/${pkgs.python.sitePackages}"; + penvPack = "${penv}/${pkgs.python3.sitePackages}"; in concatStringsSep ":" [ "${graphiteLocalSettingsDir}" - "${penvPack}/opt/graphite/webapp" "${penvPack}" # explicitly adding pycairo in path because it cannot be imported via buildEnv - "${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}" + "${pkgs.python3Packages.pycairo}/${pkgs.python3.sitePackages}" ]; DJANGO_SETTINGS_MODULE = "graphite.settings"; + GRAPHITE_SETTINGS_MODULE = "graphite_local_settings"; GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; }; serviceConfig = { ExecStart = '' - ${pkgs.python27Packages.waitress-django}/bin/waitress-serve-django \ + ${pkgs.python3Packages.waitress-django}/bin/waitress-serve-django \ --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} ''; User = "graphite"; @@ -510,7 +458,7 @@ in { mkdir -p ${dataDir}/{whisper/,log/webapp/} chmod 0700 ${dataDir}/{whisper/,log/webapp/} - ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py migrate --noinput + ${pkgs.python3Packages.django}/bin/django-admin.py migrate --noinput chown -R graphite:graphite ${dataDir} @@ -518,16 +466,16 @@ in { fi # Only collect static files when graphite_web changes. - if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite-web}" ]; then + if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python3Packages.graphite-web}" ]; then mkdir -p ${staticDir} - ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear + ${pkgs.python3Packages.django}/bin/django-admin.py collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} - ln -sfT "${pythonPackages.graphite-web}" "${dataDir}/current_graphite_web" + ln -sfT "${pkgs.python3Packages.graphite-web}" "${dataDir}/current_graphite_web" fi ''; }; - environment.systemPackages = [ pythonPackages.graphite-web ]; + environment.systemPackages = [ pkgs.python3Packages.graphite-web ]; })) (mkIf cfg.api.enable { @@ -537,16 +485,16 @@ in { after = [ "network.target" ]; environment = { PYTHONPATH = let - aenv = pkgs.python.buildEnv.override { - extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders; + aenv = pkgs.python3.buildEnv.override { + extraLibs = [ cfg.api.package pkgs.cairo pkgs.python3Packages.cffi ] ++ cfg.api.finders; }; - in "${aenv}/${pkgs.python.sitePackages}"; + in "${aenv}/${pkgs.python3.sitePackages}"; GRAPHITE_API_CONFIG = graphiteApiConfig; LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; }; serviceConfig = { ExecStart = '' - ${pkgs.python27Packages.waitress}/bin/waitress-serve \ + ${pkgs.python3Packages.waitress}/bin/waitress-serve \ --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \ graphite_api.app:app ''; @@ -591,34 +539,13 @@ in { services.mongodb.enable = mkDefault true; }) - (mkIf cfg.pager.enable { - systemd.services.graphitePager = { - description = "Graphite Pager Alerting Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "redis.service" ]; - environment = { - REDIS_URL = cfg.pager.redisUrl; - GRAPHITE_URL = cfg.pager.graphiteUrl; - }; - serviceConfig = { - ExecStart = "${pkgs.pythonPackages.graphitepager}/bin/graphite-pager --config ${pagerConfig}"; - User = "graphite"; - Group = "graphite"; - }; - }; - - services.redis.enable = mkDefault true; - - environment.systemPackages = [ pkgs.pythonPackages.graphitepager ]; - }) - (mkIf cfg.beacon.enable { systemd.services.graphite-beacon = { description = "Grpahite Beacon Alerting Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = '' - ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \ + ${pkgs.python3Packages.graphite_beacon}/bin/graphite-beacon \ --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} ''; User = "graphite"; @@ -630,7 +557,7 @@ in { (mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || cfg.web.enable || cfg.api.enable || - cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable + cfg.seyren.enable || cfg.beacon.enable ) { users.users.graphite = { uid = config.ids.uids.graphite; diff --git a/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/nixpkgs/nixos/modules/services/monitoring/netdata.nix index f8225af20428..e43241eea894 100644 --- a/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -9,10 +9,12 @@ let mkdir -p $out/libexec/netdata/plugins.d ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin + ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin + ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin ''; plugins = [ - "${pkgs.netdata}/libexec/netdata/plugins.d" + "${cfg.package}/libexec/netdata/plugins.d" "${wrappedPlugins}/libexec/netdata/plugins.d" ] ++ cfg.extraPluginPaths; @@ -35,6 +37,13 @@ in { services.netdata = { enable = mkEnableOption "netdata"; + package = mkOption { + type = types.package; + default = pkgs.netdata; + defaultText = "pkgs.netdata"; + description = "Netdata package to use."; + }; + user = mkOption { type = types.str; default = "netdata"; @@ -141,8 +150,8 @@ in { path = (with pkgs; [ curl gawk which ]) ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages); serviceConfig = { - Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules"; - ExecStart = "${pkgs.netdata}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}"; + Environment="PYTHONPATH=${cfg.package}/libexec/netdata/python.d/python_modules"; + 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; # User and group @@ -159,7 +168,7 @@ in { systemd.enableCgroupAccounting = true; security.wrappers."apps.plugin" = { - source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin.org"; + source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org"; capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; owner = cfg.user; group = cfg.group; @@ -167,13 +176,29 @@ in { }; security.wrappers."freeipmi.plugin" = { - source = "${pkgs.netdata}/libexec/netdata/plugins.d/freeipmi.plugin.org"; + source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org"; capabilities = "cap_dac_override,cap_fowner+ep"; owner = cfg.user; group = cfg.group; permissions = "u+rx,g+rx,o-rwx"; }; + security.wrappers."perf.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org"; + capabilities = "cap_sys_admin+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+rx,o-rx"; + }; + + security.wrappers."slabinfo.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; + capabilities = "cap_dac_override+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+rx,o-rx"; + }; + security.pam.loginLimits = [ { domain = "netdata"; type = "soft"; item = "nofile"; value = "10000"; } { domain = "netdata"; type = "hard"; item = "nofile"; value = "30000"; } diff --git a/nixpkgs/nixos/modules/services/networking/firewall.nix b/nixpkgs/nixos/modules/services/networking/firewall.nix index b0045ff795e3..cdc3a172ea70 100644 --- a/nixpkgs/nixos/modules/services/networking/firewall.nix +++ b/nixpkgs/nixos/modules/services/networking/firewall.nix @@ -546,9 +546,13 @@ in options nf_conntrack nf_conntrack_helper=1 ''; - assertions = [ { assertion = cfg.checkReversePath -> kernelHasRPFilter; - message = "This kernel does not support rpfilter"; } - ]; + assertions = [ + # This is approximately "checkReversePath -> kernelHasRPFilter", + # but the checkReversePath option can include non-boolean + # values. + { assertion = cfg.checkReversePath == false || kernelHasRPFilter; + message = "This kernel does not support rpfilter"; } + ]; systemd.services.firewall = { description = "Firewall"; diff --git a/nixpkgs/nixos/modules/services/networking/iodine.nix b/nixpkgs/nixos/modules/services/networking/iodine.nix index f9ca26c27960..46051d7044b5 100644 --- a/nixpkgs/nixos/modules/services/networking/iodine.nix +++ b/nixpkgs/nixos/modules/services/networking/iodine.nix @@ -9,6 +9,8 @@ let iodinedUser = "iodined"; + /* is this path made unreadable by ProtectHome = true ? */ + isProtected = x: hasPrefix "/root" x || hasPrefix "/home" x; in { imports = [ @@ -35,45 +37,48 @@ in corresponding attribute name. ''; example = literalExample '' - { - foo = { - server = "tunnel.mdomain.com"; - relay = "8.8.8.8"; - extraConfig = "-v"; + { + foo = { + server = "tunnel.mdomain.com"; + relay = "8.8.8.8"; + extraConfig = "-v"; + } } - } ''; - type = types.attrsOf (types.submodule ( - { - options = { - server = mkOption { - type = types.str; - default = ""; - description = "Domain or Subdomain of server running iodined"; - example = "tunnel.mydomain.com"; - }; - - relay = mkOption { - type = types.str; - default = ""; - description = "DNS server to use as a intermediate relay to the iodined server"; - example = "8.8.8.8"; - }; - - extraConfig = mkOption { - type = types.str; - default = ""; - description = "Additional command line parameters"; - example = "-l 192.168.1.10 -p 23"; - }; - - passwordFile = mkOption { - type = types.str; - default = ""; - description = "File that contains password"; - }; - }; - })); + type = types.attrsOf ( + types.submodule ( + { + options = { + server = mkOption { + type = types.str; + default = ""; + description = "Hostname of server running iodined"; + example = "tunnel.mydomain.com"; + }; + + relay = mkOption { + type = types.str; + default = ""; + description = "DNS server to use as an intermediate relay to the iodined server"; + example = "8.8.8.8"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Additional command line parameters"; + example = "-l 192.168.1.10 -p 23"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "Path to a file containing the password."; + }; + }; + } + ) + ); }; server = { @@ -121,31 +126,67 @@ in boot.kernelModules = [ "tun" ]; systemd.services = - let - createIodineClientService = name: cfg: - { - description = "iodine client - ${name}"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}"; - serviceConfig = { - RestartSec = "30s"; - Restart = "always"; + let + createIodineClientService = name: cfg: + { + description = "iodine client - ${name}"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${builtins.toString cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}"; + serviceConfig = { + RestartSec = "30s"; + Restart = "always"; + + # hardening : + # Filesystem access + ProtectSystem = "strict"; + ProtectHome = if isProtected cfg.passwordFile then "read-only" else "true" ; + PrivateTmp = true; + ReadWritePaths = "/dev/net/tun"; + PrivateDevices = false; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + # Caps + NoNewPrivileges = true; + # Misc. + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + MemoryDenyWriteExecute = true; + }; + }; + in + listToAttrs ( + mapAttrsToList + (name: value: nameValuePair "iodine-${name}" (createIodineClientService name value)) + cfg.clients + ) // { + iodined = mkIf (cfg.server.enable) { + description = "iodine, ip over dns server daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${builtins.toString cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}"; + serviceConfig = { + # Filesystem access + ProtectSystem = "strict"; + ProtectHome = if isProtected cfg.server.passwordFile then "read-only" else "true" ; + PrivateTmp = true; + ReadWritePaths = "/dev/net/tun"; + PrivateDevices = false; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + # Caps + NoNewPrivileges = true; + # Misc. + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + MemoryDenyWriteExecute = true; + }; + }; }; - }; - in - listToAttrs ( - mapAttrsToList - (name: value: nameValuePair "iodine-${name}" (createIodineClientService name value)) - cfg.clients - ) // { - iodined = mkIf (cfg.server.enable) { - description = "iodine, ip over dns server daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}"; - }; - }; users.users.${iodinedUser} = { uid = config.ids.uids.iodined; diff --git a/nixpkgs/nixos/modules/services/networking/resilio.nix b/nixpkgs/nixos/modules/services/networking/resilio.nix index 9b25aa575837..e74e03fc0b07 100644 --- a/nixpkgs/nixos/modules/services/networking/resilio.nix +++ b/nixpkgs/nixos/modules/services/networking/resilio.nix @@ -244,7 +244,7 @@ in group = "rslsync"; }; - users.groups = [ { name = "rslsync"; } ]; + users.groups.rslsync = {}; systemd.services.resilio = with pkgs; { description = "Resilio Sync Service"; diff --git a/nixpkgs/nixos/modules/services/networking/supplicant.nix b/nixpkgs/nixos/modules/services/networking/supplicant.nix index 35c1e649e2e1..b5b9989ce186 100644 --- a/nixpkgs/nixos/modules/services/networking/supplicant.nix +++ b/nixpkgs/nixos/modules/services/networking/supplicant.nix @@ -39,8 +39,6 @@ let bindsTo = deps; after = deps; before = [ "network.target" ]; - # Receive restart event after resume - partOf = [ "post-resume.target" ]; path = [ pkgs.coreutils ]; diff --git a/nixpkgs/nixos/modules/services/networking/supybot.nix b/nixpkgs/nixos/modules/services/networking/supybot.nix index d5b9a97a1c1a..dc9fb31ffd0b 100644 --- a/nixpkgs/nixos/modules/services/networking/supybot.nix +++ b/nixpkgs/nixos/modules/services/networking/supybot.nix @@ -3,32 +3,35 @@ with lib; let - cfg = config.services.supybot; - + isStateDirHome = hasPrefix "/home/" cfg.stateDir; + isStateDirVar = cfg.stateDir == "/var/lib/supybot"; + pyEnv = pkgs.python3.withPackages (p: [ p.limnoria ] ++ (cfg.extraPackages p)); in - { - options = { services.supybot = { enable = mkOption { + type = types.bool; default = false; - description = "Enable Supybot, an IRC bot"; + description = "Enable Supybot, an IRC bot (also known as Limnoria)."; }; stateDir = mkOption { - # Setting this to /var/lib/supybot caused useradd to fail - default = "/home/supybot"; + type = types.path; + default = if versionAtLeast config.system.stateVersion "20.09" + then "/var/lib/supybot" + else "/home/supybot"; + defaultText = "/var/lib/supybot"; description = "The root directory, logs and plugins are stored here"; }; configFile = mkOption { type = types.path; description = '' - Path to a supybot config file. This can be generated by + Path to initial supybot config file. This can be generated by running supybot-wizard. Note: all paths should include the full path to the stateDir @@ -36,21 +39,54 @@ in ''; }; + plugins = mkOption { + type = types.attrsOf types.path; + default = {}; + description = '' + Attribute set of additional plugins that will be symlinked to the + <filename>plugin</filename> subdirectory. + + Please note that you still need to add the plugins to the config + file (or with <literal>!load</literal>) using their attribute name. + ''; + example = literalExample '' + let + plugins = pkgs.fetchzip { + url = "https://github.com/ProgVal/Supybot-plugins/archive/57c2450c.zip"; + sha256 = "077snf84ibnva3sbpzdfpfma6hcdw7dflwnhg6pw7mgnf0nd84qd"; + }; + in + { + Wikipedia = "''${plugins}/Wikipedia"; + Decide = ./supy-decide; + } + ''; + }; + + extraPackages = mkOption { + default = p: []; + description = '' + Extra Python packages available to supybot plugins. The + value must be a function which receives the attrset defined + in <varname>python3Packages</varname> as the sole argument. + ''; + example = literalExample ''p: [ p.lxml p.requests ]''; + }; + }; }; - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.pythonPackages.limnoria ]; + environment.systemPackages = [ pkgs.python3Packages.limnoria ]; users.users.supybot = { uid = config.ids.uids.supybot; group = "supybot"; description = "Supybot IRC bot user"; home = cfg.stateDir; - createHome = true; + isSystemUser = true; }; users.groups.supybot = { @@ -59,19 +95,16 @@ in systemd.services.supybot = { description = "Supybot, an IRC bot"; + documentation = [ "https://limnoria.readthedocs.io/" ]; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.pythonPackages.limnoria ]; preStart = '' - cd ${cfg.stateDir} - mkdir -p backup conf data plugins logs/plugins tmp web - ln -sf ${cfg.configFile} supybot.cfg # This needs to be created afresh every time - rm -f supybot.cfg.bak + rm -f '${cfg.stateDir}/supybot.cfg.bak' ''; serviceConfig = { - ExecStart = "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.stateDir}/supybot.cfg"; + ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg"; PIDFile = "/run/supybot.pid"; User = "supybot"; Group = "supybot"; @@ -79,8 +112,50 @@ in Restart = "on-abort"; StartLimitInterval = "5m"; StartLimitBurst = "1"; + + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + RestrictNamespaces = true; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RemoveIPC = true; + ProtectHostname = true; + CapabilityBoundingSet = ""; + ProtectSystem = "full"; + } + // optionalAttrs isStateDirVar { + StateDirectory = "supybot"; + ProtectSystem = "strict"; + } + // optionalAttrs (!isStateDirHome) { + ProtectHome = true; }; }; + systemd.tmpfiles.rules = [ + "d '${cfg.stateDir}' 0700 supybot supybot - -" + "d '${cfg.stateDir}/backup' 0750 supybot supybot - -" + "d '${cfg.stateDir}/conf' 0750 supybot supybot - -" + "d '${cfg.stateDir}/data' 0750 supybot supybot - -" + "d '${cfg.stateDir}/plugins' 0750 supybot supybot - -" + "d '${cfg.stateDir}/logs' 0750 supybot supybot - -" + "d '${cfg.stateDir}/logs/plugins' 0750 supybot supybot - -" + "d '${cfg.stateDir}/tmp' 0750 supybot supybot - -" + "d '${cfg.stateDir}/web' 0750 supybot supybot - -" + "L '${cfg.stateDir}/supybot.cfg' - - - - ${cfg.configFile}" + ] + ++ (flip mapAttrsToList cfg.plugins (name: dest: + "L+ '${cfg.stateDir}/plugins/${name}' - - - - ${dest}" + )); + }; } diff --git a/nixpkgs/nixos/modules/services/networking/tailscale.nix b/nixpkgs/nixos/modules/services/networking/tailscale.nix new file mode 100644 index 000000000000..513c42b40117 --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -0,0 +1,46 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.tailscale; +in { + meta.maintainers = with maintainers; [ danderson mbaillie ]; + + options.services.tailscale = { + enable = mkEnableOption "Tailscale client daemon"; + + port = mkOption { + type = types.port; + default = 41641; + description = "The port to listen on for tunnel traffic (0=autoselect)."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.tailscale = { + description = "Tailscale client daemon"; + + after = [ "network-pre.target" ]; + wants = [ "network-pre.target" ]; + wantedBy = [ "multi-user.target" ]; + + unitConfig = { + StartLimitIntervalSec = 0; + StartLimitBurst = 0; + }; + + serviceConfig = { + ExecStart = + "${pkgs.tailscale}/bin/tailscaled --port ${toString cfg.port}"; + + RuntimeDirectory = "tailscale"; + RuntimeDirectoryMode = 755; + + StateDirectory = "tailscale"; + StateDirectoryMode = 700; + + Restart = "on-failure"; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/networking/zerotierone.nix b/nixpkgs/nixos/modules/services/networking/zerotierone.nix index 042c4d5adddd..cf39ed065a76 100644 --- a/nixpkgs/nixos/modules/services/networking/zerotierone.nix +++ b/nixpkgs/nixos/modules/services/networking/zerotierone.nix @@ -69,13 +69,14 @@ in environment.systemPackages = [ cfg.package ]; # Prevent systemd from potentially changing the MAC address - environment.etc."systemd/network/50-zerotier.link".text = '' - [Match] - OriginalName=zt* - - [Link] - AutoNegotiation=false - MACAddressPolicy=none - ''; + systemd.network.links."50-zerotier" = { + matchConfig = { + OriginalName = "zt*"; + }; + linkConfig = { + AutoNegotiation = false; + MACAddressPolicy = "none"; + }; + }; }; } diff --git a/nixpkgs/nixos/modules/services/security/fail2ban.nix b/nixpkgs/nixos/modules/services/security/fail2ban.nix index cb748c93d24e..3f84f9c2560c 100644 --- a/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -216,6 +216,10 @@ in config = mkIf cfg.enable { + warnings = mkIf (config.networking.firewall.enable == false && config.networking.nftables.enable == false) [ + "fail2ban can not be used without a firewall" + ]; + environment.systemPackages = [ cfg.package ]; environment.etc = { diff --git a/nixpkgs/nixos/modules/services/web-apps/gerrit.nix b/nixpkgs/nixos/modules/services/web-apps/gerrit.nix new file mode 100644 index 000000000000..b184c0754d45 --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/gerrit.nix @@ -0,0 +1,218 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.gerrit; + + # NixOS option type for git-like configs + gitIniType = with types; + let + primitiveType = either str (either bool int); + multipleType = either primitiveType (listOf primitiveType); + sectionType = lazyAttrsOf multipleType; + supersectionType = lazyAttrsOf (either multipleType sectionType); + in lazyAttrsOf supersectionType; + + gerritConfig = pkgs.writeText "gerrit.conf" ( + lib.generators.toGitINI cfg.settings + ); + + # Wrap the gerrit java with all the java options so it can be called + # like a normal CLI app + gerrit-cli = pkgs.writeShellScriptBin "gerrit" '' + set -euo pipefail + jvmOpts=( + ${lib.escapeShellArgs cfg.jvmOpts} + -Xmx${cfg.jvmHeapLimit} + ) + exec ${cfg.jvmPackage}/bin/java \ + "''${jvmOpts[@]}" \ + -jar ${cfg.package}/webapps/${cfg.package.name}.war \ + "$@" + ''; + + gerrit-plugins = pkgs.runCommand + "gerrit-plugins" + { + buildInputs = [ gerrit-cli ]; + } + '' + shopt -s nullglob + mkdir $out + + for name in ${toString cfg.builtinPlugins}; do + echo "Installing builtin plugin $name.jar" + gerrit cat plugins/$name.jar > $out/$name.jar + done + + for file in ${toString cfg.plugins}; do + name=$(echo "$file" | cut -d - -f 2-) + echo "Installing plugin $name" + ln -sf "$file" $out/$name + done + ''; +in +{ + options = { + services.gerrit = { + enable = mkEnableOption "Gerrit service"; + + package = mkOption { + type = types.package; + default = pkgs.gerrit; + description = "Gerrit package to use"; + }; + + jvmPackage = mkOption { + type = types.package; + default = pkgs.jre_headless; + defaultText = "pkgs.jre_headless"; + description = "Java Runtime Environment package to use"; + }; + + jvmOpts = mkOption { + type = types.listOf types.str; + default = [ + "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance" + "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance" + ]; + description = "A list of JVM options to start gerrit with."; + }; + + jvmHeapLimit = mkOption { + type = types.str; + default = "1024m"; + description = '' + How much memory to allocate to the JVM heap + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "[::]:8080"; + description = '' + <literal>hostname:port</literal> to listen for HTTP traffic. + + This is bound using the systemd socket activation. + ''; + }; + + settings = mkOption { + type = gitIniType; + default = {}; + description = '' + Gerrit configuration. This will be generated to the + <literal>etc/gerrit.config</literal> file. + ''; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of plugins to add to Gerrit. Each derivation is a jar file + itself where the name of the derivation is the name of plugin. + ''; + }; + + builtinPlugins = mkOption { + type = types.listOf (types.enum cfg.package.passthru.plugins); + default = []; + description = '' + List of builtins plugins to install. Those are shipped in the + <literal>gerrit.war</literal> file. + ''; + }; + + serverId = mkOption { + type = types.str; + description = '' + Set a UUID that uniquely identifies the server. + + This can be generated with + <literal>nix-shell -p utillinux --run uuidgen</literal>. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + services.gerrit.settings = { + cache.directory = "/var/cache/gerrit"; + container.heapLimit = cfg.jvmHeapLimit; + gerrit.basePath = lib.mkDefault "git"; + gerrit.serverId = cfg.serverId; + httpd.inheritChannel = "true"; + httpd.listenUrl = lib.mkDefault "http://${cfg.listenAddress}"; + index.type = lib.mkDefault "lucene"; + }; + + # Add the gerrit CLI to the system to run `gerrit init` and friends. + environment.systemPackages = [ gerrit-cli ]; + + systemd.sockets.gerrit = { + unitConfig.Description = "Gerrit HTTP socket"; + wantedBy = [ "sockets.target" ]; + listenStreams = [ cfg.listenAddress ]; + }; + + systemd.services.gerrit = { + description = "Gerrit"; + + wantedBy = [ "multi-user.target" ]; + requires = [ "gerrit.socket" ]; + after = [ "gerrit.socket" "network.target" ]; + + path = [ + gerrit-cli + pkgs.bash + pkgs.coreutils + pkgs.git + pkgs.openssh + ]; + + environment = { + GERRIT_HOME = "%S/gerrit"; + GERRIT_TMP = "%T"; + HOME = "%S/gerrit"; + XDG_CONFIG_HOME = "%S/gerrit/.config"; + }; + + preStart = '' + set -euo pipefail + + # bootstrap if nothing exists + if [[ ! -d git ]]; then + gerrit init --batch --no-auto-start + fi + + # install gerrit.war for the plugin manager + rm -rf bin + mkdir bin + ln -sfv ${cfg.package}/webapps/${cfg.package.name}.war bin/gerrit.war + + # copy the config, keep it mutable because Gerrit + ln -sfv ${gerritConfig} etc/gerrit.config + + # install the plugins + rm -rf plugins + ln -sv ${gerrit-plugins} plugins + '' + ; + + serviceConfig = { + CacheDirectory = "gerrit"; + DynamicUser = true; + ExecStart = "${gerrit-cli}/bin/gerrit daemon --console-log"; + LimitNOFILE = 4096; + StandardInput = "socket"; + StandardOutput = "journal"; + StateDirectory = "gerrit"; + WorkingDirectory = "%S/gerrit"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ edef zimbatm ]; +} diff --git a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 912e05d6d400..087bd0e5df3e 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -30,7 +30,7 @@ let occ = pkgs.writeScriptBin "nextcloud-occ" '' #! ${pkgs.stdenv.shell} - cd ${pkgs.nextcloud} + cd ${cfg.package} sudo=exec if [[ "$USER" != nextcloud ]]; then sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR' @@ -42,6 +42,8 @@ let occ $* ''; + inherit (config.system) stateVersion; + in { options.services.nextcloud = { enable = mkEnableOption "nextcloud"; @@ -64,6 +66,11 @@ in { default = false; description = "Use https for generated links."; }; + package = mkOption { + type = types.package; + description = "Which package to use for the Nextcloud instance."; + relatedPackages = [ "nextcloud17" "nextcloud18" ]; + }; maxUploadSize = mkOption { default = "512M"; @@ -309,10 +316,31 @@ in { } ]; - warnings = optional (cfg.poolConfig != null) '' - Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release. - Please migrate your configuration to config.services.nextcloud.poolSettings. - ''; + warnings = [] + ++ (optional (cfg.poolConfig != null) '' + Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release. + Please migrate your configuration to config.services.nextcloud.poolSettings. + '') + ++ (optional (versionOlder cfg.package.version "18") '' + You're currently deploying an older version of Nextcloud. This may be needed + since Nextcloud doesn't allow major version upgrades across multiple versions (i.e. an + upgrade from 16 is possible to 17, but not to 18). + + Please deploy this to your server and wait until the migration is finished. After + that you can deploy to the latest Nextcloud version available. + ''); + + services.nextcloud.package = with pkgs; + mkDefault ( + if pkgs ? nextcloud + then throw '' + The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default + nextcloud defined in an overlay, please set `services.nextcloud.package` to + `pkgs.nextcloud`. + '' + else if versionOlder stateVersion "20.03" then nextcloud17 + else nextcloud18 + ); } { systemd.timers.nextcloud-cron = { @@ -407,7 +435,7 @@ in { path = [ occ ]; script = '' chmod og+x ${cfg.home} - ln -sf ${pkgs.nextcloud}/apps ${cfg.home}/ + ln -sf ${cfg.package}/apps ${cfg.home}/ mkdir -p ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php @@ -429,7 +457,7 @@ in { environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php"; + serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php"; }; nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable { serviceConfig.Type = "oneshot"; @@ -471,7 +499,7 @@ in { enable = true; virtualHosts = { ${cfg.hostName} = { - root = pkgs.nextcloud; + root = cfg.package; locations = { "= /robots.txt" = { priority = 100; diff --git a/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml b/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml index d66e0f0c2997..fc454f8ba254 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml @@ -113,5 +113,53 @@ maintenance:install</literal>! This command tries to install the application and can cause unwanted side-effects!</para> </warning> + + <para> + Nextcloud doesn't allow to move more than one major-version forward. If you're e.g. on + <literal>v16</literal>, you cannot upgrade to <literal>v18</literal>, you need to upgrade to + <literal>v17</literal> first. This is ensured automatically as long as the + <link linkend="opt-system.stateVersion">stateVersion</link> is declared properly. In that case + the oldest version available (one major behind the one from the previous NixOS + release) will be selected by default and the module will generate a warning that reminds + the user to upgrade to latest Nextcloud <emphasis>after</emphasis> that deploy. + </para> + </section> + + <section xml:id="module-services-nextcloud-maintainer-info"> + <title>Maintainer information</title> + + <para> + As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud + since it cannot move more than one major version forward on a single upgrade. This chapter + adds some notes how Nextcloud updates should be rolled out in the future. + </para> + + <para> + While minor and patch-level updates are no problem and can be done directly in the + package-expression (and should be backported to supported stable branches after that), + major-releases should be added in a new attribute (e.g. Nextcloud <literal>v19.0.0</literal> + should be available in <literal>nixpkgs</literal> as <literal>pkgs.nextcloud19</literal>). + To provide simple upgrade paths it's generally useful to backport those as well to stable + branches. As long as the package-default isn't altered, this won't break existing setups. + After that, the versioning-warning in the <literal>nextcloud</literal>-module should be + updated to make sure that the + <link linkend="opt-services.nextcloud.package">package</link>-option selects the latest version + on fresh setups. + </para> + + <para> + If major-releases will be abandoned by upstream, we should check first if those are needed + in NixOS for a safe upgrade-path before removing those. In that case we shold keep those + packages, but mark them as insecure in an expression like this (in + <literal><nixpkgs/pkgs/servers/nextcloud/default.nix></literal>): +<programlisting>/* ... */ +{ + nextcloud17 = generic { + version = "17.0.x"; + sha256 = "0000000000000000000000000000000000000000000000000000"; + insecure = true; + }; +}</programlisting> + </para> </section> </chapter> diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix index 65a7b9c628e5..e997b9a11343 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -20,7 +20,7 @@ in services.xserver.desktopManager.session = [{ name = "kodi"; start = '' - ${pkgs.kodi}/bin/kodi --lircdev /run/lirc/lircd --standalone & + LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone & waitPID=$! ''; }]; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix index 910a246d776c..f236c14fcf3e 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix @@ -44,35 +44,35 @@ in config = mkIf cfg.enable { - services.xserver.desktopManager.session = singleton { - name = "mate"; - bgSupport = true; - start = '' - export XDG_MENU_PREFIX=mate- + services.xserver.displayManager.sessionPackages = [ + pkgs.mate.mate-session-manager + ]; - # Let caja find extensions - export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 + services.xserver.displayManager.sessionCommands = '' + if test "$XDG_CURRENT_DESKTOP" = "MATE"; then + export XDG_MENU_PREFIX=mate- - # Let caja extensions find gsettings schemas - ${concatMapStrings (p: '' + # Let caja find extensions + export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 + + # Let caja extensions find gsettings schemas + ${concatMapStrings (p: '' if [ -d "${p}/lib/caja/extensions-2.0" ]; then - ${addToXDGDirs p} + ${addToXDGDirs p} fi - '') - config.environment.systemPackages - } + '') config.environment.systemPackages} - # Let mate-panel find applets - export MATE_PANEL_APPLETS_DIR=$MATE_PANEL_APPLETS_DIR''${MATE_PANEL_APPLETS_DIR:+:}${config.system.path}/share/mate-panel/applets - export MATE_PANEL_EXTRA_MODULES=$MATE_PANEL_EXTRA_MODULES''${MATE_PANEL_EXTRA_MODULES:+:}${config.system.path}/lib/mate-panel/applets + # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive) + ${addToXDGDirs pkgs.mate.mate-control-center} + fi + ''; - # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive) - ${addToXDGDirs pkgs.mate.mate-control-center} + # Let mate-panel find applets + environment.sessionVariables."MATE_PANEL_APPLETS_DIR" = "${config.system.path}/share/mate-panel/applets"; + environment.sessionVariables."MATE_PANEL_EXTRA_MODULES" = "${config.system.path}/lib/mate-panel/applets"; - ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} & - waitPID=$! - ''; - }; + # Debugging + environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; environment.systemPackages = pkgs.mate.basePackages ++ diff --git a/nixpkgs/nixos/modules/system/activation/top-level.nix b/nixpkgs/nixos/modules/system/activation/top-level.nix index 14bd751ce324..49693b6f1be0 100644 --- a/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -75,7 +75,7 @@ let echo -n "$configurationName" > $out/configuration-name echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version echo -n "$nixosLabel" > $out/nixos-version - echo -n "${pkgs.stdenv.hostPlatform.system}" > $out/system + echo -n "${config.boot.kernelPackages.stdenv.hostPlatform.system}" > $out/system mkdir $out/fine-tune childCount=0 diff --git a/nixpkgs/nixos/modules/system/boot/kernel.nix b/nixpkgs/nixos/modules/system/boot/kernel.nix index c247f334c23d..43871f439f7f 100644 --- a/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -192,139 +192,144 @@ in ###### implementation - config = mkIf (!config.boot.isContainer) { - - system.build = { inherit kernel; }; - - system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages; - - # Implement consoleLogLevel both in early boot and using sysctl - # (so you don't need to reboot to have changes take effect). - boot.kernelParams = - [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++ - optionals config.boot.vesa [ "vga=0x317" "nomodeset" ]; - - boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel; - - boot.kernelModules = [ "loop" "atkbd" ]; - - boot.initrd.availableKernelModules = - [ # Note: most of these (especially the SATA/PATA modules) - # shouldn't be included by default since nixos-generate-config - # detects them, but I'm keeping them for now for backwards - # compatibility. - - # Some SATA/PATA stuff. - "ahci" - "sata_nv" - "sata_via" - "sata_sis" - "sata_uli" - "ata_piix" - "pata_marvell" - - # Standard SCSI stuff. - "sd_mod" - "sr_mod" - - # SD cards and internal eMMC drives. - "mmc_block" - - # Support USB keyboards, in case the boot fails and we only have - # a USB keyboard, or for LUKS passphrase prompt. - "uhci_hcd" - "ehci_hcd" - "ehci_pci" - "ohci_hcd" - "ohci_pci" - "xhci_hcd" - "xhci_pci" - "usbhid" - "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" - "hid_logitech_hidpp" "hid_logitech_dj" - - ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ - # Misc. x86 keyboard stuff. - "pcips2" "atkbd" "i8042" - - # x86 RTC needed by the stage 2 init script. - "rtc_cmos" - ]; - - boot.initrd.kernelModules = - [ # For LVM. - "dm_mod" - ]; - - # The Linux kernel >= 2.6.27 provides firmware. - hardware.firmware = [ kernel ]; - - # Create /etc/modules-load.d/nixos.conf, which is read by - # systemd-modules-load.service to load required kernel modules. - environment.etc = - { "modules-load.d/nixos.conf".source = kernelModulesConf; - }; - - systemd.services.systemd-modules-load = - { wantedBy = [ "multi-user.target" ]; - restartTriggers = [ kernelModulesConf ]; - serviceConfig = - { # Ignore failed module loads. Typically some of the - # modules in ‘boot.kernelModules’ are "nice to have but - # not required" (e.g. acpi-cpufreq), so we don't want to - # barf on those. - SuccessExitStatus = "0 1"; + config = mkMerge + [ (mkIf config.boot.initrd.enable { + boot.initrd.availableKernelModules = + [ # Note: most of these (especially the SATA/PATA modules) + # shouldn't be included by default since nixos-generate-config + # detects them, but I'm keeping them for now for backwards + # compatibility. + + # Some SATA/PATA stuff. + "ahci" + "sata_nv" + "sata_via" + "sata_sis" + "sata_uli" + "ata_piix" + "pata_marvell" + + # Standard SCSI stuff. + "sd_mod" + "sr_mod" + + # SD cards and internal eMMC drives. + "mmc_block" + + # Support USB keyboards, in case the boot fails and we only have + # a USB keyboard, or for LUKS passphrase prompt. + "uhci_hcd" + "ehci_hcd" + "ehci_pci" + "ohci_hcd" + "ohci_pci" + "xhci_hcd" + "xhci_pci" + "usbhid" + "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" + "hid_logitech_hidpp" "hid_logitech_dj" + + ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ + # Misc. x86 keyboard stuff. + "pcips2" "atkbd" "i8042" + + # x86 RTC needed by the stage 2 init script. + "rtc_cmos" + ]; + + boot.initrd.kernelModules = + [ # For LVM. + "dm_mod" + ]; + }) + + (mkIf (!config.boot.isContainer) { + system.build = { inherit kernel; }; + + system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages; + + # Implement consoleLogLevel both in early boot and using sysctl + # (so you don't need to reboot to have changes take effect). + boot.kernelParams = + [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++ + optionals config.boot.vesa [ "vga=0x317" "nomodeset" ]; + + boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel; + + boot.kernelModules = [ "loop" "atkbd" ]; + + # The Linux kernel >= 2.6.27 provides firmware. + hardware.firmware = [ kernel ]; + + # Create /etc/modules-load.d/nixos.conf, which is read by + # systemd-modules-load.service to load required kernel modules. + environment.etc = + { "modules-load.d/nixos.conf".source = kernelModulesConf; }; - }; - - lib.kernelConfig = { - isYes = option: { - assertion = config: config.isYes option; - message = "CONFIG_${option} is not yes!"; - configLine = "CONFIG_${option}=y"; - }; - - isNo = option: { - assertion = config: config.isNo option; - message = "CONFIG_${option} is not no!"; - configLine = "CONFIG_${option}=n"; - }; - - isModule = option: { - assertion = config: config.isModule option; - message = "CONFIG_${option} is not built as a module!"; - configLine = "CONFIG_${option}=m"; - }; - - ### Usually you will just want to use these two - # True if yes or module - isEnabled = option: { - assertion = config: config.isEnabled option; - message = "CONFIG_${option} is not enabled!"; - configLine = "CONFIG_${option}=y"; - }; - - # True if no or omitted - isDisabled = option: { - assertion = config: config.isDisabled option; - message = "CONFIG_${option} is not disabled!"; - configLine = "CONFIG_${option}=n"; - }; - }; - # The config options that all modules can depend upon - system.requiredKernelConfig = with config.lib.kernelConfig; [ - # !!! Should this really be needed? - (isYes "MODULES") - (isYes "BINFMT_ELF") - ] ++ (optional (randstructSeed != "") (isYes "GCC_PLUGIN_RANDSTRUCT")); + systemd.services.systemd-modules-load = + { wantedBy = [ "multi-user.target" ]; + restartTriggers = [ kernelModulesConf ]; + serviceConfig = + { # Ignore failed module loads. Typically some of the + # modules in ‘boot.kernelModules’ are "nice to have but + # not required" (e.g. acpi-cpufreq), so we don't want to + # barf on those. + SuccessExitStatus = "0 1"; + }; + }; - # nixpkgs kernels are assumed to have all required features - assertions = if config.boot.kernelPackages.kernel ? features then [] else - let cfg = config.boot.kernelPackages.kernel.config; in map (attrs: - { assertion = attrs.assertion cfg; inherit (attrs) message; } - ) config.system.requiredKernelConfig; + lib.kernelConfig = { + isYes = option: { + assertion = config: config.isYes option; + message = "CONFIG_${option} is not yes!"; + configLine = "CONFIG_${option}=y"; + }; - }; + isNo = option: { + assertion = config: config.isNo option; + message = "CONFIG_${option} is not no!"; + configLine = "CONFIG_${option}=n"; + }; + + isModule = option: { + assertion = config: config.isModule option; + message = "CONFIG_${option} is not built as a module!"; + configLine = "CONFIG_${option}=m"; + }; + + ### Usually you will just want to use these two + # True if yes or module + isEnabled = option: { + assertion = config: config.isEnabled option; + message = "CONFIG_${option} is not enabled!"; + configLine = "CONFIG_${option}=y"; + }; + + # True if no or omitted + isDisabled = option: { + assertion = config: config.isDisabled option; + message = "CONFIG_${option} is not disabled!"; + configLine = "CONFIG_${option}=n"; + }; + }; + + # The config options that all modules can depend upon + system.requiredKernelConfig = with config.lib.kernelConfig; + [ + # !!! Should this really be needed? + (isYes "MODULES") + (isYes "BINFMT_ELF") + ] ++ (optional (randstructSeed != "") (isYes "GCC_PLUGIN_RANDSTRUCT")); + + # nixpkgs kernels are assumed to have all required features + assertions = if config.boot.kernelPackages.kernel ? features then [] else + let cfg = config.boot.kernelPackages.kernel.config; in map (attrs: + { assertion = attrs.assertion cfg; inherit (attrs) message; } + ) config.system.requiredKernelConfig; + + }) + + ]; } diff --git a/nixpkgs/nixos/modules/system/boot/networkd.nix b/nixpkgs/nixos/modules/system/boot/networkd.nix index 6dfbe66fc647..3078f84f6e92 100644 --- a/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -355,6 +355,14 @@ let }; linkOptions = commonNetworkOptions // { + # overwrite enable option from above + enable = mkOption { + default = true; + type = types.bool; + description = '' + Whether to enable this .link unit. It's handled by udev no matter if <command>systemd-networkd</command> is enabled or not + ''; + }; linkConfig = mkOption { default = {}; @@ -1045,44 +1053,49 @@ in }; - config = mkIf config.systemd.network.enable { + config = mkMerge [ + # .link units are honored by udev, no matter if systemd-networkd is enabled or not. + { + systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links; + environment.etc = unitFiles; + } - users.users.systemd-network.group = "systemd-network"; + (mkIf config.systemd.network.enable { - systemd.additionalUpstreamSystemUnits = [ - "systemd-networkd.service" "systemd-networkd-wait-online.service" - ]; + users.users.systemd-network.group = "systemd-network"; - systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links - // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs - // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks; + systemd.additionalUpstreamSystemUnits = [ + "systemd-networkd.service" "systemd-networkd-wait-online.service" + ]; - environment.etc = unitFiles; + systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs + // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks; - systemd.services.systemd-networkd = { - wantedBy = [ "multi-user.target" ]; - restartTriggers = attrNames unitFiles; - # prevent race condition with interface renaming (#39069) - requires = [ "systemd-udev-settle.service" ]; - after = [ "systemd-udev-settle.service" ]; - }; + systemd.services.systemd-networkd = { + wantedBy = [ "multi-user.target" ]; + restartTriggers = attrNames unitFiles; + # prevent race condition with interface renaming (#39069) + requires = [ "systemd-udev-settle.service" ]; + after = [ "systemd-udev-settle.service" ]; + }; - systemd.services.systemd-networkd-wait-online = { - wantedBy = [ "network-online.target" ]; - }; + systemd.services.systemd-networkd-wait-online = { + wantedBy = [ "network-online.target" ]; + }; - systemd.services."systemd-network-wait-online@" = { - description = "Wait for Network Interface %I to be Configured"; - conflicts = [ "shutdown.target" ]; - requisite = [ "systemd-networkd.service" ]; - after = [ "systemd-networkd.service" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I"; + systemd.services."systemd-network-wait-online@" = { + description = "Wait for Network Interface %I to be Configured"; + conflicts = [ "shutdown.target" ]; + requisite = [ "systemd-networkd.service" ]; + after = [ "systemd-networkd.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I"; + }; }; - }; - services.resolved.enable = mkDefault true; - }; + services.resolved.enable = mkDefault true; + }) + ]; } diff --git a/nixpkgs/nixos/modules/system/boot/stage-1.nix b/nixpkgs/nixos/modules/system/boot/stage-1.nix index 26117cffeda2..93cd801ef803 100644 --- a/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -390,6 +390,17 @@ in ''; }; + boot.initrd.enable = mkOption { + type = types.bool; + default = !config.boot.isContainer; + defaultText = "!config.boot.isContainer"; + description = '' + Whether to enable the NixOS initial RAM disk (initrd). This may be + needed to perform some initialisation tasks (like mounting + network/encrypted file systems) before continuing the boot process. + ''; + }; + boot.initrd.prepend = mkOption { default = [ ]; type = types.listOf types.str; @@ -555,7 +566,7 @@ in }; - config = mkIf (!config.boot.isContainer) { + config = mkIf config.boot.initrd.enable { assertions = [ { assertion = any (fs: fs.mountPoint == "/") fileSystems; message = "The ‘fileSystems’ option does not specify your root file system."; diff --git a/nixpkgs/nixos/release-small.nix b/nixpkgs/nixos/release-small.nix index 7b86a91357ec..2a15073b6698 100644 --- a/nixpkgs/nixos/release-small.nix +++ b/nixpkgs/nixos/release-small.nix @@ -28,7 +28,7 @@ let in rec { nixos = { - inherit (nixos') channel manual iso_minimal dummy; + inherit (nixos') channel manual options iso_minimal dummy; tests = { inherit (nixos'.tests) containers-imperative diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 7dd0f23df658..3501c551625d 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -97,6 +97,7 @@ in fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; freeswitch = handleTest ./freeswitch.nix {}; fsck = handleTest ./fsck.nix {}; + gerrit = handleTest ./gerrit.nix {}; gotify-server = handleTest ./gotify-server.nix {}; grocy = handleTest ./grocy.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; @@ -135,6 +136,7 @@ in initrd-network-ssh = handleTest ./initrd-network-ssh {}; initrdNetwork = handleTest ./initrd-network.nix {}; installer = handleTest ./installer.nix {}; + iodine = handleTest ./iodine.nix {}; ipv6 = handleTest ./ipv6.nix {}; jackett = handleTest ./jackett.nix {}; jellyfin = handleTest ./jellyfin.nix {}; diff --git a/nixpkgs/nixos/tests/fenics.nix b/nixpkgs/nixos/tests/fenics.nix new file mode 100644 index 000000000000..7252d19e4e65 --- /dev/null +++ b/nixpkgs/nixos/tests/fenics.nix @@ -0,0 +1,50 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + fenicsScript = pkgs.writeScript "poisson.py" '' + #!/usr/bin/env python + from dolfin import * + + mesh = UnitSquareMesh(4, 4) + V = FunctionSpace(mesh, "Lagrange", 1) + + def boundary(x): + return x[0] < DOLFIN_EPS or x[0] > 1.0 - DOLFIN_EPS + + u0 = Constant(0.0) + bc = DirichletBC(V, u0, boundary) + + u = TrialFunction(V) + v = TestFunction(V) + f = Expression("10*exp(-(pow(x[0] - 0.5, 2) + pow(x[1] - 0.5, 2)) / 0.02)", degree=2) + g = Expression("sin(5*x[0])", degree=2) + a = inner(grad(u), grad(v))*dx + L = f*v*dx + g*v*ds + + u = Function(V) + solve(a == L, u, bc) + print(u) + ''; +in +{ + name = "fenics"; + meta = { + maintainers = with pkgs.stdenv.lib.maintainers; [ knedlsepp ]; + }; + + nodes = { + fenicsnode = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + gcc + (python3.withPackages (ps: with ps; [ fenics ])) + ]; + virtualisation.memorySize = 512; + }; + }; + testScript = + { nodes, ... }: + '' + start_all() + node1.succeed("${fenicsScript}") + ''; +}) diff --git a/nixpkgs/nixos/tests/gerrit.nix b/nixpkgs/nixos/tests/gerrit.nix new file mode 100644 index 000000000000..e8b5cb4c4feb --- /dev/null +++ b/nixpkgs/nixos/tests/gerrit.nix @@ -0,0 +1,56 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + lfs = pkgs.fetchurl { + url = "https://gerrit-ci.gerritforge.com/job/plugin-lfs-bazel-master/90/artifact/bazel-bin/plugins/lfs/lfs.jar"; + sha256 = "023b0kd8djm3cn1lf1xl67yv3j12yl8bxccn42lkfmwxjwjfqw6h"; + }; + +in { + name = "gerrit"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ flokli zimbatm ]; + }; + + nodes = { + server = + { config, pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 80 2222 ]; + + virtualisation.memorySize = 1024; + + services.gerrit = { + enable = true; + serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0"; + listenAddress = "[::]:80"; + jvmPackage = pkgs.jdk12_headless; + jvmHeapLimit = "1g"; + + plugins = [ lfs ]; + builtinPlugins = [ "hooks" "webhooks" ]; + settings = { + gerrit.canonicalWebUrl = "http://server"; + lfs.plugin = "lfs"; + plugins.allowRemoteAdmin = true; + sshd.listenAddress = "[::]:2222"; + sshd.advertisedAddress = "[::]:2222"; + }; + }; + }; + + client = + { ... }: { + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("gerrit.service") + server.wait_for_open_port(80) + client.succeed("curl http://server") + + server.wait_for_open_port(2222) + client.succeed("nc -z server 2222") + ''; +}) diff --git a/nixpkgs/nixos/tests/graphite.nix b/nixpkgs/nixos/tests/graphite.nix index ba3c73bb878d..71776a94cbd6 100644 --- a/nixpkgs/nixos/tests/graphite.nix +++ b/nixpkgs/nixos/tests/graphite.nix @@ -12,15 +12,19 @@ import ./make-test-python.nix ({ pkgs, ... } : virtualisation.memorySize = 1024; time.timeZone = "UTC"; services.graphite = { - web.enable = true; + web = { + enable = true; + extraConfig = '' + SECRET_KEY = "abcd"; + ''; + }; api = { enable = true; port = 8082; - finders = [ pkgs.python27Packages.influxgraph ]; + finders = [ pkgs.python3Packages.influxgraph ]; }; carbon.enableCache = true; - seyren.enable = true; - pager.enable = true; + seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure beacon.enable = true; }; }; @@ -31,16 +35,16 @@ import ./make-test-python.nix ({ pkgs, ... } : one.wait_for_unit("default.target") one.wait_for_unit("graphiteWeb.service") one.wait_for_unit("graphiteApi.service") - one.wait_for_unit("graphitePager.service") one.wait_for_unit("graphite-beacon.service") one.wait_for_unit("carbonCache.service") - one.wait_for_unit("seyren.service") # The services above are of type "simple". systemd considers them active immediately # even if they're still in preStart (which takes quite long for graphiteWeb). # Wait for ports to open so we're sure the services are up and listening. one.wait_for_open_port(8080) one.wait_for_open_port(2003) one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') - one.wait_until_succeeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2") + one.wait_until_succeeds( + "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" + ) ''; }) diff --git a/nixpkgs/nixos/tests/installer.nix b/nixpkgs/nixos/tests/installer.nix index 983861911e0d..babde4126c4c 100644 --- a/nixpkgs/nixos/tests/installer.nix +++ b/nixpkgs/nixos/tests/installer.nix @@ -104,7 +104,6 @@ let with subtest("Assert readiness of login prompt"): machine.succeed("echo hello") - machine.wait_for_unit("nixos-manual") with subtest("Wait for hard disks to appear in /dev"): machine.succeed("udevadm settle") diff --git a/nixpkgs/nixos/tests/iodine.nix b/nixpkgs/nixos/tests/iodine.nix new file mode 100644 index 000000000000..8bd9603a6d6c --- /dev/null +++ b/nixpkgs/nixos/tests/iodine.nix @@ -0,0 +1,63 @@ +import ./make-test-python.nix ( + { pkgs, ... }: let + domain = "whatever.example.com"; + in + { + name = "iodine"; + nodes = { + server = + { ... }: + + { + networking.firewall = { + allowedUDPPorts = [ 53 ]; + trustedInterfaces = [ "dns0" ]; + }; + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.ip_forward" = 1; + }; + + services.iodine.server = { + enable = true; + ip = "10.53.53.1/24"; + passwordFile = "${builtins.toFile "password" "foo"}"; + inherit domain; + }; + + # test resource: accessible only via tunnel + services.openssh = { + enable = true; + openFirewall = false; + }; + }; + + client = + { ... }: { + services.iodine.clients.testClient = { + # test that ProtectHome is "read-only" + passwordFile = "/root/pw"; + relay = "server"; + server = domain; + }; + systemd.tmpfiles.rules = [ + "f /root/pw 0666 root root - foo" + ]; + environment.systemPackages = [ + pkgs.nagiosPluginsOfficial + ]; + }; + + }; + + testScript = '' + start_all() + + server.wait_for_unit("sshd") + server.wait_for_unit("iodined") + client.wait_for_unit("iodine-testClient") + + client.succeed("check_ssh -H 10.53.53.1") + ''; + } +) diff --git a/nixpkgs/nixos/tests/mongodb.nix b/nixpkgs/nixos/tests/mongodb.nix index 9ebf84eed232..ee7fc50f7ecc 100644 --- a/nixpkgs/nixos/tests/mongodb.nix +++ b/nixpkgs/nixos/tests/mongodb.nix @@ -1,42 +1,52 @@ # This test start mongodb, runs a query using mongo shell -import ./make-test-python.nix ({ pkgs, ...} : let - testQuery = pkgs.writeScript "nixtest.js" '' - db.greetings.insert({ "greeting": "hello" }); - print(db.greetings.findOne().greeting); - ''; -in { - name = "mongodb"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bluescreen303 offline cstrahan rvl phile314 ]; - }; +import ./make-test-python.nix ({ pkgs, ... }: + let + testQuery = pkgs.writeScript "nixtest.js" '' + db.greetings.insert({ "greeting": "hello" }); + print(db.greetings.findOne().greeting); + ''; - nodes = { - one = - { ... }: - { - services = { - mongodb.enable = true; - mongodb.enableAuth = true; - mongodb.initialRootPassword = "root"; - mongodb.initialScript = pkgs.writeText "mongodb_initial.js" '' - db = db.getSiblingDB("nixtest"); - db.createUser({user:"nixtest",pwd:"nixtest",roles:[{role:"readWrite",db:"nixtest"}]}); - ''; - mongodb.extraConfig = '' - # Allow starting engine with only a small virtual disk - storage.journal.enabled: false - storage.mmapv1.smallFiles: true - ''; - }; - }; + runMongoDBTest = pkg: '' + node.execute("(rm -rf data || true) && mkdir data") + node.execute( + "${pkg}/bin/mongod --fork --logpath logs --dbpath data" + ) + node.wait_for_open_port(27017) + + assert "hello" in node.succeed( + "mongo ${testQuery}" + ) + + node.execute( + "${pkg}/bin/mongod --shutdown --dbpath data" + ) + node.wait_for_closed_port(27017) + ''; + + in { + name = "mongodb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bluescreen303 offline cstrahan rvl phile314 ]; + }; + + nodes = { + node = {...}: { + environment.systemPackages = with pkgs; [ +# mongodb-3_4 + mongodb-3_6 + mongodb-4_0 + ]; + }; }; - testScript = '' - start_all() - one.wait_for_unit("mongodb.service") - one.succeed( - "mongo -u nixtest -p nixtest nixtest ${testQuery} | grep -q hello" - ) - ''; -}) + testScript = '' + node.start() + '' +# + runMongoDBTest pkgs.mongodb-3_4 + + runMongoDBTest pkgs.mongodb-3_6 + + runMongoDBTest pkgs.mongodb-4_0 + + '' + node.shutdown() + ''; + }) diff --git a/nixpkgs/nixos/tests/mysql.nix b/nixpkgs/nixos/tests/mysql.nix index 924bac84e26c..84673181e1a4 100644 --- a/nixpkgs/nixos/tests/mysql.nix +++ b/nixpkgs/nixos/tests/mysql.nix @@ -22,6 +22,27 @@ import ./make-test-python.nix ({ pkgs, ...} : { services.mysql.package = pkgs.mysql57; }; + mysql80 = + { pkgs, ... }: + + { + # prevent oom: + # Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled + virtualisation.memorySize = 1024; + + services.mysql.enable = true; + services.mysql.initialDatabases = [ + { name = "testdb"; schema = ./testdb.sql; } + { name = "empty_testdb"; } + ]; + # note that using pkgs.writeText here is generally not a good idea, + # as it will store the password in world-readable /nix/store ;) + services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; + ''; + services.mysql.package = pkgs.mysql80; + }; + mariadb = { pkgs, ... }: @@ -61,6 +82,12 @@ import ./make-test-python.nix ({ pkgs, ...} : { # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript mysql.succeed("echo ';' | mysql -u passworduser --password=password123") + mysql80.wait_for_unit("mysql") + mysql80.succeed("echo 'use empty_testdb;' | mysql -u root") + mysql80.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4") + # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript + mysql80.succeed("echo ';' | mysql -u passworduser --password=password123") + mariadb.wait_for_unit("mysql") mariadb.succeed( "echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser" diff --git a/nixpkgs/nixos/tests/networking.nix b/nixpkgs/nixos/tests/networking.nix index 933a4451af92..0a6507d2dc88 100644 --- a/nixpkgs/nixos/tests/networking.nix +++ b/nixpkgs/nixos/tests/networking.nix @@ -655,6 +655,31 @@ let ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue) ''; }; + # even with disabled networkd, systemd.network.links should work + # (as it's handled by udev, not networkd) + link = { + name = "Link"; + nodes.client = { pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = false; + }; + systemd.network.links."50-foo" = { + matchConfig = { + Name = "foo"; + Driver = "dummy"; + }; + linkConfig.MTUBytes = "1442"; + }; + }; + testScript = '' + print(client.succeed("ip l add name foo type dummy")) + print(client.succeed("stat /etc/systemd/network/50-foo.link")) + client.succeed("udevadm settle") + assert "mtu 1442" in client.succeed("ip l show dummy0") + ''; + }; }; in mapAttrs (const (attrs: makeTest (attrs // { diff --git a/nixpkgs/pkgs/applications/audio/ardour/default.nix b/nixpkgs/pkgs/applications/audio/ardour/default.nix index 30a4e052d77c..c1749029cdc9 100644 --- a/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf +, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper +, 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 @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + 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 diff --git a/nixpkgs/pkgs/applications/audio/aucatctl/default.nix b/nixpkgs/pkgs/applications/audio/aucatctl/default.nix new file mode 100644 index 000000000000..4aff3e1f7bfb --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/aucatctl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, sndio, libbsd }: + +stdenv.mkDerivation rec { + pname = "aucatctl"; + version = "0.1"; + + src = fetchurl { + url = "http://www.sndio.org/${pname}-${version}.tar.gz"; + sha256 = "524f2fae47db785234f166551520d9605b9a27551ca438bd807e3509ce246cf0"; + }; + + buildInputs = [ sndio ] + ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) + libbsd; + + outputs = [ "out" "man" ]; + + preBuild = '' + makeFlagsArray+=("PREFIX=$out") + '' + stdenv.lib.optionalString + (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) '' + makeFlagsArray+=(LDADD="-lsndio -lbsd") + + # Fix warning about implicit declaration of function 'strlcpy' + substituteInPlace aucatctl.c \ + --replace '#include <string.h>' '#include <bsd/string.h>' + ''; + + meta = with stdenv.lib; { + description = + "The aucatctl utility sends MIDI messages to control sndiod and/or aucat volumes"; + homepage = "http://www.sndio.org"; + license = licenses.isc; + maintainers = with maintainers; [ sna ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch b/nixpkgs/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch new file mode 100644 index 000000000000..2e2746f43417 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix b/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix new file mode 100644 index 000000000000..732c2968fde4 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/cmt/default.nix b/nixpkgs/pkgs/applications/audio/cmt/default.nix new file mode 100644 index 000000000000..96cc3c573198 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/cmt/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchurl +, ladspaH +}: + +stdenv.mkDerivation rec { + name = "cmt"; + version = "1.17"; + + src = fetchurl { + url = "http://www.ladspa.org/download/${name}_${version}.tgz"; + sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; + }; + + buildInputs = [ ladspaH ]; + + preBuild = '' + cd src + ''; + + installFlags = [ "INSTALL_PLUGINS_DIR=${placeholder "out"}/lib/ladspa" ]; + preInstall = '' + mkdir -p $out/lib/ladspa + ''; + + meta = with stdenv.lib; { + description = "Computer Music Toolkit"; + homepage = "https://www.ladspa.org/cmt"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ sjfloat ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix index 74a5f4d383d9..cca0e21f8358 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with stdenv.lib.strings; let - version = "2.20.2"; + version = "unstable-2020-03-20"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = version; - sha256 = "08hv8gyj6c83128z3si92r1ka5ckf9sdpn5jdnlhrqyzja4mrxsy"; + rev = "2782088d4485f1c572755f41e7a072b41cb7148a"; + sha256 = "1l7bi2mq10s5wm8g4cdipg8gndd478x897qv0h7nqi1s2q9nq99p"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix index 5a015e5ca31e..144d19cb01e4 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix @@ -3,6 +3,7 @@ , opencv , qt4 , libsndfile +, which }: faust.wrapWithBuildEnv { @@ -19,6 +20,7 @@ faust.wrapWithBuildEnv { opencv qt4 libsndfile + which ]; } diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2lv2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2lv2.nix index 3472ce5047eb..51d956b14036 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2lv2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2lv2.nix @@ -2,6 +2,7 @@ , faust , lv2 , qt4 +, which }: @@ -9,6 +10,6 @@ faust.wrapWithBuildEnv { baseName = "faust2lv2"; - propagatedBuildInputs = [ boost lv2 qt4 ]; + propagatedBuildInputs = [ boost lv2 qt4 which ]; } diff --git a/nixpkgs/pkgs/applications/audio/grandorgue/default.nix b/nixpkgs/pkgs/applications/audio/grandorgue/default.nix new file mode 100644 index 000000000000..e2ba4ee2244e --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/grandorgue/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchsvn, cmake, pkg-config, gcc, pkgconfig, fftwFloat, alsaLib +, zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 +, includeDemo ? true }: + +stdenv.mkDerivation rec { + pname = "grandorgue"; + rev = "2333"; + version = "0.3.1-r${rev}"; + src = fetchsvn { + url = "https://svn.code.sf.net/p/ourorgan/svn/trunk"; + inherit rev; + sha256 = "0xzjdc2g4gja2lpmn21xhdskv43qpbpzkbb05jfqv6ma2zwffzz1"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ pkgconfig fftwFloat alsaLib zlib wavpack wxGTK31 udev ] + ++ lib.optional jackaudioSupport libjack2; + + cmakeFlags = lib.optional (!jackaudioSupport) [ + "-DRTAUDIO_USE_JACK=OFF" + "-DRTMIDI_USE_JACK=OFF" + ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; + + meta = { + description = "Virtual Pipe Organ Software"; + homepage = "https://sourceforge.net/projects/ourorgan"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.puzzlewolf ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/nixpkgs/pkgs/applications/audio/guitarix/default.nix index ca552882ba43..acb078fea876 100644 --- a/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python2 , avahi, bluez, boost, eigen, fftw, glib, glib-networking , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 -, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom +, ladspaH, libav, libsndfile, lilv, lrdf, lv2, serd, sord, sratom , wrapGAppsHook, zita-convolver, zita-resampler, curl, wafHook , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib-networking.out - gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf - libsndfile lilv lv2 serd sord sratom zita-convolver + gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav + libsndfile lilv lrdf lv2 serd sord sratom zita-convolver zita-resampler curl ]; diff --git a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix index 50093f8a61de..d8aa2a013c4d 100644 --- a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix +++ b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, alsaLib, boost, cmake, glib, lash, libjack2, libarchive -, liblrdf, libsndfile, pkgconfig, qt4 }: +{ stdenv, fetchurl, pkgconfig, cmake +, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +}: stdenv.mkDerivation rec { version = "0.9.7"; @@ -10,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ - alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4 + alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/audio/jack-rack/default.nix b/nixpkgs/pkgs/applications/audio/jack-rack/default.nix index 41b40223b87f..2f9b9db93c24 100644 --- a/nixpkgs/pkgs/applications/audio/jack-rack/default.nix +++ b/nixpkgs/pkgs/applications/audio/jack-rack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, librdf }: +{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; + buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ]; NIX_LDFLAGS = "-ldl -lm -lpthread"; meta = { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index fece392ab1cc..735e7efe54dc 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' + echo "hack out autoComp.dsp due to https://github.com/grame-cncm/faust/407/issues " + rm autoComp.dsp for f in *.dsp; do echo "compiling standalone from" $f diff --git a/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/nixpkgs/pkgs/applications/audio/mixxx/default.nix index 82db91dcb077..1247534b1e83 100644 --- a/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -3,7 +3,7 @@ , 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 }: mkDerivation rec { @@ -20,7 +20,7 @@ mkDerivation rec { buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis libxcb libGLU 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 ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 2f3e5f64767d..000a0bc0bfe3 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.45.1"; + version = "3.46.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "02jmylz76wlwxlv8drndprb7r9l8kqqgjkp17mjx5ngnl545pc2w"; + sha256 = "0c7b6zbcj4bq5qsxvhjwqclrl1k2hs3wb50pfjbw7gs7m3gm2b7d"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix b/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix new file mode 100644 index 000000000000..4dd32ea3aa35 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix @@ -0,0 +1,24 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-MPD"; + version = "3.0.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0prjli4352521igcsfcgmk97jmzgbfy4ik8hnli37wgvv252wiac"; + }; + + propagatedBuildInputs = [mopidy]; + + # no tests implemented + doCheck = false; + pythonImportsCheck = [ "mopidy_mpd" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mopidy/mopidy-mpd"; + description = "Mopidy extension for controlling playback from MPD clients"; + license = licenses.asl20; + maintainers = [ maintainers.tomahna ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mup/default.nix b/nixpkgs/pkgs/applications/audio/mup/default.nix new file mode 100644 index 000000000000..43098be12e3f --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mup/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, autoreconfHook, bison, flex, ghostscript, groff, netpbm +, fltk, libXinerama, libXpm, libjpeg +}: + +stdenv.mkDerivation rec { + pname = "mup"; + version = "6.7"; + + src = fetchurl { + url = "http://www.arkkra.com/ftp/pub/unix/mup${builtins.replaceStrings ["."] [""] version}src.tar.gz"; + sha256 = "1y1qknhib1isdjsbv833w3nxzyfljkfgp1gmjwly60l55q60frpk"; + }; + + nativeBuildInputs = [ autoreconfHook bison flex ghostscript groff netpbm ]; + + buildInputs = [ fltk libXinerama libXpm libjpeg ]; + + patches = [ ./ghostscript-permit-file-write.patch ]; + + postPatch = '' + for f in Makefile.am doc/Makefile.am doc/htmldocs/Makefile.am src/mupmate/Preferences.C; do + substituteInPlace $f --replace doc/packages doc + done + substituteInPlace src/mupprnt/mupprnt --replace 'mup ' $out/bin/mup' ' + substituteInPlace src/mupdisp/genfile.c --replace '"mup"' '"'$out/bin/mup'"' + substituteInPlace src/mupmate/Preferences.C \ + --replace '"mup"' '"'$out/bin/mup'"' \ + --replace '"gv"' '"xdg-open"' \ + --replace /usr/share/doc $out/share/doc + ''; + + enableParallelBuilding = false; # Undeclared dependencies + https://stackoverflow.com/a/19822767/1687334 for prolog.ps. + + meta = with stdenv.lib; { + homepage = http://www.arkkra.com/; + description = "Music typesetting program (ASCII to PostScript and MIDI)"; + license = licenses.bsd3; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch b/nixpkgs/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch new file mode 100644 index 000000000000..5059e71001f0 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch @@ -0,0 +1,5 @@ +--- a/src/mup/Makefile.am ++++ b/src/mup/Makefile.am +@@ -39 +39 @@ fontdata.c: prolog.ps ../../tools/mup/getfontinfo.ps ../../LICENSE +- $(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c ++ $(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET --permit-file-write=charnames:fontinit - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c diff --git a/nixpkgs/pkgs/applications/audio/muse/default.nix b/nixpkgs/pkgs/applications/audio/muse/default.nix index f1fad05beced..87f86306b482 100644 --- a/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -1,25 +1,33 @@ -{ stdenv -, fetchFromGitHub -, libjack2 -, wrapQtAppsHook -, qtsvg -, qttools -, cmake -, libsndfile -, libsamplerate -, ladspaH -, fluidsynth -, alsaLib -, rtaudio -, lash -, dssi -, liblo -, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook +, alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo +, libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "muse-sequencer"; - version = "3.1pre1"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "muse-sequencer"; + repo = "muse"; + rev = "muse_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "08k25652w88xf2i79lw305x1phpk7idrww9jkqwcs8q6wzgmz8aq"; + }; + + sourceRoot = "source/muse3"; + + prePatch = '' + chmod u+w $NIX_BUILD_TOP + ''; + + patches = [ ./fix-parallel-building.patch ]; + + nativeBuildInputs = [ cmake pkgconfig qttools wrapQtAppsHook ]; + + buildInputs = [ + alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo + libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord + ]; meta = with stdenv.lib; { homepage = "https://www.muse-sequencer.org/"; @@ -32,38 +40,7 @@ stdenv.mkDerivation { MusE aims to be a complete multitrack virtual studio for Linux, it is published under the GNU General Public License. ''; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; }; - - src = - fetchFromGitHub { - owner = "muse-sequencer"; - repo = "muse"; - rev = "2167ae053c16a633d8377acdb1debaac10932838"; - sha256 = "0rsdx8lvcbz5bapnjvypw8h8bq587s9z8cf2znqrk6ah38s6fsrf"; - }; - - - nativeBuildInputs = [ - pkgconfig - wrapQtAppsHook - qttools - cmake - ]; - - buildInputs = [ - libjack2 - qtsvg - libsndfile - libsamplerate - ladspaH - fluidsynth - alsaLib - rtaudio - lash - dssi - liblo - ]; - - sourceRoot = "source/muse3"; } diff --git a/nixpkgs/pkgs/applications/audio/muse/fix-parallel-building.patch b/nixpkgs/pkgs/applications/audio/muse/fix-parallel-building.patch new file mode 100644 index 000000000000..a11970b7111a --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/muse/fix-parallel-building.patch @@ -0,0 +1,93 @@ +To confirm these dependencies, run in a fresh build tree: + + +ninja muse/components/CMakeFiles/components.dir/confmport.o + +In file included from ../muse/components/confmport.cpp:48: +../muse/mplugins/midifilterimpl.h:28:10: fatal error: +ui_midifilter.h: No such file or directory + + +ninja muse/waveedit/CMakeFiles/waveedit.dir/wavecanvas.o + +In file included from ../muse/waveedit/wavecanvas.cpp:72: +../muse/components/copy_on_write.h:26:10: fatal error: +ui_copy_on_write_base.h: No such file or directory + + +ninja muse/instruments/CMakeFiles/instruments.dir/editinstrument.o + +In file included from ../muse/instruments/editinstrument.cpp:58: +../muse/components/editevent.h:26:10: fatal error: +ui_editnotedialogbase.h: No such file or directory + + +ninja muse/liste/CMakeFiles/liste.dir/listedit.o + +In file included from ../muse/liste/listedit.cpp:37: +../muse/components/editevent.h:26:10: fatal error: +ui_editnotedialogbase.h: No such file or directory + + +ninja muse/mixer/CMakeFiles/mixer.dir/rack.o + +In file included from ../muse/mixer/rack.cpp:49: +../muse/components/plugindialog.h:4:10: fatal error: +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 + target_link_libraries ( components + ${QT_LIBRARIES} ++ mplugins + widgets + xml_module +--- a/muse/waveedit/CMakeLists.txt ++++ b/muse/waveedit/CMakeLists.txt +@@ -79,4 +79,5 @@ set_target_properties( waveedit + target_link_libraries( waveedit + ${QT_LIBRARIES} ++ components + widgets + ) +--- a/muse/instruments/CMakeLists.txt ++++ b/muse/instruments/CMakeLists.txt +@@ -78,4 +78,5 @@ set_target_properties( instruments + target_link_libraries ( instruments + ${QT_LIBRARIES} ++ components + icons + widgets +--- a/muse/liste/CMakeLists.txt ++++ b/muse/liste/CMakeLists.txt +@@ -65,4 +65,5 @@ set_target_properties( liste + target_link_libraries ( liste + ${QT_LIBRARIES} ++ components + awl + widgets +--- a/muse/mixer/CMakeLists.txt ++++ b/muse/mixer/CMakeLists.txt +@@ -87,4 +87,5 @@ set_target_properties ( mixer + target_link_libraries ( mixer + ${QT_LIBRARIES} ++ 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/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index 5368fcb61656..7ef6328c02c2 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "musescore"; - version = "3.2.3"; + version = "3.4.2"; src = fetchzip { url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip"; - sha256 = "17mr0c8whw6vz86lp1j36rams4h8virc4z68fld0q3rpq6g05szs"; + sha256 = "1laskvp40dncs12brkgvk7wl0qrvzy52rn7nf3b67ps1vmd130gp"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch index 53a0c90ce46e..57a6092d5852 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch +++ b/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch @@ -1,12 +1,9 @@ ---- a/mscore/CMakeLists.txt -+++ b/mscore/CMakeLists.txt -@@ -660,22 +660,6 @@ if (MINGW) - else (MINGW) - - if ( NOT MSVC ) --## install qwebengine core +--- a/main/CMakeLists.txt ++++ b/main/CMakeLists.txt +@@ -220,16 +219,0 @@ else (MINGW) +- ## install qwebengine core - if (NOT APPLE AND USE_WEBENGINE) -- install(FILES +- install(PROGRAMS - ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess - DESTINATION bin - ) @@ -20,6 +17,3 @@ - ) - endif(NOT APPLE AND USE_WEBENGINE) - - target_link_libraries(mscore - ${ALSA_LIB} - ${QT_LIBRARIES} diff --git a/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix b/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix index 76dcba304a32..15afe233b3ab 100644 --- a/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix +++ b/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix @@ -68,7 +68,6 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/netease-cloud-music \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QT_AUTO_SCREEN_SCALE_FACTOR 1 \ --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef" ''; diff --git a/nixpkgs/pkgs/applications/audio/non/default.nix b/nixpkgs/pkgs/applications/audio/non/default.nix index 5f8c82b98d04..651db50f0a7b 100644 --- a/nixpkgs/pkgs/applications/audio/non/default.nix +++ b/nixpkgs/pkgs/applications/audio/non/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2 -, libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook +, libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile - ladspaH liblrdf liblo libsigcxx + ladspaH liblo libsigcxx lrdf ]; meta = { diff --git a/nixpkgs/pkgs/applications/audio/nootka/default.nix b/nixpkgs/pkgs/applications/audio/nootka/default.nix new file mode 100644 index 000000000000..4f7b1e7e30f7 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/nootka/unstable.nix b/nixpkgs/pkgs/applications/audio/nootka/unstable.nix new file mode 100644 index 000000000000..d76fd0835caa --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix index 0cb0f00844e3..911bb4c8c773 100644 --- a/nixpkgs/pkgs/applications/audio/padthv1/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/nixpkgs/pkgs/applications/audio/parlatype/default.nix index fb5fe47f4f2d..e4728b9b9c45 100644 --- a/nixpkgs/pkgs/applications/audio/parlatype/default.nix +++ b/nixpkgs/pkgs/applications/audio/parlatype/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "1.6.2"; + version = "2.0"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "157423f40l8nd5da6y0qjmg4l3125zailp98w2hda3mxxn1j5ix3"; + sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx"; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { It plays audio sources to transcribe them in your favourite text application. It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. ''; - homepage = https://gkarsay.github.io/parlatype/; + homepage = "https://gkarsay.github.io/parlatype/"; license = licenses.gpl3Plus; maintainers = [ maintainers.melchips ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/qmidiarp/default.nix b/nixpkgs/pkgs/applications/audio/qmidiarp/default.nix new file mode 100644 index 000000000000..4bbfe79a2c9f --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix index 4076692e7fe7..8cb9f8dccb84 100644 --- a/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { suil ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Audio/MIDI multi-track sequencer"; homepage = http://qtractor.sourceforge.net; diff --git a/nixpkgs/pkgs/applications/audio/rosegarden/default.nix b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix index 8d8e3e1b6c0e..3d9342f16caa 100644 --- a/nixpkgs/pkgs/applications/audio/rosegarden/default.nix +++ b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook , dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib -, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: +, liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: stdenv.mkDerivation (rec { version = "19.12"; @@ -25,10 +25,10 @@ stdenv.mkDerivation (rec { ladspaPlugins libjack2 liblo - liblrdf libsamplerate libsndfile lirc + lrdf qtbase alsaLib ]; diff --git a/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix index 615a8a8c6604..165f8446c763 100644 --- a/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix b/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix index 4ad9e51b6455..93b4c2dade4d 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound -, libid3tag, liblo, liblrdf, libmad, liboggz, libpulseaudio, libsamplerate -, libsndfile, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto +, libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate +, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkgconfig }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo liblrdf - libmad liboggz libpulseaudio libsamplerate libsndfile opusfile pkgconfig + [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo + libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile portaudio rubberband serd sord capnproto ]; diff --git a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix index d1c981de2d5d..f7803098066d 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,9 +1,9 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo -, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate +, 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 }: @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband - libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland + [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband + libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland serd sord # optional diff --git a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix index 94f08a5f7a82..5837bd453101 100644 --- a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "0fmj25zjg12v0kyanic343lrdhxkh290v88qiz6ac47g8bdy3c83"; + sha256 = "1jx2qyshqg84l3fm682h8262da0hy68qjjg3dm2i53dxqxrm5ji9"; }; - cargoSha256 = "1n8aacy0hapjm10hmgqm07rb5c0ngmzr1s116pspsl7cdszza6xi"; + cargoSha256 = "12qwp59gshc9d6nz0s3w03zc8sxqri12vrav94vi54fqagiikinm"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/applications/audio/tony/default.nix b/nixpkgs/pkgs/applications/audio/tony/default.nix new file mode 100644 index 000000000000..92cab9b5b8de --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix index f815ac02e6e5..44d322069fc2 100644 --- a/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix +++ b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix @@ -3,8 +3,8 @@ let debPatch = fetchzip { - url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-6.debian.tar.xz"; - sha256 = "1xmmpdvxyr84lazlg23c6ck5ic97ga2rkiqabb1d98ix2zdzyqz5"; + url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz"; + sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi"; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix b/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix new file mode 100644 index 000000000000..5de51e23d731 --- /dev/null +++ b/nixpkgs/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; [ orivej ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix b/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix new file mode 100644 index 000000000000..33d61eeb35f6 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/zita-at1/default.nix b/nixpkgs/pkgs/applications/audio/zita-at1/default.nix new file mode 100644 index 000000000000..c91edf34c826 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index d8660967a4e0..80e17cf1138a 100644 --- a/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: +{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, CoreServices }: buildGoModule rec { pname = "go-ethereum"; @@ -30,6 +30,8 @@ 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/nixpkgs/pkgs/applications/blockchains/lnd.nix b/nixpkgs/pkgs/applications/blockchains/lnd.nix index dd45746c8df5..4be19beedc39 100644 --- a/nixpkgs/pkgs/applications/blockchains/lnd.nix +++ b/nixpkgs/pkgs/applications/blockchains/lnd.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "lnd"; @@ -13,10 +13,12 @@ buildGoModule rec { modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Lightning Network Daemon"; homepage = "https://github.com/lightningnetwork/lnd"; - license = lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ cypherpunk2140 ]; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index 0311169deb24..980e20d04b75 100644 --- a/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,36 +1,35 @@ -{ stdenv, wrapQtAppsHook, makeDesktopItem, fetchFromGitHub -, qtbase, qmake, qtmultimedia, qttools -, qtgraphicaleffects, qtdeclarative -, qtlocation, qtquickcontrols, qtquickcontrols2 -, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns +{ stdenv, wrapQtAppsHook, makeDesktopItem +, fetchFromGitHub, qmake, qttools, pkgconfig +, qtbase, qtdeclarative, qtgraphicaleffects +, qtmultimedia, qtxmlpatterns +, qtquickcontrols, qtquickcontrols2 , monero, unbound, readline, boost, libunwind -, libsodium, pcsclite, zeromq, cppzmq, pkgconfig -, hidapi, randomx +, libsodium, pcsclite, zeromq, cppzmq +, hidapi, libusb, protobuf, randomx }: with stdenv.lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.15.0.1"; + version = "0.15.0.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "08j8kkncdn57xql0bhmlzjpjkdfhqbpda1p07r797q8qi0nl4w8n"; + sha256 = "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; buildInputs = [ - qtbase qtmultimedia qtgraphicaleffects - qtdeclarative qtlocation - qtquickcontrols qtquickcontrols2 - qtwebchannel qtwebengine qtx11extras - qtxmlpatterns monero unbound readline + qtbase qtdeclarative qtgraphicaleffects + qtmultimedia qtquickcontrols qtquickcontrols2 + qtxmlpatterns + monero unbound readline boost libunwind libsodium pcsclite zeromq - cppzmq hidapi randomx + cppzmq hidapi libusb protobuf randomx ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; diff --git a/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch b/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch index e540f1960d6c..6d3313624e37 100644 --- a/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch +++ b/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch @@ -1,15 +1,14 @@ -diff --git a/main.cpp b/main.cpp -index a51568d..5a9f683 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -152,7 +152,9 @@ int main(int argc, char *argv[]) +diff --git a/src/main/main.cpp b/src/main/main.cpp +index c5210e5f..45794d72 100644 +--- a/src/main/main.cpp ++++ b/src/main/main.cpp +@@ -220,6 +220,9 @@ int main(int argc, char *argv[]) QCommandLineOption logPathOption(QStringList() << "l" << "log-file", QCoreApplication::translate("main", "Log to specified file"), QCoreApplication::translate("main", "file")); -- + logPathOption.setDefaultValue( + QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + + "/monero-wallet-gui.log"); - parser.addOption(logPathOption); - parser.addHelpOption(); - parser.process(app); + + QCommandLineOption testQmlOption("test-qml"); + testQmlOption.setFlags(QCommandLineOption::HiddenFromHelp); diff --git a/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/nixpkgs/pkgs/applications/blockchains/monero/default.nix index 7eb4238679eb..c942197006c4 100644 --- a/nixpkgs/pkgs/applications/blockchains/monero/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, hidapi -, python3Packages, randomx, rapidjson +, pythonProtobuf, randomx, rapidjson, libusb , CoreData, IOKit, PCSC }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline libsodium hidapi randomx rapidjson - python3Packages.protobuf + pythonProtobuf libusb ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/blockchains/namecoin.nix b/nixpkgs/pkgs/applications/blockchains/namecoin.nix index 4b8dc5525dc4..02f2249862d0 100644 --- a/nixpkgs/pkgs/applications/blockchains/namecoin.nix +++ b/nixpkgs/pkgs/applications/blockchains/namecoin.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "nc0.15.99-name-tab-beta2"; + version = "nc0.19.1"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "1r0v0yvlazmidxp6xhapbdawqb8fhzrdp11d4an5vgxa208s6wdf"; + sha256 = "13rdvngrl2w0gk7km3sd9fy8yxzgxlkcwn50ajsbrhgzl8kx4q7m"; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; - homepage = https://namecoin.org; + homepage = "https://namecoin.org"; license = licenses.mit; maintainers = with maintainers; [ doublec AndersonTorres infinisil ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/blockchains/quorum.nix b/nixpkgs/pkgs/applications/blockchains/quorum.nix new file mode 100644 index 000000000000..49bc0be108ff --- /dev/null +++ b/nixpkgs/pkgs/applications/blockchains/quorum.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, buildGoPackage, git, which }: + +buildGoPackage rec { + pname = "quorum"; + version = "2.5.0"; + + goPackagePath = "github.com/jpmorganchase/quorum"; + + src = fetchFromGitHub { + owner = "jpmorganchase"; + repo = pname; + rev = "v${version}"; + sha256 = "0xfdaqp9bj5dkw12gy19lxj73zh7w80j051xclsvnd41sfah86ll"; + }; + + buildInputs = [ git which ]; + + buildPhase = '' + cd "go/src/$goPackagePath" + make geth bootnode swarm + ''; + + installPhase = '' + mkdir -pv $bin/bin + cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin + ''; + + meta = with stdenv.lib; { + description = "A permissioned implementation of Ethereum supporting data privacy"; + homepage = "https://www.goquorum.com/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ mmahut ]; + platforms = subtractLists ["aarch64-linux"] platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/blockchains/tessera.nix b/nixpkgs/pkgs/applications/blockchains/tessera.nix new file mode 100644 index 000000000000..84f7925d2180 --- /dev/null +++ b/nixpkgs/pkgs/applications/blockchains/tessera.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "tessera"; + version = "0.10.2"; + + src = fetchurl { + url = "https://oss.sonatype.org/service/local/repositories/releases/content/com/jpmorgan/quorum/${pname}-app/${version}/${pname}-app-${version}-app.jar"; + sha256 = "1zn8w7q0q5man0407kb82lw4mlvyiy9whq2f6izf2b5415f9s0m4"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/tessera --add-flags "-jar $src" + ''; + + meta = with stdenv.lib; { + description = "Enterprise Implementation of Quorum's transaction manager"; + homepage = "https://github.com/jpmorganchase/tessera"; + license = licenses.asl20; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index f6114b3c2134..e2c57d514cda 100644 --- a/nixpkgs/pkgs/applications/blockchains/zcash/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix @@ -7,15 +7,19 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "zcash"; - version = "2.1.0-1"; + version = "2.1.1-1"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "05bnn4lxrrcv1ha3jdfrgwg4ar576161n3j9d4gpc14ww3zgf9vz"; + sha256 = "1g5zlfzfp31my8w8nlg5fncpr2y95iv9fm04x57sjb93rgmjdh5n"; }; + patchPhase = '' + sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib protobuf libevent libsodium librustzcash ] @@ -23,17 +27,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ]; - patchPhase = '' - sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am - ''; - postInstall = '' cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params ''; + enableParallelBuilding = true; + meta = { description = "Peer-to-peer, anonymous electronic cash system"; - homepage = https://z.cash/; + homepage = "https://z.cash/"; maintainers = with maintainers; [ rht tkerber ]; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 5032594468e7..6cd2ae018fb6 100644 --- a/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -1,20 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "librustzcash-unstable"; - version = "2018-10-27"; + pname = "librustzcash"; + version = "0.1.0"; src = fetchFromGitHub { owner = "zcash"; repo = "librustzcash"; - rev = "06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5"; - sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv"; + rev = version; + sha256 = "0d28k29sgzrg9clynz29kpw50kbkp0a4dfdayqhmpjmsh05y6261"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1"; + cargoSha256 = "1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax"; installPhase = '' mkdir -p $out/lib @@ -23,11 +20,12 @@ rustPlatform.buildRustPackage rec { cp librustzcash/include/librustzcash.h $out/include/ ''; + # The tests do pass, but they take an extremely long time to run. doCheck = false; meta = with stdenv.lib; { description = "Rust-language assets for Zcash"; - homepage = https://github.com/zcash/librustzcash; + homepage = "https://github.com/zcash/librustzcash"; maintainers = with maintainers; [ rht tkerber ]; license = with licenses; [ mit asl20 ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 8354a04b2c58..9a476ada2142 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77"; }; betaVersion = { - version = "4.0.0.11"; # "Android Studio 4.0 Beta 2" - build = "193.6254973"; - sha256Hash = "0i4n5kxnfxnz3y44ba0x2j8nkmss4gchrzcdnb9wf6xc1jqrjwcm"; + version = "4.0.0.12"; # "Android Studio 4.0 Beta 3" + build = "193.6296804"; + sha256Hash = "072rvh20xkn7izh6f2r2bspy06jrvcibj2hc12hz76m8cwzf4v0m"; }; latestVersion = { # canary & dev - version = "4.1.0.2"; # "Android Studio 4.1 Canary 2" - build = "193.6264773"; - sha256Hash = "0m09q4jp653i9jlqsjplx3d64xkdm27c35781yz6h5rw0a1sq6kz"; + version = "4.1.0.4"; # "Android Studio 4.1 Canary 4" + build = "193.6325121"; + sha256Hash = "19b4a03qfljdisn7cw44qzab85hib000m9mgswzssjh6ylkd9arw"; }; in { # Attributes are named by their corresponding release channels diff --git a/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 4b3a7e11f3bb..345f7eae9fc6 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -13,10 +13,10 @@ assert stdenv ? glibc; let platform_major = "4"; - platform_minor = "14"; - year = "2019"; - month = "12"; - timestamp = "201912100610"; + platform_minor = "15"; + year = "2020"; + month = "03"; + timestamp = "${year}${month}050155"; in rec { buildEclipse = import ./build-eclipse.nix { @@ -32,8 +32,8 @@ in rec { description = "Eclipse IDE for C/C++ Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "28h8z45j7zlcbvvabzsniwqls1lns21isx69y6l207a869rknp9vzg6506q6zalj9b49j8c7ynkn379xgbzp07i6zw3dzk3pqp2rgam"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-incubation-linux-gtk-x86_64.tar.gz"; + sha512 = "2wy4a3p347fajr9zsfz1zlvz6jpy3vficdry27m5fs0azfmxmy2cfns5hh18sin4xqq3jvqppfqxh41rzcpcmiq12zhc6cz42brqgxw"; }; }; @@ -45,7 +45,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "1g1zsz3c2kx4vs1mjpcisbk81lk4hsr1z2fw46lih825c53vwf59snp8d97c8yw2i25y0ml48nc1nskib6qnif8m2h6rpah7kgmi8ay"; + sha512 = "0qccsclay9000sqrymm8hkg70a4jcvd70vymw1kkxsklcs7dnrhch55an98gbzf9r0jgd1ap62a4hyxlnm6hdqqniwcgdza0i4nwwgj"; }; }; @@ -57,7 +57,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "05nsldw937l1g9fj964njivgkf2ipk1rh1jg5w8svdhpp3v1pp3iinfm2mz9kk8namwfkx8krsvsxcgvqyzgrkhf42wqh53vqrjf70h"; + sha512 = "01rv5x7qqm0a2p30828z2snms3nb2kjx9si63sr5rdkdgr3vbh6xq8n8fn757dqazmpz9zskmwxxmbxnwycfllhgb8msb77pcy3fpg7"; }; }; @@ -87,7 +87,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "0dcbxzjqc27v1faz16yxqcm6zrbna4kkd32xy7paadiwn125y6ijx8zvda4kc7bih6v5b9ch2i0z5ndra1lcjcc88z6cklh0vngjkh1"; + sha512 = "33ra8qslwz73240xzjvr751lpl94drlcf425a7kxngq1qla2cda7gxr71bxlr9fm2hrqq0h097ihmg0ix9hv2dmwnc76gp4hwwrlk41"; }; }; @@ -99,7 +99,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "21lhgv3z23mn8q0gffgxlfwhyxb348zjnzv716zsys7h7kj5vigl45q9mz0qrl11524rxx7jwi901jjd4l258w9kp7wzlq0d5n1r39m"; + sha512 = "0ffa1q19z31j8i552mp9zg4v0p4iv002cvlzh49ia8hi0hgk75pbkp6vxlr75jz0as03n71f0ww8xbflji31qgwfmy6rs1rzqihfff9"; }; }; diff --git a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index 87c32c30e190..a60b1a2ae511 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.10.0"; + version = "9.11.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.10/${name}/${name}.zip"; - sha256 = "11nbrcvgbg9l3cmp3v3y8y0vldzcf6qlpp185a6dzabdcij6gz5m"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.11/${name}/${name}.zip"; + sha256 = "1730w6rbv649nzfalfd10p2ph0z9rbrrcflga0n1dpmg181xh9lk"; }; meta = with stdenv.lib; { @@ -474,12 +474,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.14"; + version = "4.15"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.14-201912100610/org.eclipse.jdt-4.14.zip; - sha256 = "1c2a23qviv58xljpq3yb37ra8cqw7jh52hmzqlg1nij2sdxb6hm5"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202003050155/org.eclipse.jdt-${version}.zip"; + sha256 = "1dm4qgfb6rm7w0dk8br071c7wy0ybp7zrwvr3i02c2bxzy2psz7q"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index 1ab22a73c635..2b40eb77e2cf 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -7,7 +7,7 @@ , withNS ? stdenv.isDarwin , withGTK2 ? false, gtk2-x11 ? null , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null -, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null +, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , siteStart ? ./site-start.el @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk ] + ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/applications/editors/glow/default.nix b/nixpkgs/pkgs/applications/editors/glow/default.nix index 928291940cfe..80fdcc8a09c1 100644 --- a/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "glow"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Render markdown on the CLI"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 466d52236d0d..8d5e8540aa14 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2019.3.5"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0whd379ck79vhz14yh5g6vpl4cvgw4z9ag4mwgizmd8kbcfnvdxd"; /* updated by script */ + sha256 = "0qmhp0sqcknwgsirnbi6461lzr7mxgrgjsd0q5cxnhscbbczl7pk"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0zbyiw60gqcqi5bbazmsbs4qzmmxx1q034hs36k1dryf2y02jyih"; /* updated by script */ + sha256 = "1ygbi212sga6mdkassi51idh7ppchr77ifq3vi5bbm4ibgnsf2b4"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "15rs866fp4lrsqdk13fnbg7ncdfrhky1m5sl90p32v45j90hagrg"; /* updated by script */ + sha256 = "1kspj5a9z6smcgrfxdylvc0y53s7y6jv7ckfhmbkvplmrj0h0wd7"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "034aq5lf64apc152xr0889hg2xak2if9n5xl6zvd3f9q9srhivxn"; /* updated by script */ + sha256 = "1i34kcd2j1xwx3l2sqc6jh3b69wqbxwwlq5yb7kf2ms9x4144bn0"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "03ag1a40l1k8sqlywcs7kjn02c65xm3l9riyimg4hx23yi17w18h"; /* updated by script */ + sha256 = "1bxi2i6vxpw8x4mvb4d5plqy4r938xjf8nkimfg0sspramcc4r5m"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0ly3cdzm4hp4qchdadjmbd39jnqpmpnlk6vgp8s4amsv35b6hydd"; /* updated by script */ + sha256 = "0k917si1d28fnmjyvi0fs7rkdyvi2vr0d138436lh300a6y0z6wr"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1305zvb5n2zqnny4l50qfv7jd1sj4ffhrig4rpfiqg65ncfpypwb"; /* updated by script */ + sha256 = "1hdwzkh6qzad2pqskqw9m8glj15x9d2g4csl0dxk6an82ps52naz"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1b7hwqpk96g4il5rbxb8cpqsizgc9k5kb8vkvkcc9xh7qqz02i85"; /* updated by script */ + sha256 = "0q3595r4m22wf5r5zyncr1zv7yap5przbzjnyf75y51mqwl1g61i"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/nixpkgs/pkgs/applications/editors/nano/default.nix b/nixpkgs/pkgs/applications/editors/nano/default.nix index 4197792d7365..3350f6a3db3e 100644 --- a/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "4.7"; + version = "4.9"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q"; + sha256 = "19ik88b3g0d9xwav4hkai2h1acmjy5fdnh21gdc1mjq5s4lrff8f"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index 6a6ea80ca458..093635b10e42 100644 --- a/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -1,25 +1,58 @@ -{ buildFHSUserEnv, makeDesktopItem, stdenv, lib, requireFile, unstick, cycloneVSupport ? true }: +{ buildFHSUserEnv, makeDesktopItem, writeScript, stdenv, lib, requireFile, unstick, + supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }: let + deviceIds = { + "Arria II" = "arria_lite"; + "Cyclone V" = "cyclonev"; + "Cyclone IV" = "cyclone"; + "Cyclone 10 LP" = "cyclone10lp"; + "MAX II/V" = "max"; + "MAX 10 FPGA" = "max10"; + }; + + supportedDeviceIds = + assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices) + "Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}"; + lib.listToAttrs (map (name: { + inherit name; + value = deviceIds.${name}; + }) supportedDevices); + + unsupportedDeviceIds = lib.filterAttrs (name: value: + !(lib.hasAttr name supportedDeviceIds) + ) deviceIds; + quartus = stdenv.mkDerivation rec { version = "19.1.0.670"; - pname = "quartus-prime-lite"; + pname = "quartus-prime-lite-unwrapped"; src = let require = {name, sha256}: requireFile { inherit name sha256; url = "${meta.homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux"; }; + + hashes = { + "arria_lite" = "1flj9w0vb2p9f9zll136izr6qvmxn0lg72bvaqxs3sxc9vj06wm1"; + "cyclonev" = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab"; + "cyclone" = "0pzs8y4s3snxg4g6lrb21qi88abm48g279xzd98qv17qxb2z82rr"; + "cyclone10lp" = "1ccxq8n20y40y47zddkijcv41w3cddvydddr3m4844q31in3nxha"; + "max" = "1cxzbqscxvlcy74dpqmvlnxjyyxfwcx3spygpvpwi6dfj3ipgm2z"; + "max10" = "14k83javivbk65mpb17wdwsyb8xk7x9gzj9x0wnd24mmijrvdy9s"; + }; + + devicePackages = map (id: { + name = "${id}-${version}.qdz"; + sha256 = lib.getAttr id hashes; + }) (lib.attrValues supportedDeviceIds); in map require ([{ name = "QuartusLiteSetup-${version}-linux.run"; sha256 = "15vxvqxqdk29ahlw3lkm1nzxyhzy4626wb9s5f2h6sjgq64r8m7f"; } { name = "ModelSimSetup-${version}-linux.run"; sha256 = "0j1vfr91jclv88nam2plx68arxmz4g50sqb840i60wqd5b0l3y6r"; - }] ++ lib.optional cycloneVSupport { - name = "cyclonev-${version}.qdz"; - sha256 = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab"; - }); + }] ++ devicePackages); nativeBuildInputs = [ unstick ]; @@ -37,27 +70,22 @@ let disabledComponents = [ "quartus_help" "quartus_update" + # not modelsim_ase "modelsim_ae" - # Devices - "arria_lite" - "cyclone" - "cyclone10lp" - "max" - "max10" - ] ++ lib.optional (!cycloneVSupport) "cyclonev"; + ] ++ (lib.attrValues unsupportedDeviceIds); in '' - ${lib.concatMapStringsSep "\n" copyInstaller installers} - ${lib.concatMapStringsSep "\n" copyComponent components} + ${lib.concatMapStringsSep "\n" copyInstaller installers} + ${lib.concatMapStringsSep "\n" copyComponent components} - unstick $TEMP/${(builtins.head installers).name} \ - --disable-components ${lib.concatStringsSep "," disabledComponents} \ - --mode unattended --installdir $out --accept_eula 1 + unstick $TEMP/${(builtins.head installers).name} \ + --disable-components ${lib.concatStringsSep "," disabledComponents} \ + --mode unattended --installdir $out --accept_eula 1 - # This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software - patch --force --strip 0 --directory $out < ${./vsim.patch} + # This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software + patch --force --strip 0 --directory $out < ${./vsim.patch} - rm -r $out/uninstall $out/logs - ''; + rm -r $out/uninstall $out/logs + ''; meta = { homepage = "https://fpgasoftware.intel.com"; @@ -69,17 +97,17 @@ let }; desktopItem = makeDesktopItem { - name = quartus.name; + name = "quartus-prime-lite"; exec = "quartus"; icon = "quartus"; desktopName = "Quartus"; - genericName = "Quartus FPGA IDE"; + genericName = "Quartus Prime"; categories = "Development;"; }; # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` -in buildFHSUserEnv { - name = "quartus-prime-lite"; +in buildFHSUserEnv rec { + name = "quartus-prime-lite"; # wrapped targetPkgs = pkgs: with pkgs; [ # quartus requirements @@ -110,10 +138,43 @@ in buildFHSUserEnv { xorg.libXrender ]; - extraInstallCommands = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + passthru = { + unwrapped = quartus; + }; + + extraInstallCommands = let + quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [ + "asm" "cdb" "cpf" "drc" "eda" "fit" "jbcc" "jli" "map" "pgm" "pow" + "sh" "si" "sim" "sta" "stp" "tan" + ]) ++ [ "quartus/bin/quartus" ]; + + qsysExecutables = map (c: "quartus/sopc_builder/bin/qsys-${c}") [ + "generate" "edit" "script" + ]; + # Should we install all executables ? + modelsimExecutables = map (c: "modelsim_ase/bin/${c}") [ + "vsim" "vlog" "vlib" + ]; + in '' + mkdir -p $out/share/applications $out/share/icons/128x128 + ln -s ${desktopItem}/share/applications/* $out/share/applications + ln -s ${quartus}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png + + mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin + WRAPPER=$out/bin/${name} + EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}" + for executable in $EXECUTABLES; do + echo "#!${stdenv.shell}" >> $out/$executable + echo "$WRAPPER ${quartus}/$executable \$@" >> $out/$executable + done + + cd $out + chmod +x $EXECUTABLES + # link into $out/bin so executables become available on $PATH + ln --symbolic --relative --target-directory ./bin $EXECUTABLES ''; - runScript = "${quartus}/quartus/bin/quartus"; + runScript = writeScript "${name}-wrapper" '' + exec $@ + ''; } diff --git a/nixpkgs/pkgs/applications/editors/texworks/default.nix b/nixpkgs/pkgs/applications/editors/texworks/default.nix index 8042363f73c9..d5549c525928 100644 --- a/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -1,30 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, qt5, libsForQt5, hunspell +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +, qtscript, poppler, hunspell , withLua ? true, lua , withPython ? true, python3 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "texworks"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "1ljfl784z7dmh6f1qacqhc6qhcaqdzw033yswbvpvkkck0lsk2mr"; + sha256 = "0d7f23c6c1wj4aii4h5w9piv01qfb69zrd79dvxwydrk99i8gnl4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt5.qtscript libsForQt5.poppler hunspell ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qtscript poppler hunspell ] ++ lib.optional withLua lua ++ lib.optional withPython python3; cmakeFlags = lib.optional withLua "-DWITH_LUA=ON" ++ lib.optional withPython "-DWITH_PYTHON=ON"; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple TeX front-end program inspired by TeXShop"; - homepage = http://www.tug.org/texworks/; + homepage = "http://www.tug.org/texworks/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/applications/editors/vim/vimacs.nix b/nixpkgs/pkgs/applications/editors/vim/vimacs.nix new file mode 100644 index 000000000000..d067b4181213 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index de436088fa76..80115ab8243e 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.1"; + version = "3.10.4"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0xq0nnp7zdqaihqvh5rsi1129g23vnk5ijkpxfzaggafgmhf5hgz"; + sha256 = "0d1rsgjgnnq6jgms5bgppz8lkh4518nf90fk0qvxajdfi9j4jn12"; }; passthru = { diff --git a/nixpkgs/pkgs/applications/gis/saga/default.nix b/nixpkgs/pkgs/applications/gis/saga/default.nix index 747777c75af2..30ae92f58aee 100644 --- a/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "saga"; - version = "7.5.0"; + version = "7.6.1"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin @@ -18,13 +18,13 @@ 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.5.0/saga-7.5.0.tar.gz"; - sha256 = "0s5195802xwlkb2w4i4vd9ys95d7fnzn5cnnixh1csaqc2x1qp6r"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.6.1/saga-7.6.1.tar.gz"; + sha256 = "1i0cp1lms6cmjl7f5vgr9pl3qc02fmappn4kq21y0dn2gy7j2mkn"; }; meta = with stdenv.lib; { description = "System for Automated Geoscientific Analyses"; - homepage = http://www.saga-gis.org; + homepage = "http://www.saga-gis.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ michelk mpickering ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix b/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix index 32d079d85ff3..a6b35b1d8ea6 100644 --- a/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix +++ b/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix @@ -21,7 +21,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pyqt5 pyparsing pyqtgraph - spyder + spyder_3 pathpy qtconsole requests diff --git a/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 53e04dc7f784..771e6677b170 100644 --- a/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.0.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db"; + sha256 = "1dvwmgnlfvi1lvdhgyddcp5apwlc8v5gwy9gmfcpra8lv8hkjjy5"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual lighttable and darkroom for photographers"; - homepage = https://www.darktable.org; + homepage = "https://www.darktable.org"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ goibhniu flosse mrVanDalo ]; diff --git a/nixpkgs/pkgs/applications/graphics/jbrout/default.nix b/nixpkgs/pkgs/applications/graphics/jbrout/default.nix deleted file mode 100644 index 4eb7518cc102..000000000000 --- a/nixpkgs/pkgs/applications/graphics/jbrout/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchsvn, pythonPackages, makeWrapper, fbida, which }: - -let - inherit (pythonPackages) python; -in pythonPackages.buildPythonApplication rec { - pname = "jbrout"; - version = "338"; - - src = fetchsvn { - url = "http://jbrout.googlecode.com/svn/trunk"; - rev = version; - sha256 = "0257ni4vkxgd0qhs73fw5ppw1qpf11j8fgwsqc03b1k1yv3hk4hf"; - }; - - doCheck = false; - - # XXX: patchPhase to avoid this - # File "/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py", line 348, in FileHeader - # len(filename), len(extra)) - #struct.error: ushort format requires 0 <= number <= USHRT_MAX - patchPhase = '' - find | xargs touch - - substituteInPlace setup.py --replace "version=__version__" "version=baseVersion" - ''; - - postInstall = '' - mkdir $out/bin - echo "python $out/${python.sitePackages}/jbrout/jbrout.py" > $out/bin/jbrout - chmod +x $out/bin/jbrout - ''; - - buildInputs = [ python makeWrapper which ]; - propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ]; - - meta = { - homepage = https://manatlan.com/jbrout/; - description = "Photo manager"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/rx/default.nix b/nixpkgs/pkgs/applications/graphics/rx/default.nix index b4338d8f3cda..53e8109fef51 100644 --- a/nixpkgs/pkgs/applications/graphics/rx/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rx/default.nix @@ -1,5 +1,5 @@ { stdenv, rustPlatform, fetchFromGitHub, makeWrapper -, cmake, pkgconfig +, cmake, pkg-config , xorg ? null , libGL ? null }: @@ -7,18 +7,18 @@ with stdenv.lib; rustPlatform.buildRustPackage rec { pname = "rx"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cloudhead"; repo = pname; rev = "v${version}"; - sha256 = "1n5s7v2z13550gkqz7w6dw62jdy60wdi8w1lfa23609b4yhg4w94"; + sha256 = "1pln65pqy39ijrld11d06klwzfhhzmrgdaxijpx9q7w9z66zmqb8"; }; - cargoSha256 = "077cs9bf7f3h5aschcv7pbbnpaq1rg79j7f6pnyrzkmn7gxzicg3"; + cargoSha256 = "143a5x61s7ywk0ljqd10jkfvs6lrhlibkm2a9lw41wq13mgzb78j"; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = optionals stdenv.isLinux (with xorg; [ @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Modern and extensible pixel editor implemented in Rust"; - homepage = "https://cloudhead.io/rx/"; + homepage = "https://rx.cloudhead.io/"; license = licenses.gpl3; maintainers = with maintainers; [ minijackson filalex77 ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/misc/archiver/default.nix b/nixpkgs/pkgs/applications/misc/archiver/default.nix index 64b592b78714..8c79d867c831 100644 --- a/nixpkgs/pkgs/applications/misc/archiver/default.nix +++ b/nixpkgs/pkgs/applications/misc/archiver/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { @@ -16,7 +17,9 @@ buildGoModule rec { modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix index 338a5249aebb..e27aca4fc3d1 100644 --- a/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages +, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages , openvdb, libXxf86vm, tbb, alembic , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff - opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc + opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc alembic (opensubdiv.override { inherit cudaSupport; }) tbb diff --git a/nixpkgs/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix index d4d0643bfdc2..ffe2759a5e76 100644 --- a/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "cheat"; - version = "3.0.7"; + version = "3.8.0"; src = fetchFromGitHub { - owner = "chrisallenlane"; + owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0i5j85ciimk14kndb81qxny1ksr57sr9xdvjn7x1ibc7h6pikjn5"; + sha256 = "062dlc54x9qwb3hsxp20h94dpwsa1nzpjln9cqmvwjhvp434l97r"; }; subPackages = [ "cmd/cheat" ]; - modSha256 = "1v9hvxygwvqma2j5yz7r95g34xpwb0n29hm39i89vgmvl3hy67s0"; + modSha256 = "1is19qca5wgzya332rmpk862nnivxzgxchkllv629f5fwwdvdgmg"; meta = with stdenv.lib; { description = "Create and view interactive cheatsheets on the command-line"; maintainers = with maintainers; [ mic92 ]; license = with licenses; [ gpl3 mit ]; - homepage = "https://github.com/chrisallenlane/cheat"; + inherit (src.meta) homepage; }; } diff --git a/nixpkgs/pkgs/applications/misc/clipmenu/default.nix b/nixpkgs/pkgs/applications/misc/clipmenu/default.nix index 7577c0a3db99..4bc56f0c4526 100644 --- a/nixpkgs/pkgs/applications/misc/clipmenu/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 9ff70af73dde..1334813131b4 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.0"; + version = "7.0.1"; 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 = "1fnvwndzny51z0zmdnlafdcxawsyz435g712mc4bjjj29qy0inzm"; + sha256 = "1kq0ingzfl6q2yz3y5nj9k35y9f1izg1idgbgvpz784gn7937m64"; }; installPhase = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://dbeaver.io/; + homepage = "https://dbeaver.io/"; description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; longDescription = '' Free multi-platform database tool for developers, SQL programmers, database diff --git a/nixpkgs/pkgs/applications/misc/exercism/default.nix b/nixpkgs/pkgs/applications/misc/exercism/default.nix index a071761599a3..81c2d9782997 100644 --- a/nixpkgs/pkgs/applications/misc/exercism/default.nix +++ b/nixpkgs/pkgs/applications/misc/exercism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "exercism"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "./exercism" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix index b7b90448e4bc..71ea8a3d43f4 100644 --- a/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix +++ b/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "geoipupdate"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index f1d68b926910..dc1f24368118 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -1,19 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "hugo"; - version = "0.67.1"; - - goPackagePath = "github.com/gohugoio/hugo"; + version = "0.68.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0q55f8w0drc1miqziqp8r064h7900hrgj7nixxs71cb1p8ih4cq3"; + sha256 = "138sv4q6f1szpkrrxnzhvxr6rrznhq1d7in0zba1pifsw3yimqq4"; }; - modSha256 = "0s7a13jkhsr6h19a9ysr8877imac5skdray0zg2qgwrapic2nw17"; + modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildFlags = [ "-tags" "extended" ]; diff --git a/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index 48f369d30290..1756aefe19a6 100644 --- a/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.6.21799"; + version = "0.6.24251"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "19axrcfmycmdfgphkfwl9qgwd9xj8g37gmwi4ynb45w7nhfid5vm"; + sha256 = "0f26fg5fqpz0f6jxp72cj5f2kf76jah5iaqlqsl87250y0hm330g"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/misc/kitty/default.nix b/nixpkgs/pkgs/applications/misc/kitty/default.nix index f5553cac6b59..6860f04f99c1 100644 --- a/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ b/nixpkgs/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.16.0"; + version = "0.17.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf"; + sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f"; }; buildInputs = [ @@ -72,7 +72,6 @@ buildPythonApplication rec { }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-lto.patch - ./png2icns.patch ]; # Causes build failure due to warning @@ -106,6 +105,7 @@ buildPythonApplication rec { mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" + "$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty" ''; postInstall = '' diff --git a/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch b/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch index 44d231cb07f9..8073c11fbd2a 100644 --- a/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch +++ b/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch @@ -1,12 +1,13 @@ --- a/setup.py +++ b/setup.py -@@ -233,9 +233,6 @@ def init_env( +@@ -277,10 +277,6 @@ def init_env( cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) cflags += shlex.split(os.environ.get('CFLAGS', '')) ldflags += shlex.split(os.environ.get('LDFLAGS', '')) - if not debug and not sanitize: - # See https://github.com/google/sanitizers/issues/647 -- cflags.append('-flto'), ldflags.append('-flto') +- cflags.append('-flto') +- ldflags.append('-flto') if profile: cppflags.append('-DWITH_PROFILER') diff --git a/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch b/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch deleted file mode 100644 index 68566e2a899f..000000000000 --- a/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -aru a/setup.py b/setup.py ---- a/setup.py 2019-07-29 11:09:32.000000000 -0400 -+++ b/setup.py 2019-07-29 11:11:37.000000000 -0400 -@@ -784,9 +784,15 @@ - def create_macos_app_icon(where='Resources'): - logo_dir = os.path.abspath(os.path.join('logo', appname + '.iconset')) - subprocess.check_call([ -- 'iconutil', '-c', 'icns', logo_dir, '-o', -+ 'png2icns', - os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns') -- ]) -+ ] + [os.path.join(logo_dir, logo) for logo in [ -+ 'icon_128x128.png', -+ 'icon_16x16.png', -+ 'icon_256x256.png', -+ 'icon_32x32.png', -+ 'icon_512x512.png', -+ ]]) - - - def create_minimal_macos_bundle(args, where): diff --git a/nixpkgs/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix index c9ea146f063b..6cd5c6d204ed 100644 --- a/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchFromGitHub +{ 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 @@ -31,15 +31,22 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "0n6xa3pnwvsvfipinrkbhxwjzfbw2cjpc9igv97nffcmpydmn5xv"; + sha256 = "0i4i6g3pys1vf2q1pbs1fkywgapj4qfxrjrvim98hzw9al4l06y9"; }; + 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 @@ -63,4 +70,3 @@ in buildPythonApplication rec { platforms = platforms.linux; }; } - diff --git a/nixpkgs/pkgs/applications/misc/minder/default.nix b/nixpkgs/pkgs/applications/misc/minder/default.nix index 7b6be997ffa0..baa8f69cfacb 100644 --- a/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "0zma6hjx0068ih7fagb1gg5cgci0ccc764sd8qw6iglg61aihpx7"; + sha256 = "0y30gdnx270m857iijhgdv7a2nqxmmd8w6kfhd80763ygk17xk1r"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/nixpkgs/pkgs/applications/misc/moolticute/default.nix index e3154b7cd1cd..0a54bc98bb9a 100644 --- a/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.42.32-testing"; + version = "0.43.3"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1kx1p2h65dilj1pbzf36d1mxwym19kvln1sqg8fb7na8q7lk4b05"; + sha256 = "0kl7wksiqmy0hqbg6xwmzqfn3l17if2hiw7xc9x067x9rviyxrl3"; }; outputs = [ "out" "udev" ]; diff --git a/nixpkgs/pkgs/applications/misc/opentx/default.nix b/nixpkgs/pkgs/applications/misc/opentx/default.nix index 370f88d7b479..53d6e398cf0d 100644 --- a/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -1,50 +1,38 @@ -{ stdenv, fetchFromGitHub -, cmake, gcc-arm-embedded, binutils-arm-embedded, python -, qt5, SDL, gtest +{ stdenv, mkDerivation, fetchFromGitHub +, cmake, gcc-arm-embedded, python3Packages +, qtbase, qtmultimedia, qttranslations, SDL, gtest , dfu-util, avrdude }: -let - - version = "2.2.1"; - -in stdenv.mkDerivation { - +mkDerivation rec { pname = "opentx"; - inherit version; + version = "2.3.5"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; rev = version; - sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g"; + sha256 = "18iv3c74y9fpp1045s2l7l2dqfn9riyagrwmfwp2mmf2ccsrwz2g"; }; enableParallelBuilding = true; - nativeBuildInputs = [ - cmake - gcc-arm-embedded binutils-arm-embedded - ]; + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; - buildInputs = with qt5; [ - python python.pkgs.pyqt4 - qtbase qtmultimedia qttranslations - SDL - ]; + buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; postPatch = '' - sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' - sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|' + sed -i companion/src/burnconfigdialog.cpp \ + -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' \ + -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|' ''; cmakeFlags = [ "-DGTEST_ROOT=${gtest.src}/googletest" - "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" + "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" - "-DNANO=NO" ]; meta = with stdenv.lib; { @@ -54,11 +42,10 @@ in stdenv.mkDerivation { firmware to the radio, backing up model settings, editing settings and running radio simulators. ''; - homepage = https://open-tx.org/; - license = stdenv.lib.licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ elitak ]; - broken = true; + homepage = "https://www.open-tx.org/"; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ elitak lopsided98 ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/pueue/default.nix b/nixpkgs/pkgs/applications/misc/pueue/default.nix index aac371164fa8..76350773b328 100644 --- a/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -1,23 +1,19 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.1.6"; + version = "0.2.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "1qp9h1xlfxwswcqi1qn2hfybxl547z13xjbvfgsx1nc8yj51bi3c"; + sha256 = "1yx69pwdal0p5dfhabjdns9z6z3fa41wh7bxa4dpsjx37ziglcsp"; }; - nativeBuildInputs = [ installShellFiles ]; + cargoSha256 = "1ksr5fw9p3j1bnlgfimb5nsryb4si8ic2x4prsra1mwkc91hr7x3"; - cargoSha256 = "00va292bjdp42bkqdkjqajmzc2nshhqa1fj0yfwdf3rrx4nhssjd"; - - postInstall = '' - installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue - ''; + checkPhase = "cargo test -- --skip test_single_huge_payload"; meta = with lib; { description = "A daemon for managing long running shell commands"; diff --git a/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index b1f4e5f9e42b..91845abc8b21 100644 --- a/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -1,27 +1,28 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK31, libXext, libXi, libXt, libXtst, xercesc +, wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization -, curl, openssl +, curl, openssl, file }: stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.08.2"; + version = "1.09.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${version}BETA"; - sha256 = "14qwk3cv5psj7ll71ikyv452x55c7iwjw9765yrpij6741r4yjln"; + rev = "${version}"; + sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b"; }; nativeBuildInputs = [ cmake gettext perl pkgconfig zip ]; buildInputs = [ - libXext libXi libXt libXtst wxGTK31 + libXext libXi libXt libXtst wxGTK30 curl qrencode libuuid openssl xercesc libyubikey yubikey-personalization + file ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/misc/pydf/default.nix b/nixpkgs/pkgs/applications/misc/pydf/default.nix index bfbee1bea24d..ae29993a79a1 100644 --- a/nixpkgs/pkgs/applications/misc/pydf/default.nix +++ b/nixpkgs/pkgs/applications/misc/pydf/default.nix @@ -9,6 +9,12 @@ python3Packages.buildPythonPackage rec { sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439"; }; + postInstall = '' + mkdir -p $out/share/man/man1 $out/share/pydf + install -t $out/share/pydf -m 444 pydfrc + install -t $out/share/man/man1 -m 444 pydf.1 + ''; + meta = with stdenv.lib; { description = "colourised df(1)-clone"; homepage = http://kassiopeia.juls.savba.sk/~garabik/software/pydf/; diff --git a/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/nixpkgs/pkgs/applications/misc/sidequest/default.nix index 7059eeb2a0d5..3638a1d18809 100644 --- a/nixpkgs/pkgs/applications/misc/sidequest/default.nix +++ b/nixpkgs/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.8.4"; + version = "0.8.7"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1fiqjzvl7isjn7w6vbbs439pp3bdhw6mnbf8483kvfb0fqhh3vs2"; + sha256 = "1hbr6ml689zq4k3mzmn2xcn4r4dy717rgq3lgm32pzwgy5w92i2j"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/stretchly/default.nix b/nixpkgs/pkgs/applications/misc/stretchly/default.nix index 75f3be85dadf..9769045b9ce5 100644 --- a/nixpkgs/pkgs/applications/misc/stretchly/default.nix +++ b/nixpkgs/pkgs/applications/misc/stretchly/default.nix @@ -1,177 +1,38 @@ -{ GConf -, alsaLib -, at-spi2-atk -, at-spi2-core -, atk -, buildFHSUserEnv -, cairo +{ stdenv, lib, fetchurl, makeWrapper, wrapGAppsHook, electron , common-updater-scripts -, coreutils -, cups -, dbus -, expat -, fetchurl -, fontconfig -, gdk-pixbuf -, glib -, gtk2 -, gtk3 -, lib -, libX11 -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libappindicator -, libdrm -, libnotify -, libpciaccess -, libpng12 -, libuuid -, libxcb -, nspr -, nss -, pango -, pciutils -, pulseaudio -, runtimeShell -, stdenv -, udev -, wrapGAppsHook -, writeScript -, file +, writeShellScript }: -let - libs = [ - GConf - alsaLib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - gdk-pixbuf - glib - gtk2 - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libappindicator - libdrm - libnotify - libpciaccess - libpng12 - libuuid - libxcb - nspr - nss - pango - pciutils - pulseaudio - stdenv.cc.cc.lib - udev - ]; - - libPath = lib.makeLibraryPath libs; - - stretchly = - stdenv.mkDerivation rec { - pname = "stretchly"; - version = "0.21.0"; - - src = fetchurl { - url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; - sha256 = "1gyyr22xq8s4miiacs8wqhp7lxnwvkvlwhngnq8671l62s6iyjzl"; - }; - - nativeBuildInputs = [ - wrapGAppsHook - coreutils - ]; - - buildInputs = libs; - - dontPatchELF = true; - dontBuild = true; - dontConfigure = true; - - installPhase = '' - mkdir -p $out/bin $out/lib/stretchly - cp -r ./* $out/lib/stretchly/ - ln -s $out/lib/stretchly/stretchly $out/bin/ - ''; +stdenv.mkDerivation rec { + pname = "stretchly"; + version = "0.21.1"; - preFixup = '' - patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so - patchelf --set-rpath "${libPath}" $out/lib/stretchly/libEGL.so - patchelf --set-rpath "${libPath}" $out/lib/stretchly/libGLESv2.so - patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libEGL.so - patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libGLESv2.so - - patchelf \ - --set-rpath "$out/lib/stretchly:${libPath}" \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/lib/stretchly/stretchly - - patchelf \ - --set-rpath "$out/lib/stretchly:${libPath}" \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/lib/stretchly/chrome-sandbox - ''; + src = fetchurl { + url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; + sha256 = "0776pywyqylwd33m85l4wdr89x0q9xkrjgliag10fp1bswz844lf"; + }; - meta = with stdenv.lib; { - description = "A break time reminder app"; - longDescription = '' - stretchly is a cross-platform electron app that reminds you to take - breaks when working on your computer. By default, it runs in your tray - and displays a reminder window containing an idea for a microbreak for 20 - 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/; - license = licenses.bsd2; - maintainers = with maintainers; [ cdepillabout ]; - platforms = platforms.linux; - }; - }; + nativeBuildInputs = [ + wrapGAppsHook + ]; -in + installPhase = '' + runHook preInstall -buildFHSUserEnv { - inherit (stretchly) meta; + mkdir -p $out/bin $out/share/${pname}/ + mv resources/app.asar $out/share/${pname}/ - name = "stretchly"; + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/app.asar \ + "''${gappsWrapperArgs[@]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" - targetPkgs = pkgs: [ - stretchly - ]; + runHook postInstall + ''; - runScript = "stretchly"; passthru = { - updateScript = writeScript "update-stretchly" '' - #!${runtimeShell} - + updateScript = writeShellScript "update-stretchly" '' set -eu -o pipefail # get the latest release version @@ -179,9 +40,23 @@ buildFHSUserEnv { echo "updating to $latest_version..." - ${common-updater-scripts}/bin/update-source-version stretchly.passthru.stretchlyWrapped "$latest_version" + ${common-updater-scripts}/bin/update-source-version stretchly "$latest_version" ''; + }; - stretchlyWrapped = stretchly; + meta = with stdenv.lib; { + description = "A break time reminder app"; + longDescription = '' + stretchly is a cross-platform electron app that reminds you to take + breaks when working on your computer. By default, it runs in your tray + and displays a reminder window containing an idea for a microbreak for 20 + 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/; + license = licenses.bsd2; + maintainers = with maintainers; [ cdepillabout ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 610409af7a7b..20dd3d6a3c68 100644 --- a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.6"; + version = "0.10.7"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "1lh1qsdy5081jrs27ba0mfh90ya1fj9h6j5k0cdsfap9mcxyjd9g"; + sha256 = "0qix22wblakpxwqy63378p5rksnx2ik9gfw0c6za19mzhx7gwln8"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/nixpkgs/pkgs/applications/misc/todoist/default.nix b/nixpkgs/pkgs/applications/misc/todoist/default.nix index 74b2b770215c..a625c8340558 100644 --- a/nixpkgs/pkgs/applications/misc/todoist/default.nix +++ b/nixpkgs/pkgs/applications/misc/todoist/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "todoist"; @@ -13,10 +13,12 @@ buildGoModule rec { modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; - meta = { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { homepage = https://github.com/sachaos/todoist; description = "Todoist CLI Client"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix index bf22cb0181da..a0d663efb3cc 100644 --- a/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig +{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco , qtbase, qtwebengine, qtx11extras, sqlite }: @@ -11,7 +11,7 @@ let sha256 = "01hqkx9dljnhwnyqi6mmzfp02hnbi2j50rsfiasniqrkbi99x9v1"; }; - bugsnag-qt = stdenv.mkDerivation rec { + bugsnag-qt = mkDerivation rec { pname = "bugsnag-qt"; version = "20180522.005732"; @@ -24,7 +24,7 @@ let buildInputs = [ qtbase ]; }; - qxtglobalshortcut = stdenv.mkDerivation rec { + qxtglobalshortcut = mkDerivation rec { pname = "qxtglobalshortcut"; version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; @@ -37,7 +37,7 @@ let buildInputs = [ qtbase qtx11extras ]; }; - qt-oauth-lib = stdenv.mkDerivation rec { + qt-oauth-lib = mkDerivation rec { pname = "qt-oauth-lib"; version = "20190125.190943"; @@ -62,7 +62,7 @@ let mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc ''; - libtoggl = stdenv.mkDerivation { + libtoggl = mkDerivation { name = "libtoggl-${version}"; inherit src version; @@ -77,7 +77,7 @@ let ''; }; - toggldesktop = stdenv.mkDerivation { + toggldesktop = mkDerivation { name = "${name}-unwrapped"; inherit src version; @@ -108,7 +108,7 @@ let ]; }; - toggldesktop-icons = stdenv.mkDerivation { + toggldesktop-icons = mkDerivation { name = "${name}-icons"; inherit (toggldesktop) src sourceRoot; @@ -138,7 +138,7 @@ buildEnv { inherit name; paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for Toggl time tracking service"; homepage = https://github.com/toggl/toggldesktop; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch b/nixpkgs/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch new file mode 100644 index 000000000000..f14d7f718027 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 9fa284aba434..5b77e13d7243 100644 --- a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/fix-extensions.patch b/nixpkgs/pkgs/applications/misc/ulauncher/fix-extensions.patch new file mode 100644 index 000000000000..f6d00f9fafd5 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/misc/ulauncher/fix-permissions.patch b/nixpkgs/pkgs/applications/misc/ulauncher/fix-permissions.patch new file mode 100644 index 000000000000..9d743c950f9d --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix index 64645e00bd85..cc88cb1751ef 100644 --- a/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -1,5 +1,16 @@ -{ buildPythonApplication, lib, fetchFromGitHub -, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp +{ buildPythonApplication +, lib +, fetchFromGitHub +, dateutil +, pyyaml +, openpyxl +, xlrd +, h5py +, fonttools +, lxml +, pandas +, pyshp +, setuptools }: buildPythonApplication rec { pname = "visidata"; @@ -12,16 +23,26 @@ buildPythonApplication rec { sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0"; }; - propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools - lxml pandas pyshp ]; + propagatedBuildInputs = [ + dateutil + pyyaml + openpyxl + xlrd + h5py + fonttools + lxml + pandas + pyshp + setuptools + ]; doCheck = false; meta = { inherit version; description = "Interactive terminal multitool for tabular data"; - license = lib.licenses.gpl3 ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "http://visidata.org/"; }; diff --git a/nixpkgs/pkgs/applications/misc/wofi/default.nix b/nixpkgs/pkgs/applications/misc/wofi/default.nix index 659b7099943d..3c14219b141d 100644 --- a/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -1,18 +1,28 @@ -{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3 }: +{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wofi"; - version = "1.1"; + version = "1.1.2"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "0rq6c8fv0h7xj3jw1i01r39dz0f31k7jgf7hpgl6mlsyn0ddc80z"; + sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn"; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ]; buildInputs = [ wayland gtk3 ]; + # Fixes icon bug on NixOS. + # Will need to be removed on next release + # see https://todo.sr.ht/~scoopta/wofi/54 + patches = [ + (fetchpatch { + url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49"; + sha256 = "18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh"; + }) + ]; + meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; diff --git a/nixpkgs/pkgs/applications/misc/wtf/default.nix b/nixpkgs/pkgs/applications/misc/wtf/default.nix index f12f96871c00..8c34baba5828 100644 --- a/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -1,8 +1,9 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv , makeWrapper , ncurses +, Security }: buildGoModule rec { @@ -24,12 +25,14 @@ 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 lib; { + meta = with stdenv.lib; { description = "The personal information dashboard for your terminal"; homepage = "https://wtfutil.com/"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/applications/misc/xterm/default.nix b/nixpkgs/pkgs/applications/misc/xterm/default.nix index 8dcd533b5223..8842d01e7068 100644 --- a/nixpkgs/pkgs/applications/misc/xterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-351"; + name = "xterm-353"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "05kf586my4irrzz2bxgmwjdvynyrg9ybhvfqmx29g70w4888l2kn"; + sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5"; }; buildInputs = diff --git a/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix index 7c2c8fb31cab..4e2d16819ba5 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.1.8"; src = fetchurl { - url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = https://pwmt.org/projects/zathura-cb/; + homepage = "https://pwmt.org/projects/zathura-cb/"; description = "A zathura CB plugin"; longDescription = '' The zathura-cb plugin adds comic book support to zathura. diff --git a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 99729125b631..44f200174d9b 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -9,12 +9,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - pname = "zathura-core"; - version = "0.4.4"; + pname = "zathura"; + version = "0.4.5"; src = fetchurl { - url = "https://git.pwmt.org/pwmt/zathura/-/archive/${version}/zathura-${version}.tar.gz"; - sha256 = "0v5klgr009rsxi41h73k0398jbgmgh37asvwz2w15i4fzmw89jgb"; + url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"; }; outputs = [ "bin" "man" "dev" "out" ]; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { "-Dmanpages=enabled" "-Dconvert-icon=enabled" "-Dsynctex=enabled" + # Make sure tests are enabled for doCheck + "-Dtests=enabled" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix b/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix index 54f68969d4f7..954df5301e31 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.8"; + pname = "zathura-djvu"; + version = "0.2.9"; src = fetchurl { - url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; - sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"; + url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with stdenv.lib; { - homepage = https://pwmt.org/projects/zathura-djvu/; + homepage = "https://pwmt.org/projects/zathura-djvu/"; description = "A zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the diff --git a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index d8c1364d3957..82c94d48068a 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,20 +1,13 @@ -{ stdenv, lib, meson, ninja, fetchFromGitHub +{ stdenv, lib, meson, ninja, fetchurl , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { version = "0.3.5"; pname = "zathura-pdf-mupdf"; - # pwmt.org server was down at the time of last update - # src = fetchurl { - # url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; - # sha256 = "1zbaqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"; - # }; - src = fetchFromGitHub { - owner = "pwmt"; - repo = "zathura-pdf-mupdf"; - rev = version; - sha256 = "0wb46hllykbi30ir69s8s23mihivqn13mgfdzawbsn2a21p8y4zl"; + src = fetchurl { + url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -26,7 +19,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { - homepage = https://pwmt.org/projects/zathura-pdf-mupdf/; + homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/"; description = "A zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by diff --git a/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 5b38555eda1a..bafa293ad9c3 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { - version = "0.2.9"; pname = "zathura-pdf-poppler"; + version = "0.3.0"; src = fetchurl { - url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l"; + url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"; }; nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = https://pwmt.org/projects/zathura-pdf-poppler/; + homepage = "https://pwmt.org/projects/zathura-pdf-poppler/"; description = "A zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by diff --git a/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix b/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix index 48d42b5e9399..05cc570eb8f1 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.2.6"; + pname = "zathura-ps"; + version = "0.2.6"; src = fetchurl { - url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = https://pwmt.org/projects/zathura-ps/; + homepage = "https://pwmt.org/projects/zathura-ps/"; description = "A zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the diff --git a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix index 6c8ad97d3556..4a6ef041b540 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix @@ -8,6 +8,8 @@ in symlinkJoin { paths = with zathura_core; [ man dev out ]; + inherit plugins; + buildInputs = [ makeWrapper ]; postBuild = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index cf3750addf85..073cc23e5ccf 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.4.96"; + version = "1.5.115"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "12fdef417180d295170dd61ff0586e568a0c6475fabc0b3d003921ec924a84fc"; + sha256 = "04zyv5amqxax1z0da4bcgxwsq596zfs416nshg6ffg4ci9nfbiab"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix index 2b910fe0c5c4..94e939b9ab42 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix @@ -26,7 +26,7 @@ in buildGoPackage rec { sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0"; }; - buildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata ]; # embed the web extension in a go file and place it where it's supposed to # be. See diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index ec69f3d233f4..edbf97e89633 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -18,6 +18,16 @@ mkChromiumDerivation (base: rec { cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" + # Swiftshader + # See https://stackoverflow.com/a/4264351/263061 for the find invocation. + if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then + echo "Swiftshader files found; installing" + mkdir -p "$libExecPath/swiftshader" + cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" + else + echo "Swiftshader files not found" + fi + mkdir -p "$sandbox/bin" cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 255b399ef3da..83c492e1e651 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg_utils, yasm, minizip, libwebp , libusb1, pciutils, nss, re2, zlib -, python2Packages, perl, pkgconfig, clang-tools +, python2Packages, perl, pkgconfig , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf @@ -104,8 +104,6 @@ let result else result; - llvm-clang-tools = clang-tools.override { inherit llvmPackages; }; - base = rec { name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) channel version; @@ -139,6 +137,8 @@ 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: @@ -216,8 +216,6 @@ let ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar - '' + optionalString (stdenv.lib.versionAtLeast version "82") '' - ln -s ${llvm-clang-tools}/bin/clang-format buildtools/linux64/clang-format ''; gnFlags = mkGnFlags ({ @@ -244,7 +242,6 @@ let is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; blink_symbol_level = 0; - enable_swiftshader = false; fieldtrial_testing_like_official_build = true; # Google API keys, see: diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch new file mode 100644 index 000000000000..cf24e2704191 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch @@ -0,0 +1,61 @@ +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/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index a58131ce0e0d..0e939f2fd219 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/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 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2"; - sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z"; - version = "81.0.4044.34"; + sha256 = "177hv5jkgpcbi6khk7j883rf3rzzkjmi8cqqpzckaiw7pcwsvyvd"; + sha256bin64 = "0sicz51d2l3gj70mfpyh5idwarjl19pba5lc6ahznxxqsrjfp80r"; + version = "81.0.4044.69"; }; dev = { - sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l"; - sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s"; - version = "82.0.4068.4"; + sha256 = "0s0072rmg287iijh6wwm9i5a5fsh96qm6nhd13xwbxrvj6pldb7n"; + sha256bin64 = "0l5ljjz0s5x9727syq4gs5xshl9vs8apvw6xw8il0xy5qax32g85"; + version = "82.0.4083.0"; }; stable = { - sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c"; - sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8"; - version = "80.0.3987.132"; + sha256 = "07icl3hgg1wjkmz88lbpjf6ll4xyi64spki1nmsy6899jgkxvgjh"; + sha256bin64 = "0qgp6hv4qj04v6pzfx9ggjvcl1vi6ljjc3cpi4hfr67p4jab40ji"; + version = "80.0.3987.149"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 4fafe19b3792..a8a426b61626 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -90,19 +90,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.5"; + version = "9.0.6"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s"; + sha256 = "1vk1pww8zmpjd5snyfz0if9v17g140ymlp6navxp28snzlffahss"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y"; + sha256 = "0bhikdilfz31iilgb48mayy9f4lilycq24pqsrq7w3dqdjg4v55v"; }; }; in diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index d0e1114bdd3a..e129542d530b 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.47-1"; + version = "2.11.1811.49-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "16fw6v00xy66mxkkq0b4k49jd0wwlyyvxaaml2gglfk7swxy7i02"; + sha256 = "0xn23jmh8pqp1hc0q6nysc8x9xgpypzqr4wz2rzqyald4asxj60v"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index f02b64e92c8b..25fb33399c0d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -32,6 +32,8 @@ 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 @@ -39,7 +41,7 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Container native workflow engine for Kubernetes"; homepage = https://github.com/argoproj/argo; license = licenses.asl20; diff --git a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index 7f9ebda93c0a..51635292fa13 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, packr }: +{ stdenv, buildGoModule, fetchFromGitHub, packr, Security }: buildGoModule rec { pname = "argocd"; @@ -16,6 +16,8 @@ buildGoModule rec { nativeBuildInputs = [ packr ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + patches = [ ./use-go-module.patch ]; buildFlagsArray = '' @@ -31,7 +33,7 @@ buildGoModule rec { packr ''; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix index cb846060a3de..ce3a1730ae54 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "atlantis"; @@ -15,6 +15,8 @@ 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/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix new file mode 100644 index 000000000000..716e9da8b7e5 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, minikube }: + +buildGoModule rec { + inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; + + pname = "docker-machine-hyperkit"; + subPackages = [ "cmd/drivers/hyperkit" ]; + + modSha256 = minikube.go-modules.outputHash; + + postInstall = '' + mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit + ''; + + meta = with lib; { + homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + description = "HyperKit driver for docker-machine."; + license = licenses.asl20; + maintainers = with maintainers; [ atkinschang ]; + platforms = platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index eb2946cec771..609b7b02cbb4 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,32 +1,22 @@ -{ stdenv, buildGoModule, libvirt, pkgconfig, minikube }: +{ lib, buildGoModule, minikube }: buildGoModule rec { - pname = "docker-machine-kvm2"; - version = minikube.version; + inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; - goPackagePath = "k8s.io/minikube"; + pname = "docker-machine-kvm2"; subPackages = [ "cmd/drivers/kvm" ]; - src = minikube.src; - - modSha256 = minikube.go-modules.outputHash; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libvirt ]; - - preBuild = '' - export buildFlagsArray=(-ldflags="-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=v${version}") - ''; + modSha256 = minikube.go-modules.outputHash; postInstall = '' mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; description = "KVM2 driver for docker-machine."; license = licenses.asl20; - maintainers = with maintainers; [ tadfisher ]; + maintainers = with maintainers; [ tadfisher atkinschang ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 982add3d517f..75e097131ea8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "fluxctl"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/fluxctl" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix index 31184bd68ff5..f2f3925fbe4d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,27 +1,23 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig -, libsodium, libarchive, openssl }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig +, libsodium, libarchive, openssl, zeromq }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "habitat"; - version = "0.30.2"; + # Newer versions required protobuf, which requires some finesse to get to + # compile with the vendored protobuf crate. + version = "0.90.6"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; rev = version; - sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1"; + sha256 = "0rwi0lkmhlq4i8fba3s9nd9ajhz2dqxzkgfp5i8y0rvbfmhmfd6b"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0"; - - buildInputs = [ libsodium libarchive openssl ]; + cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy"; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsodium libarchive openssl zeromq ]; cargoBuildFlags = ["--package hab"]; @@ -32,12 +28,11 @@ buildRustPackage rec { runHook postCheck ''; - meta = with lib; { + meta = with stdenv.lib; { description = "An application automation framework"; - homepage = https://www.habitat.sh; + homepage = "https://www.habitat.sh"; license = licenses.asl20; - maintainers = [ maintainers.rushmorem ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = true; # mark temporary as broken due git dependencies + maintainers = with maintainers; [ rushmorem ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 88ca9b3da947..822df7656554 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: buildGoModule rec { pname = "helm"; @@ -16,6 +16,9 @@ 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 diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index ee7c4ab9cbdd..2de07e9fdc7d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, Security }: -let version = "0.102.0"; in - -buildGoModule { +buildGoModule rec { pname = "helmfile"; - inherit version; + version = "0.102.0"; src = fetchFromGitHub { owner = "roboll"; @@ -13,12 +11,12 @@ buildGoModule { sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy"; }; - goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq"; nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X main.Version=${version} @@ -26,14 +24,14 @@ buildGoModule { postInstall = '' wrapProgram $out/bin/helmfile \ - --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ kubernetes-helm ]} ''; - meta = { + meta = with stdenv.lib; { description = "Deploy Kubernetes Helm charts"; homepage = "https://github.com/roboll/helmfile"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ pneumaticat yurrriq ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 1d9940c8f318..8a59bf3197a9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "hetzner-kube"; @@ -13,16 +13,18 @@ buildGoModule rec { modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X github.com/xetys/hetzner-kube/cmd.version=${version} ''; - meta = { + meta = with stdenv.lib; { description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; homepage = "https://github.com/xetys/hetzner-kube"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ eliasp ]; - platforms = lib.platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ eliasp ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index 88aa8777ee5e..f817a68ced19 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { name = "jx"; @@ -16,6 +16,8 @@ buildGoModule rec { ./3321-fix-location-of-thrift.patch ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; subPackages = [ "cmd/jx" ]; @@ -26,7 +28,7 @@ buildGoModule rec { -X github.com/jenkins-x/jx/pkg/version.Revision=${version} ''; - meta = with lib; { + meta = with stdenv.lib; { description = "JX is a command line tool for installing and using Jenkins X."; homepage = https://jenkins-x.io; longDescription = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 99326a20bfa0..956d7b106b97 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "k9s"; @@ -22,6 +22,8 @@ buildGoModule rec { modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; homepage = "https://github.com/derailed/k9s"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 595cfae2e697..0e71e91fbc1e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -18,8 +18,8 @@ let inherit sha256; }; - buildInputs = [go-bindata]; - subPackages = ["cmd/kops"]; + nativeBuildInputs = [ go-bindata ]; + subPackages = [ "cmd/kops" ]; buildFlagsArray = '' -ldflags= @@ -43,7 +43,7 @@ let description = "Easiest way to get a production Kubernetes up and running"; homepage = https://github.com/kubernetes/kops; license = licenses.asl20; - maintainers = with maintainers; [offline zimbatm kampka]; + maintainers = with maintainers; [ offline zimbatm kampka ]; platforms = platforms.unix; }; } // attrs'; @@ -60,7 +60,7 @@ in rec { version = "1.13.2"; sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng"; }; - + kops_1_14 = mkKops { version = "1.14.1"; sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n"; @@ -70,4 +70,9 @@ in rec { version = "1.15.2"; sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3"; }; + + kops_1_16 = mkKops { + version = "1.16.0"; + sha256 = "1b2lzf6b29rs5imbpqp8gnp3b511lk7jrm2f62y32gmx0gyjws6a"; + }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 5178b7a2bd41..004e88ff44e4 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi"; }; - buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; + nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; outputs = ["out" "man" "pause"]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index 6d35d233d4f4..092cee5f7a27 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kubeseal"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/kubeseal" ]; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix index 84e9b8899431..046052f78bef 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,25 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }: - -let - - # Cache schema as a package so network calls are not - # necessary at runtime, allowing use in package builds - schema = stdenv.mkDerivation { - name = "kubeval-schema"; - src = fetchFromGitHub { - owner = "instrumenta"; - repo = "kubernetes-json-schema"; - rev = "6a498a60dc68c5f6a1cc248f94b5cd1e7241d699"; - sha256 = "1y9m2ma3n4h7sf2lg788vjw6pkfyi0fa7gzc870faqv326n6x2jr"; - }; - - installPhase = '' - mkdir -p $out/kubernetes-json-schema/master - cp -R . $out/kubernetes-json-schema/master - ''; - }; - -in +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "kubeval"; @@ -32,13 +11,11 @@ buildGoModule rec { sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv"; }; - buildInputs = [ makeWrapper ]; - modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; - postFixup = "wrapProgram $out/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}/kubernetes-json-schema/master"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Validate your Kubernetes configuration files"; homepage = https://github.com/instrumenta/kubeval; license = licenses.asl20; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeval/schema.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeval/schema.nix new file mode 100644 index 000000000000..370fe9a1cd82 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeval/schema.nix @@ -0,0 +1,15 @@ +{ fetchFromGitHub }: +# To cache schema as a package so network calls are not +# necessary at runtime, allowing use in package builds you can use the following: + +# KUBEVAL_SCHEMA_LOCATION="file:///${kubeval-schema}"; +(fetchFromGitHub { + name = "kubeval-schema"; + owner = "instrumenta"; + repo = "kubernetes-json-schema"; + rev = "6a498a60dc68c5f6a1cc248f94b5cd1e7241d699"; + sha256 = "1y9m2ma3n4h7sf2lg788vjw6pkfyi0fa7gzc870faqv326n6x2jr"; +}) // { + # the schema is huge (> 7GB), we don't get any benefit from building int on hydra + meta.hydraPlatforms = []; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 8c0265d14914..d52b25c2e015 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule { pname = "linkerd-unstablle"; @@ -13,6 +13,8 @@ buildGoModule { modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cli/cmd" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 5637e486ef11..ebd78424f4af 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,68 +1,71 @@ -{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, libvirt, qemu -, gpgme, makeWrapper, vmnet -, docker-machine-kvm, docker-machine-kvm2 -, extraDrivers ? [] +{ stdenv +, buildGoModule +, fetchFromGitHub +, pkgconfig +, makeWrapper +, go-bindata +, libvirt +, vmnet +, xpc +, libobjc +, Foundation +, IOKit }: -let - drivers = stdenv.lib.filter (d: d != null) (extraDrivers - ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]); - - binPath = drivers - ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]); - -in buildGoModule rec { +buildGoModule rec { pname = "minikube"; - version = "1.2.0"; - - kubernetesVersion = "1.15.0"; + version = "1.8.1"; + # for -ldflags + commit = "cbda04cf6bbe65e987ae52bb393c10099ab62014"; goPackagePath = "k8s.io/minikube"; + subPackages = [ "cmd/minikube" ]; + modSha256 = "1wyz8aq291lx614ilqrcgzdc8rjxbd6v3rv1fy6r2m6snyysycfn"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0l9znrp49877cp1bkwx84c8lv282ga5a946rjbxi8gznkf3kwaw7"; + sha256 = "1nf0n701rw3anp8j7k3f553ipqwpzzxci41zsi0il4l35dpln5g0"; }; - modSha256 = "1cp63n0x2lgbqvvymx9byx48r42qw6w224x5x4iiarc2nryfdhn0"; - - buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet; - subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "cmd/drivers/hyperkit"; + nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] + ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet xpc libobjc IOKit Foundation ]; preBuild = '' go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... + go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/... VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//") ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0 ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") - KUBERNETES_VERSION=${kubernetesVersion} export buildFlagsArray="-ldflags=\ - -X k8s.io/minikube/pkg/version.version=v${version} \ - -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \ - -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET \ - -X k8s.io/minikube/vendor/k8s.io/client-go/pkg/version.gitVersion=$KUBERNETES_VERSION \ - -X k8s.io/minikube/vendor/k8s.io/kubernetes/pkg/version.gitVersion=$KUBERNETES_VERSION" + -X ${goPackagePath}/pkg/version.version=v${version} \ + -X ${goPackagePath}/pkg/version.isoVersion=$ISO_VERSION \ + -X ${goPackagePath}/pkg/version.isoPath=$ISO_BUCKET \ + -X ${goPackagePath}/pkg/version.gitCommitID=${commit} \ + -X ${goPackagePath}/pkg/drivers/kvm.version=v${version} \ + -X ${goPackagePath}/pkg/drivers/kvm.gitCommitID=${commit} \ + -X ${goPackagePath}/pkg/drivers/hyperkit.version=v${version} \ + -X ${goPackagePath}/pkg/drivers/hyperkit.gitCommitID=${commit}" ''; postInstall = '' - wrapProgram $out/bin/${pname} --prefix PATH : $out/bin:${stdenv.lib.makeBinPath binPath} mkdir -p $out/share/bash-completion/completions/ MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube + mkdir -p $out/share/zsh/site-functions/ MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube - ''+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit ''; meta = with stdenv.lib; { 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 ]; + maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang ]; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index 3b96ef4ea45e..fb88dfdbb643 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -33,7 +33,9 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ which rsync go-bindata kerberos clang ]; + buildInputs = [ kerberos ]; + + nativeBuildInputs = [ which rsync go-bindata clang ]; patchPhase = '' patchShebangs ./hack diff --git a/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix b/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix index 1c802802c096..e3eb24b23746 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "prow-unstable"; @@ -20,6 +20,8 @@ buildGoModule rec { modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "./prow/cmd/admission" "./prow/cmd/artifact-uploader" @@ -54,7 +56,7 @@ buildGoModule rec { "./prow/cmd/tot" ]; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index 4a8b2a2e6648..4e475320a613 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "qbec"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 6298c25ba254..1487f8ad875f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,7 +2,7 @@ , buildGoPackage , fetchFromGitHub , callPackage -, buildGo112Module +, Security }: let list = import ./data.nix; @@ -25,13 +25,11 @@ let in { elasticsearch = callPackage ./elasticsearch { - # Version 0.7.0 fails to build with go 1.13 due to dependencies: - # verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused - # verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused - buildGoModule = buildGo112Module; + inherit Security; }; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; + lxd = callPackage ./lxd {}; ansible = callPackage ./ansible {}; } // lib.mapAttrs (n: v: toDrv v) list diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 1aadbbc5ccd3..2f13000c0cde 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "terraform-provider-elasticsearch"; version = "0.7.0"; @@ -12,6 +12,8 @@ buildGoModule rec { modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; # Terraform allow checking the provider versions, but this breaks diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 40a6bb11c7da..c2014a4d7bf1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -30,7 +30,9 @@ buildGoPackage rec { sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz"; }; - buildInputs = [ libvirt pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ libvirt ]; # mkisofs needed to create ISOs holding cloud-init data, # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 @@ -48,4 +50,3 @@ buildGoPackage rec { maintainers = with maintainers; [ mic92 ]; }; } - diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix new file mode 100644 index 000000000000..fd2a6c36d65c --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-provider-lxd"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "sl1pm4t"; + repo = "terraform-provider-lxd"; + rev = "v${version}"; + sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv"; + }; + + modSha256 = "1h95ng9by3i3v15s1ws1fv86a47vglivn42xbffdy94s108g0908"; + + postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = "https://github.com/sl1pm4t/terraform-provider-lxd"; + description = "Terraform provider for lxd"; + platforms = platforms.linux; + license = licenses.mpl20; + maintainers = with maintainers; [ gila ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 6862ed23e742..b9c82f97c4fd 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.23"; - sha256 = "1lr2gfk5dmj6rhv5rvzn3fggb34za73ryjy0vdzx4kf3qj12r0wz"; + version = "0.12.24"; + sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index 27bf8e81b117..15328c56d27b 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,18 +1,18 @@ { stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses -, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }: +, asciidoctor, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da"; + sha256 = "0yyrq8a90l6pkrczm9qvdg75jhsdq0niwp79vrdpm8rsxqpdmfq7"; }; - cargoSha256 = "0q7bira2adfmx0ghb1c5nqz200iajaxap9bq8j5wvvk9l2wywslp"; + cargoSha256 = "1q3jf3d80c0ik38qk8jgbhfz5jxv0cy3lzmkyh2l002azp9hvv59"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" @@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec { --replace "ncurses5.4" "ncurses" ''; - nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] + nativeBuildInputs = [ + pkgconfig + asciidoctor + ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ] @@ -31,12 +34,12 @@ rustPlatform.buildRustPackage rec { make ''; - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" - + stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; + # TODO: Check if that's still needed + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; doCheck = true; - checkPhase = '' + preCheck = '' make test ''; @@ -50,7 +53,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - homepage = https://newsboat.org/; + homepage = "https://newsboat.org/"; description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console"; maintainers = with maintainers; [ dotlambda nicknovitski ]; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index 6dcfb27b7ba6..340cfdf879a7 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,13 +1,13 @@ { callPackage }: let - stableVersion = "2.2.5"; + stableVersion = "2.2.6"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; - extraArgs = { + extraArgs = rec { mkOverride = attrname: version: sha256: self: super: { ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { @@ -18,11 +18,15 @@ let doCheck = oldAttrs.doCheck && (attrname != "psutil"); }); }; + commonOverrides = [ + (mkOverride "psutil" "5.6.6" + "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd") + ]; }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx"; - serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d"; + guiSrcHash = "0inqy2zw5h9cgiyqb04kv8b5sjrdi4a637gdqs83k887axkd48aw"; + serverSrcHash = "04d9lny5vyk0kbi5ilv5mngaicnxb077xpcaaqlcd9b1m3kiq19n"; in { guiStable = mkGui { stable = true; diff --git a/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/nixpkgs/pkgs/applications/networking/gns3/gui.nix index 2d462d5c11d0..2524731cd05c 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/gui.nix @@ -1,12 +1,10 @@ -{ stable, branch, version, sha256Hash, mkOverride }: +{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: { lib, stdenv, python3, fetchFromGitHub }: let # TODO: This package requires qt5Full to launch - defaultOverrides = [ - (mkOverride "psutil" "5.6.3" - "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6") + defaultOverrides = commonOverrides ++ [ (mkOverride "jsonschema" "2.6.0" "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") ]; @@ -40,7 +38,8 @@ in python.pkgs.buildPythonPackage rec { requires access to a local or remote GNS3 server (it's recommended to download the official GNS3 VM). ''; - homepage = https://www.gns3.com/; + homepage = "https://www.gns3.com/"; + changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix index beeac9d02936..32dc42e9f51a 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -1,11 +1,9 @@ -{ stable, branch, version, sha256Hash, mkOverride }: +{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: { lib, stdenv, python3, fetchFromGitHub }: let - defaultOverrides = [ - (mkOverride "psutil" "5.6.3" - "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6") + defaultOverrides = commonOverrides ++ [ (mkOverride "jsonschema" "2.6.0" "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") ]; @@ -25,8 +23,6 @@ in python.pkgs.buildPythonPackage { }; postPatch = '' - # Only 2.x is problematic: - sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt # yarl 1.4+ only requires Python 3.6+ sed -iE "s/yarl==1.3.0//" requirements.txt ''; @@ -34,7 +30,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles - (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) + prompt_toolkit py-cpuinfo ]; # Requires network access @@ -51,7 +47,8 @@ in python.pkgs.buildPythonPackage { Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST API. ''; - homepage = https://www.gns3.com/; + homepage = "https://www.gns3.com/"; + changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/applications/networking/hydroxide/default.nix b/nixpkgs/pkgs/applications/networking/hydroxide/default.nix index 75c1cdaece96..d3f45f7f0385 100644 --- a/nixpkgs/pkgs/applications/networking/hydroxide/default.nix +++ b/nixpkgs/pkgs/applications/networking/hydroxide/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: buildGoModule rec { pname = "hydroxide"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # FIXME: remove with next release patches = [ (fetchpatch { @@ -23,7 +25,7 @@ buildGoModule rec { subPackages = [ "cmd/hydroxide" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A third-party, open-source ProtonMail bridge"; homepage = "https://github.com/emersion/hydroxide"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index 3186009db582..e507d986510c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -14,7 +14,9 @@ buildGoPackage rec { sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "a safe and secure chat client"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index a36f72c03d08..27790c2c9e08 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "gomuks"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index 488da12c18c2..71102e7ed776 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -3,18 +3,18 @@ }: let - version = "0.7.3"; + 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 = "09v8zlayas906zhqy2aw4wkvyl87ykr09sjf0nmgmf69piwmjgg6"; + sha256 = "108yd5djnap37yh0nbjyqkp5ci1zmydfzqcsbapin40a4f36zm31"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "0gv4pf3vhrw4xyccm24ivv92d9qy4zpwsh0m82ib1w764lyxmyrz"; + sha256 = "1pvh048h6m19rmbscsy69ih0jkyhazmq2pcagmf3kk8gmbi7y6p6"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = http://rambox.pro; license = licenses.mit; - maintainers = [ maintainers.gnidorah ]; + maintainers = with maintainers; [ gnidorah ma27 ]; platforms = ["i686-linux" "x86_64-linux"]; hydraPlatforms = []; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 122a7e74f863..87342115e1e4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.12"; + version = "1.5.13"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym"; + sha256 = "1p2bdqq8yziv3l7kjkwqvi27a8djav7rk3lsipl7dvdjk1926941"; }; electron = electron_7; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index e633f60d9770..1ff55fbb1cb0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "064zghrsl348ydzngwxhwjn0d0gkkf3nkzq03v5gad2f11qwnwb6"; + sha256 = "0xghpf9rv7ns5aipc6n517qd9dp50rr93arvx6r36kqhkdyzbfad"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 3592665ef0b4..903b349edfa1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/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.1"; # Please backport all updates to the stable channel. + version = "1.32.3"; # 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 = "0sfzz1z57l20prj2s8hdl8ip1hrlzb5fqnccqcfd101a6mjnp9i9"; + sha256 = "1aqk0hdgdxjznj0nbh2glvyzdq2af8xgiw3qb4k7wpjd0my28r2l"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 78b7a6d81a2e..a4852f16245c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.56.0.103"; + version = "8.58.0.93"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -63,7 +63,7 @@ let "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "01qyi92dh4xalzaqzj9n3bz59y91rx45gkyw4k9ckjknbjwb3c90"; + sha256 = "1nqadil50z896jg0r202gw3xmm3diawn0pnh6n6nxn900f02avl3"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 6271e338a964..d1f3e98c4ec2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { # https://github.com/erroneousboat/slack-term pname = "slack-term"; - version = "0.4.1"; + version = "0.5.0"; goPackagePath = "github.com/erroneousboat/slack-term"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "erroneousboat"; repo = "slack-term"; rev = "v${version}"; - sha256 = "1340bq7h31fxykxbxpn6hv7n2hmjf20f8vg5gan9pjf5jaa6kfza"; + sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index ef7e3717f728..63d922ab2994 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.958"; + version = "1.3.00.5153"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "015awxgbwk4j973jnxj7q3i8csx7wnwpwp5g4jlmn7z8fxwy83d5"; + sha256 = "13c7fmij0gcg6mrjjj2mhs21q7fzdssscwhihzyrmbmj64cd0a69"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 9cd181c591d6..3d4096667983 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -2,7 +2,7 @@ , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, microsoft_gsl +, tl-expected, microsoft_gsl, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.14"; + version = "1.9.21"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0jsss4b51ylf4qk58frvh2yap1s3cjf3isnlc273cc0fh5g1skc6"; + sha256 = "1b7z68q2sb2y203nf4p6lmz72zkpi5gyv9ypqi5h99bm2j6bbyg1"; }; postPatch = '' @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected microsoft_gsl + tl-expected microsoft_gsl hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -55,13 +55,9 @@ mkDerivation rec { # TODO: Officiall API credentials for Nixpkgs # (see: https://github.com/NixOS/nixpkgs/issues/55271): "-DTDESKTOP_API_TEST=ON" - "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF" - "-DDESKTOP_APP_USE_PACKAGED=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" - "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" - "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default @@ -90,8 +86,7 @@ mkDerivation rec { "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --prefix PATH : ${xdg_utils}/bin \ - --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \ - --unset QT_QPA_PLATFORMTHEME # From the Arch wrapper + --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; @@ -104,7 +99,8 @@ mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.linux; - homepage = https://desktop.telegram.org/; + homepage = "https://desktop.telegram.org/"; + changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}"; maintainers = with maintainers; [ primeos abbradar ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 165e3e959e0c..7f2ce9553e9b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/nixpkgs/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}"); diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index c04851d586b4..d09793733e97 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/nixpkgs/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.15.3621"; + x86_64-linux = "3.16.2923"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "0xvhx3r99fl1v1cdqj6sk46kzxv9qi7j754amkhv7knrpmgyp55z"; - x86_64-linux = "0xx03cpy6kapbjpygwranxjg1a0p8s1xq3cpapvi55rnkbk0qvjw"; + x86_64-darwin = "13sgakb3zjlvqv6d6b264fc9x99swpl7s1dmnrgc5v3pgyaklr01"; + x86_64-linux = "0c8jmlsg2gnxsvly04xj1al80nj52rg4czfdha58sg14x14lyspz"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -75,7 +75,7 @@ let icon = "wire-desktop"; name = "wire-desktop"; extraEntries = '' - StartupWMClass="Wire" + StartupWMClass=Wire ''; }; @@ -121,7 +121,7 @@ let src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "macos%2F${version}/Wire.pkg"; + + "wrapper_macos_production%2F${version}/Wire.pkg"; inherit sha256; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d47368a9cb25..ae92e23d0bd0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/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.361976.0301"; + version = "3.5.374815.0324"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "12pqs4pk73d7y9b49vq6f4fryph27k45zm1rjrpijnbi6ln2w993"; + sha256 = "1pnr00jwjjp23bbqdg5sv2s2rnciz57g1453sgi13kzpppydhzi5"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index a214f222d566..9bf7faf51f3e 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ipfs-cluster"; @@ -14,6 +14,8 @@ 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/; @@ -22,4 +24,3 @@ buildGoModule rec { maintainers = with maintainers; [ jglukasik ]; }; } - diff --git a/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/nixpkgs/pkgs/applications/networking/ipfs/default.nix index 4f71fcf3b745..c3a31f4e290f 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ipfs"; @@ -18,6 +18,8 @@ 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/; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 632a485381d0..7b98630e85ee 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "0h425ln5vv76zv41dccapyfbl8qmmflbpwmrd26knqyj8k24zfpr"; + sha256 = "0sxgi5fg8qvzqmxy7sdma6v0wj93xwh21av10n8nxvdskacw5dxz"; }; patches = [ @@ -19,13 +19,19 @@ stdenv.mkDerivation rec { paths = with python3Packages; [ websocket_client six ]; }}/${python3Packages.python.sitePackages}"; }) + ./hardcode-json-file-path.patch ]; + postPatch = '' + substituteInPlace wee_slack.py --subst-var out + ''; + passthru.scripts = [ "wee_slack.py" ]; installPhase = '' mkdir -p $out/share cp wee_slack.py $out/share/wee_slack.py + install -D -m 0444 weemoji.json $out/share/wee-slack/weemoji.json ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch new file mode 100644 index 000000000000..7413a9229ce6 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch @@ -0,0 +1,12 @@ +--- a/wee_slack.py ++++ b/wee_slack.py +@@ -4560,8 +4560,7 @@ + + def load_emoji(): + try: +- DIR = w.info_get('weechat_dir', '') +- with open('{}/weemoji.json'.format(DIR), 'r') as ef: ++ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef: + emojis = json.loads(ef.read()) + if 'emoji' in emojis: + print_error('The weemoji.json file is in an old format. Please update it.') diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index 0fa30a85d1b6..e0f98208e7ab 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc -, python3, perl, w3m, dante +, python3, perl, w3m, dante, Security }: let @@ -17,10 +17,8 @@ in buildGoModule rec { modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; nativeBuildInputs = [ - go scdoc python3.pkgs.wrapPython - notmuch ]; patches = [ @@ -31,7 +29,8 @@ in buildGoModule rec { python3.pkgs.colorama ]; - buildInputs = [ python3 perl ]; + buildInputs = [ python3 notmuch ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; GOFLAGS="-tags=notmuch"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index b4d7bd046d2e..bcd35510dce3 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20200313"; + version = "20200320"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5"; + sha256 = "06xcl9pr8dna4kqjaqm7ss50gdy185425bwl31i0xs3l11cyjap4"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index d673c75764a3..3b7de8360d74 100644 --- a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers ;[ filalex77 xfix ]; + maintainers = with maintainers; [ filalex77 ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix b/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix index 94720f35504b..f07db173dbcf 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "magnetico"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "boramalper"; repo = "magnetico"; rev = "v${version}"; - sha256 = "1flw7r8igc0hhm288p67lpy9aj1fnywva5b28yfknpw8g97c9r5x"; + sha256 = "1622xcl5v67lrnkjwbg7g5b5ikrawx7p91jxbj3ixc1za2f3a3fn"; }; - modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf"; + modSha256 = "193n323xaypm9xkpray68nqcgyf141x8qzpxzwjnrmsgfz8p6wgk"; - buildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata ]; buildPhase = '' make magneticow magneticod ''; diff --git a/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix index 03d1a665273e..e62bc21ab5b8 100644 --- a/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, openvpn, dialog }: +{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }: python3Packages.buildPythonApplication rec { - name = "protonvpn-cli-ng"; - version = "2.2.0"; + pname = "protonvpn-cli-ng"; + version = "2.2.2"; src = fetchFromGitHub { owner = "protonvpn"; - repo = "protonvpn-cli-ng"; + repo = "${pname}"; rev = "v${version}"; - sha256 = "11fvnnr5p3qdc4y10815jnydcjvxlxwkkq9kvaajg0yszq84rwkz"; + sha256 = "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8"; }; propagatedBuildInputs = (with python3Packages; [ @@ -19,15 +19,16 @@ python3Packages.buildPythonApplication rec { ]) ++ [ dialog openvpn + iptables ]; # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/protonvpn-cli-ng"; - maintainers = [ maintainers.jtcoolen ]; + maintainers = with maintainers; [ jtcoolen jefflabonte ]; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index de221fce3896..3e41649d8cc0 100644 --- a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.3.10"; + version = "1.4.1"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "0gc7b88129avl9sbax3ncvm7zf2qvq35ixvvpr2zj74g3qnphl08"; + sha256 = "084yw0fd3qmzzd6xinhf4plv5bg8gfj4jnfac7zi1nif8zilf456"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { license = licenses.gpl2; - homepage = https://gitlab.com/Remmina/Remmina; + homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; maintainers = with maintainers; [ melsigl ryantm ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix b/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix index 7cf989de33ec..865710184f93 100644 --- a/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1qk8xrqd8ls2hpkj7g4aknr73x3lbzzdjpja16rbp2r0m4iv95ld"; + sha256 = "0aa12fkbwhzs0g2pqw1b27l33nn5dpbcvsf1z8h88kwsf9xdvb2r"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/sync/unison/4.08-compatibility.patch b/nixpkgs/pkgs/applications/networking/sync/unison/4.08-compatibility.patch new file mode 100644 index 000000000000..a6921b516f07 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/sync/unison/4.08-compatibility.patch @@ -0,0 +1,52 @@ +From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001 +From: Jaap Boender <jaapb@kerguelen.org> +Date: Thu, 21 Mar 2019 12:26:51 +0000 +Subject: [PATCH] Compatibility with OCaml 4.08 + +--- + src/files.ml | 2 +- + src/recon.ml | 4 ++-- + src/system/system_generic.ml | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/files.ml b/src/files.ml +index ba42ad57..5babf21e 100644 +--- a/src/files.ml ++++ b/src/files.ml +@@ -722,7 +722,7 @@ let get_files_in_directory dir = + with End_of_file -> + dirh.System.closedir () + end; +- Sort.list (<) !files ++ List.sort String.compare !files + + let ls dir pattern = + Util.convertUnixErrorsToTransient +diff --git a/src/recon.ml b/src/recon.ml +index 5ed358d7..0df2cfe4 100644 +--- a/src/recon.ml ++++ b/src/recon.ml +@@ -651,8 +651,8 @@ let rec reconcile + + (* Sorts the paths so that they will be displayed in order *) + let sortPaths pathUpdatesList = +- Sort.list +- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) ++ List.sort ++ Path.compare + pathUpdatesList + + let rec enterPath p1 p2 t = +diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml +index ed8e18f3..0e28a781 100755 +--- a/src/system/system_generic.ml ++++ b/src/system/system_generic.ml +@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen + let chmod = Unix.chmod + let chown = Unix.chown + let utimes = Unix.utimes +-let link = Unix.link ++let link s d = Unix.link s d + let openfile = Unix.openfile + let opendir f = + let h = Unix.opendir f in diff --git a/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index c29bd3a486cc..9c49b22d9443 100644 --- a/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -27,6 +27,12 @@ stdenv.mkDerivation (rec { "UISTYLE=${if enableX11 then "gtk2" else "text"}" ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; + patches = [ + # NOTE: Only needed until Unison 2.51.3 is released! + ./4.08-compatibility.patch + ./lablgtk.patch + ]; + preInstall = "mkdir -p $out/bin"; postInstall = if enableX11 then '' diff --git a/nixpkgs/pkgs/applications/networking/sync/unison/lablgtk.patch b/nixpkgs/pkgs/applications/networking/sync/unison/lablgtk.patch new file mode 100644 index 000000000000..20c1db1b1166 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/sync/unison/lablgtk.patch @@ -0,0 +1,31 @@ +From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001 +From: daviddavid <geiger.david68210@gmail.com> +Date: Mon, 26 Feb 2018 13:36:36 +0100 +Subject: [PATCH] Fix for lablgtk >= 2.18.6 + +--- + src/uigtk2.ml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/uigtk2.ml b/src/uigtk2.ml +index 2ba6d79..04c4da4 100644 +--- a/src/uigtk2.ml ++++ b/src/uigtk2.ml +@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic") + (* This does not work with the current version of Lablgtk, due to a bug + let icon = + GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true +- (Gpointer.region_of_string Pixmaps.icon_data) ++ (Gpointer.region_of_bytes Pixmaps.icon_data) + *) + let icon = + let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in + Gpointer.blit +- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); ++ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + p + + let leftPtrWatch = +-- +2.25.1 + diff --git a/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 2d7624ed89cb..0fd3a5ca2801 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -1,21 +1,21 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, libobjc, CoreServices, Foundation }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.3.4"; + version = "1.4.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "076k06p2vqqz2r5bgvqkjipnhznbfbalp3pa2gjm2j9hy7nldr9f"; + sha256 = "049f9h03qq9a7pa8ngwampwf5xc7kr7mm473zn56yl3nrmv0nid6"; }; - goPackagePath = "github.com/syncthing/syncthing"; + modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh"; - modSha256 = "10fgfjip5xr8lim2z0dh7399xpcnhxis9s9yd36fk934h1k1hwzd"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc CoreServices Foundation ]; patches = [ ./add-stcli-target.patch diff --git a/nixpkgs/pkgs/applications/networking/websocketd/default.nix b/nixpkgs/pkgs/applications/networking/websocketd/default.nix index 4160e70b9c44..8d0e92488dbb 100644 --- a/nixpkgs/pkgs/applications/networking/websocketd/default.nix +++ b/nixpkgs/pkgs/applications/networking/websocketd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "websocketd"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; homepage = "http://websocketd.com/"; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix b/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix index b114194d5633..d9f901ff4635 100644 --- a/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/office/timetrap/Gemfile.lock b/nixpkgs/pkgs/applications/office/timetrap/Gemfile.lock index 9f2ea82cee05..c97fb170324a 100644 --- a/nixpkgs/pkgs/applications/office/timetrap/Gemfile.lock +++ b/nixpkgs/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 + 1.17.3 diff --git a/nixpkgs/pkgs/applications/office/timetrap/gemset.nix b/nixpkgs/pkgs/applications/office/timetrap/gemset.nix index 1ea489b92c3f..65ab4ade9e0a 100644 --- a/nixpkgs/pkgs/applications/office/timetrap/gemset.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix index ba37b7ecad22..005f83e0f54e 100644 --- a/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gnss-sdr"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0ajj0wx68yyzigppxxa1wag3hzkrjj8dqq8k28rj0jhp8a6bw2q7"; + sha256 = "0i9cz85jc2m758pzy3bq4dk4vj9wv7k2z118lasb09xldx01dwsq"; }; buildInputs = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source Global Navigation Satellite Systems software-defined receiver"; - homepage = https://gnss-sdr.org/; + homepage = "https://gnss-sdr.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/science/biology/last/default.nix b/nixpkgs/pkgs/applications/science/biology/last/default.nix index b47ce6ac3a94..1a3762f43264 100644 --- a/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/science/biology/seaview/default.nix b/nixpkgs/pkgs/applications/science/biology/seaview/default.nix index fea8da41d70a..4192de714d0b 100644 --- a/nixpkgs/pkgs/applications/science/biology/seaview/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/seaview/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coreutils, fltk, libjpeg }: stdenv.mkDerivation rec { - version = "5.0"; + version = "5.0.2"; pname = "seaview"; src = fetchurl { url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz"; - sha256 = "0gzjqf5mm91pa1drwxvz229bv6l995npdggngszh6z6j4pfh8j7c"; + sha256 = "0bad0nd18a36g6ysx28j68rbnwqn33ra8inx2lv2igqqcs6i5kif"; }; buildInputs = [ fltk libjpeg ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Gouy M., Guindon S. & Gascuel O. (2010) SeaView version 4 : a multiplatform graphical user interface for sequence alignment and phylogenetic tree building. Molecular Biology and Evolution 27(2):221-224. ''; - homepage = http://doua.prabi.fr/software/seaview; + homepage = "http://doua.prabi.fr/software/seaview"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/science/chemistry/gwyddion/codegen.patch b/nixpkgs/pkgs/applications/science/chemistry/gwyddion/codegen.patch new file mode 100644 index 000000000000..eb306d99f8a3 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix b/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix index 12007c940b3d..cd8b93c9aac7 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -1,17 +1,69 @@ -{ 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 ? true +}: -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 ] ++ + optionals 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/; @@ -29,5 +81,6 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.cge ]; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index 68f4fafa887c..7c5942d825a9 100644 --- a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.5.2"; + version = "9.6.0"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "0k707pyh0g2r6sgyran59sznq0nlh0i16la2gxqj3c5da1vb58y5"; + sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8"; }; desktopItem = makeDesktopItem { @@ -72,7 +72,7 @@ let meta = with stdenv.lib; { description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)"; - homepage = https://www.autodesk.com/products/eagle/overview; + homepage = "https://www.autodesk.com/products/eagle/overview"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.rittelle ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index a60f8db388a5..f03a0a0cceff 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -137,5 +137,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ evils kiwi berce ]; # kicad's cross-platform, not sure what to fill in here platforms = with platforms; linux; + } // optionalAttrs with3d { + # We can't download the 3d models on Hydra - they are a ~1 GiB download and + # they occupy ~5 GiB in store. + hydraPlatforms = []; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix index 53e190d2749b..7cdf9373e087 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix @@ -12,8 +12,8 @@ # }; with lib; let - mkLib = name: attrs: - stdenv.mkDerivation ( + mkLib = name: + stdenv.mkDerivation { pname = "kicad-${name}"; version = "${version}"; @@ -27,16 +27,13 @@ let ); nativeBuildInputs = [ cmake ]; meta.license = licenses.cc-by-sa-40; - } // attrs - ); + }; in { - symbols = mkLib "symbols" { }; - templates = mkLib "templates" { }; - footprints = mkLib "footprints" { }; - packages3d = mkLib "packages3d" { - hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store - }; + symbols = mkLib "symbols"; + templates = mkLib "templates"; + footprints = mkLib "footprints"; + packages3d = mkLib "packages3d"; # i18n is a special case, not actually a library # more a part of kicad proper, but also optional and separate diff --git a/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix b/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix index 418144e6af7b..d10b486492e0 100644 --- a/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix @@ -2,7 +2,7 @@ , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: let - version = "3.9.73"; + version = "3.10.12"; name = "xcircuit-${version}"; inherit (stdenv.lib) getBin; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://opencircuitdesign.com/xcircuit/archive/${name}.tgz"; - sha256 = "1kj9hayipplzm4960kx48vxddqj154qnxkccaqj9cnkp62b7q3jg"; + sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; }; nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; @@ -30,6 +30,6 @@ in stdenv.mkDerivation { homepage = http://opencircuitdesign.com/xcircuit; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.spacefrogg ]; + maintainers = with maintainers; [ spacefrogg thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/applications/science/logic/abc/default.nix b/nixpkgs/pkgs/applications/science/logic/abc/default.nix index 8551a3ee4ca3..a33cc92c7ce7 100644 --- a/nixpkgs/pkgs/applications/science/logic/abc/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/abc/default.nix @@ -1,35 +1,32 @@ -{ fetchFromGitHub, stdenv, readline, cmake }: +{ stdenv, fetchFromGitHub +, readline, cmake +}: -let - rev = "71f2b40320127561175ad60f6f2428f3438e5243"; -in stdenv.mkDerivation { - pname = "abc-verifier"; - version = "2020-01-11"; +stdenv.mkDerivation rec { + pname = "abc-verifier"; + version = "2020.03.05"; src = fetchFromGitHub { - inherit rev; - owner = "berkeley-abc"; - repo = "abc"; - sha256 = "15sn146ajxql7l1h8rsag5lhn4spwvgjhwzqawfr78snzadw8by3"; + owner = "berkeley-abc"; + repo = "abc"; + rev = "ed90ce20df9c7c4d6e1db5d3f786f9b52e06bab1"; + sha256 = "01sw67pkrb6wzflkxbkxzwsnli3nvp0yxwp3j1ngb3c0j86ri437"; }; - passthru.rev = rev; - nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; enableParallelBuilding = true; + installPhase = "mkdir -p $out/bin && mv abc $out/bin"; - installPhase = '' - mkdir -p $out/bin - mv abc $out/bin - ''; + # needed by yosys + passthru.rev = src.rev; - meta = { + meta = with stdenv.lib; { description = "A tool for squential logic synthesis and formal verification"; - homepage = https://people.eecs.berkeley.edu/~alanmi/abc; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index f83480cfbafc..ad931c23d53c 100644 --- a/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,26 +1,48 @@ -{ fetchurl, stdenv, which, dune, ocamlPackages }: +{ fetchurl, lib, which, ocamlPackages }: -stdenv.mkDerivation rec { +let pname = "alt-ergo"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz"; name = "${pname}-${version}.tar.gz"; - sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz"; + sha256 = "124n836alqm13245hcnxixzc6a15rip919shfflvxqnl617mkmhg"; }; - buildInputs = [ dune which ] ++ (with ocamlPackages; [ - ocaml findlib camlzip lablgtk menhir num ocplib-simplex psmt2-frontend seq zarith - ]); - preConfigure = "patchShebangs ./configure"; + nativeBuildInputs = [ which ]; + +in + +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 ]; +}; in + +let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { + pname = "alt-ergo-parsers"; + inherit version src preConfigure nativeBuildInputs; + configureFlags = pname; + buildInputs = with ocamlPackages; [ menhir ]; + propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); +}; in + +ocamlPackages.buildDunePackage { + + inherit pname version src preConfigure nativeBuildInputs; + + configureFlags = pname; + + buildInputs = [ alt-ergo-parsers ocamlPackages.menhir ]; + meta = { description = "High-performance theorem prover and SMT solver"; homepage = "https://alt-ergo.ocamlpro.com/"; - license = stdenv.lib.licenses.ocamlpro_nc; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.ocamlpro_nc; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix index d799b52d115e..69ffb87e7670 100644 --- a/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }: +{ stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: let load_num = @@ -30,6 +30,11 @@ stdenv.mkDerivation { sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; }; + patches = [(fetchpatch { + url = https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch; + sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; + })]; + buildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; diff --git a/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/nixpkgs/pkgs/applications/science/logic/lean/default.nix index ac65a72c94b9..cfd645a3c732 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.7.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1khy41zv4bjbpy3949j7y7d4qal53w4679iqlhm2l8jxd7y46nvi"; + sha256 = "0d9lz0mbxyaaykkvk2p8w2hcif9cx0ksihgh7qhxf417bz6msgc1"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/logic/mcy/default.nix b/nixpkgs/pkgs/applications/science/logic/mcy/default.nix index 9f239f221b18..a9366d560583 100644 --- a/nixpkgs/pkgs/applications/science/logic/mcy/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/mcy/default.nix @@ -7,28 +7,31 @@ let in stdenv.mkDerivation { pname = "mcy"; - version = "2020.02.05"; + version = "2020.03.21"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "mcy"; - rev = "83deeddd12d583a89ad4aa1d2147efa4d6adc33c"; - sha256 = "1i0cabiqr68zflwzc6z894i4n7k6m3hbfck58vzh8zb9jwxwizav"; + rev = "bac92b8aad9bf24714fda70d3750bb50d6d96177"; + sha256 = "0mmg6zd5cbn8g0am9c3naamg0lq67yyy117fzn2ydigcyia7vmnp"; }; buildInputs = [ python ]; patchPhase = '' substituteInPlace mcy.py \ --replace yosys '${yosys}/bin/yosys' \ - --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/libexec/mcy/mcy-dash.py\"" + --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/bin/mcy-dash\"" + substituteInPlace mcy-dash.py \ + --replace 'app.run(debug=True)' 'app.run(host="0.0.0.0",debug=True)' ''; # the build needs a bit of work... buildPhase = "true"; installPhase = '' - mkdir -p $out/bin $out/libexec/mcy - install mcy.py $out/bin/mcy && chmod +x $out/bin/mcy - install mcy-dash.py $out/libexec/mcy/mcy-dash.py + mkdir -p $out/bin $out/share/mcy/dash + install mcy.py $out/bin/mcy && chmod +x $out/bin/mcy + install mcy-dash.py $out/bin/mcy-dash && chmod +x $out/bin/mcy-dash + cp -r dash/. $out/share/mcy/dash/. ''; meta = { diff --git a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index 6b41a44a3583..b180cf307f0f 100644 --- a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub , bash, python3, yosys -, yices, boolector, aiger, abc-verifier +, yices, boolector, aiger }: stdenv.mkDerivation { pname = "symbiyosys"; - version = "2020.02.08"; + version = "2020.03.24"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "SymbiYosys"; - rev = "500b526131f434b9679732fc89515dbed67c8d7d"; - sha256 = "1pwbirszc80r288x81nx032snniqgmc80i09bbha2i3zd0c3pj5h"; + rev = "8a62780b9df4d2584e41cdd42cab92fddcd75b31"; + sha256 = "0ss5mrzwff2dny8kfciqbrz67m6k52yvc1shd7gk3qb99x7g7fp8"; }; buildInputs = [ python3 ]; @@ -29,8 +29,8 @@ stdenv.mkDerivation { --replace ': "btormc"' ': "${boolector}/bin/btormc"' \ --replace ': "yosys"' ': "${yosys}/bin/yosys"' \ --replace ': "yosys-smtbmc"' ': "${yosys}/bin/yosys-smtbmc"' \ - --replace ': "yosys-abc"' ': "${abc-verifier}/bin/abc"' \ - --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \ + --replace ': "yosys-abc"' ': "${yosys}/bin/yosys-abc"' \ + --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \ ''; buildPhase = "true"; diff --git a/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix b/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix index be400ffe5f95..e8eba4c2ab2f 100644 --- a/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix +++ b/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix @@ -1,6 +1,7 @@ { stdenv , autoPatchelfHook , dpkg +, fahviewer , fetchurl , makeWrapper , python2 @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { makeWrapper ]; - buildInputs = [ python ]; + buildInputs = [ fahviewer python ]; doBuild = false; @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { postFixup = '' sed -e 's|/usr/bin|$out/bin|g' -i $out/share/applications/FAHControl.desktop wrapProgram "$out/bin/FAHControl" \ + --suffix PATH : "${fahviewer.outPath}/bin" \ --set PYTHONPATH "$out/lib/python2.7/dist-packages" ''; diff --git a/nixpkgs/pkgs/applications/system/glances/default.nix b/nixpkgs/pkgs/applications/system/glances/default.nix index a7dffd0bfab6..3dfec185b572 100644 --- a/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/nixpkgs/pkgs/applications/system/glances/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.4"; + version = "3.1.4.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1lr186rc3fvldy2m2yx1hxzdlxll93pjabs01sxz48kkpsvbiydi"; + sha256 = "04dc3pwj9qbbhxpihf13ckdgwz0qc771c7v7awni4vyzk3a9cdfb"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix index be84b7abc820..1aa7afcd98bf 100644 --- a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix @@ -14,6 +14,24 @@ stdenv.mkDerivation rec { ln -s ${src} "$out"/webapps/gerrit-${version}.war ''; + passthru = { + # A list of plugins that are part of the gerrit.war file. + # Use `java -jar gerrit.war ls | grep plugins/` to generate that list. + plugins = [ + "codemirror-editor" + "commit-message-length-validator" + "delete-project" + "download-commands" + "gitiles" + "hooks" + "plugin-manager" + "replication" + "reviewnotes" + "singleusergroup" + "webhooks" + ]; + }; + meta = with stdenv.lib; { homepage = "https://www.gerritcodereview.com/index.md"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index 8df8d96e6411..c4a99cf18584 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -30,9 +30,13 @@ let diff-so-fancy = callPackage ./diff-so-fancy { }; - gh = callPackage ./gh { }; + gh = callPackage ./gh { + inherit (darwin.apple_sdk.frameworks) Security; + }; - ghq = callPackage ./ghq { }; + ghq = callPackage ./ghq { + inherit (darwin.apple_sdk.frameworks) Security; + }; git = appendToName "minimal" gitBase; @@ -63,7 +67,9 @@ let git-appraise = callPackage ./git-appraise {}; - git-bug = callPackage ./git-bug { }; + git-bug = callPackage ./git-bug { + inherit (darwin.apple_sdk.frameworks) Security; + }; # support for bugzilla git-bz = callPackage ./git-bz { }; @@ -134,7 +140,9 @@ let git-subrepo = callPackage ./git-subrepo { }; - git-subtrac = callPackage ./git-subtrac { }; + git-subtrac = callPackage ./git-subtrac { + inherit (darwin.apple_sdk.frameworks) Security; + }; git-sync = callPackage ./git-sync { }; @@ -175,9 +183,13 @@ let inherit (darwin) Security; }; - lab = callPackage ./lab { }; + lab = callPackage ./lab { + inherit (darwin.apple_sdk.frameworks) Security; + }; - lefthook = callPackage ./lefthook { }; + lefthook = callPackage ./lefthook { + inherit (darwin.apple_sdk.frameworks) Security; + }; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index a7e6918b4d8f..e655813d3403 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }: buildGoModule rec { pname = "gh"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0jqr7i67s00gvi6cbww397jnh8qzwr37prd7frbl12j89glshwy1"; + sha256 = "10vylfsc8lldmr1l6r882sx87pgxl687k419c19faq90vd403i14"; }; modSha256 = "03m193ny5z77yy586cwh099ypi1lmhb5vdj7d4kphxycnvpndr66"; @@ -20,6 +20,7 @@ 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 @@ -27,7 +28,7 @@ buildGoModule rec { done ''; - meta = with lib; { + meta = with stdenv.lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix index d0c468ab68ea..34829c14b7bb 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ghq"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X=main.Version=${version} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index ed0c8680d753..fdb5a6c53fdf 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "git-bug"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index af21296cffa4..0439669f9da5 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.25.0"; + version = "2.26.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a"; + sha256 = "15d07i66b090bhjfj9s4s2s38k75mhxmddzyn44bnnyb967w6yjk"; }; buildInputs = [ pythonPackages.python ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index e420fe405cf0..40da9045b817 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.13.5"; + version = "2.13.6"; src = fetchPypi { inherit pname version; - sha256 = "1ll5l1f3vcib9a8qsqm8bfzz4g4q1dnr389x7x26kl13n6a50wib"; + sha256 = "0n07gm05676vgfh6vlym59jwwzym9xmibhr0zpf0drlx02fr47qy"; }; nativeBuildInputs = [ installShellFiles pbr ]; @@ -25,7 +25,7 @@ buildPythonApplication rec { meta = with lib; { homepage = https://github.com/VirtusLab/git-machete; - description = "Git repository organizer and rebase workflow automation tool"; + description = "Git repository organizer and rebase/merge workflow automation tool"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.blitz ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 07c63ea0119b..9ccf3c606a2a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "git-subtrac"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 57caada72b54..a444ab05039f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2020-03-06"; + version = "unstable-2020-03-15"; src = fetchFromGitHub { owner = "romkatv"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 3e47631caf69..8780ce4a2205 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "lab"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 9fc89d520ae9..c80cff15265e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "lefthook"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 543ca58401a9..93fb65d1031c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.4.1"; + version = "2.5"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3"; + sha256 = "0y37s0v37gygv0dm8y9sjc4jr7ml8irix5rwmbk6smzwa74n0x8a"; }; patches = [ ./import-ssl-module.patch ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 2bd1f6434b7b..fef92f6e367e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper +{ stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true @@ -8,23 +8,20 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.10.3"; + version = "1.11.3"; - src = fetchFromGitHub { - owner = "go-gitea"; - repo = "gitea"; - rev = "v${version}"; - sha256 = "04jg1b0d1fbhnk434dnffc2c118gs084za3m33lxwf5lxzlbbimc"; - # Required to generate the same checksum on MacOS due to unicode encoding differences - # More information: https://github.com/NixOS/nixpkgs/pull/48128 - extraPostFetch = '' - rm -rf $out/integrations - rm -rf $out/vendor/github.com/Unknown/cae/tz/testdata - rm -rf $out/vendor/github.com/Unknown/cae/zip/testdata - rm -rf $out/vendor/gopkg.in/macaron.v1/fixtures - ''; + src = fetchurl { + url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; + sha256 = "1v0i7cppdqb02d73qq0bxzz8yydn17jh0g83y3cq3k48awlk22sx"; }; + unpackPhase = '' + mkdir source/ + tar xvf $src -C source/ + ''; + + sourceRoot = "source"; + patches = [ ./static-root-path.patch ]; postPatch = '' @@ -32,8 +29,9 @@ buildGoPackage rec { substituteInPlace modules/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ] - ++ optional pamSupport pam; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = optional pamSupport pam; preBuild = let tags = optional pamSupport "pam" @@ -50,9 +48,9 @@ buildGoPackage rec { postInstall = '' mkdir $data - cp -R $src/{public,templates,options} $data + cp -R ./go/src/${goPackagePath}/{public,templates,options} $data mkdir -p $out - cp -R $src/options/locale $out/locale + cp -R ./go/src/${goPackagePath}/options/locale $out/locale wrapProgram $bin/bin/gitea \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} @@ -64,6 +62,6 @@ buildGoPackage rec { description = "Git with a cup of tea"; homepage = "https://gitea.io"; license = licenses.mit; - maintainers = with maintainers; [ disassembler kolaente ]; + maintainers = with maintainers; [ disassembler kolaente ma27 ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch b/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch index 7c36afdff84c..985dbe04082c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch +++ b/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch @@ -1,13 +1,13 @@ -diff --git i/modules/setting/setting.go w/modules/setting/setting.go -index aafe2d1b..1e4a8064 100644 ---- i/modules/setting/setting.go -+++ w/modules/setting/setting.go -@@ -730,7 +730,7 @@ func NewContext() { - LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL) +diff --git a/modules/setting/setting.go b/modules/setting/setting.go +index 714015c47..a2f85337e 100644 +--- a/modules/setting/setting.go ++++ b/modules/setting/setting.go +@@ -641,7 +641,7 @@ func NewContext() { + PortToRedirect = sec.Key("PORT_TO_REDIRECT").MustString("80") OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() - StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath) + StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") - AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data")) + StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour) + AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data")) EnableGzip = sec.Key("ENABLE_GZIP").MustBool() - EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false) diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index ddad51dfb636..8da56229a02c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.8.6", - "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib", + "version": "12.8.8", + "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.6-ee", + "rev": "v12.8.8-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.6", + "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/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 9b3e4da20248..aea38245c913 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.6"; + version = "12.8.8"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk"; + sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 937c3576fc33..0197e8d89b33 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/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"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index aa33bd4cd68a..9735b9be9358 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index efba20ab0822..f92b72361df5 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/nixpkgs/pkgs/applications/version-management/gogs/default.nix index fedb000e42de..487026d8e3f9 100644 --- a/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -24,8 +24,9 @@ buildGoPackage rec { substituteInPlace pkg/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ] - ++ optional pamSupport pam; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = optional pamSupport pam; buildFlags = [ "-tags" ]; diff --git a/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 7842c48a78a6..de9310740912 100644 --- a/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/video/kodi/default.nix b/nixpkgs/pkgs/applications/video/kodi/default.nix index eef390d30ed8..875ef8d52ddb 100644 --- a/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -19,6 +19,7 @@ , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson +, lirc , dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -43,15 +44,15 @@ assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; let - kodiReleaseDate = "20191116"; - kodiVersion = "18.5"; + kodiReleaseDate = "20200301"; + kodiVersion = "18.6"; rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "0pcrraj1ddzrd296br10yjnaxgb3iym74xzixcakaqhhp00f5hf6"; + sha256 = "0rwymipn5hljy5xrslzmrljmj6f9wb191wi7gjw20wl6sv44d0bk"; }; cmakeProto = fetchurl { @@ -168,6 +169,7 @@ in stdenv.mkDerivation { libcrossguid cwiid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp ffmpeg flatbuffers fmt fstrcmp rapidjson + lirc # libdvdcss libdvdnav libdvdread ] ++ lib.optional dbusSupport dbus @@ -194,15 +196,6 @@ in stdenv.mkDerivation { autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 ] ++ lib.optionals useWayland [ wayland-protocols ]; - patches = [ - # Adds missing cassert includes, fixing builds. This will be unnecessary - # after 18.6 is released (which will contain this patch) - (fetchpatch { - url = "https://github.com/xbmc/xbmc/commit/d5947e6733fd564edb68df91fd6d389d9fb82319.patch"; - sha256 = "1shlbsbfba3074wdyhl42vgin6jfzl7sy3zsvxaxkpx8g7my9jn2"; - }) - ]; - cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdnav_URL=${libdvdnav.src}" @@ -211,7 +204,6 @@ in stdenv.mkDerivation { "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_OPTICAL=ON" - "-DLIRC_DEVICE=/run/lirc/lircd" ] ++ lib.optional useWayland [ "-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl" diff --git a/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/nixpkgs/pkgs/applications/video/kodi/plugins.nix index 41e5a7c5c75a..fae53434254f 100644 --- a/nixpkgs/pkgs/applications/video/kodi/plugins.nix +++ b/nixpkgs/pkgs/applications/video/kodi/plugins.nix @@ -531,14 +531,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/nixpkgs/pkgs/applications/video/makemkv/default.nix b/nixpkgs/pkgs/applications/video/makemkv/default.nix index ca202c5ce603..5423ffcb1422 100644 --- a/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -3,21 +3,21 @@ }: let - version = "1.14.7"; + version = "1.15.0"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "19j62vyk8havv38lh35108f7jmrqiqzikl3aqlsncxxa69m6fv5n"; + sha256 = "1zr63fqx4qcrnrbg1f97w9mp3yzzxf0dk8pw60y2d4436vanfba4"; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "1w6b4cvhfg1dv2claam0l6slhjqzy0n2lvwk1ggkh4c561qbfp59"; + sha256 = "01pdydll37inkq74874rqd5kk0maafnm1lqcv41jzgzjrfkky8d9"; }; in mkDerivation { pname = "makemkv"; diff --git a/nixpkgs/pkgs/applications/video/mpv/default.nix b/nixpkgs/pkgs/applications/video/mpv/default.nix index f1713fe29d4b..c24d25634a1b 100644 --- a/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 380b3d49ca73..fd292304cfec 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -37,13 +37,13 @@ let inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "24.0.6"; + version = "25.0.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "07grnab5v4fd4lw25adhnlifs5c5phc3rsz7h80m663nbszy7abh"; + sha256 = "12c2p179fijz5606h3bp4g88479gwgr7d5f8vk6j2n0rlzs76nsn"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -87,7 +87,7 @@ in mkDerivation rec { Software", software originally designed for recording and streaming live video content, efficiently ''; - homepage = https://obsproject.com; + homepage = "https://obsproject.com"; maintainers = with maintainers; [ jb55 MP2E ]; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index 1c5359e5f0c6..e8a348b43286 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -2,26 +2,17 @@ , doxygen, python3Packages, libopenshot , wrapGAppsHook, gtk3 }: -let - fixPermissions = fetchpatch rec { - url = https://github.com/OpenShot/openshot-qt/pull/2973.patch; - sha256 = "037rh0p3k4sdzprlpyb73byjq3qhqk5zd0d4iin6bq602r8bbp0n"; - }; -in - mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; - version = "2.4.4"; + version = "2.5.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba"; + sha256 = "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq"; }; - patches = [ fixPermissions ]; - nativeBuildInputs = [ doxygen wrapGAppsHook ]; buildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 9bf211164553..253ef15a600f 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libopenshot-audio"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "1fvp6nmf30xzkmcznakh8dv5vn9d7nq051pqcqv638hsfppkmcrl"; + sha256 = "13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf"; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix index 2ed4b8ce3e3d..19852664a9f6 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libopenshot"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "0r1qmr8ar5n72603xkj9h065vbpznrqsq88kxxmn9n8djyyvk03k"; + sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix index 98fcd2b5d408..950cb253c129 100644 --- a/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix +++ b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix @@ -1,21 +1,26 @@ { stdenv, fetchurl, lib, vdr , libav, libcap, libvdpau -, xineLib, libjpeg, libextractor, mesa, libGLU +, xineLib, libjpeg, libextractor, libglvnd, libGLU , libX11, libXext, libXrender, libXrandr , makeWrapper }: let - name = "vdr-xineliboutput-2.1.0"; - makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l); - self = stdenv.mkDerivation { - inherit name; + self = stdenv.mkDerivation rec { + pname = "vdr-xineliboutput"; + version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${name}/${name}.tgz"; - sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba"; + url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${pname}-${version}/${pname}-${version}.tgz"; + sha256 = "0a24hs5nr7ncf51c5agyfn1xrvb4p70y3i0s6dlyyd9bwbfjldns"; }; + postPatch = '' + # pkg-config is called with opengl, which do not contain needed glx symbols + substituteInPlace configure \ + --replace "X11 opengl" "X11 gl" + ''; + # configure don't accept argument --prefix dontAddPrefix = true; @@ -40,13 +45,13 @@ libcap libextractor libjpeg + libglvnd libGLU libvdpau libXext libXrandr libXrender libX11 - mesa vdr xineLib ]; diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 53a31c656346..449d06430a57 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.11"; + version = "2.0.14"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1mdnfkbbv41g590a1ja4rfw69z6kp03znyhikdmg6zqp4qsv32ib"; + sha256 = "1h5mxs8wrsm1q48fmd7slpa0j6g6kjbm1mcizyhk7xz1xrbnicc1"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 6075a7bb2190..7b48d8c19345 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -16,7 +16,10 @@ buildGoPackage rec { goPackagePath = "github.com/containerd/containerd"; outputs = [ "bin" "out" "man" ]; - buildInputs = [ btrfs-progs go-md2man utillinux ]; + nativeBuildInputs = [ go-md2man utillinux ]; + + buildInputs = [ btrfs-progs ]; + buildFlags = [ "VERSION=v${version}" ]; BUILDTAGS = [] diff --git a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 6b4db2d5f0ce..a4c2be050610 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.28.1"; + version = "1.29.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "13lws9vgzq3chlqxc8aggz3i5kmir3vld2af0fx15kvcb9kpd79a"; + sha256 = "0qfjmwqxgghp9pqj4s2z71cmn8mi1l6655z6nbhh72yqaxh5a6ia"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/nixpkgs/pkgs/applications/virtualization/gvisor/containerd-shim.nix index 0161a117def3..d30897df79e9 100644 --- a/nixpkgs/pkgs/applications/virtualization/gvisor/containerd-shim.nix +++ b/nixpkgs/pkgs/applications/virtualization/gvisor/containerd-shim.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, go-bindata }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { name = "gvisor-containerd-shim-${version}"; diff --git a/nixpkgs/pkgs/applications/virtualization/hercules/default.nix b/nixpkgs/pkgs/applications/virtualization/hercules/default.nix new file mode 100644 index 000000000000..901e2f0b6ec0 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/hercules/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "hercules"; + version = "3.13"; + + src = fetchurl { + url = "http://downloads.hercules-390.eu/${pname}-${version}.tar.gz"; + sha256 = "0zg6rwz8ib4alibf8lygi8qn69xx8n92kbi8b3jhi1ymb32mf349"; + }; + + meta = with stdenv.lib; { + description = "IBM mainframe emulator"; + homepage = "http://www.hercules-390.eu"; + license = licenses.qpl; + maintainers = [ maintainers.dkudriavtsev ]; + }; +} diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 7e557842bc8d..288cac27b21a 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "podman"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "047nji6vbrdb1pm8ymxz4dv07xdnp5c624bq2cfy58m5l4f1dn75"; + sha256 = "1nxlkqz1ffa3l2yf4rmsxj788dx6xdp8pbi55m9jc9k1vqwc9hxs"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 60825063cabc..930afa317229 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -27,8 +27,8 @@ buildGoPackage rec { goPackagePath = "github.com/sylabs/singularity"; goDeps = ./deps.nix; - buildInputs = [ openssl ]; - nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ]; + buildInputs = [ openssl utillinux ]; + nativeBuildInputs = [ removeReferencesTo which makeWrapper ]; propagatedBuildInputs = [ coreutils squashfsTools ]; prePatch = '' diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index c935a40c5400..ba8407e4a736 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -1,8 +1,9 @@ -{fetchurl, lib}: +{fetchurl, lib, virtualbox}: with lib; -let version = "6.0.14"; +let + inherit (virtualbox) version; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -11,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "c8a5cc980c9c94cdac3d94e23cf159c2433aae76b416dbfb5b1a918758f21e63"; + let value = "3b73798d776ff223ea8025b1a45001762f8d4e5bcd1ea61449773c1249935800"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index 0d6b3632bc76..add16fd98f95 100644 --- a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/nixpkgs/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.5.0"; + version = "6.6.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "1lh45cxzpdwvhahlcayzqwq1q5hra25mszs13j0dswklcjvjqw8b"; + sha256 = "0a7fggyaybfppsvqyll1gsh19pp41nkly4x1sgy5pk1d9j1lblgx"; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Run graphical applications with Docker"; - homepage = https://github.com/mviereck/x11docker; + homepage = "https://github.com/mviereck/x11docker"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix index 4ca69ce31b44..b6b354021d96 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; }; patchPhase = '' - sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy + sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" i3lock-fancy sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy diff --git a/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix b/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix index 5b1cdbe05f5d..98855517303e 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; - version = "2019-05-10"; + version = "2020-03-18"; src = fetchFromGitHub { owner = "tmfink"; repo = pname; - rev = "05a2d5d35e9841d2a26630f1866fc0a0e8e708eb"; - sha256 = "0ln192abdqrrs7rdazp9acbji2y6pf68z2d1by4nf2q529dh24dc"; + rev = "a618cb8f52120aa8d533bb7c0c8de3ff13b3dc06"; + sha256 = "0ci0w5igjk5xa8x4rx17cpgmdkamwjmavxhp0vp6213cl93ybjhz"; }; propagatedBuildInputs = with python3Packages; [ i3ipc ]; diff --git a/nixpkgs/pkgs/applications/window-managers/notion/default.nix b/nixpkgs/pkgs/applications/window-managers/notion/default.nix index 2b9e8237a045..ac4f00f45453 100644 --- a/nixpkgs/pkgs/applications/window-managers/notion/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 7ae1c87e993a..96d48ecbc79d 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -10,7 +10,7 @@ , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? cc != null && cc ? man -, extraPackages ? [], extraBuildCommands ? "" +, extraTools ? [], extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} , libcxx ? null @@ -214,7 +214,7 @@ stdenv.mkDerivation { ''; strictDeps = true; - propagatedBuildInputs = [ bintools ]; + propagatedBuildInputs = [ bintools ] ++ extraTools; depsTargetTargetPropagated = extraPackages; wrapperName = "CC_WRAPPER"; diff --git a/nixpkgs/pkgs/build-support/ocaml/dune.nix b/nixpkgs/pkgs/build-support/ocaml/dune.nix index a0aac1447969..435bbe89c1c4 100644 --- a/nixpkgs/pkgs/build-support/ocaml/dune.nix +++ b/nixpkgs/pkgs/build-support/ocaml/dune.nix @@ -1,7 +1,9 @@ -{ stdenv, ocaml, findlib, dune, opaline }: +{ stdenv, ocaml, findlib, dune, dune_2, opaline }: { pname, version, buildInputs ? [], ... }@args: +let Dune = if args.useDune2 or false then dune_2 else dune; in + if args ? minimumOCamlVersion && ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" @@ -29,7 +31,7 @@ stdenv.mkDerivation ({ name = "ocaml${ocaml.version}-${pname}-${version}"; - buildInputs = [ ocaml dune findlib ] ++ buildInputs; + buildInputs = [ ocaml Dune findlib ] ++ buildInputs; meta = (args.meta or {}) // { platforms = args.meta.platforms or ocaml.meta.platforms; }; diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 013b99a77b4b..61c39c6b21c0 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -56,32 +56,63 @@ in '' i=$1 ln -s -f $i/lib/*.rlib $2 #*/ ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/ - if [ -e "$i/lib/link" ]; then - cat $i/lib/link >> target/link - cat $i/lib/link >> target/link.final - fi if [ -e $i/env ]; then source $i/env fi } + # The following steps set up the dependencies of the crate. Two + # kinds of dependencies are distinguished: build dependencies + # (used by the build script) and crate dependencies. For each + # dependency we have to: + # + # - Make its Rust library available to rustc. This is done by + # symlinking all library dependencies into a directory that + # can be provided to rustc. + # - Accumulate linking flags. These flags are largely used for + # linking native libraries. + # + # The crate link flags are added to the `link` and `link.final` + # files. The `link` file is used for linkage in the current + # crate. The `link.final` file will be copied to the output and can + # be used by downstream crates to get the linker flags of this + # crate. + mkdir -p target/{deps,lib,build,buildDeps} chmod uga+w target -R echo ${extraLinkFlags} > target/link echo ${extraLinkFlags} > target/link.final + + # Prepare crate dependencies for i in ${completeDepsDir}; do symlink_dependency $i target/deps + if [ -e "$i/lib/link" ]; then + cat $i/lib/link >> target/link + cat $i/lib/link >> target/link.final + fi done + + # Prepare crate build dependencies that are used for the build script. for i in ${completeBuildDepsDir}; do - symlink_dependency $i target/buildDeps + symlink_dependency $i target/buildDeps + if [ -e "$i/lib/link" ]; then + cat $i/lib/link >> target/link.build + fi done - if [[ -e target/link ]]; then - sort -u target/link > target/link.sorted - mv target/link.sorted target/link - sort -u target/link.final > target/link.final.sorted - mv target/link.final.sorted target/link.final - tr '\n' ' ' < target/link > target/link_ + + # Remove duplicate linker flags from the build dependencies. + if [[ -e target/link.build ]]; then + sort -uo target/link.build target/link.build fi + + # Remove duplicate linker flags from the dependencies. + sort -uo target/link target/link + tr '\n' ' ' < target/link > target/link_ + + # Remove duplicate linker flags from the that are written + # to the derivation's output. + sort -uo target/link.final target/link.final + EXTRA_BUILD="" BUILD_OUT_DIR="" export CARGO_PKG_NAME=${crateName} @@ -120,15 +151,14 @@ in '' elif [[ -e "build.rs" ]]; then BUILD="build.rs" fi + + # Compile and run the build script, when available. if [[ ! -z "$BUILD" ]] ; then echo_build_heading "$BUILD" ${libName} mkdir -p target/build/${crateName} EXTRA_BUILD_FLAGS="" - if [ -e target/link_ ]; then - EXTRA_BUILD_FLAGS=$(cat target/link_) - fi if [ -e target/link.build ]; then - EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)" + EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(tr '\n' ' ' < target/link.build)" fi noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \ ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \ diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index 70d48bef8c9b..a175ba9d7f6e 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/build-support/rust/build-rust-crate/lib.sh b/nixpkgs/pkgs/build-support/rust/build-rust-crate/lib.sh index 0f08c133e557..5843ee98b0d5 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -79,6 +79,7 @@ build_bin_test_file() { build_bin_test "$derived_crate_name" "$file" } +# Add additional link options that were provided by the build script. setup_link_paths() { EXTRA_LIB="" if [[ -e target/link_ ]]; then diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix index 710045664686..f24583c41fcb 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -207,6 +207,36 @@ let }) ]; }; + buildScriptDeps = let + depCrate = boolVal: mkCrate { + crateName = "bar"; + src = mkFile "src/lib.rs" '' + pub const baz: bool = ${boolVal}; + ''; + }; + in { + crateName = "foo"; + src = symlinkJoin { + name = "build-script-and-main"; + paths = [ + (mkFile "src/main.rs" '' + extern crate bar; + #[cfg(test)] + #[test] + fn baz_false() { assert!(!bar::baz); } + fn main() { } + '') + (mkFile "build.rs" '' + extern crate bar; + fn main() { assert!(bar::baz); } + '') + ]; + }; + buildDependencies = [ (depCrate "true") ]; + dependencies = [ (depCrate "false") ]; + buildTests = true; + expectedTestOutputs = [ "test baz_false ... ok" ]; + }; # Regression test for https://github.com/NixOS/nixpkgs/issues/74071 # Whenevever a build.rs file is generating files those should not be overlayed onto the actual source dir buildRsOutDirOverlay = { diff --git a/nixpkgs/pkgs/build-support/rust/default.nix b/nixpkgs/pkgs/build-support/rust/default.nix index de8c6d896d03..684429f1e9d2 100644 --- a/nixpkgs/pkgs/build-support/rust/default.nix +++ b/nixpkgs/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, rust, cargo, rustc, fetchcargo, fetchCargoTarball, buildPackages, windows }: +{ stdenv, cacert, git, rust, cargo, rustc, fetchCargoTarball, buildPackages, windows }: let buildRustPackage = @@ -16,7 +16,6 @@ let , cargoUpdateHook ? "" , cargoDepsHook ? "" , cargoBuildFlags ? [] - , legacyCargoFetcher ? false , buildType ? "release" , meta ? {} , target ? null @@ -28,21 +27,17 @@ let let - cargoFetcher = if legacyCargoFetcher - then fetchcargo - else fetchCargoTarball; - cargoDeps = if cargoVendorDir == null - then cargoFetcher { + then fetchCargoTarball { inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; patches = cargoPatches; sha256 = cargoSha256; } else null; - # If we're using the modern fetcher that always preserves the original Cargo.lock - # and have vendored deps, check them against the src attr for consistency. - validateCargoDeps = cargoSha256 != "unset" && !legacyCargoFetcher; + # If we have a cargoSha256 fixed-output derivation, validate it at build time + # against the src fixed-output derivation to check consistency. + validateCargoDeps = cargoSha256 != "unset"; # Some cargo builds include build hooks that modify their own vendor # dependencies. This copies the vendor directory into the build tree and makes @@ -52,8 +47,6 @@ let then ('' unpackFile "$cargoDeps" cargoDepsCopy=$(stripHash $cargoDeps) - '' + stdenv.lib.optionalString legacyCargoFetcher '' - chmod -R +w "$cargoDepsCopy" '') else '' cargoDepsCopy="$sourceRoot/${cargoVendorDir}" @@ -67,13 +60,9 @@ let cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; releaseDir = "target/${rustTarget}/${buildType}"; - # Fetcher implementation choice should not be part of the hash in final - # derivation; only the cargoSha256 input matters. - filteredArgs = builtins.removeAttrs args [ "legacyCargoFetcher" ]; - in - stdenv.mkDerivation (filteredArgs // { + stdenv.mkDerivation (args // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; diff --git a/nixpkgs/pkgs/build-support/rust/fetchcargo.nix b/nixpkgs/pkgs/build-support/rust/fetchcargo.nix deleted file mode 100644 index 7a0ba38dce71..000000000000 --- a/nixpkgs/pkgs/build-support/rust/fetchcargo.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, cacert, git, cargo, python3 }: -let cargo-vendor-normalise = stdenv.mkDerivation { - name = "cargo-vendor-normalise"; - src = ./cargo-vendor-normalise.py; - nativeBuildInputs = [ python3.pkgs.wrapPython ]; - dontUnpack = true; - installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; - pythonPath = [ python3.pkgs.toml ]; - postFixup = "wrapPythonPrograms"; - doInstallCheck = true; - installCheckPhase = '' - # check that ./fetchcargo-default-config.toml is a fix point - reference=${./fetchcargo-default-config.toml} - < $reference $out/bin/cargo-vendor-normalise > test; - cmp test $reference - ''; - preferLocalBuild = true; -}; -in -{ name ? "cargo-deps" -, src ? null -, srcs ? [] -, patches ? [] -, sourceRoot -, sha256 -, cargoUpdateHook ? "" -, # whenever to also include the Cargo.lock in the output - copyLockfile ? false -, ... -} @ args: -stdenv.mkDerivation ({ - name = "${name}-vendor"; - nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ]; - - phases = "unpackPhase patchPhase installPhase"; - - installPhase = '' - if [[ ! -f Cargo.lock ]]; then - echo - echo "ERROR: The Cargo.lock file doesn't exist" - echo - echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change" - echo "when the registry is updated." - echo - - exit 1 - fi - - # Keep the original around for copyLockfile - cp Cargo.lock Cargo.lock.orig - - export CARGO_HOME=$(mktemp -d cargo-home.XXX) - CARGO_CONFIG=$(mktemp cargo-config.XXXX) - - ${cargoUpdateHook} - - mkdir -p $out - cargo vendor $out | cargo-vendor-normalise > $CARGO_CONFIG - # fetchcargo used to never keep the config output by cargo vendor - # and instead hardcode the config in ./fetchcargo-default-config.toml. - # This broke on packages needing git dependencies, so now we keep the config. - # But not to break old cargoSha256, if the previous behavior was enough, - # we don't store the config. - if ! cmp $CARGO_CONFIG ${./fetchcargo-default-config.toml} > /dev/null; then - install -D $CARGO_CONFIG $out/.cargo/config; - fi; - - '' + stdenv.lib.optionalString copyLockfile '' - # add the Cargo.lock to allow hash invalidation - cp Cargo.lock.orig $out/Cargo.lock - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; - - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; - preferLocalBuild = true; -} // (builtins.removeAttrs args [ - "name" "sha256" "cargoUpdateHook" "copyLockfile" -])) diff --git a/nixpkgs/pkgs/data/fonts/inconsolata-nerdfont/default.nix b/nixpkgs/pkgs/data/fonts/inconsolata-nerdfont/default.nix new file mode 100644 index 000000000000..b4356e73d5c7 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/inconsolata-nerdfont/default.nix @@ -0,0 +1,28 @@ +{ 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/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index 8a7e841df672..4297d15da948 100644 --- a/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.4"; + version = "1.0.5"; in fetchzip rec { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1m6wppz6mrh7475d92yvwrjgbwkkcfq444v0im90f5c7fsf3dzbd"; + sha256 = "1iqqix7rr22ij0cn7vg812qs4gbjpphndgbzm57abqk658lra4kl"; postFetch = '' mkdir -p $out/share/fonts diff --git a/nixpkgs/pkgs/data/fonts/lm-math/default.nix b/nixpkgs/pkgs/data/fonts/lmmath/default.nix index 8df851cb9dfb..c971a699b2a5 100644 --- a/nixpkgs/pkgs/data/fonts/lm-math/default.nix +++ b/nixpkgs/pkgs/data/fonts/lmmath/default.nix @@ -3,14 +3,14 @@ let version = "1.959"; in fetchzip rec { - name = "latinmodern-math-${version}"; + name = "lmmath-${version}"; url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; postFetch = '' mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/${name}/ - unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/ - unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/ + mkdir -p $out/share/doc/latinmodern-math-${version}/ + unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ + unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ ''; sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; diff --git a/nixpkgs/pkgs/data/fonts/lmodern/lmmath.nix b/nixpkgs/pkgs/data/fonts/lmodern/lmmath.nix deleted file mode 100644 index 679f52002139..000000000000 --- a/nixpkgs/pkgs/data/fonts/lmodern/lmmath.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchzip }: - -fetchzip { - name = "lmmath-0.903"; - - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - - postFetch = '' - unzip $downloadedFile - - mkdir -p $out/texmf-dist/fonts/opentype - mkdir -p $out/share/fonts/opentype - - cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf - cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf - - ln -s -r $out/texmf* $out/share/ - ''; - - sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln"; - - meta = { - description = "Latin Modern font"; - }; -} - diff --git a/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix b/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix index c8044905a088..f051ef76c9c1 100644 --- a/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix @@ -13,10 +13,10 @@ fetchFromGitHub { find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \; find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \; - find . -name '*.psf.gz' -exec install -Dt $out/share/fonts/psf {} \; + find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts {} \; ''; - sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww"; + sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; meta = with lib; { homepage = https://github.com/powerline/fonts; diff --git a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix index cfd4e3808aa3..9bb655268014 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix index f9f6ec342e91..1fec03b46fe4 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/terminus-nerdfont/default.nix b/nixpkgs/pkgs/data/fonts/terminus-nerdfont/default.nix new file mode 100644 index 000000000000..3c1730146b3d --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/terminus-nerdfont/default.nix @@ -0,0 +1,28 @@ +{ 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/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 221974c79419..3aebf09554c3 100644 --- a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4"; + sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh"; }; nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Elementary icons for Xfce and other GTK desktops like GNOME"; - homepage = https://github.com/shimmerproject/elementary-xfce; + homepage = "https://github.com/shimmerproject/elementary-xfce"; license = licenses.gpl2; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index 96514b6a4cda..c954af9e83dc 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.10"; + version = "4.11"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1imnbfrmizs0yx2165qj423y3m5vw9z33pqxmvhvs0rcwwddgqix"; + sha256 = "18sqnrvh4bbmg3zzm78n4s2hvv8a77ilg7xa3hl94mp9qla6gasn"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix index 96617bb0f278..46db53e739b3 100644 --- a/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz"; - sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e0bc864e0b6edb5e5ce1ec4bfa763a442b343bf5.tar.gz"; + sha256 = "1lmjxam58srrv9cjqajqz4bishx8hy99db3cx83i95qb3qiiiz6m"; } diff --git a/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix index 5f50049856f3..1eda25fbe2b1 100644 --- a/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix +++ b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "unicode-character-database"; - version = "12.1.0"; + version = "13.0.0"; src = fetchurl { url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip"; - sha256 = "19m06iw0jl7lhlggcmghi12p6jld0qrmfpksgc243yn6sjh53fi5"; + sha256 = "0ld97ppkb5f8d5b3mlkxfwnr6f3inijyqias9xc4bbin9lxrfxig"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant-bloody.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant-bloody.nix new file mode 100644 index 000000000000..3c540889c13a --- /dev/null +++ b/nixpkgs/pkgs/data/themes/ant-theme/ant-bloody.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +let + themeName = "Ant-Bloody"; +in +stdenv.mkDerivation rec { + pname = "ant-bloody-theme"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; + sha256 = "0rrz50kmzjmqj17hvrw67pbaclwxv85i5m08s7842iky6dnn5z8s"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Bloody variant of the Ant theme"; + homepage = "https://github.com/EliverLara/${themeName}"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant-dracula.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant-dracula.nix new file mode 100644 index 000000000000..e365ab94c300 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/ant-theme/ant-dracula.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +let + themeName = "Ant-Dracula"; +in +stdenv.mkDerivation rec { + pname = "ant-dracula-theme"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; + sha256 = "00b8w69xapqy8kc7zqwlfz1xpld6hibbh35djvhcnd905gzzymkd"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Dracula variant of the Ant theme"; + homepage = "https://github.com/EliverLara/${themeName}"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant-nebula.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant-nebula.nix new file mode 100644 index 000000000000..03ee3b5d2d42 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/ant-theme/ant-nebula.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +let + themeName = "Ant-Nebula"; +in +stdenv.mkDerivation rec { + pname = "ant-nebula-theme"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; + sha256 = "1xpgw577nmgjk547mg2vvv0gdai60srgncykm5pb1w8dnlk69jbz"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Nebula variant of the Ant theme"; + homepage = "https://github.com/EliverLara/${themeName}"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/ant-theme/default.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant.nix index c60fb4d33558..736c8a1aa6ac 100644 --- a/nixpkgs/pkgs/data/themes/ant-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/ant-theme/ant.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, gtk-engine-murrine }: +let + themeName = "Ant"; +in stdenv.mkDerivation rec { pname = "ant-theme"; version = "1.3.0"; src = fetchurl { - url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar"; + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; sha256 = "1r795v96ywzcb4dq08q2fdbmfia32g36cc512mhy41s8fb1a47dz"; }; @@ -13,25 +16,19 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - dontBuild = true; - installPhase = '' runHook preInstall - mkdir -p $out/share/themes/Ant - cp -a * $out/share/themes/Ant - rm -r $out/share/themes/Ant/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} runHook postInstall ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1gpacrmi5y87shp39jgy78n0ca2xdpvbqfh0mgldlxx99ca9rvvy"; - meta = with stdenv.lib; { description = "A flat and light theme with a modern look"; - homepage = https://github.com/EliverLara/Ant; + homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ alexarice ]; }; } diff --git a/nixpkgs/pkgs/data/themes/greybird/default.nix b/nixpkgs/pkgs/data/themes/greybird/default.nix index cc665749d3c1..794034af7e7c 100644 --- a/nixpkgs/pkgs/data/themes/greybird/default.nix +++ b/nixpkgs/pkgs/data/themes/greybird/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.11"; + version = "3.22.12"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "00x7dcjldph9k0nmvc8hyh3k4lhbmwk791rywd89ry6jivrx40pc"; + sha256 = "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix index 05292e97772f..ecf508a61b3b 100644 --- a/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha"; - version = "2020-03-11"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1np2964g5f0vwdvfmi8gidsk9jj7v43nkshiqnfdbvmwa85ldpfl"; + sha256 = "13lcv2cihb24zjsdzhh188kd1rga49mzfa2sddqd63pqxxph188z"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/nixpkgs/pkgs/data/themes/mojave/default.nix b/nixpkgs/pkgs/data/themes/mojave/default.nix index d560e3fe5838..0bd71b46c0d9 100644 --- a/nixpkgs/pkgs/data/themes/mojave/default.nix +++ b/nixpkgs/pkgs/data/themes/mojave/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchurl, gtk_engines, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2020-02-20"; + version = "2020-03-19"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0fbpjfdx53g4qicr97jl1dssykjwwca9xzrfyh53dmd81vr6znpy"; + sha256 = "1f120sx092i56q4dx2b8d3nnn9pdw67656446nw702rix7zc5jpx"; }) (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; @@ -19,12 +19,32 @@ stdenv.mkDerivation rec { sourceRoot = "source"; + nativeBuildInputs = [ glib inkscape optipng sassc which ]; + buildInputs = [ gtk_engines ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - installPhase = '' + postPatch = '' patchShebangs . + + for f in render-assets.sh \ + src/assets/gtk-2.0/render-assets.sh \ + src/assets/gtk-3.0/common-assets/render-assets.sh \ + src/assets/gtk-3.0/windows-assets/render-assets.sh \ + src/assets/metacity-1/render-assets.sh \ + src/assets/xfwm4/render-assets.sh + do + substituteInPlace $f \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ + --replace /usr/bin/optipng ${optipng}/bin/optipng + done + + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; + + installPhase = '' name= ./install.sh -d $out/share/themes install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* ''; diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index e8fa7c7b4e39..454d65335540 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -33,7 +33,7 @@ , wrapGAppsHook , tzdata , glibc -, networkmanagerapplet +, libnma , modemmanager , xorg , gdk-pixbuf @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { gnome-online-accounts tzdata networkmanager - networkmanagerapplet + libnma modemmanager xorg.libXxf86misc xorg.libxkbfile diff --git a/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix index 9dbab8fd767e..d67a5d8386a8 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix @@ -17,7 +17,6 @@ , libffi , gtk3 , readline -, networkmanagerapplet }: let @@ -46,7 +45,6 @@ stdenv.mkDerivation rec { keybinder3 upower xapps - networkmanagerapplet ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/cinnamon/default.nix b/nixpkgs/pkgs/desktops/cinnamon/default.nix index 44b81e85c682..fc8f465913bb 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/default.nix @@ -8,5 +8,8 @@ lib.makeScope pkgs.newScope (self: with self; { 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/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix b/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix new file mode 100644 index 000000000000..770baf77bcda --- /dev/null +++ b/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub +, stdenv +, python3 +, sassc +, sass +}: + +stdenv.mkDerivation rec { + pname = "mint-themes"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0a8f2cmcl00y4607v5qr2zdcdjc0z74ixm2yakscvw6qzgsh9fac"; + }; + + nativeBuildInputs = [ + python3 + sassc + sass + ]; + + preBuild = '' + patchShebangs . + ''; + + installPhase = '' + mkdir -p $out + mv usr/share $out + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/mint-themes"; + description = "Mint-X and Mint-Y themes for the cinnamon desktop"; + license = licenses.gpl3; # from debian/copyright + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix new file mode 100644 index 000000000000..d4415c4bf040 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix b/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix new file mode 100644 index 000000000000..2913d4761ff8 --- /dev/null +++ b/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix @@ -0,0 +1,115 @@ +{ fetchFromGitHub +, cinnamon-desktop +, glib +, file +, gnome3 +, gnome-doc-utils +, fetchpatch +, gobject-introspection +, gtk3 +, intltool +, json-glib +, libinput +, libstartup_notification +, libXtst +, libxkbcommon +, pkgconfig +, stdenv +, udev +, xorg +, wrapGAppsHook +, pango +, cairo +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, docbook_xml_dtd_42 +, docbook_xml_dtd_412 +, autoconf +, automake +, gettext +, libtool +}: + +# it's a frankensteins monster with some cinnamon sparkles added on top of it + +stdenv.mkDerivation rec { + pname = "muffin"; + version = "4.4.2"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "1kzjw4a5p69j8x55vpbpn6gy8pkbbyii6kzw2nzbypmipgnnijw8"; + }; + + patches = [ + # backport patch that disables wayland components via build flags + # https://github.com/linuxmint/muffin/pull/548#issuecomment-578316820 + (fetchpatch { + url = "https://github.com/linuxmint/muffin/commit/f78bf5b309b3d306848f47cc241b31e9399999a7.patch"; + sha256 = "1c79aa9w2v23xlz86x3l42pavwrqx5d6nmfd9nms29hjsk8mpf4i"; + }) + # mute some warnings that caused build failures + # https://github.com/linuxmint/muffin/issues/535#issuecomment-536917143 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/muffin/raw/6b0af3a22173e374804371a1cca74e23d696dd37/f/0001-fix-warnings-when-compiling.patch"; + sha256 = "15wdbn3afn3103v7rq1icp8n0vqqwrrya03h0g2rzqlrsc7wrvzw"; + }) + ]; + + buildInputs = [ + gtk3 + glib + pango + cairo + json-glib + cinnamon-desktop + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libxkbfile + xorg.xkeyboardconfig + + libxkbcommon + gnome3.zenity + libinput + libstartup_notification + libXtst + udev + gobject-introspection + ]; + + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + wrapGAppsHook + pkgconfig + intltool + + gnome-doc-utils + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + docbook_xml_dtd_42 + docbook_xml_dtd_412 + ]; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/muffin"; + description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index ea38ed883209..4e66a16bf7c5 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -48,6 +48,7 @@ , mutter , networkmanager , networkmanagerapplet +, libnma , ninja , pkgconfig , polkit @@ -126,7 +127,7 @@ stdenv.mkDerivation rec { modemmanager mutter # schemas for the keybindings networkmanager - networkmanagerapplet + libnma polkit samba tracker diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 4423755f71ce..47d06ddac310 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -28,7 +28,7 @@ , polkit , webkitgtk , systemd -, networkmanagerapplet +, libnma , tzdata , yelp , libgnomekbd @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { pango polkit webkitgtk - networkmanagerapplet + libnma ]; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 71d47a338a78..26e96b5a3385 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -3,7 +3,7 @@ , 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 -, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop +, 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 , gnome-autoar, asciidoc-full }: @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { gnome-autoar # not declared at build time, but typelib is needed at runtime - libgweather networkmanagerapplet + libgweather libnma ]; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix index ce5e073ac064..b6e8b4c11c03 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,16 +1,15 @@ { stdenv , intltool , fetchFromGitLab -, fetchpatch +, meson +, ninja , pkgconfig +, python3 , gtk3 , adwaita-icon-theme , glib , desktop-file-utils , gtk-doc -, autoconf -, automake -, libtool , wrapGAppsHook , gnome3 , itstool @@ -45,7 +44,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "12.0.1"; + version = "13.0.0"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,26 +53,18 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw"; + sha256 = "17arjigs1lw1h428s9g171n0idrpf9ks23sndldsik1zvvwzlldh"; }; - patches = [ - # fix build with Unicode 12.1 - (fetchpatch { - url = "https://salsa.debian.org/gnome-team/gucharmap/raw/de079ad494a15f662416257fca2f2b8db757f4ea/debian/patches/update-to-unicode-12.1.patch"; - sha256 = "093gqsxfpp3s0b88p1dgkskr4ng3hv8irmxc60l3fdrkl8am00xh"; - }) - ]; - nativeBuildInputs = [ + meson + ninja pkgconfig + python3 wrapGAppsHook unzip intltool itstool - autoconf - automake - libtool gtk-doc docbook_xsl docbook_xml_dtd_412 @@ -90,19 +81,15 @@ in stdenv.mkDerivation rec { adwaita-icon-theme ]; - configureFlags = [ - "--with-unicode-data=${ucd}/share/unicode" - "--enable-gtk-doc" + mesonFlags = [ + "-Ducd_path=${ucd}/share/unicode" + "-Dvapi=false" ]; doCheck = true; postPatch = '' - patchShebangs gucharmap/gen-guch-unicode-tables.pl - ''; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh + patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py ''; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/default.nix b/nixpkgs/pkgs/desktops/gnome-3/default.nix index c7c26cec7c3c..f2d3182c337d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/default.nix @@ -18,7 +18,7 @@ lib.makeScope pkgs.newScope (self: with self; { in lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; - maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ]; + maintainers = lib.teams.gnome.members; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix new file mode 100644 index 000000000000..5e6f7b89e1d9 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, gettext, gnome3 }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-draw-on-your-screen"; + version = "6"; + + src = fetchgit { + url = "https://framagit.org/abakkk/DrawOnYourScreen/"; + rev = "v${version}"; + sha256 = "05i20ii8lv6mg56rz8lng80dx35l6g45j8wr7jgbp591hg0spj1w"; + }; + + uuid = "drawOnYourScreen@abakkk.framagit.org"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A drawing extension for GNOME Shell"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ericdallo ]; + platforms = gnome3.gnome-shell.meta.platforms; + homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; + }; +} diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix index b36f3489b57c..c3ca1b621211 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Speed up builtin gnome-shell animations"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ]; + maintainers = with maintainers; [ timbertson tiramiseb ]; homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 13b2d6a1db4f..d14dbd1c4118 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa tiramiseb ]; + maintainers = with maintainers; [ tiramiseb ]; homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix index b4c6eaaec1bf..4d0512f1adbc 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "five-or-more"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn"; + sha256 = "0xw05dd2dwi9vsph9h158b4n89s5k07xrh6bjz1icm0pdmjwhpgk"; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Five_or_more; + homepage = "https://wiki.gnome.org/Apps/Five_or_more"; description = "Remove colored balls from the board by forming lines"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index 37ff34e081ab..30f1c48fa5f6 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h6wm8vna97iayhwqh7rfsc87715np12nxa72w27p4zl54bdkdlg"; + sha256 = "13ar40x5hs4d4h81q8qsy0agbx5wnarry3mbhws54zydcxd7j20a"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { dbus-glib upower polkit - mate.mate-panel + mate-panel ]; configureFlags = [ "--enable-applets" ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix index 1db0947bf2a4..09973e04bc0a 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook + wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"; }; + patches = [ + # allow turning on debugging from environment variable + (fetchpatch { + url = "https://github.com/mate-desktop/mate-session-manager/commit/3ab6fbfc811d00100d7a2959f8bbb157b536690d.patch"; + sha256 = "0yjaklq0mp44clymyhy240kxlw95z3azmravh4f5pfm9dys33sg0"; + }) + ]; + nativeBuildInputs = [ pkgconfig gettext @@ -33,6 +41,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postFixup = '' + substituteInPlace $out/share/xsessions/mate.desktop \ + --replace "Exec=mate-session" "Exec=$out/bin/mate-session" \ + --replace "TryExec=mate-session" "TryExec=$out/bin/mate-session" + ''; + + passthru.providedSessions = [ "mate" ]; + meta = with stdenv.lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 6e050c92d805..1ff1068119b7 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -11,6 +11,7 @@ , gtk3 , networkmanager , networkmanagerapplet +, libnma , switchboard }: @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 libgee networkmanager - networkmanagerapplet + libnma switchboard ]; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index cc6b37095fdb..67f4105ff3d1 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -1,7 +1,8 @@ { wrapGAppsHook , glib , lib -, symlinkJoin +, stdenv +, xorg , switchboard , switchboardPlugs , plugs @@ -14,26 +15,45 @@ let if plugs == null then switchboardPlugs else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs); in -symlinkJoin { +stdenv.mkDerivation rec { name = "${switchboard.name}-with-plugs"; + src = null; + paths = [ switchboard ] ++ selectedPlugs; - buildInputs = [ - wrapGAppsHook + passAsFile = [ "paths" ]; + + nativeBuildInputs = [ glib - ] ++ (lib.forEach selectedPlugs (x: x.buildInputs)) + wrapGAppsHook + ]; + + buildInputs = lib.forEach selectedPlugs (x: x.buildInputs) ++ selectedPlugs; - postBuild = '' - make_glib_find_gsettings_schemas + dontUnpack = true; + dontConfigure = true; + dontBuild = true; - gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard") + preferLocalBuild = true; + allowSubstitutes = false; - wrapGAppsHook + installPhase = '' + mkdir -p $out + for i in $(cat $pathsPath); do + ${xorg.lndir}/bin/lndir -silent $i $out + done + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard" + ) ''; inherit (switchboard) meta; } + diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index fd22de25d63c..cd04e6287b72 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -8,7 +8,7 @@ , gtk3 , granite , networkmanager -, networkmanagerapplet +, libnma , wingpanel , libgee }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gtk3 libgee networkmanager - networkmanagerapplet + libnma wingpanel ]; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index 596ee816f891..ca887d45dc39 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -1,7 +1,8 @@ { lib , wrapGAppsHook , glib -, symlinkJoin +, stdenv +, xorg , wingpanel , wingpanelIndicators , switchboard-with-plugs @@ -15,30 +16,44 @@ let if indicators == null then wingpanelIndicators else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators); in -symlinkJoin { +stdenv.mkDerivation rec { name = "${wingpanel.name}-with-indicators"; + src = null; + paths = [ wingpanel ] ++ selectedIndicators; - buildInputs = [ + passAsFile = [ "paths" ]; + + nativeBuildInputs = [ glib wrapGAppsHook - ] ++ (lib.forEach selectedIndicators (x: x.buildInputs)) + ]; + + buildInputs = lib.forEach selectedIndicators (x: x.buildInputs) ++ selectedIndicators; - # We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu - # has a plugin to search switchboard settings - postBuild = '' - make_glib_find_gsettings_schemas + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + preferLocalBuild = true; + allowSubstitutes = false; + installPhase = '' + mkdir -p $out + for i in $(cat $pathsPath); do + ${xorg.lndir}/bin/lndir -silent $i $out + done + ''; + + preFixup = '' gappsWrapperArgs+=( --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" ) - - wrapGAppsHook ''; inherit (wingpanel) meta; diff --git a/nixpkgs/pkgs/development/compilers/acme/default.nix b/nixpkgs/pkgs/development/compilers/acme/default.nix new file mode 100644 index 000000000000..2aca7478d7be --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/acme/default.nix @@ -0,0 +1,24 @@ +{ 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" ]; + + 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/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 22a3c9cf4686..a7782610afb3 100755 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -releases = ("openjdk8", "openjdk11") +releases = ("openjdk8", "openjdk11", "openjdk13") oses = ("mac", "linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index fe38f2b21633..d62224d518de 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -9,6 +9,7 @@ sourcePerArch: , fontconfig , zlib , xorg +, libffi }: let @@ -29,7 +30,7 @@ let result = stdenv.mkDerivation rec { buildInputs = [ alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - ]; + ] ++ lib.optional stdenv.isAarch32 libffi; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix new file mode 100644 index 000000000000..48806143c87c --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.hotspot; + jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.hotspot; + jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.openj9; + jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.openj9; +} diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix new file mode 100644 index 000000000000..1bd7bb884481 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.hotspot; + jre-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.hotspot; + jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.openj9; + jre-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.openj9; +} diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 760608027904..80a16465af25 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -117,6 +117,124 @@ } } }, + "openjdk13": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "33", + "sha256": "74f4110333ac4239564ed864b1d7d69b7af32af39efcfbde9816e1486cb5ae07", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_aarch64_linux_hotspot_13_33.tar.gz", + "version": "13.0.0" + }, + "armv6l": { + "build": "33", + "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz", + "version": "13.0.0" + }, + "armv7l": { + "build": "33", + "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz", + "version": "13.0.0" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "33", + "sha256": "e562caeffa89c834a69a44242d802eae3523875e427f07c05b1902c152638368", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz", + "version": "13.0.0" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "33", + "sha256": "68ebab0021c719694be8fc868478725a69c5c515cdb62e2933eefe87ba6437df", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz", + "version": "13.0.0" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "33", + "sha256": "2365b7fbba8d9125fb091933aad9f38f8cc1fbb0217cdec9ec75d2000f6d451a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_aarch64_linux_hotspot_13_33.tar.gz", + "version": "13.0.0" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "33", + "sha256": "73800a0d7c4e81df408a8518d282aa2c001ce4ee15541574c639dfc3564f708f", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz", + "version": "13.0.0" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "33", + "sha256": "2ee59be5062a81daa7be85be161cab6b245f9a2e2cbd4769ae9edefaac41e31d", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz", + "version": "13.0.0" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "33", + "sha256": "f948be96daba250b6695e22cb51372d2ba3060e4d778dd09c89548889783099f", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz", + "version": "13.0.0" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "33", + "sha256": "583e0defd5c062550896ead7cac383be16f1a81d9b6492dfec26da9af5dcc1c0", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz", + "version": "13.0.0" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "33", + "sha256": "1c23efba7908de9a611a98e755602f45381a8f7c957adb3fc4012ab1369a352c", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_mac_hotspot_13_33.tar.gz", + "version": "13.0.0" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "33", + "sha256": "33a60b78138d50cb02325156c7d1fcf588697749a4401f6c11a3cbefa3033127", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz", + "version": "13.0.0" + } + } + } + } + }, "openjdk8": { "linux": { "jdk": { @@ -139,6 +257,18 @@ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz", "version": "8.0.232" }, + "armv6l": { + "build": "10", + "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, + "armv7l": { + "build": "10", + "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { @@ -179,6 +309,18 @@ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz", "version": "8.0.232" }, + "armv6l": { + "build": "10", + "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, + "armv7l": { + "build": "10", + "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, "packageType": "jre", "vmType": "hotspot", "x86_64": { @@ -247,4 +389,4 @@ } } } -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/compilers/as31/default.nix b/nixpkgs/pkgs/development/compilers/as31/default.nix deleted file mode 100644 index b70fde00e15e..000000000000 --- a/nixpkgs/pkgs/development/compilers/as31/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchpatch, fetchurl, yacc }: - -let - - version = "2.3.1"; - -in stdenv.mkDerivation { - pname = "as31"; - inherit version; - src = fetchurl { - name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL - url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz"; - sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd"; - }; - - buildInputs = [ yacc ]; - - patches = [ - (fetchpatch { - name = "CVE-2012-0808.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=655496;filename=as31-mkstemps.patch;msg=5"; - sha256 = "0iia4wa8m141bwz4588yxb1dp2qwhapcii382sncm6jvwyngwh21"; - }) - ]; - - preConfigure = '' - chmod +x ./configure - ''; - - postConfigure = '' - rm as31/parser.c - ''; - - meta = with stdenv.lib; { - homepage = http://wiki.erazor-zone.de/wiki:projects:linux:as31; - description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats"; - maintainers = with maintainers; [ aneeshusa ]; - platforms = with platforms; unix; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix index 1d61b8331493..3e2d3ce2ad2f 100644 --- a/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -42,6 +42,7 @@ let doCheck = false; jailbreak = true; })); + elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: { prePatch = '' substituteInPlace package.yaml --replace "- -Werror" "" @@ -50,6 +51,15 @@ let jailbreak = true; })); + elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: { + prePatch = '' + sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place + ''; + jailbreak = true; + # Tests are failing because of missing instances for Eq and Show type classes + doCheck = false; + })); + inherit fetchElmDeps; elmVersion = elmPkgs.elm.version; }; @@ -76,6 +86,26 @@ let in with hsPkgs.elmPkgs; { elm-test = patchBinwrap [elmi-to-json] nodePkgs.elm-test; elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples; + elm-coverage = + let patched = patchBinwrap [elmi-to-json] nodePkgs.elm-coverage; + in patched.override { + preRebuild = '' + sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json + + # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done + # in case of just this package + sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json + + rm node_modules/elm/install.js + echo "console.log('no-op');" > node_modules/elm/install.js + ''; + + # Link Elm instrument binary + postInstall = patched.postInstall + '' + mkdir -p unpacked_bin + ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument + ''; + }; elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix new file mode 100644 index 000000000000..54077994fbdd --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -0,0 +1,34 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary +, bytestring, Cabal, cmark, containers, directory, elm-format +, fetchgit, filepath, free, HUnit, indents, json, mtl +, optparse-applicative, parsec, process, QuickCheck, quickcheck-io +, split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, text +}: +mkDerivation { + pname = "elm-instrument"; + version = "0.0.7"; + src = fetchgit { + url = "https://github.com/zwilias/elm-instrument"; + sha256 = "167d7l2547zxdj7i60r6vazznd9ichwc0bqckh3vrh46glkz06jv"; + rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base binary bytestring containers + directory filepath free indents json mtl optparse-applicative + parsec process split text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base cmark containers elm-format HUnit mtl parsec QuickCheck + quickcheck-io split tasty tasty-golden tasty-hunit tasty-quickcheck + text + ]; + homepage = "http://elm-lang.org"; + description = "Instrumentation library for Elm"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix index 87b02f013f85..eaed18c5297b 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix @@ -5,11 +5,11 @@ }: mkDerivation { pname = "elmi-to-json"; - version = "1.2.0"; + version = "1.3.0"; src = fetchgit { - url = "https://github.com/stoeffel/elmi-to-json.git"; - sha256 = "1kxai87h2g0749yq0fkxwk3xaavydraaivhnavbwr62q2hw4wrj7"; - rev = "af08ceafe742a252f1f1f3c229b0ce3b3e00084d"; + url = "https://github.com/stoeffel/elmi-to-json"; + sha256 = "11j56vcyhijkwi9hzggkwwmxlhzhgm67ab2m7kxkhcbbqgpasa8n"; + rev = "ae40d1aa1e3d6878f2af514e611d44890e7abc1e"; fetchSubmodules = true; }; isLibrary = true; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 1d24df549ea6..343721208b89 100755 --- a/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -1,10 +1,12 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix +#!/usr/bin/env bash + +ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../../..)" set -eu -o pipefail rm -f node-env.nix -node2nix --nodejs-10 \ +$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ + --nodejs-10 \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json index e129a0ffaec4..643aad746fa2 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json @@ -1,10 +1,11 @@ [ - "elm-test", - "elm-verify-examples", - "elm-doc-preview", - "elm-upgrade", "elm-analyse", + "elm-coverage", + "elm-doc-preview", + "@elm-tooling/elm-language-server", "elm-live", - "elm-xref", - "@elm-tooling/elm-language-server" + "elm-test", + "elm-upgrade", + "elm-verify-examples", + "elm-xref" ] diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index 70aa04987c68..1c8956f4beac 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -121,6 +121,15 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; @@ -157,6 +166,15 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; "ansi-styles-2.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -283,6 +301,15 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; @@ -661,6 +688,15 @@ let sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; + "cliui-6.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; + }; + }; "clone-response-1.0.2" = { name = "clone-response"; packageName = "clone-response"; @@ -895,6 +931,15 @@ let sha1 = "a3bbb302db2297cbea3c04edf36941f4613aa399"; }; }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; "cross-spawn-6.0.5" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -1129,6 +1174,15 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; + "elm-0.19.1" = { + name = "elm"; + packageName = "elm"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elm/-/elm-0.19.1.tgz"; + sha512 = "rehOtJKZvoYDddlrd7AX5NAf0H+LUllnBg3AHaeaIOKWzw4W316d7Bkhlbo7aSG+hVUVWP2ihKwyYkDi589TfA=="; + }; + }; "elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" = { name = "elm-analyse"; packageName = "elm-analyse"; @@ -1184,6 +1238,15 @@ let sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -1220,13 +1283,13 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es6-promisify-6.0.2" = { + "es6-promisify-6.1.0" = { name = "es6-promisify"; packageName = "es6-promisify"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz"; - sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz"; + sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; }; }; "escape-html-1.0.3" = { @@ -1481,6 +1544,15 @@ let sha1 = "7afbd00f8f08c5b622f97cda6f714173d547bb3f"; }; }; + "find-0.2.9" = { + name = "find"; + packageName = "find"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/find/-/find-0.2.9.tgz"; + sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; + }; + }; "find-elm-dependencies-2.0.2" = { name = "find-elm-dependencies"; packageName = "find-elm-dependencies"; @@ -1508,6 +1580,15 @@ let sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; "firstline-1.2.0" = { name = "firstline"; packageName = "firstline"; @@ -1607,6 +1688,15 @@ let sha1 = "337352bded4a0b714f3eb84de8cea765e9d37600"; }; }; + "fs-extra-4.0.3" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; + sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; + }; + }; "fs-extra-5.0.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -2219,6 +2309,15 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; "is-glob-4.0.1" = { name = "is-glob"; packageName = "is-glob"; @@ -2561,6 +2660,15 @@ let sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; "lodash-4.17.15" = { name = "lodash"; packageName = "lodash"; @@ -2786,15 +2894,6 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; "minimist-1.2.0" = { name = "minimist"; packageName = "minimist"; @@ -2840,13 +2939,22 @@ let sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.3" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; + sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; + }; + }; + "moment-2.24.0" = { + name = "moment"; + packageName = "moment"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; "ms-2.0.0" = { @@ -2948,6 +3056,15 @@ let sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA=="; }; }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -3236,6 +3353,15 @@ let sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; "p-timeout-2.0.1" = { name = "p-timeout"; packageName = "p-timeout"; @@ -3290,6 +3416,15 @@ let sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -4064,6 +4199,15 @@ let sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -4208,6 +4352,15 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; + "string-width-4.2.0" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + }; + }; "string.prototype.trimleft-2.1.1" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; @@ -4262,6 +4415,15 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; "strip-eof-1.0.0" = { name = "strip-eof"; packageName = "strip-eof"; @@ -4325,6 +4487,15 @@ let sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; "tar-4.4.13" = { name = "tar"; packageName = "tar"; @@ -4397,6 +4568,15 @@ let sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; }; }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; "tmp-0.1.0" = { name = "tmp"; packageName = "tmp"; @@ -4469,6 +4649,15 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; + "touch-3.1.0" = { + name = "touch"; + packageName = "touch"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; + sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; + }; + }; "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -4622,6 +4811,15 @@ let sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; }; }; + "upgrade-1.1.0" = { + name = "upgrade"; + packageName = "upgrade"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upgrade/-/upgrade-1.1.0.tgz"; + sha1 = "4a50875ec5c715d19379799f0590a0e796958f61"; + }; + }; "uri-js-4.2.2" = { name = "uri-js"; packageName = "uri-js"; @@ -4838,6 +5036,15 @@ let sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; + "wrap-ansi-6.2.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -4946,6 +5153,15 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; + "yargs-15.3.1" = { + name = "yargs"; + packageName = "yargs"; + version = "15.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; + sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; + }; + }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -4955,6 +5171,15 @@ let sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; + "yargs-parser-18.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz"; + sha512 = "KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA=="; + }; + }; "yn-4.0.0" = { name = "yn"; packageName = "yn"; @@ -4967,180 +5192,210 @@ let }; in { - elm-test = nodeEnv.buildNodePackage { - name = "elm-test"; - packageName = "elm-test"; - version = "0.19.1-revision2"; + elm-analyse = nodeEnv.buildNodePackage { + name = "elm-analyse"; + packageName = "elm-analyse"; + version = "0.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; - sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; + url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.5.tgz"; + sha512 = "I7dgGFOc+mYDcDuyo1/HcIn3E5MiMbocStNzivsPSjCUviuEieHdDKZmJJ9uM3IdCu0fdBmRNWQBSOXtXrgzKg=="; }; dependencies = [ - sources."@types/color-name-1.1.1" + sources."accepts-1.3.7" sources."ajv-6.12.0" - sources."ansi-styles-4.2.1" - sources."anymatch-3.1.1" + sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" - sources."balanced-match-1.0.0" + sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" - sources."binary-extensions-2.0.0" - sources."binwrap-0.2.2" - sources."bluebird-3.7.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffers-0.1.1" + sources."body-parser-1.19.0" + sources."bytes-3.1.0" sources."caseless-0.12.0" - sources."chainsaw-0.1.0" - sources."chalk-3.0.0" - sources."chokidar-3.3.0" - sources."chownr-1.1.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" + sources."concat-stream-1.5.2" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.1" sources."dashdash-1.14.1" + sources."debug-2.6.9" sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" sources."ecc-jsbn-0.1.2" - sources."elmi-to-json-1.3.0" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + (sources."express-4.16.3" // { + dependencies = [ + sources."body-parser-1.18.2" + sources."bytes-3.0.0" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.19" + sources."qs-6.5.1" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."setprototypeof-1.0.3" + ]; + }) + sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" + ]; + }) + (sources."express-ws-2.0.0" // { + dependencies = [ + sources."ws-1.1.5" + ]; + }) sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" - (sources."find-elm-dependencies-2.0.2" // { + (sources."finalhandler-1.1.1" // { dependencies = [ - sources."firstline-1.2.0" + sources."statuses-1.4.0" ]; }) - sources."find-parent-dir-0.3.0" - sources."firstline-2.0.2" + sources."find-0.2.7" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" - sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."glob-7.1.6" - sources."glob-parent-5.1.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-4.0.0" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - sources."is-number-7.0.0" + sources."iconv-lite-0.4.24" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.1" + sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."isexe-2.0.0" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" + sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."lodash-4.17.15" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."node-watch-0.5.5" + sources."oauth-sign-0.9.0" + sources."on-finished-2.3.0" + sources."opn-5.4.0" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."process-nextick-args-1.0.7" + sources."proxy-addr-2.0.6" + sources."psl-1.7.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."readable-stream-2.0.6" + sources."regenerator-runtime-0.9.6" + (sources."request-2.88.0" // { dependencies = [ - sources."minimist-0.0.8" + sources."qs-6.5.2" + sources."safe-buffer-5.2.0" ]; }) - sources."murmur-hash-js-1.0.0" - sources."mustache-3.2.1" - sources."nice-try-1.0.5" - (sources."node-elm-compiler-5.0.4" // { + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + (sources."send-0.16.2" // { dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" + sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" ]; }) - sources."normalize-path-3.0.0" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."performance-now-2.1.0" - sources."picomatch-2.2.1" - sources."psl-1.7.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."readdirp-3.2.0" - sources."request-2.88.2" - sources."request-promise-4.2.5" - sources."request-promise-core-1.1.3" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" - sources."safer-buffer-2.1.2" - sources."semver-5.7.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."split-1.0.1" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.1" sources."sshpk-1.16.1" - sources."stealthy-require-1.1.1" - sources."supports-color-7.1.0" - sources."tar-4.4.13" - sources."temp-0.9.1" - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" - sources."traverse-0.3.9" + sources."statuses-1.5.0" + sources."string_decoder-0.10.31" + sources."sums-0.2.4" + sources."through2-2.0.1" + sources."tmp-0.0.31" + sources."toidentifier-1.0.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."universalify-0.1.2" - sources."unzip-stream-0.3.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."ultron-1.0.2" + sources."unpipe-1.0.0" sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."vary-1.1.2" sources."verror-1.10.0" - sources."which-2.0.1" - sources."wrappy-1.0.2" - sources."xmlbuilder-13.0.2" - sources."yallist-3.1.1" + (sources."ws-3.3.1" // { + dependencies = [ + sources."ultron-1.1.1" + ]; + }) + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Run elm-test suites."; - homepage = "https://github.com/rtfeldman/node-test-runner#readme"; - license = "BSD-3-Clause"; + description = "A tool that allows you analyse your Elm code and identifies deficiencies and best practices."; + license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; - elm-verify-examples = nodeEnv.buildNodePackage { - name = "elm-verify-examples"; - packageName = "elm-verify-examples"; - version = "5.0.0"; + elm-coverage = nodeEnv.buildNodePackage { + name = "elm-coverage"; + packageName = "elm-coverage"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.0.0.tgz"; - sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ=="; + url = "https://registry.npmjs.org/elm-coverage/-/elm-coverage-0.3.0.tgz"; + sha512 = "WHlO9LCu6DLzlIPR28GqcCgtyy6ZjRKBR+c6yYwy7m2o0D0buuLsr3wsZxJBjZYmwregmWRseUOM3DzHmoiIzg=="; }; dependencies = [ + sources."@types/color-name-1.1.1" + sources."abbrev-1.1.1" sources."ajv-6.12.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" @@ -5156,29 +5411,42 @@ in sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - sources."chalk-2.4.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) sources."chokidar-3.2.1" sources."chownr-1.1.4" - sources."cliui-5.0.0" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - (sources."cross-spawn-7.0.0" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) + sources."cross-spawn-5.1.0" sources."dashdash-1.14.1" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" + sources."elm-0.19.1" (sources."elm-test-0.19.1" // { dependencies = [ + (sources."cross-spawn-7.0.0" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) sources."fs-extra-8.1.0" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."which-2.0.1" ]; }) sources."elmi-to-json-1.2.0" @@ -5189,17 +5457,18 @@ in sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" + sources."find-0.2.9" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ sources."firstline-1.2.0" ]; }) sources."find-parent-dir-0.3.0" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."firstline-2.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-5.0.0" + sources."fs-extra-4.0.3" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.1.2" @@ -5220,6 +5489,7 @@ in sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -5228,19 +5498,21 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" + (sources."lru-cache-4.1.5" // { + dependencies = [ + sources."yallist-2.1.2" + ]; + }) sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.3" + sources."moment-2.24.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -5248,20 +5520,23 @@ in dependencies = [ sources."cross-spawn-6.0.5" sources."path-key-2.0.1" - sources."which-1.3.1" ]; }) + sources."nopt-1.0.10" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" + sources."opn-5.5.0" + sources."os-tmpdir-1.0.2" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."performance-now-2.1.0" sources."picomatch-2.2.1" + sources."pseudomap-1.0.2" sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -5271,49 +5546,75 @@ in sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."rimraf-2.7.1" + sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."slice-ansi-2.1.0" sources."split-1.0.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" - sources."tar-4.4.13" - (sources."temp-0.9.0" // { + (sources."supports-color-7.1.0" // { dependencies = [ - sources."rimraf-2.6.3" + sources."has-flag-4.0.0" ]; }) + sources."table-5.4.6" + sources."tar-4.4.13" + sources."temp-0.9.0" sources."through-2.3.8" + sources."tmp-0.0.33" sources."to-regex-range-5.0.1" + sources."touch-3.1.0" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" + sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" sources."unzip-stream-0.3.0" + sources."upgrade-1.1.0" sources."uri-js-4.2.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."which-2.0.1" + sources."which-1.3.1" sources."which-module-2.0.0" - sources."wrap-ansi-5.1.0" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" + (sources."yargs-15.3.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."yargs-parser-18.1.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Verify examples in Elm doc-comments"; + description = "> Work in progress - Code coverage tooling for Elm"; + homepage = "https://github.com/zwilias/elm-coverage#readme"; license = "BSD-3-Clause"; }; production = true; @@ -5736,97 +6037,22 @@ in bypassCache = true; reconstructLock = true; }; - elm-upgrade = nodeEnv.buildNodePackage { - name = "elm-upgrade"; - packageName = "elm-upgrade"; - version = "0.19.8"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.8.tgz"; - sha512 = "SwNzV40wu9IEe35TWR9b7F8WctIRUkpl6F3lzF0AqmYnCcKjbzrxbW6G7DYfA9ICUYjuSLcyYJKm5c86oMiH8w=="; - }; - dependencies = [ - sources."@sindresorhus/is-2.1.0" - sources."@szmarczak/http-timer-4.0.5" - sources."@types/cacheable-request-6.0.1" - sources."@types/http-cache-semantics-4.0.0" - sources."@types/keyv-3.1.1" - sources."@types/node-13.9.1" - sources."@types/responselike-1.0.0" - sources."cacheable-lookup-2.0.0" - sources."cacheable-request-7.0.1" - sources."caw-2.0.1" - (sources."clone-response-1.0.2" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) - sources."config-chain-1.1.12" - sources."decompress-response-5.0.0" - sources."defer-to-connect-2.0.0" - sources."duplexer3-0.1.4" - sources."end-of-stream-1.4.4" - sources."fs-extra-8.1.0" - sources."get-proxy-2.1.0" - sources."get-stream-5.1.0" - sources."got-10.6.0" - sources."graceful-fs-4.2.3" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" - sources."http-cache-semantics-4.1.0" - sources."ini-1.3.5" - sources."is-object-1.0.1" - sources."isexe-2.0.0" - sources."isurl-1.0.0" - sources."json-buffer-3.0.1" - sources."jsonfile-4.0.0" - sources."keyv-4.0.0" - sources."lowercase-keys-2.0.0" - sources."mimic-response-2.1.0" - sources."normalize-url-4.5.0" - sources."npm-conf-1.1.3" - sources."once-1.4.0" - sources."p-cancelable-2.0.0" - sources."p-event-4.1.0" - sources."p-finally-1.0.0" - sources."p-timeout-2.0.1" - sources."pify-3.0.0" - sources."proto-list-1.2.4" - sources."pump-3.0.0" - sources."responselike-2.0.0" - sources."safe-buffer-5.2.0" - sources."safename-1.0.2" - sources."semver-7.1.3" - sources."to-readable-stream-2.1.0" - sources."tunnel-agent-0.6.0" - sources."type-fest-0.10.0" - sources."universalify-0.1.2" - sources."url-to-options-1.0.1" - sources."which-2.0.2" - sources."wrappy-1.0.2" - sources."yn-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Upgrade Elm projects"; - homepage = "https://github.com/avh4/elm-upgrade#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - elm-analyse = nodeEnv.buildNodePackage { - name = "elm-analyse"; - packageName = "elm-analyse"; - version = "0.16.5"; + "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { + name = "_at_elm-tooling_slash_elm-language-server"; + packageName = "@elm-tooling/elm-language-server"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.5.tgz"; - sha512 = "I7dgGFOc+mYDcDuyo1/HcIn3E5MiMbocStNzivsPSjCUviuEieHdDKZmJJ9uM3IdCu0fdBmRNWQBSOXtXrgzKg=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.6.3.tgz"; + sha512 = "8liKU5tfKrldgNtE8GNGEUlZM+o7Qfjycn3gnyzzKqWEBCjkxeuU6VwWaIozw5k/xfJqHcIDb5nFPsqEadO5Ig=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" sources."accepts-1.3.7" sources."ajv-6.12.0" sources."array-flatten-1.1.1" + sources."array-union-2.1.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" @@ -5836,6 +6062,7 @@ in sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" + sources."braces-3.0.2" sources."bytes-3.1.0" sources."caseless-0.12.0" sources."combined-stream-1.0.8" @@ -5846,16 +6073,25 @@ in sources."cookie-signature-1.0.6" sources."core-js-2.6.11" sources."core-util-is-1.0.2" + sources."cross-spawn-7.0.1" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" + sources."dir-glob-3.0.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" + sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" + (sources."execa-4.0.0" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) (sources."express-4.16.3" // { dependencies = [ sources."body-parser-1.18.2" @@ -5882,7 +6118,11 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" + sources."fast-diff-1.2.0" + sources."fast-glob-3.2.2" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.6.1" + sources."fill-range-7.0.1" (sources."finalhandler-1.1.1" // { dependencies = [ sources."statuses-1.4.0" @@ -5894,19 +6134,28 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-2.0.0" + sources."get-stream-5.1.0" sources."getpass-0.1.7" + sources."glob-parent-5.1.0" + sources."globby-11.0.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" + sources."ignore-5.1.4" sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-wsl-1.1.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" @@ -5917,26 +6166,38 @@ in sources."lodash-4.17.15" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.3.0" sources."methods-1.1.2" + sources."micromatch-4.0.2" sources."mime-1.4.1" sources."mime-db-1.43.0" sources."mime-types-2.1.26" + sources."mimic-fn-2.1.0" sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."node-watch-0.5.5" + sources."npm-run-path-4.0.1" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-5.1.0" sources."opn-5.4.0" sources."options-0.0.6" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."parseurl-1.3.3" + sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" sources."performance-now-2.1.0" + sources."picomatch-2.2.1" + sources."pjson-1.0.9" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.6" sources."psl-1.7.0" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -5949,6 +6210,9 @@ in sources."safe-buffer-5.2.0" ]; }) + sources."reusify-1.0.4" + sources."run-parallel-1.1.9" + sources."rxjs-6.5.4" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" (sources."send-0.16.2" // { @@ -5960,12 +6224,18 @@ in }) sources."serve-static-1.13.2" sources."setprototypeof-1.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.2" + sources."slash-3.0.0" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."string_decoder-0.10.31" + sources."strip-final-newline-2.0.0" sources."sums-0.2.4" sources."through2-2.0.1" sources."tmp-0.0.31" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -5973,6 +6243,7 @@ in ]; }) sources."traverse-chain-0.1.0" + sources."tslib-1.11.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -5985,6 +6256,15 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + sources."vscode-uri-2.1.1" + sources."web-tree-sitter-0.16.2" + sources."which-2.0.2" + sources."wrappy-1.0.2" (sources."ws-3.3.1" // { dependencies = [ sources."ultron-1.1.1" @@ -5994,7 +6274,8 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "A tool that allows you analyse your Elm code and identifies deficiencies and best practices."; + description = "Implementation of an elm language server in node."; + homepage = "https://github.com/elm-tooling/elm-language-server#readme"; license = "MIT"; }; production = true; @@ -6031,7 +6312,7 @@ in sources."elm-hot-1.1.4" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es6-promisify-6.0.2" + sources."es6-promisify-6.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" @@ -6123,291 +6404,470 @@ in bypassCache = true; reconstructLock = true; }; - elm-xref = nodeEnv.buildNodePackage { - name = "elm-xref"; - packageName = "elm-xref"; - version = "4.1.0"; + elm-test = nodeEnv.buildNodePackage { + name = "elm-test"; + packageName = "elm-test"; + version = "0.19.1-revision2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.1.0.tgz"; - sha512 = "23nVGYsArS2DZ0RnFq6cKYO49pCjuLULhM+fvBcfA7ZIbKSw5WkDyK9c5hlQEm+JZAPZ43PNcI0yLzTEqaajiA=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; + sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; }; dependencies = [ + sources."@types/color-name-1.1.1" + sources."ajv-6.12.0" + sources."ansi-styles-4.2.1" + sources."anymatch-3.1.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."binary-0.3.0" + sources."binary-extensions-2.0.0" + sources."binwrap-0.2.2" sources."bluebird-3.7.2" - sources."compare-versions-3.6.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffers-0.1.1" + sources."caseless-0.12.0" + sources."chainsaw-0.1.0" + sources."chalk-3.0.0" + sources."chokidar-3.3.0" + sources."chownr-1.1.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."fs-extra-6.0.1" + sources."cross-spawn-7.0.1" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."elmi-to-json-1.3.0" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" + sources."fill-range-7.0.1" + (sources."find-elm-dependencies-2.0.2" // { + dependencies = [ + sources."firstline-1.2.0" + ]; + }) + sources."find-parent-dir-0.3.0" + sources."firstline-2.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-extra-8.1.0" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.2" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."glob-parent-5.1.0" sources."graceful-fs-4.2.3" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-flag-4.0.0" + sources."http-signature-1.2.0" + sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."isarray-1.0.0" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" - sources."klaw-2.1.1" + sources."jsprim-1.4.1" + sources."lodash-4.17.15" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" + sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."process-nextick-args-2.0.1" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."semver-6.3.0" - sources."semver-regex-1.0.0" - (sources."semver-sort-0.0.4" // { + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.3" + sources."murmur-hash-js-1.0.0" + sources."mustache-3.2.1" + sources."nice-try-1.0.5" + (sources."node-elm-compiler-5.0.4" // { dependencies = [ - sources."semver-5.7.1" + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" ]; }) - sources."string_decoder-1.1.1" - sources."through2-2.0.5" + sources."normalize-path-3.0.0" + sources."oauth-sign-0.9.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."performance-now-2.1.0" + sources."picomatch-2.2.1" + sources."psl-1.7.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."readdirp-3.2.0" + sources."request-2.88.2" + sources."request-promise-4.2.5" + sources."request-promise-core-1.1.3" + sources."rimraf-2.6.3" + sources."safe-buffer-5.2.0" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."split-1.0.1" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" + sources."supports-color-7.1.0" + sources."tar-4.4.13" + sources."temp-0.9.1" + sources."through-2.3.8" + sources."to-regex-range-5.0.1" + sources."tough-cookie-2.5.0" + sources."traverse-0.3.9" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - sources."util-deprecate-1.0.2" - sources."xtend-4.0.2" + sources."unzip-stream-0.3.0" + sources."uri-js-4.2.2" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."which-2.0.1" + sources."wrappy-1.0.2" + sources."xmlbuilder-13.0.2" + sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Cross referencing tool for Elm - find usages and unused code"; - homepage = "https://github.com/zwilias/elm-xref#readme"; + description = "Run elm-test suites."; + homepage = "https://github.com/rtfeldman/node-test-runner#readme"; license = "BSD-3-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; - "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { - name = "_at_elm-tooling_slash_elm-language-server"; - packageName = "@elm-tooling/elm-language-server"; - version = "1.6.3"; + elm-upgrade = nodeEnv.buildNodePackage { + name = "elm-upgrade"; + packageName = "elm-upgrade"; + version = "0.19.8"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.6.3.tgz"; - sha512 = "8liKU5tfKrldgNtE8GNGEUlZM+o7Qfjycn3gnyzzKqWEBCjkxeuU6VwWaIozw5k/xfJqHcIDb5nFPsqEadO5Ig=="; + url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.8.tgz"; + sha512 = "SwNzV40wu9IEe35TWR9b7F8WctIRUkpl6F3lzF0AqmYnCcKjbzrxbW6G7DYfA9ICUYjuSLcyYJKm5c86oMiH8w=="; + }; + dependencies = [ + sources."@sindresorhus/is-2.1.0" + sources."@szmarczak/http-timer-4.0.5" + sources."@types/cacheable-request-6.0.1" + sources."@types/http-cache-semantics-4.0.0" + sources."@types/keyv-3.1.1" + sources."@types/node-13.9.1" + sources."@types/responselike-1.0.0" + sources."cacheable-lookup-2.0.0" + sources."cacheable-request-7.0.1" + sources."caw-2.0.1" + (sources."clone-response-1.0.2" // { + dependencies = [ + sources."mimic-response-1.0.1" + ]; + }) + sources."config-chain-1.1.12" + sources."decompress-response-5.0.0" + sources."defer-to-connect-2.0.0" + sources."duplexer3-0.1.4" + sources."end-of-stream-1.4.4" + sources."fs-extra-8.1.0" + sources."get-proxy-2.1.0" + sources."get-stream-5.1.0" + sources."got-10.6.0" + sources."graceful-fs-4.2.3" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."http-cache-semantics-4.1.0" + sources."ini-1.3.5" + sources."is-object-1.0.1" + sources."isexe-2.0.0" + sources."isurl-1.0.0" + sources."json-buffer-3.0.1" + sources."jsonfile-4.0.0" + sources."keyv-4.0.0" + sources."lowercase-keys-2.0.0" + sources."mimic-response-2.1.0" + sources."normalize-url-4.5.0" + sources."npm-conf-1.1.3" + sources."once-1.4.0" + sources."p-cancelable-2.0.0" + sources."p-event-4.1.0" + sources."p-finally-1.0.0" + sources."p-timeout-2.0.1" + sources."pify-3.0.0" + sources."proto-list-1.2.4" + sources."pump-3.0.0" + sources."responselike-2.0.0" + sources."safe-buffer-5.2.0" + sources."safename-1.0.2" + sources."semver-7.1.3" + sources."to-readable-stream-2.1.0" + sources."tunnel-agent-0.6.0" + sources."type-fest-0.10.0" + sources."universalify-0.1.2" + sources."url-to-options-1.0.1" + sources."which-2.0.2" + sources."wrappy-1.0.2" + sources."yn-4.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Upgrade Elm projects"; + homepage = "https://github.com/avh4/elm-upgrade#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + elm-verify-examples = nodeEnv.buildNodePackage { + name = "elm-verify-examples"; + packageName = "elm-verify-examples"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.0.0.tgz"; + sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" - sources."accepts-1.3.7" sources."ajv-6.12.0" - sources."array-flatten-1.1.1" - sources."array-union-2.1.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" - sources."babel-runtime-6.18.0" + sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."body-parser-1.19.0" + sources."binary-0.3.0" + sources."binary-extensions-2.0.0" + sources."binwrap-0.2.2" + sources."bluebird-3.7.2" + sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bytes-3.1.0" + sources."buffers-0.1.1" + sources."camelcase-5.3.1" sources."caseless-0.12.0" + sources."chainsaw-0.1.0" + sources."chalk-2.4.2" + sources."chokidar-3.2.1" + sources."chownr-1.1.4" + sources."cliui-5.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."concat-stream-1.5.2" - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.1" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."dir-glob-3.0.1" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - (sources."execa-4.0.0" // { - dependencies = [ - sources."is-stream-2.0.0" - ]; - }) - (sources."express-4.16.3" // { + (sources."cross-spawn-7.0.0" // { dependencies = [ - sources."body-parser-1.18.2" - sources."bytes-3.0.0" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" + sources."which-1.3.1" ]; }) - (sources."express-ws-2.0.0" // { + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.2" + (sources."elm-test-0.19.1" // { dependencies = [ - sources."ws-1.1.5" + sources."fs-extra-8.1.0" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" ]; }) + sources."elmi-to-json-1.2.0" + sources."emoji-regex-7.0.3" + sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" - sources."fast-diff-1.2.0" - sources."fast-glob-3.2.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.6.1" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.1" // { + (sources."find-elm-dependencies-2.0.2" // { dependencies = [ - sources."statuses-1.4.0" + sources."firstline-1.2.0" ]; }) - sources."find-0.2.7" + sources."find-parent-dir-0.3.0" + sources."find-up-3.0.0" + sources."firstline-2.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" - sources."fresh-0.5.2" - sources."fs-extra-2.0.0" - sources."get-stream-5.1.0" + sources."fs-extra-5.0.0" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.2" + sources."get-caller-file-2.0.5" sources."getpass-0.1.7" + sources."glob-7.1.4" sources."glob-parent-5.1.0" - sources."globby-11.0.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."http-errors-1.7.2" + sources."has-flag-3.0.0" sources."http-signature-1.2.0" - sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" - sources."ignore-5.1.4" - sources."inherits-2.0.3" - sources."ipaddr.js-1.9.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" + sources."jsonfile-4.0.0" sources."jsprim-1.4.1" + sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" - sources."merge2-1.3.0" - sources."methods-1.1.2" - sources."micromatch-4.0.2" - sources."mime-1.4.1" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."mimic-fn-2.1.0" - sources."minimist-1.2.0" - sources."ms-2.0.0" - sources."negotiator-0.6.2" - sources."node-watch-0.5.5" - sources."npm-run-path-4.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.3" + sources."murmur-hash-js-1.0.0" + sources."mustache-3.2.1" + sources."nice-try-1.0.5" + (sources."node-elm-compiler-5.0.4" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."which-1.3.1" + ]; + }) + sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" - sources."on-finished-2.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" - sources."opn-5.4.0" - sources."options-0.0.6" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."parseurl-1.3.3" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.2.1" - sources."pjson-1.0.9" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.6" sources."psl-1.7.0" - sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.7.0" - sources."range-parser-1.2.1" - sources."raw-body-2.4.0" - sources."readable-stream-2.0.6" - sources."regenerator-runtime-0.9.6" - (sources."request-2.88.0" // { - dependencies = [ - sources."qs-6.5.2" - sources."safe-buffer-5.2.0" - ]; - }) - sources."reusify-1.0.4" - sources."run-parallel-1.1.9" - sources."rxjs-6.5.4" - sources."safe-buffer-5.1.1" + sources."qs-6.5.2" + sources."readdirp-3.1.3" + sources."request-2.88.2" + sources."request-promise-4.2.5" + sources."request-promise-core-1.1.3" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - (sources."send-0.16.2" // { - dependencies = [ - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - ]; - }) - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.2" - sources."slash-3.0.0" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."split-1.0.1" sources."sshpk-1.16.1" - sources."statuses-1.5.0" - sources."string_decoder-0.10.31" - sources."strip-final-newline-2.0.0" - sources."sums-0.2.4" - sources."through2-2.0.1" - sources."tmp-0.0.31" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { + sources."stealthy-require-1.1.1" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + sources."tar-4.4.13" + (sources."temp-0.9.0" // { dependencies = [ - sources."punycode-1.4.1" + sources."rimraf-2.6.3" ]; }) - sources."traverse-chain-0.1.0" - sources."tslib-1.11.1" + sources."through-2.3.8" + sources."to-regex-range-5.0.1" + sources."tough-cookie-2.5.0" + sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."ultron-1.0.2" - sources."unpipe-1.0.0" + sources."universalify-0.1.2" + sources."unzip-stream-0.3.0" sources."uri-js-4.2.2" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" sources."uuid-3.4.0" - sources."vary-1.1.2" sources."verror-1.10.0" - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.15.3" - sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" - sources."vscode-uri-2.1.1" - sources."web-tree-sitter-0.16.2" - sources."which-2.0.2" + sources."which-2.0.1" + sources."which-module-2.0.0" + sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - (sources."ws-3.3.1" // { + sources."xmlbuilder-13.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Verify examples in Elm doc-comments"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + elm-xref = nodeEnv.buildNodePackage { + name = "elm-xref"; + packageName = "elm-xref"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.1.0.tgz"; + sha512 = "23nVGYsArS2DZ0RnFq6cKYO49pCjuLULhM+fvBcfA7ZIbKSw5WkDyK9c5hlQEm+JZAPZ43PNcI0yLzTEqaajiA=="; + }; + dependencies = [ + sources."bluebird-3.7.2" + sources."compare-versions-3.6.0" + sources."core-util-is-1.0.2" + sources."fs-extra-6.0.1" + sources."graceful-fs-4.2.3" + sources."inherits-2.0.4" + sources."isarray-1.0.0" + sources."jsonfile-4.0.0" + sources."klaw-2.1.1" + sources."minimist-1.2.5" + sources."process-nextick-args-2.0.1" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."semver-6.3.0" + sources."semver-regex-1.0.0" + (sources."semver-sort-0.0.4" // { dependencies = [ - sources."ultron-1.1.1" + sources."semver-5.7.1" ]; }) + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + sources."universalify-0.1.2" + sources."util-deprecate-1.0.2" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Implementation of an elm language server in node."; - homepage = "https://github.com/elm-tooling/elm-language-server#readme"; - license = "MIT"; + description = "Cross referencing tool for Elm - find usages and unused code"; + homepage = "https://github.com/zwilias/elm-xref#readme"; + license = "BSD-3-Clause"; }; production = true; bypassCache = true; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix b/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix index 3a67954b78c9..30f54e6f5ac5 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix @@ -14,7 +14,7 @@ in targets: pkg: pkg.override { - buildInputs = [ binwrap binwrap-install ]; + nativeBuildInputs = pkg.nativeBuildInputs ++ [ binwrap binwrap-install ]; # Manually install targets # by symlinking binaries into `node_modules` diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix index bd67fae158af..9198d08cef45 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix @@ -88,12 +88,12 @@ let in stdenv.mkDerivation (rec { - version = "8.10.0.20200123"; + version = "8.10.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "162s5g33s918i12qfcqdj5wanc10xg07g5lq3gpm5j7c1v0y1zrf"; + url = "https://downloads.haskell.org/ghc/8.10.1/ghc-${version}-src.tar.xz"; + sha256 = "1xgdl6ig5jzli3bg054vfryfkg0y6wggf68g66c32sr67bw0ffsf"; }; enableParallelBuilding = true; @@ -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 [ diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix index 1f24b9a1ff24..9f546bcb541c 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -1,12 +1,15 @@ { stdenv, substituteAll , fetchurl, perl, gcc, llvm , 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); @@ -53,7 +56,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ]; + propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix index fe576186b0e5..97793d912895 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 3ee12af5c06c..1502b243d889 100644 --- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, openjdk12, fetchFromGitHub, jetbrains }: +{ stdenv, openjdk11, fetchFromGitHub, jetbrains }: -openjdk12.overrideAttrs (oldAttrs: rec { +openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; version = "11.0.6-b774"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix index 13fe4bedd46f..dfdc9f74e15b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "1w7ixr16a9f0g5kv4irvhwq973wn0d418kb0p9rabyfscm05wfmq"; + src = fetch "clang" "0ap63qhz0j6m63l4njwp055xni4s71dsxqi1w5d2p93hbswaiiw2"; unpackPhase = '' unpackFile $src @@ -36,7 +36,7 @@ let ]; patches = [ - # 10.0.0rc3-only + # 10.0.0 only, this should be present in 10.0.1 ./clang-extension-handling.patch ./purity.patch diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix index 2d71268c6624..8c870a610cc2 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "0qv40mv91630l6f75w9g5y6v97s5shz94n82rms12gcd8mir6qp5"; + src = fetch pname "1g067yx8qz0bmf00b2xqjqaayqj2xvrjp9smms3a16syj9m0hfri"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index f2a8883a9a7e..574ab5ec4e77 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -6,7 +6,7 @@ let release_version = "10.0.0"; - candidate = "rc3"; + candidate = "rc5"; version = "10.0.0${candidate}"; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,7 +14,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "03669c93wzmbmfpv0pyzb7y4z1xc912l95iqywyx01xgdl1xws0r"; + clang-tools-extra_src = fetch "clang-tools-extra" "0x23q70c0xcwdhj0d66nisr8rqq69qcshrbb4si9pxfsm0zs9h3i"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); @@ -30,16 +30,11 @@ let in { llvm = callPackage ./llvm.nix { }; - llvm-polly = callPackage ./llvm.nix { enablePolly = true; }; clang-unwrapped = callPackage ./clang { inherit (tools) lld; inherit clang-tools-extra_src; }; - clang-polly-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - llvm = tools.llvm-polly; - }; llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix index 767b1cbbc583..18eae91d3402 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "1cjxiby8nq95g02rgx08iy86pswpi66b9wmxqjiyga1s92nb19j0"; + src = fetch "libcxx" "0qw85sy3y1mcdrj8yd1j1gmskh0vs4xdgrx80niigizhr7030vxs"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix index 8ad52b5ed57f..ba51f0f33f1b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "1xs7dr91qzz7lq9am4q3vcj2jf1gx23ar1jbnhn763011hl94vs0"; + src = fetch "libcxxabi" "15iclzxjqfjynqxjg8dahyr0gfg83blv9dm7z9hq5ipxw8x2sglf"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix index 74a8687179fe..6016d0536bff 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "1dm7l75ajnjy6kbg2157v2g5gfia3n47fc56ayryyp2jdvbgprwl"; + src = fetch pname "12c2fh63afav8rfmplfs628r74ksfs8fjls655rwjsrg1hk0gy3l"; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix index 6323866ae886..ab2dd8caee83 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "1w9c9xmzbdnkwgal612hqz2lxj9jgqpfzxr2rllcspmf6v7arvf4"; + src = fetch pname "08zg546872b432qrx49i7k1c2vdq9yjvc7gnrvy2nywv0d2qf9nc"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix index fd318314dea5..12cb43bc504c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "06qzh13cr20wrd5925698yq696bhl68zbvm7kjxp7c2rx5swxmg8"; + src = fetch pname "0swv16n7gm12f399f7hxai1jh89s14h3yg7cci10yaiibpvwk73x"; patches = [ ./lldb-procfs.patch ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix index eb93d8648f9a..0405958070a2 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix @@ -17,7 +17,7 @@ , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 ) -, enablePolly ? false +, enablePolly ? true }: let @@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "1pa322iwqg071gxdn5wxri263j6aki6ag36xbdzbyi3g8m8v8jci"; - polly_src = fetch "polly" "0p9dmv4hxwx4f5k1v4r9b5jp7fbi71ajpmrv3xf3vmp6m4i3r0pc"; + src = fetch pname "1abfi0zqbcwxf68dk00szpjxkcd44589va243af8sg97hljq6709"; + polly_src = fetch "polly" "1fzg5934km69rwam6vgznk0p4slzhr0icwmj3jibw3p93ppa8k9r"; unpackPhase = '' unpackFile $src diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix index cff2ad365360..1cdd4cc9bba1 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "0axdxar18rvk9r4yx7y55ywqr3070mixag9sg2fcck1jzwfgymjb"; + src = fetch pname "0swif1plz7drjha6rdw02b60symsz95w62wxpiygbpdwsmhbbgam"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix index 05f4dbf6aa06..3c1b07e7ca70 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix @@ -23,7 +23,7 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags ''; in { @@ -50,8 +50,10 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ + extraTools = [ libstdcxxHook + ]; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix index d4745930ed3f..ba704f972c31 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix @@ -23,7 +23,7 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags ''; in { @@ -50,8 +50,10 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ + extraTools = [ libstdcxxHook + ]; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index ae98940adeab..7a5e3d4c8fc9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,4 +1,13 @@ { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + stdenv.mkDerivation { pname = "compiler-rt"; inherit version; @@ -11,26 +20,34 @@ stdenv.mkDerivation { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false || stdenv.isDarwin) [ + cmakeFlags = stdenv.lib.optionals (useLLVM || stdenv.isDarwin) [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ - "-DCMAKE_C_FLAGS=-nodefaultlibs" - "-DCMAKE_CXX_COMPILER_WORKS=ON" - "-DCOMPILER_RT_BUILD_BUILTINS=ON" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ stdenv.lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ stdenv.lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" ]; outputs = [ "out" "dev" ]; patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch + ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks @@ -41,7 +58,7 @@ stdenv.mkDerivation { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -53,7 +70,7 @@ stdenv.mkDerivation { # Hack around weird upsream RPATH bug postInstall = stdenv.lib.optionalString stdenv.isDarwin '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index 04e1610fb791..5124a5df00b3 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -23,7 +23,7 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc) '' + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags ''; in { @@ -57,8 +57,10 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ + extraTools = [ libstdcxxHook + ]; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 9c0829146f72..795c81f42196 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,4 +1,13 @@ { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + stdenv.mkDerivation { pname = "compiler-rt"; inherit version; @@ -11,27 +20,26 @@ stdenv.mkDerivation { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = stdenv.lib.optionals (useLLVM || stdenv.isDarwin) [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_C_FLAGS=-nodefaultlibs" - "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ stdenv.lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [ - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" ]; @@ -40,7 +48,7 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch; + ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra @@ -50,7 +58,7 @@ stdenv.mkDerivation { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -62,7 +70,7 @@ stdenv.mkDerivation { # Hack around weird upsream RPATH bug postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index d604dda5fe5e..105011595c8b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -57,8 +57,10 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ + extraTools = [ libstdcxxHook + ]; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix index 037953bb23d8..0cfd8d7c9e72 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -1,4 +1,13 @@ { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; @@ -11,27 +20,26 @@ stdenv.mkDerivation rec { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = stdenv.lib.optionals (useLLVM || stdenv.isDarwin) [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_C_FLAGS=-nodefaultlibs" - "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ stdenv.lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [ - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" ]; @@ -49,7 +57,7 @@ stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -61,7 +69,7 @@ stdenv.mkDerivation rec { # Hack around weird upsream RPATH bug postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix index 11e44b8bdfaa..d42e5187c3c7 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/9/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix @@ -57,8 +57,10 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ + extraTools = [ libstdcxxHook + ]; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index afd08f6e96e7..b0fbc2eb8d13 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.02.04"; + version = "2020.03.25"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "ca733561873cd54be047ae30a94efcd71b3f8be5"; - sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp"; + rev = "a3ede0293a50c910e7d96319b2084d50f2501a6b"; + sha256 = "0ikfjva4gqmlx6y7mjamg03ad7x9gnz32ahqv798ynd87svq10aq"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix index 4b56d82eba54..a093a2446419 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index 6980b6e5ff13..12369ebcc6f1 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -11,7 +11,7 @@ let in { stdenv, fetchurl, ncurses, buildEnv -, libX11, xorgproto, useX11 ? safeX11 stdenv +, libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09" , aflSupport ? false , flambdaSupport ? false }: diff --git a/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/nixpkgs/pkgs/development/compilers/openjdk/12.nix new file mode 100644 index 000000000000..094bd57e6e98 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/12.nix @@ -0,0 +1,155 @@ +{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk11 +, setJavaClassPath +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + major = "12"; + update = ".0.2"; + build = "ga"; + + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}-${build}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; + sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; + }; + + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk11 + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap.patch + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # 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; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk10.patch + ]; + + prePatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + configureFlags = [ + "--with-boot-jdk=${openjdk11.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + + NIX_LDFLAGS = lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk11 ]; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + }; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + }; + }; +in openjdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix index c954a8e2cf85..775fd3cd3c43 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix @@ -7,11 +7,11 @@ let }; jdk = stdenv.mkDerivation rec { - name = "zulu12.1.3-ca-jdk12"; + name = "zulu13.29.9-ca-jdk13.0.2"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; - sha256 = "05q3v4vwjd7xhqr21bzlip5x4xhq5rpdshfpb8i86n4zvn7l0mxy"; + sha256 = "1x8ja3x880a1izrwi7bdrwz1ljdvracjx627slzjd2xk8c4211pf"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/default.nix index b2d511173c45..24828f16e7be 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk11 +, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -9,24 +9,24 @@ }: let - major = "12"; + major = "13"; update = ".0.2"; - build = "ga"; + build = "-ga"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}-${build}"; + version = "${major}${update}${build}"; src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; + sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; }; nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk11 + libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -35,7 +35,7 @@ let ./fix-java-home-jdk10.patch ./read-truststore-from-env-jdk10.patch ./currency-date-range-jdk10.patch - ./increase-javadoc-heap.patch + ./increase-javadoc-heap-jdk13.patch # -Wformat etc. are stricter in newer gccs, per # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 # so grab the work-around from @@ -45,7 +45,7 @@ let sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk10.patch + ./swing-use-gtk-jdk13.patch ]; prePatch = '' @@ -54,7 +54,7 @@ let ''; configureFlags = [ - "--with-boot-jdk=${openjdk11.home}" + "--with-boot-jdk=${openjdk13-bootstrap.home}" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-libjpeg=system" @@ -137,7 +137,7 @@ let done ''; - disallowedReferences = [ openjdk11 ]; + disallowedReferences = [ openjdk13-bootstrap ]; meta = with stdenv.lib; { homepage = http://openjdk.java.net/; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch b/nixpkgs/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch new file mode 100644 index 000000000000..6e48db6ac3b9 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch @@ -0,0 +1,12 @@ +diff -uw -r a/make/Docs.gmk b/make/Docs.gmk +--- a/make/Docs.gmk 2019-10-09 08:05:43.107349180 -0400 ++++ b/make/Docs.gmk 2019-10-09 08:09:29.330118790 -0400 +@@ -277,7 +277,7 @@ + $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS)) + + $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \ +- -Djspec.version=$$(VERSION_SPECIFICATION) ++ -Djspec.version=$$(VERSION_SPECIFICATION) -Xmx1G + + ifeq ($$(ENABLE_FULL_DOCS), true) + # Tell the ModuleGraph taglet to generate html links to soon-to-be-created diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index c6bff3961088..b5ac58e6c677 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -29,6 +29,9 @@ let JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); + #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/13.nix index 30c8d36fdfca..632724a9ac00 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/13.nix @@ -3,9 +3,9 @@ , ffmpeg, python, ruby }: let - major = "12"; - update = ""; - build = "14"; + major = "13"; + update = ".0.2"; + build = "1"; repover = "${major}${update}+${build}"; gradle_ = (gradleGen.override { java = openjdk11_headless; @@ -15,8 +15,8 @@ let version = "${major}${update}-${build}"; src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; - sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz"; + url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; + sha256 = "1si9wpb9malnf8zzz57l6b80088z2370zfxp1b0kk6rs0cnvpr74"; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; @@ -29,6 +29,9 @@ let JDK_HOME = ${openjdk11_headless.home} '' + args.gradleProperties or ""); + #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + buildPhase = '' runHook preBuild @@ -59,8 +62,8 @@ let outputHashMode = "recursive"; # Downloaded AWT jars differ by platform. outputHash = { - x86_64-linux = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"; - i686-linux = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"; + x86_64-linux = "077zss95iq6iskx7ghz1c57ymydpzj0wm7r1pkznw99l9xwvdmqi"; + i686-linux = "03gglr2sh77cyg16qw9g45ji33dg7i93s5s30hz3mh420g112qa0"; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -72,6 +75,9 @@ in makePackage { COMPILE_WEBKIT = true ''; + #openjdk build fails if licenses are identical, so we must patch this trivial difference + patches = [ ./openjfx-mesa-license.patch ]; + preBuild = '' swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" substituteInPlace build.gradle \ diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch new file mode 100644 index 000000000000..d3bf9e17c22b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch @@ -0,0 +1,17 @@ +--- a/modules/javafx.graphics/src/main/legal/mesa3d.md 1969-12-31 19:00:01.000000000 -0500 ++++ b/modules/javafx.graphics/src/main/legal/mesa3d.md 2019-08-08 01:05:04.000000000 -0400 +@@ -1,7 +1,7 @@ + ## Mesa 3-D Graphics Library v5.0 + + ### Mesa License +-``` ++<pre> + + Mesa 3-D graphics library + Version: 5.0 +@@ -25,4 +25,4 @@ + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-``` ++</pre> diff --git a/nixpkgs/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch b/nixpkgs/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch new file mode 100644 index 000000000000..8a1b9b6149bb --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch @@ -0,0 +1,22 @@ +--- a/src/java.desktop/share/classes/javax/swing/UIManager.java 2019-08-08 01:05:04.000000000 -0400 ++++ b/src/java.desktop/share/classes/javax/swing/UIManager.java 2019-10-09 08:20:31.791606748 -0400 +@@ -660,9 +660,8 @@ + Toolkit toolkit = Toolkit.getDefaultToolkit(); + if (toolkit instanceof SunToolkit) { + SunToolkit suntk = (SunToolkit)toolkit; +- String desktop = suntk.getDesktop(); + boolean gtkAvailable = suntk.isNativeGTKAvailable(); +- if ("gnome".equals(desktop) && gtkAvailable) { ++ if (gtkAvailable) { + return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; + } + } +@@ -1397,7 +1396,7 @@ + lafName = lafData.remove("defaultlaf"); + } + if (lafName == null) { +- lafName = getCrossPlatformLookAndFeelClassName(); ++ lafName = getSystemLookAndFeelClassName(); + } + lafName = swingProps.getProperty(defaultLAFKey, lafName); + diff --git a/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/nixpkgs/pkgs/development/compilers/rgbds/default.nix index bf2594b9bf4c..52d388beaed5 100644 --- a/nixpkgs/pkgs/development/compilers/rgbds/default.nix +++ b/nixpkgs/pkgs/development/compilers/rgbds/default.nix @@ -6,18 +6,18 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "rednex"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv"; + sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; meta = with stdenv.lib; { - homepage = https://rednex.github.io/rgbds/; + homepage = "https://rednex.github.io/rgbds/"; description = "A free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; longDescription = diff --git a/nixpkgs/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix index a5da7ee7a6d4..d08b63dd643f 100644 --- a/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -18,8 +18,9 @@ "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; - }.${cpu.name} or cpu.name; - in "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + }.${cpu.name} or platform.rustc.arch or cpu.name; + in platform.rustc.config + or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; makeRustPlatform = { rustc, cargo, ... }: rec { rust = { @@ -30,14 +31,8 @@ inherit cargo; }; - # N.B. This is a legacy fetcher implementation that is being phased out and deleted. - # See ../../../build-support/rust/README.md for details. - fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix { - inherit cargo; - }; - buildRustPackage = callPackage ../../../build-support/rust { - inherit rustc cargo fetchcargo fetchCargoTarball; + inherit rustc cargo fetchCargoTarball; }; rustcSrc = callPackage ./rust-src.nix { diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix index de90a0c0695a..3a54d42498ce 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -14,14 +14,14 @@ }: stdenv.mkDerivation rec { - pname = "yosys"; - version = "2020.02.25"; + pname = "yosys"; + version = "2020.03.24"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "6edca05793197a846bbfb0329e836c87fa5aabb6"; - sha256 = "1cwps3nsld80bh2b66l8fx3fa2zsx174mw72kqxyihpfdm0m0z1s"; + rev = "c9555c9adeba886a308c60615ac794ec20d9276e"; + sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a"; }; enableParallelBuilding = true; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # we have to do this ourselves for some reason... (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) - if ! grep -q "ABCREV = ${shortAbcRev}" Makefile;then + if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then echo "yosys isn't compatible with the provided abc (${shortAbcRev}), failing." exit 1 fi @@ -60,20 +60,21 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ verilog ]; - meta = { - description = "Framework for RTL synthesis tools"; - longDescription = '' - Yosys is a framework for RTL synthesis tools. It currently has - extensive Verilog-2005 support and provides a basic set of - synthesis algorithms for various application domains. - Yosys can be adapted to perform any synthesis job by combining - the existing passes (algorithms) using synthesis scripts and - adding additional passes as needed by extending the yosys C++ - code base. - ''; - homepage = http://www.clifford.at/yosys/; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ]; - platforms = stdenv.lib.platforms.all; + # Internally, yosys knows to use the specified hardcoded ABCEXTERNAL binary. + # But other tools (like mcy or symbiyosys) can't know how yosys was built, so + # they just assume that 'yosys-abc' is available -- but it's not installed + # when using ABCEXTERNAL + # + # add a symlink to fake things so that both variants work the same way. + postInstall = '' + ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc + ''; + + meta = with stdenv.lib; { + description = "Open RTL synthesis framework and tools"; + homepage = "http://www.clifford.at/yosys/"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ shell thoughtpolice emily ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/zasm/default.nix b/nixpkgs/pkgs/development/compilers/zasm/default.nix new file mode 100644 index 000000000000..174092496bab --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/zasm/default.nix @@ -0,0 +1,44 @@ +{ fetchFromGitHub, zlib, stdenv }: +let + libs-src = fetchFromGitHub { + owner = "megatokio"; + repo = "Libraries"; + rev = "97ea480051b106e83a086dd42583dfd3e9d458a1"; + sha256 = "1kqmjb9660mnb0r18s1grrrisx6b73ijsinlyr97vz6992jd5dzh"; + }; +in +stdenv.mkDerivation { + pname = "zasm"; + version = "4.2.6"; + src = fetchFromGitHub { + owner = "megatokio"; + repo = "zasm"; + rev = "f1424add17a5514895a598d6b5e3982579961519"; + sha256 = "1kqnqdqp2bfsazs6vfx2aiqanxxagn8plx8g6rc11vmr8yqnnpks"; + }; + + buildInputs = [ zlib ]; + + configurePhase = '' + ln -sf ${libs-src} Libraries + ''; + + buildPhase = '' + cd Linux + make + ''; + + installPhase = '' + mkdir -p $out/bin + mv zasm $out/bin + ''; + + meta = with stdenv.lib; { + description = "Z80 / 8080 assembler (for unix-style OS)"; + homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; + license = licenses.bsd2; + maintainers = [ maintainers.turbomack ]; + platforms = platforms.linux; + badPlatforms = platforms.aarch64; + }; +} diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 90819d64c339..afa3c5338949 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1250,17 +1250,6 @@ self: super: { ''; }); - # Version bounds for http-client are too strict: - # https://github.com/bitnomial/prometheus/issues/34 - prometheus = doJailbreak super.prometheus; - - # Tasty-tap tests are out-of-date with TAP format - # https://github.com/MichaelXavier/tasty-tap/issues/2 - tasty-tap = appendPatch super.tasty-tap (pkgs.fetchpatch { - url = https://patch-diff.githubusercontent.com/raw/MichaelXavier/tasty-tap/pull/3.diff; - sha256 = "0l8zbc56dy8ilxl3k49aiknmfhgpcg3jhs72lh3dk51d0a09d9sv"; - }); - # The doctests in universum-1.5.0 are broken. The doctests in versions of universum after # 1.5.0 should be fixed, so this should be able to be removed. universum = dontCheck super.universum; @@ -1496,4 +1485,7 @@ self: super: { sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; }); + # Needs a version that's newer than LTS-15.x provides. + weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 513c55ea9e9c..c4c5ed9422f7 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -83,4 +83,7 @@ self: super: { # Newer versions don't compile. resolv = self.resolv_0_1_1_2; + # The old Haddock cannot process the newer documentation syntax. + fast-logger = dontHaddock super.fast-logger; + } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3c6845705336..c62797a304e9 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -76,7 +76,7 @@ default-package-overrides: # 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.3 + # LTS Haskell 15.5 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -88,7 +88,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.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -267,7 +267,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 @@ -407,7 +407,7 @@ default-package-overrides: - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - ChasingBottoms ==1.3.1.7 - - checkers ==0.5.4 + - checkers ==0.5.5 - checksum ==0.0 - chimera ==0.3.0.0 - choice ==0.2.2 @@ -448,6 +448,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 +467,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 @@ -617,7 +618,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 @@ -786,7 +787,6 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==1 - fused-effects ==1.0.2.0 - - fusion-plugin ==0.1.1 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 @@ -807,7 +807,7 @@ default-package-overrides: - generic-random ==1.3.0.0 - generics-sop ==0.5.0.0 - generics-sop-lens ==0.2 - - genvalidity ==0.10.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 @@ -835,12 +835,12 @@ default-package-overrides: - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-exactprint ==0.6.2 - - ghcid ==0.8.1 + - 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.3 + - 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 @@ -848,7 +848,7 @@ default-package-overrides: - ghc-tcplugins-extra ==0.4 - ghc-typelits-extra ==0.3.3 - ghc-typelits-knownnat ==0.7.2 - - ghc-typelits-natnormalise ==0.7.1 + - ghc-typelits-natnormalise ==0.7.2 - ghc-typelits-presburger ==0.3.0.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.21 @@ -935,6 +935,7 @@ default-package-overrides: - HaXml ==1.25.5 - haxr ==3000.11.4 - hdaemonize ==0.5.6 + - headroom ==0.1.2.0 - heap ==1.0.4 - heaps ==0.3.6.1 - heart-core ==0.1.1 @@ -1038,14 +1039,14 @@ default-package-overrides: - http2 ==2.0.3 - HTTP ==4000.3.14 - http-api-data ==0.4.1.1 - - http-client ==0.6.4 + - http-client ==0.6.4.1 - http-client-openssl ==0.3.0.0 - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.3.7.3 - http-date ==0.0.8 - - http-directory ==0.1.7 + - http-directory ==0.1.8 - http-download ==0.1.0.1 - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 @@ -1060,7 +1061,7 @@ default-package-overrides: - hvect ==0.4.0.0 - hvega ==0.5.0.0 - hw-balancedparens ==0.3.0.5 - - hw-bits ==0.7.1.2 + - hw-bits ==0.7.1.5 - hw-conduit ==0.2.0.6 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 @@ -1101,7 +1102,6 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.3 - hyphenation ==0.8 - - hyraxAbif ==0.2.3.21 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1113,7 +1113,7 @@ default-package-overrides: - Imlib ==0.1.2 - immortal ==0.3 - include-file ==0.1.0.4 - - incremental-parser ==0.4 + - incremental-parser ==0.4.0.1 - indents ==0.5.0.1 - indexed ==0.1.3 - indexed-list-literals ==0.2.1.2 @@ -1151,7 +1151,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 @@ -1403,7 +1403,7 @@ default-package-overrides: - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 - - names-th ==0.3.0.0 + - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 - nats ==1.1.2 @@ -1421,7 +1421,7 @@ default-package-overrides: - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 - - netwire-input-glfw ==0.0.10 + - netwire-input-glfw ==0.0.11 - network ==3.1.1.1 - network-bsd ==2.8.1.0 - network-byte-order ==0.1.4.0 @@ -1728,7 +1728,7 @@ 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 @@ -1771,7 +1771,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 @@ -1845,7 +1845,7 @@ default-package-overrides: - servant-swagger-ui-redoc ==0.3.3.1.22.3 - servant-websockets ==2.0.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.10.1 + - serverless-haskell ==0.10.2 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -1914,15 +1914,15 @@ default-package-overrides: - special-values ==0.1.0.0 - speculate ==0.4.1 - speedy-slice ==0.3.0 - - Spintax ==0.3.3 + - Spintax ==0.3.4 - splice ==0.6.1.1 - split ==0.2.3.4 - splitmix ==0.0.4 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - - sql-words ==0.1.6.3 + - sql-words ==0.1.6.4 - srcloc ==0.5.1.2 - - stache ==2.1.0 + - stache ==2.1.1 - stack-templatizer ==0.1.0.2 - starter ==0.3.0 - stateref ==0.3 @@ -2081,7 +2081,7 @@ default-package-overrides: - thyme ==0.3.5.5 - tidal ==1.4.8 - tile ==0.3.0.0 - - time-compat ==1.9.2.2 + - time-compat ==1.9.3 - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 @@ -2126,7 +2126,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.16 + - turtle ==1.5.17 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2180,7 +2180,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 @@ -2239,7 +2239,7 @@ default-package-overrides: - wai-app-static ==3.1.7.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.7 - - wai-enforce-https ==0.0.2 + - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - wai-extra ==3.0.29.1 - wai-handler-launch ==3.0.3.1 @@ -2319,7 +2319,7 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.2.0 + - yaml ==0.11.3.0 - yesod ==1.6.0.1 - yesod-auth ==1.6.9 - yesod-auth-hashdb ==1.7.1.2 @@ -2374,6 +2374,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 @@ -2458,12 +2459,10 @@ package-maintainers: - streaming-wai kiwi: # - glirc - - matterhorn - Unique psibi: - path-pieces - persistent - - persistent-postgresql - persistent-sqlite - persistent-template - shakespeare @@ -2473,9 +2472,10 @@ package-maintainers: - arion-compose cdepillabout: - pretty-simple - - purescript - spago - termonad + rkrzr: + - icepeak unsupported-platforms: alsa-mixer: [ x86_64-darwin ] @@ -2742,6 +2742,7 @@ broken-packages: - alex-prelude - alfred - alga + - algebra-checkers - algebra-dag - algebra-sql - algebraic @@ -2847,6 +2848,7 @@ broken-packages: - arbor-monad-metric - arbor-monad-metric-datadog - arbtt + - archive-libarchive - archive-tar-bytestring - archiver - archlinux @@ -2921,6 +2923,7 @@ broken-packages: - atomic-primops-vector - atomo - atp-haskell + - ats-pkg - ats-setup - ats-storable - attempt @@ -2969,15 +2972,26 @@ broken-packages: - awesomium-raw - aws-configuration-tools - aws-dynamodb-conduit + - aws-dynamodb-streams + - aws-easy + - aws-ec2 - aws-ec2-knownhosts - aws-elastic-transcoder + - aws-general + - aws-kinesis - aws-kinesis-client - aws-kinesis-reshard + - aws-lambda + - aws-lambda-haskell-runtime - aws-mfa-credentials - aws-performance-tests + - aws-route53 - aws-sdk + - aws-sdk-text-converter + - aws-sdk-xml-unordered - aws-sign4 - aws-simple + - aws-sns - axel - axiom - azubi @@ -3101,6 +3115,7 @@ broken-packages: - binary-tagged - binary-typed - bind-marshal + - BinderAnn - binding-core - binding-gtk - binding-wx @@ -3494,6 +3509,7 @@ broken-packages: - cgrep - chalkboard - chalkboard-viewer + - character-cases - charade - chart-cli - Chart-fltkhs @@ -3727,6 +3743,7 @@ broken-packages: - concurrent-buffer - Concurrent-Cache - concurrent-machines + - concurrent-resource-map - concurrent-state - concurrent-utilities - Concurrential @@ -3749,6 +3766,10 @@ broken-packages: - conduit-vfs-zip - conf - confcrypt + - conferer-hedis + - conferer-provider-dhall + - conferer-provider-yaml + - conferer-snap - confetti - conffmt - confide @@ -3851,6 +3872,7 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit + - cpkg - CPL - cplusplus-th - cprng-aes-effect @@ -4150,6 +4172,7 @@ broken-packages: - dhall-nix - dhall-text - dhall-to-cabal + - dhall-yaml - dhcp-lease-parser - dhrun - dia-base @@ -4284,6 +4307,7 @@ broken-packages: - doublify-toolkit - dow - download-media-content + - downloader - dozenal - dozens - DP @@ -4408,13 +4432,11 @@ broken-packages: - ekg-bosun - ekg-carbon - ekg-cloudwatch - - ekg-core - ekg-elastic - ekg-elasticsearch - ekg-influxdb - ekg-json - ekg-log - - ekg-prometheus-adapter - ekg-push - ekg-rrd - ekg-statsd @@ -4910,6 +4932,7 @@ broken-packages: - funspection - fused-effects-squeal - fusion + - fusion-plugin - futun - future - fuzzy-time-gen @@ -5030,6 +5053,7 @@ broken-packages: - ghc-srcspan-plugin - ghc-syb - ghc-syb-utils + - ghc-tags-plugin - ghc-time-alloc-prof - ghc-usage - ghc-vis @@ -5602,7 +5626,6 @@ broken-packages: - haskmon - haskoin - haskoin-bitcoind - - haskoin-core - haskoin-crypto - haskoin-node - haskoin-protocol @@ -5644,11 +5667,13 @@ broken-packages: - hasql-generic - hasql-implicits - hasql-migration + - hasql-notifications - hasql-optparse-applicative - hasql-pool - hasql-postgres - hasql-postgres-options - hasql-simple + - hasql-th - hastache - hastache-aeson - haste @@ -5731,6 +5756,7 @@ broken-packages: - hdph-closure - hdr-histogram - HDRUtils + - headed-megaparsec - headergen - headroom - heapsort @@ -5925,6 +5951,9 @@ broken-packages: - HLearn-datastructures - HLearn-distributions - hledger-api + - hledger-chart + - hledger-irr + - hledger-vty - hlibBladeRF - hlibev - hlibfam @@ -6416,7 +6445,6 @@ broken-packages: - iban - ical - iCalendar - - icepeak - IcoGrid - iconv-typed - ide-backend @@ -6979,6 +7007,7 @@ broken-packages: - lhe - lhs2TeX-hl - lhslatex + - libarchive - LibClang - libconfig - libcspm @@ -7092,6 +7121,7 @@ broken-packages: - llvm-base-types - llvm-base-util - llvm-data-interop + - llvm-dsl - llvm-extension - llvm-extra - llvm-ffi @@ -7204,6 +7234,7 @@ broken-packages: - lzma-streams - maam - mac + - macaroon-shop - macbeth-lib - machinecell - machines-amazonka @@ -7294,6 +7325,9 @@ broken-packages: - matrix-as-xyz - matrix-market - matsuri + - matterhorn + - mattermost-api + - mattermost-api-qc - maude - maxent - maxent-learner-hw @@ -7885,7 +7919,9 @@ broken-packages: - oidc-client - ois-input-manager - olwrapper + - om-actor - om-elm + - om-fail - omaketex - ombra - Omega @@ -7922,7 +7958,9 @@ broken-packages: - opensoundcontrol-ht - openssh-github-keys - openssh-protocol + - opentelemetry-http-client - opentelemetry-lightstep + - opentelemetry-wai - opentheory-char - opentok - opentype @@ -8157,6 +8195,7 @@ broken-packages: - persistent-migration - persistent-mongoDB - persistent-mysql-haskell + - persistent-postgresql - persistent-protobuf - persistent-ratelimit - persistent-redis @@ -8499,6 +8538,7 @@ broken-packages: - pure-priority-queue - pure-priority-queue-tests - purebred-email + - purescript - purescript-iso - purescript-tsd-gen - push-notifications @@ -8845,6 +8885,7 @@ broken-packages: - rethinkdb-client-driver - rethinkdb-model - rethinkdb-wereHamster + - retrie - retryer - reverse-geocoding - reversi @@ -8874,6 +8915,7 @@ broken-packages: - ring-buffer - ring-buffers - riot + - risc-v - risc386 - riscv-isa - Ritt-Wu @@ -8930,6 +8972,7 @@ broken-packages: - rpc-framework - rpf - rpm + - rrule - rsagl - rsagl-frp - rsagl-math @@ -8961,6 +9004,7 @@ broken-packages: - safe-failure-cme - safe-freeze - safe-globals + - safe-json - safe-lazy-io - safe-length - safe-money-xmlbf @@ -9072,7 +9116,6 @@ broken-packages: - seclib - second-transfer - secp256k1 - - secp256k1-haskell - secp256k1-legacy - secret-santa - secret-sharing @@ -9100,6 +9143,7 @@ broken-packages: - sendgrid-v3 - sensei - sensenet + - sensu-run - sentence-jp - sentry - seonbi @@ -9213,6 +9257,7 @@ broken-packages: - sha-streams - shade - shadower + - shake-bindist - shake-cabal-build - shake-extras - shake-minify @@ -9330,6 +9375,7 @@ broken-packages: - skews - skulk - skylark-client + - skylighting-lucid - skype4hs - slack - slack-notify-haskell @@ -9537,7 +9583,6 @@ broken-packages: - sql-simple-sqlite - sqlcipher - sqlite - - sqlite-simple - sqlite-simple-errors - sqlite-simple-typed - sqlvalue-list @@ -9837,7 +9882,6 @@ broken-packages: - tasty-laws - tasty-lens - tasty-stats - - tasty-tap - tateti-tateti - Taxonomy - TaxonomyTools @@ -10069,6 +10113,7 @@ broken-packages: - touched - Tournament - toxcore + - toxcore-c - toxiproxy-haskell - toysolver - tpar @@ -10080,6 +10125,7 @@ broken-packages: - traced - tracetree - tracing + - tracked-files - tracker - trackit - traction @@ -10381,6 +10427,7 @@ broken-packages: - validate-input - validated-types - Validation + - validation-selective - validations - validationt - value-supply diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 5824ce2f5e6d..ff1c01aa8e87 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -498,6 +498,9 @@ self: super: builtins.intersectAttrs super { # requires autotools to build secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ]; + # requires libsecp256k1 in pkgconfig-depends + secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1; + # tests require git and zsh hapistrano = addBuildTools super.hapistrano [ pkgs.buildPackages.git pkgs.buildPackages.zsh ]; diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 2caf04f479a1..12c78cc7b471 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -794,26 +794,26 @@ self: { "Agda" = callPackage ({ mkDerivation, aeson, alex, array, async, base, binary , blaze-html, boxes, bytestring, Cabal, containers, data-hash - , deepseq, directory, EdisonCore, edit-distance, emacs, equivalence - , exceptions, filepath, geniplate-mirror, gitrev, happy, hashable + , deepseq, directory, edit-distance, emacs, equivalence, exceptions + , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process , regex-tdfa, split, stm, strict, template-haskell, text, time - , unordered-containers, uri-encode, zlib + , transformers, unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.0.1"; - sha256 = "1s600ry1qwizr3ynyj05rvlx7jdcw9a1viyc0ycjamm5sjf8mf3v"; + version = "2.6.1"; + sha256 = "0af1nyyscdc4gr4l0k3ayq3rn8qxqkx1b7rh4mw023gkz1m433v7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ aeson array async base binary blaze-html boxes bytestring - containers data-hash deepseq directory EdisonCore edit-distance - equivalence exceptions filepath geniplate-mirror gitrev hashable + containers data-hash deepseq directory edit-distance equivalence + exceptions filepath geniplate-mirror ghc-compact gitrev hashable hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time + regex-tdfa split stm strict template-haskell text time transformers unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex happy ]; @@ -1484,6 +1484,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "BinderAnn" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-prim, mtl, split, syb + , transformers + }: + mkDerivation { + pname = "BinderAnn"; + version = "0.1.0.0"; + sha256 = "0fv5xrgqh7scbkzjisrh112zpggwl3rxfjzfqhx2rzdjgda3m41g"; + libraryHaskellDepends = [ + base containers ghc ghc-prim mtl split syb transformers + ]; + testHaskellDepends = [ + base containers ghc ghc-prim mtl split syb transformers + ]; + description = "Source-to-source plugin for enhancing EDSLs with static annotations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Binpack" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -7179,6 +7199,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 @@ -8007,8 +8038,8 @@ self: { }: mkDerivation { pname = "HExcel"; - version = "0.1.0.0"; - sha256 = "1g761qaqijwsnwinhbk44m967myz7iz8qfz60vhh9fljv89afifg"; + version = "0.1.0.1"; + sha256 = "0pa33yh2sqslhdr94bi17kysmf0j3gqhplcxrcafgip2gab9j626"; libraryHaskellDepends = [ base microlens microlens-th time transformers ]; @@ -9306,6 +9337,8 @@ self: { pname = "HTTP"; version = "4000.3.14"; sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6"; + revision = "1"; + editedCabalFile = "1inz9grpl9605bbymy6n5y4as54mlykbsiw8wpm5gl6qvxgrf69w"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9558,8 +9591,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 @@ -10753,8 +10786,8 @@ self: { }: mkDerivation { pname = "HsWebots"; - version = "0.1.1.2"; - sha256 = "02nm89dwm43yg5a99n9x72jf2y61rshqk6ka52s13qsg6d0bvhzv"; + version = "0.1.1.3"; + sha256 = "0ddbg63wfjwmrziaq0472iz7yhlcfsh2hrjqj02r1qavba35hzwa"; libraryHaskellDepends = [ base bytestring inline-c inline-c-cpp JuicyPixels safe-exceptions template-haskell vector @@ -14709,6 +14742,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "OneTuple_0_2_2_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "OneTuple"; + version = "0.2.2.1"; + sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc"; + libraryHaskellDepends = [ base ]; + description = "Singleton Tuple"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Only" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -16047,6 +16092,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) python3;}; + "PyF_0_9_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec + , HUnit, megaparsec, mtl, process, python3, template-haskell + , temporary, text + }: + mkDerivation { + pname = "PyF"; + version = "0.9.0.1"; + sha256 = "00pmpm2g7161bksc1l5clkghi0sbzh8y0f6xd52gwx9h6zxacns3"; + libraryHaskellDepends = [ + base containers haskell-src-exts haskell-src-meta megaparsec mtl + template-haskell text + ]; + testHaskellDepends = [ + base bytestring deepseq directory filepath hashable hspec HUnit + process template-haskell temporary text + ]; + testToolDepends = [ python3 ]; + description = "Quasiquotations for a python like interpolated string formater"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) python3;}; + "QIO" = callPackage ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { @@ -18408,19 +18477,6 @@ self: { ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; - version = "0.3.3"; - sha256 = "04vb07r26p4rxgsym5zhqsnyx4sr2a112sa31mdda5hjpy9j3pr1"; - libraryHaskellDepends = [ - attoparsec base extra mtl mwc-random text - ]; - description = "Random text generation based on spintax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spintax_0_3_4" = callPackage - ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: - mkDerivation { - pname = "Spintax"; version = "0.3.4"; sha256 = "008b83nnjgpzjr4c2dk1vambzb78dwx59c5cq4p0s8ghp6xl9sk3"; libraryHaskellDepends = [ @@ -18428,7 +18484,6 @@ self: { ]; description = "Random text generation based on spintax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock" = callPackage @@ -23418,24 +23473,26 @@ 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, attoparsec, base, base-compat + , base-compat-batteries, 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"; + version = "1.4.7.0"; + sha256 = "15ykkxa636jnx1zcyq4yxgjz78m5fp315gg0llbjf44jk4fbhndh"; + revision = "2"; + editedCabalFile = "1198bf628jc6ccn1dr23wia3rdyxhidi9hg83ykzm735ffgh9cxd"; 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 + attoparsec base base-compat-batteries 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 @@ -23449,6 +23506,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_4_7_1" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, 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.7.1"; + sha256 = "1502yjw4y5ggp1gmrx0d3pcgrx3zhwbmcz4jb4fcignrbxjldrq7"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -23874,8 +23964,8 @@ self: { }: mkDerivation { pname = "aeson-match-qq"; - version = "1.1.0"; - sha256 = "0qkj38b05klzwrgy0vyr9qnkllzz9v225b3d60f6mbx3q3nxdk9x"; + version = "1.2.0"; + sha256 = "000dna5xs5ybhr4vyla6ndj7ykk7lphg4dbcp7nn13746fnnggs2"; libraryHaskellDepends = [ aeson attoparsec base bytestring either haskell-src-meta scientific template-haskell text unordered-containers vector @@ -24267,16 +24357,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; @@ -25142,6 +25233,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "algebra-checkers" = callPackage + ({ mkDerivation, ansi-terminal, base, checkers, containers, groups + , mtl, pretty, QuickCheck, syb, template-haskell + , th-instance-reification, transformers + }: + mkDerivation { + pname = "algebra-checkers"; + version = "0.1.0.0"; + sha256 = "0phrm0lncqbjqsyxhk3ifmzfb2q42v6g81qklh49n1y73naykg9v"; + libraryHaskellDepends = [ + ansi-terminal base checkers containers groups mtl pretty QuickCheck + syb template-haskell th-instance-reification transformers + ]; + description = "Model and test API surfaces algebraically"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "algebra-dag" = callPackage ({ mkDerivation, aeson, base, containers, fgl, mtl, parsec , template-haskell, transformers @@ -25855,8 +25965,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 @@ -29662,6 +29772,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 @@ -31071,14 +31193,16 @@ self: { }: mkDerivation { pname = "archive-libarchive"; - version = "0.2.2.1"; - sha256 = "1rwvz196m837h5vxm7aqlyzc07h2y2q0czgpn8kwx2gjngpnmmdn"; + version = "0.2.2.2"; + sha256 = "12a7rvzbywz5kh403q0q612z1f2arb74jgjx9qk1vdhiyasgwnkh"; libraryHaskellDepends = [ base bytestring composition-prelude libarchive ]; libraryToolDepends = [ cpphs ]; description = "Common interface using libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archive-sig" = callPackage @@ -31431,8 +31555,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.1.0.0"; - sha256 = "11jg7y6gcgsm7pidqnpxi4smd5dbm7fnqw79pcqx60z32b0b99iz"; + version = "0.1.1.1"; + sha256 = "0qi9mj67j3kq02psm3qa855rk0hpz2pvfa7ggx4jhzqnf60xd9ph"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32416,6 +32540,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asn1-types_0_3_4" = callPackage + ({ mkDerivation, base, bytestring, hourglass, memory }: + mkDerivation { + pname = "asn1-types"; + version = "0.3.4"; + sha256 = "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq"; + libraryHaskellDepends = [ base bytestring hourglass memory ]; + description = "ASN.1 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asn1dump" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring, pem }: @@ -32558,6 +32694,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; @@ -32776,6 +32914,8 @@ self: { pname = "async"; version = "2.2.2"; sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb"; + revision = "1"; + editedCabalFile = "1kg9xmby0wkx31998h2r43yr8bl1aixk6025zqigz9vdhmkc2y51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -33415,6 +33555,8 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ats-setup" = callPackage @@ -33569,6 +33711,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_4" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.4"; + sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -34322,6 +34493,17 @@ self: { broken = true; }) {}; + "autopack" = callPackage + ({ mkDerivation, base, Cabal, dir-traverse, filepath }: + mkDerivation { + pname = "autopack"; + version = "0.0.0.0"; + sha256 = "1z1w6bvsfhnia2dxihcay6a9va2ik1bg805zkfb0vn4vcxn76dcc"; + libraryHaskellDepends = [ base Cabal dir-traverse filepath ]; + description = "Custom Setup to automate package modules discovery"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "autoproc" = callPackage ({ mkDerivation, base, directory, mtl, process, unix }: mkDerivation { @@ -34567,6 +34749,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro_0_5_0_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.0.0"; + sha256 = "01p7a56w7vg9q4ybfxyprw5cnnprava3nlay2vwq360ixw6m0s5z"; + 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 @@ -34723,8 +34943,8 @@ self: { }: mkDerivation { pname = "aws-cloudfront-signed-cookies"; - version = "0.2.0.1"; - sha256 = "1yk40n6gjs72pyi6yjwhqj0dngqc4b74rpg0ji61852nbb0snl28"; + version = "0.2.0.4"; + sha256 = "0j40760k1ackwhsy279ir8jybnvis5m56i5hy3rppjybhjiyyd4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34814,6 +35034,8 @@ self: { ]; description = "Haskell bindings for Amazon DynamoDB Streams"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-easy" = callPackage @@ -34837,6 +35059,8 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-ec2" = callPackage @@ -34866,6 +35090,8 @@ self: { ]; description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-ec2-knownhosts" = callPackage @@ -34939,6 +35165,8 @@ self: { ]; description = "Bindings for Amazon Web Services (AWS) General Reference"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-kinesis" = callPackage @@ -34964,6 +35192,8 @@ self: { ]; description = "Bindings for Amazon Kinesis"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-kinesis-client" = callPackage @@ -35049,6 +35279,8 @@ self: { ]; description = "Haskell bindings for AWS Lambda"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-lambda-haskell-runtime" = callPackage @@ -35058,8 +35290,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 @@ -35067,6 +35299,8 @@ 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 @@ -35156,6 +35390,8 @@ self: { ]; description = "Amazon Route53 DNS service plugin for the aws package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sdk" = callPackage @@ -35207,6 +35443,8 @@ self: { ]; description = "The text converter for aws-sdk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sdk-xml-unordered" = callPackage @@ -35227,6 +35465,8 @@ self: { ]; description = "The xml parser for aws-sdk package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-ses-easy" = callPackage @@ -35313,6 +35553,8 @@ self: { ]; description = "Bindings for AWS SNS Version 2013-03-31"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "axel" = callPackage @@ -36280,8 +36522,8 @@ self: { ({ mkDerivation, base, base-compat }: mkDerivation { pname = "base-compat-migrate"; - version = "0.1.1.0"; - sha256 = "1k7yjqqc9kd2a1dch33hs3xiyh868a83klx9iz69ix72khacggvk"; + version = "0.2.0.1"; + sha256 = "18nyacdji89ys6h7hw28b6rz6p9gkasd4c0l7awz79wp0w8a0cdm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; @@ -36403,8 +36645,8 @@ self: { }: mkDerivation { pname = "base16"; - version = "0.1.2.1"; - sha256 = "1dqkqyyqdym48fh59zz3jyvhbbc70q37fvx2zv80cmysa929d1fr"; + version = "0.1.3.0"; + sha256 = "0gjcf05c604dqb0av25p24m0f5r1g6h4bv24lccrbc614w2gng5j"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring memory random-bytestring tasty @@ -36435,8 +36677,8 @@ self: { }: mkDerivation { pname = "base16-lens"; - version = "0.1.0.0"; - sha256 = "17cckwpl3c7bf6jj8l1jbwpb0hlsqp7iv3mllb59gp38nfdn51rd"; + version = "0.1.1.0"; + sha256 = "056fskaj5g19yp8fzvvx3ij60hhk4i7xind1pdzv3ark2ywy1d21"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base16 bytestring lens text ]; testHaskellDepends = [ base doctest lens ]; @@ -38503,6 +38745,8 @@ self: { pname = "bin"; version = "0.1"; sha256 = "008i0yxvg9v05gby6ysq3f7ygh125p9xa5vwrcrbq5xw79igyzq5"; + revision = "1"; + editedCabalFile = "1v62ca89qdzcm03ziwaq335cwd66mwl854c6gf61vnplrbznqm33"; libraryHaskellDepends = [ base dec deepseq fin hashable QuickCheck ]; @@ -38729,10 +38973,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 @@ -41095,6 +41337,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; + "bitvec_1_0_3_0" = callPackage + ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp + , integer-gmp, primitive, quickcheck-classes, random, tasty + , tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "bitvec"; + version = "1.0.3.0"; + sha256 = "0s3gdh2rgz9wdnin5h2yhvnr8gy3sgcl9sbb1k4069ap4svrg8hd"; + libraryHaskellDepends = [ + base deepseq ghc-prim integer-gmp primitive vector + ]; + librarySystemDepends = [ gmp ]; + testHaskellDepends = [ + base integer-gmp primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base containers gauge integer-gmp random vector + ]; + description = "Space-efficient bit vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gmp;}; + "bitwise" = callPackage ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { @@ -43657,8 +43924,8 @@ self: { pname = "brittany"; version = "0.12.1.1"; sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z"; - revision = "1"; - editedCabalFile = "0wqg0yl3da1dgpqqv5q0ml3k0njn7pgipaac4vd9gidv3d1pyd74"; + revision = "2"; + editedCabalFile = "0pfrm5vvh7x94f8gy8ka6rmq6yk6xxxgba68rd91bk8lbjxsmkxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43993,6 +44260,29 @@ self: { broken = true; }) {}; + "bson_0_4_0_1" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , data-binary-ieee754, mtl, network, QuickCheck, test-framework + , test-framework-quickcheck2, text, time + }: + mkDerivation { + pname = "bson"; + version = "0.4.0.1"; + sha256 = "1xmxhq1f8v00mbq2l1sb7akzhy0gd9wcylkanpizn68wczqkdi3b"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 data-binary-ieee754 mtl + network text time + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 text time + ]; + description = "BSON documents are JSON-like objects with a standard binary encoding"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bson-generic" = callPackage ({ mkDerivation, base, bson, ghc-prim, text }: mkDerivation { @@ -44783,8 +45073,8 @@ self: { pname = "butcher"; version = "1.3.2.3"; sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5"; - revision = "1"; - editedCabalFile = "06vy9018ia6sncgxdmv4ili2krkqn1b6r7xz4raa18kdvgnl100v"; + revision = "2"; + editedCabalFile = "1751sllw8s81x3s1dhilbr5lqnv9cpdqiv17c8by466aa6304dxa"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -44921,10 +45211,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.3.2.1"; - sha256 = "196c75i7cz7yww3d5pi5p51wd5bf3a8v8nsb2vkiv25ndwrsb20w"; - revision = "1"; - editedCabalFile = "1bkrhwi851qq6jd3wcajypqi3aha66hsr0jq1h8wgqpgm6mg0abl"; + version = "0.4.0.0"; + sha256 = "1q8xb5b194ywm1sacxx47yhicww3m9hpffidgpj6l79fjqivgv09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45062,6 +45350,8 @@ self: { pname = "bytes"; version = "0.17"; sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3"; + revision = "1"; + editedCabalFile = "0pa787mwyic7bhbxpcp2dh86vhdccbdiakxss2c084h8hd8c1g97"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable @@ -45703,10 +45993,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 ]; @@ -46105,8 +46393,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 = [ @@ -46288,8 +46576,8 @@ 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 ]; @@ -46324,6 +46612,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 @@ -46911,8 +47222,8 @@ 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 ]; @@ -47033,8 +47344,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.15.0"; - sha256 = "1xfskgmwr75f1lk8a6mllp2h62jdl7hkwb01r74gpi0n6h17p3nm"; + version = "2.15.1"; + sha256 = "1gdwri0x7kw96y0c6j9rdqa68arrxkpisq43ld58applxcvr1cs7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48152,19 +48463,19 @@ self: { }) {}; "capability" = callPackage - ({ mkDerivation, base, containers, dlist, exceptions, generic-lens - , hspec, lens, monad-control, monad-unlift, mtl, mutable-containers - , primitive, safe-exceptions, silently, streaming, temporary, text - , transformers, unliftio, unliftio-core + ({ mkDerivation, base, constraints, containers, dlist, exceptions + , generic-lens, hspec, lens, monad-control, monad-unlift, mtl + , mutable-containers, primitive, safe-exceptions, silently + , streaming, temporary, text, transformers, unliftio, unliftio-core }: mkDerivation { pname = "capability"; - version = "0.2.0.0"; - sha256 = "0jssnbqrhkkfkjzya8qprk89r8vqzzy45sm9bwhw2rwx8mrbn40q"; + version = "0.3.0.0"; + sha256 = "1kha2y1x63af43psl708c0iib0ign4jrs2n4s2jl4a0pb7hlcdcz"; libraryHaskellDepends = [ - base dlist exceptions generic-lens lens monad-control monad-unlift - mtl mutable-containers primitive safe-exceptions streaming - transformers unliftio unliftio-core + base constraints dlist exceptions generic-lens lens monad-control + monad-unlift mtl mutable-containers primitive safe-exceptions + streaming transformers unliftio unliftio-core ]; testHaskellDepends = [ base containers hspec lens mtl silently streaming temporary text @@ -49040,6 +49351,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 @@ -50468,6 +50781,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "character-cases" = callPackage + ({ mkDerivation, base, containers, doctest, Glob, here, megaparsec + , prettyprinter, template-haskell + }: + mkDerivation { + pname = "character-cases"; + version = "0.1.0.1"; + sha256 = "0ywxda9hbylzlf5zyg9x8n65bwdfwgg3vvjl2i2kzj48gkm4kqxy"; + libraryHaskellDepends = [ + base containers here megaparsec prettyprinter template-haskell + ]; + testHaskellDepends = [ + base containers doctest Glob here megaparsec prettyprinter + template-haskell + ]; + description = "Exposes subspecies types of Char. And naming cases."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "charade" = callPackage ({ mkDerivation, base, configurator, containers, filepath, heist , lens, mtl, QuickCheck, random, snap, snap-core, snap-extras @@ -50735,6 +51069,8 @@ self: { pname = "cheapskate"; version = "0.1.1.2"; sha256 = "17n6laihqrjn62l8qw4565nf77zkvrl68bjmc3vzr4ckqfblhdzd"; + revision = "1"; + editedCabalFile = "15hdlp062gv8x7giwcfbj1kfmhpj1bg7y2w4wr2yl436haxkrbmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50856,8 +51192,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.5.4"; - sha256 = "09g1430hjqxy01w0rgp0d03z2y8nw2zjyvfxs0kl9j0gyv57a10v"; + version = "0.5.5"; + sha256 = "1g16603803xzz73md1azlcpd6xz7gkwjpy66l638v6lvipdl9hr9"; libraryHaskellDepends = [ array base QuickCheck random semigroupoids ]; @@ -51061,6 +51397,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chimera_0_3_1_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, gauge, mtl + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, vector + }: + mkDerivation { + pname = "chimera"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chiphunk" = callPackage ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar , vector-space @@ -54389,8 +54747,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 @@ -54415,8 +54773,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.2.7"; - sha256 = "0gf0amdlkzrar154vmqx952c5p7hbqm6qay47w7m0xb6p2qgvrv7"; + version = "0.1.2.10"; + sha256 = "00fxjp0qwj0234d3h91pb9qn1l6p4ba36rjpvl0yxfkl3ipfv0kr"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -54671,27 +55029,25 @@ self: { }) {}; "codex" = callPackage - ({ mkDerivation, ascii-progress, base, bytestring, Cabal - , containers, cryptohash, directory, filepath, hackage-db - , http-client, lens, machines, machines-directory, network, process - , tar, text, transformers, wreq, yaml, zlib + ({ mkDerivation, ascii-progress, base, bytestring, Cabal, conduit + , containers, cryptonite, directory, filepath, hackage-db + , http-client, http-client-tls, memory, network, process, tar, text + , transformers, yaml, zlib }: mkDerivation { pname = "codex"; - version = "0.5.2.0"; - sha256 = "1bvz8pzh9qgb7ffnmihcain877igf1hm8rs4z9qx1gckz2c566vv"; - revision = "1"; - editedCabalFile = "0v0jlarip2689jxixymqzy36qywla76j78iqzyyc6s7hrd63mrlx"; + version = "0.6.0.0"; + sha256 = "1xak07a2sn2fafrng53n8yksf6z73wn2r8paqymmc4385shhmndc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ascii-progress base bytestring Cabal containers cryptohash - directory filepath hackage-db http-client lens machines - machines-directory process tar text transformers wreq yaml zlib + ascii-progress base bytestring Cabal conduit containers cryptonite + directory filepath hackage-db http-client memory process tar text + transformers yaml zlib ]; executableHaskellDepends = [ - ascii-progress base Cabal directory filepath hackage-db network - process transformers wreq yaml + ascii-progress base Cabal directory filepath hackage-db + http-client-tls network process transformers yaml ]; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; @@ -56654,8 +57010,8 @@ self: { pname = "compositional-data"; version = "0.1.0.1"; sha256 = "1pw7xqzin7v9xxjkm7xixf5d6r5jmgdgyvyhpsmn8bdqp8rrwgzj"; - revision = "1"; - editedCabalFile = "167j8vjxv8lf4h92dqag8wdz7k8sp2678s72afs0wig2sy4hm720"; + revision = "2"; + editedCabalFile = "1frk7dr9kqk5s4ngni3ygvi1g6g7wlnc6cqhrml3xyj1zj5c8chi"; libraryHaskellDepends = [ base bifunctor category transformers util ]; @@ -57310,12 +57666,14 @@ self: { ({ mkDerivation, base, containers, random, stm }: mkDerivation { pname = "concurrent-resource-map"; - version = "0.1.0.0"; - sha256 = "05zgjb2plrk35fiyskk07jfiydi4mlk6awbfjvhnsa3qi11pxdly"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base random stm ]; + version = "0.2.0.0"; + sha256 = "1m66x54rvw95gm63nh18w8jcny4r9ri19am870rbnlvb572zxsjz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers random stm ]; description = "Concurrent resource map"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concurrent-rpc" = callPackage @@ -57571,8 +57929,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.1.2"; - sha256 = "12c21vrij63z60y3xd0dkg0da8sdhfq6nj5s3p5qknys5klwpqkq"; + version = "1.3.2"; + sha256 = "0vmcyi3f280b6ll6pcyma4aqrl6m69n6y6x7wplxgsmxz5q7kng3"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mono-traversable mtl primitive resourcet text transformers unix unliftio-core vector @@ -57786,8 +58144,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.4"; - sha256 = "1d853d39vj5pb8yxfcsnjwdzqzkm34ixzbnba8bslpihb7182wxi"; + version = "1.3.5"; + sha256 = "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a"; libraryHaskellDepends = [ async attoparsec base bytestring conduit directory filepath network primitive process resourcet stm streaming-commons text transformers @@ -58167,6 +58525,8 @@ self: { testHaskellDepends = [ base conferer hedis hspec text ]; description = "conferer's FromConfig instances for hedis settings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-hspec" = callPackage @@ -58212,6 +58572,8 @@ self: { ]; description = "Configuration for reading dhall files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-provider-json" = callPackage @@ -58271,6 +58633,8 @@ self: { ]; description = "Configuration for reading yaml files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-snap" = callPackage @@ -58289,6 +58653,8 @@ self: { ]; description = "conferer's FromConfig instances for snap Config"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-warp" = callPackage @@ -58443,6 +58809,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 @@ -58475,8 +58843,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 ]; @@ -58490,6 +58858,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; @@ -60932,6 +61302,8 @@ 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 @@ -62043,6 +62415,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 @@ -62467,6 +62862,17 @@ self: { broken = true; }) {}; + "crypto-token" = callPackage + ({ mkDerivation, array, base, cryptonite, memory }: + mkDerivation { + pname = "crypto-token"; + version = "0.0.0.0"; + sha256 = "1azvzzf4w6q76fbggw4f4inqibkvzy9chpdd01349rm8b0nyfh50"; + libraryHaskellDepends = [ array base cryptonite memory ]; + description = "crypto tokens"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "crypto-totp" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, cryptohash , tagged, unix @@ -62528,8 +62934,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 @@ -62646,8 +63052,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 ]; @@ -63100,6 +63506,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 @@ -67936,8 +68380,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; @@ -68746,8 +69190,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 ]; @@ -68788,12 +69232,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; }) {}; @@ -68822,8 +69266,8 @@ 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 ]; @@ -69087,15 +69531,15 @@ 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 @@ -69162,8 +69606,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2"; - sha256 = "0d9f4xjczks79vrlw93q7jg32s3ygwl488v6ql8lr4rfvbxzik23"; + version = "0.2.2"; + sha256 = "0hv7c9fyfm9zynz5kha1ws0qsizkrcjnwy84lhyixxzlqh3rl16d"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -69951,6 +70395,8 @@ self: { ]; description = "Convert between Dhall and YAML"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -70725,8 +71171,8 @@ self: { ({ mkDerivation, base, parsec, random-fu, transformers }: mkDerivation { pname = "dice"; - version = "0.1"; - sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1"; + version = "0.1.0.1"; + sha256 = "1jybckq3wf3vs0d92ji6a6mlgw64afhwdr6b0w2p1d97zp2fsdn3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec random-fu transformers ]; @@ -71587,8 +72033,8 @@ self: { }: mkDerivation { pname = "dir-traverse"; - version = "0.2.2.2"; - sha256 = "0wckqnfmdmfgp7kkvjc2pzg9610xqfnam5myv9xcq04cr3h3dy8g"; + version = "0.2.2.3"; + sha256 = "1nn85mfjsg1w3c9bz4f3igkh1ss0927zaqcz5p9qhwsf8f4wqr3x"; libraryHaskellDepends = [ base directory filepath ]; benchmarkHaskellDepends = [ base criterion directory dirstream pipes pipes-safe system-filepath @@ -71947,8 +72393,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.4.0"; - sha256 = "1011zrn5axjm44zmnj21q3w33pwwkciici2zf2sqz2plvkxn4c1w"; + version = "1.5.0"; + sha256 = "1449ap68c917z1318wg67cv7yk7cmfr61m0ikbf132gzsfyx69kv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73158,8 +73604,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.3"; - sha256 = "095wmsflwm4wqlvk2h7s64nqacha8did10av9n52pj3kcwczqx2i"; + version = "0.7.4"; + sha256 = "092fmla7a0xbnfac6izcj08wsyxbd04n23cjy33c132lqhs5k6w5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73205,8 +73651,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 ]; @@ -73475,8 +73921,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.8.2.0"; - sha256 = "1czji489jj0f18shcx4likz8l46zwvq9vabrn1wv1lyh19nnk1k8"; + version = "0.19.0.0"; + sha256 = "05nw8szg4hw7vwjp1fq5jps0yq9ivdqy3bf62qfcrr631ab1ba4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74497,6 +74943,8 @@ self: { ]; description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dozenal" = callPackage @@ -76480,11 +76928,11 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.0"; - sha256 = "1ng9lin5cavmcrp60lrnqxfkhb5drhlk9nzrl8d6gr1g7zfj75qm"; + 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 ]; @@ -76496,8 +76944,8 @@ self: { ({ mkDerivation, base, bytestring, eccrypto }: mkDerivation { pname = "eccrypto-ed25519-bindings"; - version = "0.1.0.0"; - sha256 = "1yi93a9x5sl3h50cky7l9df3077kwr3grp2iw9s5iykcwi6jdzg7"; + version = "0.1.2.0"; + sha256 = "1j2h568k2j8kpclvam3hghi13ddyas5d7c8nf469gwr80wmnyqxs"; libraryHaskellDepends = [ base bytestring eccrypto ]; description = "provides \"ed25519\" API using \"eccrypto\""; license = stdenv.lib.licenses.bsd3; @@ -77390,8 +77838,8 @@ self: { pname = "ekg"; version = "0.4.0.15"; sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; - revision = "6"; - editedCabalFile = "012y235n8k7hhx651l01xf88vgr2wskapbsn83w18ls1h1njqnzk"; + revision = "7"; + editedCabalFile = "1p6mq14si3bqgw4b1frdfj5cbqpz3p399q8wipk6z95yyg129f6i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -77465,16 +77913,14 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.6"; - sha256 = "0hjprlx99k7mgs2zn06yckir71dvz90xs24g2r990r97mmwxva36"; + version = "0.1.1.7"; + sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; benchmarkHaskellDepends = [ base ]; description = "Tracking of system metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-elastic" = callPackage @@ -77539,8 +77985,8 @@ self: { pname = "ekg-json"; version = "0.1.0.6"; sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; - revision = "4"; - editedCabalFile = "16sn4nbqm0rxkf0swi6r2jn6z9x92qmcg9xlx258d98kqb5fkwjg"; + revision = "5"; + editedCabalFile = "0qc3fdycamm97lhhvwgvl8kvj169qrwr5ds4vkvyclpv0s90ijva"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -77585,8 +78031,6 @@ self: { testHaskellDepends = [ base ]; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-push" = callPackage @@ -77638,8 +78082,8 @@ self: { pname = "ekg-statsd"; version = "0.2.4.0"; sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y"; - revision = "3"; - editedCabalFile = "0va7fliya7g546f5qbc42bl7dyh74al38sspd2smjyl7a9d5mmlk"; + revision = "4"; + editedCabalFile = "0mrar804w2m57zg9bd0qkp4vbkzmgi46478v6z7qcz7qpd8vml9d"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -77792,6 +78236,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 { @@ -78159,19 +78622,19 @@ self: { }) {}; "elm-syntax" = callPackage - ({ mkDerivation, base, bound, deriving-compat, prettyprinter - , protolude, text, unordered-containers + ({ mkDerivation, base, bound, deriving-compat, hashable + , prettyprinter, text, unordered-containers }: mkDerivation { pname = "elm-syntax"; - version = "0.2.0.0"; - sha256 = "1fqfsk3xnvl8j49rarchabvw8lq8mflzyzawq5myi74w1gd6ril8"; + version = "0.3.0.0"; + sha256 = "0pv0ly51wpbfr11rng57pasn5sgq7xz986jy36n8qb03q6irvsn9"; libraryHaskellDepends = [ - base bound deriving-compat prettyprinter protolude text + base bound deriving-compat hashable prettyprinter text unordered-containers ]; testHaskellDepends = [ - base bound deriving-compat prettyprinter protolude text + base bound deriving-compat hashable prettyprinter text unordered-containers ]; description = "Elm syntax and pretty-printing"; @@ -79682,6 +80145,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "equational-reasoning_0_6_0_2" = callPackage + ({ mkDerivation, base, containers, template-haskell, th-desugar + , th-extras, void + }: + mkDerivation { + pname = "equational-reasoning"; + version = "0.6.0.2"; + sha256 = "0zahv50jnbaaiwa7gy7w901fyqjk816gcd3fx9km0nacsjrgal4v"; + libraryHaskellDepends = [ + base containers template-haskell th-desugar th-extras void + ]; + description = "Proof assistant for Haskell using DataKinds & PolyKinds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equational-reasoning-induction" = callPackage ({ mkDerivation, base, singletons, template-haskell, th-extras }: mkDerivation { @@ -80322,6 +80801,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "esqueleto_3_3_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql + , mysql-simple, persistent, persistent-mysql, persistent-postgresql + , persistent-sqlite, persistent-template, postgresql-libpq + , postgresql-simple, resourcet, tagged, text, time, transformers + , unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "esqueleto"; + version = "3.3.2"; + sha256 = "0f901hric0qzfnrpbvlgjvcgcsywbqfjcrrid6cwnmsv8pxnxmc3"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec monad-logger mtl mysql mysql-simple persistent + persistent-mysql persistent-postgresql persistent-sqlite + persistent-template postgresql-libpq postgresql-simple resourcet + tagged text time transformers unliftio unordered-containers vector + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -81191,8 +81699,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.6.0"; - sha256 = "06v2g84hxcc7w4idhkfdix3c2yk9qdx91ys83abn7z7jjc24x2hs"; + version = "0.7.0"; + sha256 = "045ihz620xv6qhic3vy257g59l1ly2sld6dcnq28xblsf461krv1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81331,23 +81839,23 @@ self: { "eventstore" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, file-embed, hashable - , http-client, interpolate, lifted-async, lifted-base - , monad-control, monad-logger, mono-traversable, mtl, protobuf - , random, safe, safe-exceptions, semigroups, stm, stm-chans - , streaming, tasty, tasty-hspec, tasty-hunit, text, time - , transformers-base, unordered-containers, uuid, vector + , exceptions, fast-logger, file-embed, hashable, http-client + , interpolate, lifted-async, lifted-base, monad-control + , monad-logger, mono-traversable, mtl, protobuf, random, safe + , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty + , tasty-hspec, tasty-hunit, text, time, transformers-base + , unordered-containers, uuid, vector }: mkDerivation { pname = "eventstore"; - version = "1.3.3"; - sha256 = "0xf67ywg2f1wj75s82s2lsi2zgvk1xqhl09c4hnl45qzslkbl2xp"; + version = "1.4.0"; + sha256 = "0p7xfvdm4bjdp23f1ikfyq1gbylxav6b3wmbxhmscmzai396al12"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base - monad-control monad-logger mono-traversable mtl protobuf random - safe safe-exceptions semigroups stm stm-chans streaming text time + containers dns dotnet-timespan exceptions fast-logger hashable + http-client interpolate lifted-async lifted-base monad-control + monad-logger mono-traversable mtl protobuf random safe + safe-exceptions semigroups stm stm-chans streaming text time transformers-base unordered-containers uuid vector ]; testHaskellDepends = [ @@ -82560,8 +83068,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.7.1"; - sha256 = "1vmn2ziv8qnw22pkfy1c80hym7cprv70xz0mqi5076glwdjkx3gr"; + version = "0.8"; + sha256 = "1p5mnzk4x6dk8gyr3n47wlndnqf8w7112whr872355zqyvcxlsq6"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim hashable membership monad-skeleton prettyprinter primitive @@ -83268,8 +83776,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.0"; - sha256 = "0vkg1siaiq6dj1i0dnfdcdswr7fw4shn92wyfj8lxrj6krmfjrni"; + version = "1.0.1.1"; + sha256 = "1wz7f1ai73xc5n06db8mjbmbdyf5r9p78ysx3q1yiq32h2mvjd3m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83782,8 +84290,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; @@ -83992,7 +84500,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fb_2_1_0" = callPackage + "fb_2_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit , conduit-extra, containers, cryptonite, data-default, hspec , http-client, http-conduit, http-types, HUnit, memory @@ -84001,8 +84509,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "2.1.0"; - sha256 = "18h16dkyh35q0wyjvri7z2q2j8rx4bb6ma2bf6h2cdm7jh6zdakq"; + version = "2.1.1"; + sha256 = "0j2rckrv1aksfp2wyiyffqg40jl927vs97fk2lyzkscz673jd9s9"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra cryptonite data-default http-client http-conduit http-types memory @@ -84123,8 +84631,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 ]; @@ -84450,6 +84958,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed_1_3_0_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, HUnit + , markdown-unlit, old-locale, old-time, safe, syb, test-framework + , test-framework-hunit, text, time, time-locale-compat, utf8-string + , xml-conduit, xml-types + }: + mkDerivation { + pname = "feed"; + version = "1.3.0.1"; + sha256 = "0fdylvbrjlshgx398xpxx3y7mnrmpi1l2534mcv299afpm91yqcj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat bytestring old-locale old-time safe text time + time-locale-compat utf8-string xml-conduit xml-types + ]; + testHaskellDepends = [ + base base-compat HUnit old-time syb test-framework + test-framework-hunit text time xml-conduit xml-types + ]; + testToolDepends = [ markdown-unlit ]; + description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "feed-cli" = callPackage ({ mkDerivation, base, directory, feed, old-locale, old-time, time , xml @@ -85077,6 +85610,8 @@ self: { pname = "ffunctor"; version = "1.2.0"; sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w"; + revision = "1"; + editedCabalFile = "0biwzy37ig69s7l4x2cp0p71w3fn1azfd81vsj39fzn4kpcrpgld"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -85638,8 +86173,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 ]; @@ -85765,6 +86300,8 @@ self: { pname = "fin"; version = "0.1.1"; sha256 = "0zwc8x2ilbk1bhsk85brf6g300cx4w2j3602gjh6rv900961gqri"; + revision = "1"; + editedCabalFile = "0q2g83rs0zk8gbdnbqyzy42vqfyalsb8pgq3z0lwjpzaqkxmgvcc"; libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -86362,6 +86899,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-length_0_2_2" = callPackage + ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht + }: + mkDerivation { + pname = "fixed-length"; + version = "0.2.2"; + sha256 = "1bx46n11k9dpr5hhfhxiwdd5npaqf9xwvqvjd0nlbylfmsmgd14y"; + libraryHaskellDepends = [ + base non-empty storable-record tfp utility-ht + ]; + description = "Lists with statically known length based on non-empty package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixed-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -89341,6 +89893,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free-categories_0_2_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "free-categories"; + version = "0.2.0.0"; + sha256 = "0932bvy2cgmancjy4invm9m16w27kawlfmd3zy9xi8sl9a62rp38"; + libraryHaskellDepends = [ base ]; + description = "free categories"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-category" = callPackage ({ mkDerivation, base, criterion, free-algebras, QuickCheck, tasty , tasty-quickcheck @@ -89920,6 +90484,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 { @@ -90132,8 +90711,8 @@ self: { }: mkDerivation { pname = "front"; - version = "0.0.0.3"; - sha256 = "0n2w3rcl20njqrxx9ws2jrw3yjrxhxzl6q916apyh07bricmmkw9"; + version = "0.0.0.6"; + sha256 = "0380d9c9mv8jp04igjm4h9njijgc18x34xg13d5pgm7f5yz8aipk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91399,17 +91978,6 @@ self: { }) {}; "fusion-plugin" = callPackage - ({ mkDerivation, base, ghc, syb }: - mkDerivation { - pname = "fusion-plugin"; - version = "0.1.1"; - sha256 = "15bjjsxck6682nva7mahss87rxlzw8j66hzkhji122swyvgd89a1"; - libraryHaskellDepends = [ base ghc syb ]; - description = "GHC plugin to make stream fusion more predictable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fusion-plugin_0_2_0" = callPackage ({ mkDerivation, base, fusion-plugin-types, ghc, syb }: mkDerivation { pname = "fusion-plugin"; @@ -91419,6 +91987,7 @@ self: { description = "GHC plugin to make stream fusion more predictable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fusion-plugin-types" = callPackage @@ -91447,10 +92016,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.14.1"; - sha256 = "1bg0r9b0jg9j12lcc6wa684yjm58l020m9x5abpc54cghigywswj"; - revision = "1"; - editedCabalFile = "0iqg18jz8lgbh9iq1zgs8j9q5smzzi8w1asryz4dx8y6dl7n97p5"; + version = "0.15.2"; + sha256 = "064mvm52iklxzxymd3r563vw05001051zkcffc9wd3jwlwqbffg2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93075,6 +93642,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"; @@ -93192,6 +93761,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-random_1_3_0_1" = callPackage + ({ mkDerivation, base, deepseq, inspection-testing, QuickCheck }: + mkDerivation { + pname = "generic-random"; + version = "1.3.0.1"; + sha256 = "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base deepseq inspection-testing QuickCheck + ]; + description = "Generic random generators for QuickCheck"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-records" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -93617,8 +94201,8 @@ self: { }: mkDerivation { pname = "genvalidity"; - version = "0.10.0.1"; - sha256 = "0zyg3a0gqcdhdqy8w8ydqpcq7k6vbsb77v2dw31j2yfss1av4q2x"; + 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"; @@ -94535,12 +95119,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; }) {}; @@ -94791,6 +95375,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 { @@ -94940,6 +95548,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 @@ -94959,6 +95587,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 @@ -94966,8 +95614,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.5.3"; - sha256 = "0svjfrsq7r1hvpjp0bk4jqq9z6gm441hsv5zb1yljw9p9b20kbk6"; + version = "8.8.5.8"; + sha256 = "1mw1ym5bn39z7lqmxnhhkfqb0kbxddabkafw025wgs54knsghvmk"; libraryHaskellDepends = [ base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate ]; @@ -94978,17 +95626,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_8_5_5" = callPackage + "ghc-lib-parser-ex_8_10_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit , uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.5.5"; - sha256 = "15rp1829zzppz3y014cac1ssmklssn5hsfvadqrzkzmnky2yr215"; + version = "8.10.0.0"; + sha256 = "1d9614pdy78z96l7zy0w33hk5kmf0pbiwm7zvagjjd53n5rvxly5"; libraryHaskellDepends = [ - base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate + base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; testHaskellDepends = [ base directory extra filepath ghc ghc-boot-th tasty tasty-hunit @@ -95417,16 +96065,16 @@ self: { }) {}; "ghc-tags-plugin" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, filepath, ghc, lattices, QuickCheck - , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text + ({ mkDerivation, attoparsec, base, bytestring, directory, filelock + , filepath, ghc, lattices, QuickCheck, quickcheck-instances, tasty + , tasty-golden, tasty-quickcheck, text }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.1.4.0"; - sha256 = "0ci82krwqiprh23p316n1k09z6ja962xscnx9ycqpsyywbgkcqk4"; + version = "0.1.5.0"; + sha256 = "065i5xdf5i0xxj8q2aah2p9n30n65w0r60rfd49bih1iisfk0ljn"; libraryHaskellDepends = [ - attoparsec base bytestring containers directory filepath ghc text + attoparsec base bytestring directory filelock filepath ghc text ]; testHaskellDepends = [ attoparsec base bytestring lattices QuickCheck quickcheck-instances @@ -95435,6 +96083,20 @@ self: { doHaddock = false; description = "A compiler plugin which generates tags file from GHC 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 @@ -95566,24 +96228,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.1"; - sha256 = "1sbwzbs3bnvyla44kcsxs6h12sdfqzbm6n0swy2scp5p271fr0i3"; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra integer-gmp syb - transformers - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_7_2" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra - , integer-gmp, syb, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; version = "0.7.2"; sha256 = "1hk2f2vqkpia7kv7pqwf942y1w9m7mvmikzabkrjp8f8gijcsk52"; libraryHaskellDepends = [ @@ -95593,7 +96237,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-presburger" = callPackage @@ -95837,34 +96480,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.8.1"; - sha256 = "1k5yk9ba6g2x0wsqx1zb9zviqp9p7myd628fxi2rf4wjh0kkjc4c"; - 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_3" = 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.3"; - sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7"; + version = "0.8.5"; + sha256 = "15zj78wasix4yz8mxx5hl6x1gj364vsbwn5arp7sbq13rywhs2qy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95880,7 +96497,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcide" = callPackage @@ -98736,8 +99352,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"; @@ -103061,8 +103677,8 @@ self: { ({ mkDerivation, base, criterion, hedgehog }: mkDerivation { pname = "grab"; - version = "0.0.0.1"; - sha256 = "1jsi8g538w4a441w412siqvrkzmvx8sff74nax93b5paiaqfwcrf"; + version = "0.0.0.4"; + sha256 = "0yanm9ak2sw266wn9lllz086g53sra7xfncpql6403d2lj3j1jj4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog ]; benchmarkHaskellDepends = [ base criterion ]; @@ -103076,8 +103692,8 @@ self: { ({ mkDerivation, base, containers, grab, hedgehog, text }: mkDerivation { pname = "grab-form"; - version = "0.0.0.2"; - sha256 = "1mi21d3p7jwmwmn69f7xy6zkks0w11kkwwvzmhxsd84zsafnis8k"; + version = "0.0.0.4"; + sha256 = "0ch8c0kfjky9s1ilrxyr27jhmvynrp61imb188rc3fv7yfr0b5n5"; libraryHaskellDepends = [ base containers grab text ]; testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; @@ -103318,6 +103934,8 @@ self: { pname = "graph"; version = "0.0.0.0"; sha256 = "1v94nii7q6smm37m3yk390mcxpa69qclxqqdzcmay8f096dzk3pd"; + revision = "1"; + editedCabalFile = "0ij8sdnz3k6lfsvl5wvr4dl8njjlmpl3fai8fybvs0b2yhnr6v49"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of graphs"; @@ -107319,8 +107937,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 ]; @@ -107364,8 +107982,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 @@ -108837,8 +109455,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.7.0.0"; - sha256 = "0a62h0mblddp77binl73h8yq46r9szrqzdvx16zawb0y222d14mp"; + version = "0.7.1.1"; + sha256 = "1agh5sq0hj9r55w3k529jcar66p4vih54j5w3h28chm34n9k6qa2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -110309,8 +110927,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.4.2"; - sha256 = "0qrfdfyzm61zaxd9m7s93zhrr2qjpgyn24l3gbyll2v8yj38j5rm"; + version = "0.1.4.3"; + sha256 = "1sfnr6qrv95ryf6c4hpj3vj8v6y64qjjd2fnz4x9i37win9wcb1z"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default mtl network text @@ -110556,6 +111174,8 @@ self: { pname = "hashable"; version = "1.3.0.0"; sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2"; + revision = "1"; + editedCabalFile = "1c8z7vxlh4whpm1ag4xp6wknnaal28cl4dqdan9rw1c1g10g2w2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110634,8 +111254,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; @@ -111851,6 +112471,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 @@ -111890,6 +112540,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 { @@ -111991,6 +112659,31 @@ self: { broken = true; }) {}; + "haskell-names_0_9_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , data-lens-light, filemanip, filepath, haskell-src-exts, mtl + , pretty-show, tasty, tasty-golden, transformers + , traverse-with-class, uniplate + }: + mkDerivation { + pname = "haskell-names"; + version = "0.9.8"; + sha256 = "1s4pyqrjhq9x4zxq0vh02qr86kw5fk854wfwkryqyzkylr83dv4r"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-lens-light filepath + haskell-src-exts mtl transformers traverse-with-class uniplate + ]; + testHaskellDepends = [ + base containers filemanip filepath haskell-src-exts mtl pretty-show + tasty tasty-golden traverse-with-class + ]; + description = "Name resolution library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "haskell-neo4j-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-client, http-client-tls @@ -112471,8 +113164,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.22.0.0"; - sha256 = "1zfb12r7fpq5nnfgn27m8grql2bx50w7g2jbgy9404rjcr1gk59c"; + version = "1.23.0.0"; + sha256 = "1jfdjaikmjx9sfairp4jjn0vzhw5vhwrg43y082ddpc1bgx2jw7m"; libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; @@ -112568,21 +113261,21 @@ self: { }) {}; "haskell-to-elm" = callPackage - ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop - , protolude, text, time, unordered-containers + ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop, text + , time, unordered-containers }: mkDerivation { pname = "haskell-to-elm"; - version = "0.2.1.0"; - sha256 = "0a6h1hmfkwhi6yfbzb71yifmhvapbnrlwj5yp0kjp88nr1cnh69h"; + version = "0.3.0.0"; + sha256 = "02gspfwiif3a38fsfv0pxia7lcqyqppf9pnrbirnqdcry721mcvy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bound elm-syntax generics-sop protolude text time + aeson base bound elm-syntax generics-sop text time unordered-containers ]; testHaskellDepends = [ - aeson base bound elm-syntax generics-sop protolude text time + aeson base bound elm-syntax generics-sop text time unordered-containers ]; description = "Generate Elm types and JSON encoders and decoders from Haskell types"; @@ -113885,8 +114578,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskoin-crypto" = callPackage @@ -114900,6 +115591,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1_4_2" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, dlist, hashable, hashtables, loch-th, mtl + , placeholders, postgresql-binary, postgresql-libpq, profunctors + , QuickCheck, quickcheck-instances, rebase, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, transformers + , vector + }: + mkDerivation { + pname = "hasql"; + version = "1.4.2"; + sha256 = "0n617bh0achqwybngppz6inj7y5fv42zi0dxlyal3d9zbrgsljfw"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras dlist hashable hashtables + loch-th mtl placeholders postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + bug QuickCheck quickcheck-instances rebase rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -115067,6 +115787,30 @@ self: { broken = true; }) {}; + "hasql-notifications" = callPackage + ({ mkDerivation, base, bytestring, contravariant, hasql, hasql-pool + , hspec, postgresql-libpq, QuickCheck, text + }: + mkDerivation { + pname = "hasql-notifications"; + version = "0.1.0.0"; + sha256 = "18pix0fmbcf8l45q78w33vjyxxbp5c0gvqxdc9bhvkfhn0cl5q0i"; + revision = "1"; + editedCabalFile = "11crw51y45laxaidj615g7mlmp5igdxd5w35pmddb82xpg915ccs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring contravariant hasql hasql-pool postgresql-libpq + text + ]; + executableHaskellDepends = [ base hasql ]; + testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; + description = "LISTEN/NOTIFY support for Hasql"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -115178,8 +115922,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.4"; - sha256 = "1kd12vw98wml58sp1dqfq58z0vjjqdssb6q7f6ngs7q6ig27kxfb"; + version = "0.4.0.6"; + sha256 = "0s9c2aa0mpxiqsvpaf3l5k2gqchrjv4x9jpjmw7v3ywnv9pcxpkf"; libraryHaskellDepends = [ base bytestring case-insensitive containers contravariant fast-builder foldl hashable hasql headed-megaparsec megaparsec @@ -115195,6 +115939,8 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-transaction" = callPackage @@ -116912,13 +117658,15 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.1.0.2"; - sha256 = "0npkkphm4gv7cgm08asr5qxjyk6jdbm4h4w0jwsvxzpxh3nfxgbr"; + version = "0.1.0.4"; + sha256 = "1nl66j4fqmjcxkrmhm7jnbqqpw48727wfbb9xn0cz4yy1brivjrb"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; description = "More informative parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "headergen" = callPackage @@ -116968,6 +117716,32 @@ self: { broken = true; }) {}; + "headroom_0_1_3_0" = callPackage + ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec + , lens, mustache, optparse-applicative, pcre-heavy, pcre-light, rio + , template-haskell, text, time, validation, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.1.3.0"; + sha256 = "0c680vr2kjlx9l9zh6v22jjfgxrwxh9icg1psjxrjfl9zi9kqfb9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base either file-embed lens mustache optparse-applicative + pcre-heavy pcre-light rio template-haskell text time validation + yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative rio + ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -117537,6 +118311,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_12_13" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , 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.13"; + sha256 = "1axsv81r1q393m178x89km49pi7w7dci0l48cnjdskdz99jwvywq"; + libraryHaskellDepends = [ + 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 + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -117657,10 +118457,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 @@ -120228,6 +121026,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "higher-leveldb_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, data-default, exceptions + , hspec, leveldb-haskell, mtl, process, resourcet, transformers + , transformers-base, unliftio, unliftio-core + }: + mkDerivation { + pname = "higher-leveldb"; + version = "0.6.0.0"; + sha256 = "0gsqf92vp92a0jl3nchm40mxi5k7hnm7wjczhpkq0akka6b7ciy7"; + revision = "2"; + editedCabalFile = "1g8fnqvxjcq332wrnls272ff8grcbrc875phm77nsmjb8q4wjqz7"; + libraryHaskellDepends = [ + base bytestring cereal data-default exceptions leveldb-haskell mtl + resourcet transformers transformers-base unliftio-core + ]; + testHaskellDepends = [ + base bytestring cereal hspec leveldb-haskell mtl process resourcet + transformers transformers-base unliftio + ]; + description = "A rich monadic API for working with leveldb databases"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "higherorder" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -121651,10 +122473,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.17"; - sha256 = "1rdafl9c1z16ci3b812aaic6sbh1292dh5n3xqpnaqx9g68w71d4"; - revision = "1"; - editedCabalFile = "1lkg0h8hc7m0lj0hzylc3paiip2d6a6k9k37289gdynrm04nj258"; + version = "1.17.1.1"; + sha256 = "17c7g4xnwkbi77drqc6w96bp2lw0b86yg1qmm0gsdnli2m93baz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121728,6 +122548,8 @@ self: { ]; description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-diff" = callPackage @@ -121806,10 +122628,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.3"; - sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs"; - revision = "1"; - editedCabalFile = "1myqv7hci32hvm98d4fn2zqdvkxsdx1g821n1fwr6814yn89kwjj"; + version = "1.5.4"; + sha256 = "0n3pjd86j43dprpsy1k9x72v8g46dhy3f9244hvwhigyx72ijm6h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121836,22 +122656,24 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-lib" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default - , Decimal, deepseq, directory, extra, fgl, file-embed, filepath - , Glob, hashtables, megaparsec, mtl, old-time, parsec + , Decimal, deepseq, directory, doctest, extra, fgl, file-embed + , filepath, Glob, hashtables, megaparsec, mtl, old-time, parsec , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular , tasty, tasty-hunit, template-haskell, text, time, timeit , transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.17.0.1"; - sha256 = "0kmwrkm4arhzzcfh4dhmikad1kfkv9y5dc58mjhi1jacdiy980r9"; + version = "1.17.1"; + sha256 = "19vny2l2l45dk0fkpi2lzpzaj7jks2r0zjv8dkpcxlyk8bvqi92c"; libraryHaskellDepends = [ aeson ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -121864,7 +122686,7 @@ self: { testHaskellDepends = [ aeson ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory extra fgl file-embed + data-default Decimal deepseq directory doctest extra fgl file-embed filepath Glob hashtables megaparsec mtl old-time parsec parser-combinators pretty-show regex-tdfa safe split tabular tasty tasty-hunit template-haskell text time timeit transformers uglymemo @@ -121895,6 +122717,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hledger-stockquotes" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, containers + , hedgehog, hledger-lib, req, safe, scientific, split, tasty + , tasty-hedgehog, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "hledger-stockquotes"; + version = "0.1.0.0"; + sha256 = "19xn7rzrg4nw1dfdfm1hn7k0wdwrw8416rn28inkbkbn1f9mqgk5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers hledger-lib req safe scientific + split text time unordered-containers + ]; + executableHaskellDepends = [ base bytestring cmdargs text time ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Generate HLedger Price Directives From Daily Stock Quotes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hledger-ui" = callPackage ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries , brick, cmdargs, containers, data-default, directory, extra @@ -121904,8 +122749,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.17"; - sha256 = "1168h7lc6r61gpaiy07l9dp534hggnlvdcx3a2lmjx4m29ym1frz"; + version = "1.17.1.1"; + sha256 = "0cwjjcy4r6dy1w4svmi7jk1yrp654qr8ic33ipg24dh7bl6lqzps"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121935,6 +122780,8 @@ self: { ]; description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-web" = callPackage @@ -121949,8 +122796,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.17"; - sha256 = "15flyvaamr7r3dlzk9ihc3bv8z15myfrzzhlbpc5s3gy6q85lmay"; + version = "1.17.1"; + sha256 = "0zcb7a8xchsb093sw9aq30n45rns9v0xknwvigds3ka8yb383krl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122045,8 +122892,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 ]; @@ -122169,10 +123016,8 @@ self: { }: mkDerivation { pname = "hlrdb"; - version = "0.3.0.0"; - sha256 = "0pc3hqi6v9b78fijisnarfs59w6mw8jgyww25r1wmblgwyakl5ab"; - revision = "1"; - editedCabalFile = "1ycglx3b5n1l97pq0rd50wd313gwz1is10snf8s0c9bjlrzspbn5"; + version = "0.3.1.0"; + sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers @@ -124158,6 +125003,8 @@ self: { pname = "hookup"; version = "0.3.1.0"; sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y"; + revision = "1"; + editedCabalFile = "0r92s1dz7bzm2p5wpdqfkmpgzfh3xgyan82b4rkpmq8m888z74w9"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -124265,8 +125112,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.23"; - sha256 = "1sgqx8b1sq89hpjzbdmkjsmrfagh5v0jfxyqphzkh1bq2zydj0jl"; + version = "0.23.1"; + sha256 = "0jq1if7c78758fnsb6wxsky0jn9mhmzwhb5jpyrpigx08diwd2mj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126668,8 +127515,8 @@ self: { }: mkDerivation { pname = "hs-server-starter"; - version = "0.1.0.2"; - sha256 = "1fykxrhh6s2w722jknz87in3ni3a9spjhbbrqm1vw5r5mcsv29gh"; + version = "0.1.1.0"; + sha256 = "1cki3c6fl7yjw9vww4h9vd68dnci5q8f5c1i3ip8kyv53s9rgbi3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory network ]; @@ -126699,15 +127546,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"; @@ -127043,6 +127892,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 @@ -127212,6 +128063,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsc2hs_0_68_7" = callPackage + ({ mkDerivation, base, containers, directory, filepath, process + , tasty, tasty-hspec + }: + mkDerivation { + pname = "hsc2hs"; + version = "0.68.7"; + sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base containers directory filepath process + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + description = "A preprocessor that helps with writing Haskell bindings to C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsc3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-ordlist, directory, filepath, hosc, murmur-hash, network @@ -127876,8 +128747,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.6"; - sha256 = "0j2qi1gw7rpb23bkj4557kg2d47b8kgrd8vr2qnld90h9p8jnzqm"; + version = "0.3.3.8"; + sha256 = "01dagwpg70h9af5kzr2f19qsvy4h5cx5rjdrcq0r36fbmdkbza2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128075,10 +128946,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.6"; - sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg"; - revision = "1"; - editedCabalFile = "1dgcgsmx0k5p3ibfv3n5k0c5p1is2m5zfsd2s6nc6d0pz34d4wl9"; + version = "0.6.1.7"; + sha256 = "059cbcpf0jb4d6njhpk41hl64w2hxvpv8wcqk7a1s5lklvcavd3d"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -128532,6 +129401,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 @@ -131245,6 +132138,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 @@ -131282,33 +132177,6 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.6.4"; - sha256 = "1n9rnbp8lwkd4whi2anniywi4y1bn9kx6nzfigfvz28d7pn7i4in"; - libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive containers - cookie deepseq exceptions filepath ghc-prim http-types memory - mime-types network network-uri random stm streaming-commons text - time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - doCheck = false; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_6_4_1" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, deepseq, directory - , exceptions, filepath, ghc-prim, hspec, http-types, memory - , mime-types, monad-control, network, network-uri, random, stm - , streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; version = "0.6.4.1"; sha256 = "1y12xfh6xvsfvyapbssmgrpjz025rmyccprbnmzhs0y1cmlz6hjp"; libraryHaskellDepends = [ @@ -131325,7 +132193,6 @@ self: { doCheck = false; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -131692,26 +132559,6 @@ self: { }: mkDerivation { pname = "http-directory"; - version = "0.1.7"; - sha256 = "11vka7a049mh56fy6bi9snjkl68il9fnw583l8dw02n67wldks99"; - libraryHaskellDepends = [ - base bytestring html-conduit http-client http-client-tls http-date - http-types network-uri text time xml-conduit - ]; - testHaskellDepends = [ base hspec text ]; - description = "http directory listing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "http-directory_0_1_8" = callPackage - ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client - , http-client-tls, http-date, http-types, network-uri, text, time - , xml-conduit - }: - mkDerivation { - pname = "http-directory"; version = "0.1.8"; sha256 = "0sav7z5vdda6zq1xyhvrqwh3kdn1bnpmwlhiaxr3sb1npz3hjgcn"; libraryHaskellDepends = [ @@ -133089,17 +133936,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.1.0.0"; - sha256 = "0l405cp4kgmm00j91p0jmkymp83bqpxhqpgkv2g5qy242c6rjfk2"; + 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; @@ -133270,14 +134118,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_6_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.6.0.0"; - sha256 = "0znipifss3cz55xj2nw27c4m284sb71gprksabypib3qdigqpwis"; + version = "0.7.0.1"; + sha256 = "16s58m7kk72hr52k9gci17ac5k38r1zy08wll2frzjxissgza4cj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -133376,29 +134224,6 @@ self: { }: mkDerivation { pname = "hw-bits"; - version = "0.7.1.2"; - sha256 = "1jgj5j09ddiv6yf605m1azaknbfawqhfqc2m3xpr800v43myr3m8"; - libraryHaskellDepends = [ - base bitvec bytestring deepseq hw-int hw-prim hw-string-parse - vector - ]; - testHaskellDepends = [ - base bitvec bytestring doctest doctest-discover hedgehog hspec - hw-hspec-hedgehog hw-prim vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-bits_0_7_1_5" = callPackage - ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq - , doctest, doctest-discover, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector - }: - mkDerivation { - pname = "hw-bits"; version = "0.7.1.5"; sha256 = "0gvbsnirlgsj58363zqg960j0ydx2bhgw4lwql71jf9kg7hd4kqb"; libraryHaskellDepends = [ @@ -133413,7 +134238,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-ci-assist" = callPackage @@ -133715,6 +134539,8 @@ self: { pname = "hw-ip"; version = "2.4.1.0"; sha256 = "1zjl078xzing927fwwpck36ib8z5aggpi7g0z5gnhxd8isgqs6zh"; + revision = "1"; + editedCabalFile = "1dg3aa6wavdr3vh7va3yx3j272pb4zw48rm7r5a6xv6xrrd01a33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133901,6 +134727,8 @@ self: { pname = "hw-kafka-avro"; version = "4.0.1"; sha256 = "1x0mq3sn05iwrn444kzyl66056xm8203hq0ajx9f8r85faq3v1ir"; + revision = "1"; + editedCabalFile = "1409nxw5hfl09dcphcjfx580smd0q2dnp8s4xj6r03w706826zhi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135512,6 +136340,8 @@ self: { pname = "hyraxAbif"; version = "0.2.3.21"; sha256 = "0ghhfv8gzs9sg13nj3mhqd24zbrkjj1dgsjz3sql6276kpa1p2kc"; + revision = "1"; + editedCabalFile = "0rg4wldliyaixmgcyina2cnm7l6gwpcdd2bim1q83clnfk32scar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135535,8 +136365,8 @@ self: { pname = "hz3"; version = "96.0.0.0"; sha256 = "080bhbnhswic7m35rzbqi9i7lb57szag6khprrjccpa80vq7lj6n"; - revision = "2"; - editedCabalFile = "02q1pcy6z4vl1qm4klw17aqx577v7c4jsl4b5r5iw6293arym8fz"; + revision = "3"; + editedCabalFile = "0dm62xr708ps7dsln41cxsn4m4a5093dpq8xrp6hyss4mrzg8hz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers transformers ]; @@ -135861,8 +136691,7 @@ self: { ]; description = "A fast JSON document store with push notification support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ rkrzr ]; }) {}; "icon-fonts" = callPackage @@ -136682,8 +137511,8 @@ self: { ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.2.3.0"; - sha256 = "02j08ci3ss82g2a26qdnykwb1rggb8w53jqm4xnxc8hqm25fb3mk"; + version = "0.2.4.0"; + sha256 = "0yk8wxr1kh3xibb1l5jgjryq7h4id9cz59yjkjjzq41r6p1zr6yj"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; @@ -137173,20 +138002,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; @@ -137200,12 +138026,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; @@ -137603,15 +138428,15 @@ self: { }) {}; "incremental" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, extensible + ({ mkDerivation, aeson, base, bytestring, containers, deepseq , semigroups, text }: mkDerivation { pname = "incremental"; - version = "0.1.1"; - sha256 = "17lwakfa7xh0rdxr4hixlqy9hldvz06hcsclw3kln7m4iv4843d7"; + version = "0.2"; + sha256 = "0af3nrjmhxzn6q45nvrw8lw54239pkwdl3fdvhj10fv8rxdihnzh"; libraryHaskellDepends = [ - aeson base containers deepseq extensible semigroups text + aeson base bytestring containers deepseq semigroups text ]; testHaskellDepends = [ base ]; description = "incremental update library"; @@ -137672,28 +138497,6 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.4"; - sha256 = "0iyprnyk66zdyi21632d0aznvzk7i0hmr3idq49yjilxwck2xac4"; - libraryHaskellDepends = [ - base monoid-subclasses parsers rank2classes transformers - ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - description = "Generic parser library capable of providing partial results from partial input"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "incremental-parser_0_4_0_1" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "incremental-parser"; version = "0.4.0.1"; sha256 = "1cghkzdsh8vjv1ggk5qjr5ny88wna5kbifbfsy1ld5n5k66536lf"; libraryHaskellDepends = [ @@ -137707,7 +138510,6 @@ self: { ]; description = "Generic parser library capable of providing partial results from partial input"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -138941,6 +139743,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"; @@ -139560,8 +140364,8 @@ self: { pname = "intro"; version = "0.6.0.1"; sha256 = "1kka6dnlyqppjx9ykk3zixfyslr8cf4ja6sa2hgq6h69mmsicp67"; - revision = "1"; - editedCabalFile = "1jxd4agavzccgszniqzakgpb6b49qx5c20asr068rpvaf03msncx"; + revision = "2"; + editedCabalFile = "12jmy4lp9yrix6hm6cx3kmgprpmlwdyxqckyx53h01iygfpbx3w5"; libraryHaskellDepends = [ base bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -140205,26 +141009,23 @@ self: { }) {}; "ipfs" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-has, directory - , directory-tree, doctest, envy, flow, Glob, http-client, ip, lens - , lens-aeson, monad-logger, QuickCheck, regex-compat, rio - , servant-client, servant-client-core, servant-multipart - , servant-server, swagger2, text, vector, yaml + ({ mkDerivation, aeson, base, bytestring, directory, directory-tree + , doctest, envy, flow, Glob, ip, lens, lens-aeson, monad-logger + , QuickCheck, regex-compat, rio, servant-client, servant-server + , swagger2, text, vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.0.1"; - sha256 = "1k4ybm99gbwnv1crx8y8fggf9iv1f1g49x3zvypji7n1zgx84b1r"; + version = "1.0.2"; + sha256 = "0mrr67bz283qqz0d70j9gz191l4pi554j3hmcf7pscg87b84rdv5"; libraryHaskellDepends = [ - aeson base bytestring data-has envy flow Glob http-client ip lens - monad-logger regex-compat rio servant-client servant-client-core - servant-multipart servant-server swagger2 text vector + aeson base bytestring envy flow Glob ip lens monad-logger + regex-compat rio servant-client servant-server swagger2 text vector ]; testHaskellDepends = [ - aeson base bytestring data-has directory directory-tree doctest - envy flow Glob http-client ip lens lens-aeson monad-logger - QuickCheck regex-compat rio servant-client servant-client-core - servant-multipart servant-server swagger2 text vector yaml + aeson base bytestring directory directory-tree doctest envy flow + Glob ip lens lens-aeson monad-logger QuickCheck regex-compat rio + servant-client servant-server swagger2 text vector yaml ]; description = "Access IPFS locally and remotely"; license = stdenv.lib.licenses.agpl3Plus; @@ -140307,19 +141108,19 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe + ({ mkDerivation, appar, base, byteorder, bytestring, containers + , doctest, hspec, network, QuickCheck, safe }: mkDerivation { pname = "iproute"; - version = "1.7.8"; - sha256 = "0k2qzdw36qp9qs2j0bxsn95ymk3wpjvw6s5c1535aw677gw19bad"; + version = "1.7.9"; + sha256 = "1m306fi39ifqq53sklwn81q96wam8nvx7mr5hv4m9f26kiczlism"; libraryHaskellDepends = [ - appar base byteorder containers network + appar base byteorder bytestring containers network ]; testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe + appar base byteorder bytestring containers doctest hspec network + QuickCheck safe ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; @@ -140501,6 +141302,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 @@ -141700,10 +142503,8 @@ self: { }: mkDerivation { pname = "ixset-typed"; - version = "0.4.0.1"; - sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8"; - revision = "1"; - editedCabalFile = "0kfklsbjn4gmx76vl7vm1s149f13h2p537930yaq8s2671lzc79p"; + version = "0.5"; + sha256 = "07n7qfi8slmrlgzvrkddr17b792phhb140q9gb5pm68kk1im4izs"; libraryHaskellDepends = [ base containers deepseq safecopy syb template-haskell ]; @@ -142434,6 +143235,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "jira-wiki-markup_1_1_4" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "1.1.4"; + sha256 = "0riwi6i0vvmfffprzd4gklxjivjv1x7cmb2vx43x6n8yfrd75yzv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -143103,15 +143920,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 = [ @@ -143191,22 +144008,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.4"; + sha256 = "0p4qx7pfb4qxdizsqvm88dw4wbzmygpblzvna0mh3wl9dlx554rm"; 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 @@ -144824,8 +145642,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "18"; - editedCabalFile = "0yxgndvrashc0cp3zv39gjrzw7p53g0k51p13q67nqnpxhh05w2k"; + revision = "19"; + editedCabalFile = "0pnfhv3dlg9cs98nyz5kqdi5mq340909id8rb4lcdj9748w8gz4w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -146385,19 +147203,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; @@ -147404,8 +148225,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 @@ -148054,8 +148875,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 @@ -148088,6 +148909,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "language-avro_0_1_3_0" = callPackage + ({ mkDerivation, avro, base, containers, directory, filepath, hspec + , hspec-megaparsec, megaparsec, text, vector + }: + mkDerivation { + pname = "language-avro"; + version = "0.1.3.0"; + sha256 = "15r14px422s06d28q3rvxfbymxfgrzhgxgsyrkmw9b1vj8c74ln6"; + 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 @@ -148399,8 +149239,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 @@ -148641,6 +149481,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-javascript_0_7_1_0" = callPackage + ({ mkDerivation, alex, array, base, blaze-builder, bytestring + , Cabal, containers, happy, hspec, mtl, QuickCheck, text + , utf8-light, utf8-string + }: + mkDerivation { + pname = "language-javascript"; + version = "0.7.1.0"; + sha256 = "0s6igb54cxm2jywgc3sq53f52gcsc39wd3g78yisfzvl9jm3d86i"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers mtl text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base blaze-builder bytestring Cabal containers hspec mtl + QuickCheck utf8-light utf8-string + ]; + description = "Parser for JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-js" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -149636,6 +150498,8 @@ self: { pname = "lattices"; version = "2.0.2"; sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix"; + revision = "1"; + editedCabalFile = "0mgwil55q4a5dy6r8pyf7jj7z378n1hvsm79nkkz69zjd80wi2mw"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -149660,8 +150524,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "1.0.1"; - sha256 = "1425n7b587k9c6w3k95lcdhk5blj9blzjgnb67ylr1fizzayxc7h"; + version = "1.0.2"; + sha256 = "1psm449p7fsh4b5mf7y7dlgh44za1fhf0cbn0qya1j4imy3x673b"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -150299,6 +151163,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_9_2" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.9.2"; + sha256 = "0grgxa2w378wkbabqlniwm78qgmhym7pvgp6azd89kr83gvyfhd1"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leancheck-enum-instances" = callPackage ({ mkDerivation, base, enum-types, leancheck }: mkDerivation { @@ -151709,6 +152586,8 @@ self: { ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libarchive;}; "libarchive-conduit" = callPackage @@ -152651,30 +153530,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; + description = "Synchronize personal configs across multiple machines"; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -154897,6 +155775,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 @@ -154918,21 +155815,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; @@ -154944,8 +155845,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 ]; @@ -155205,14 +156106,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; @@ -155403,8 +156306,8 @@ self: { ({ mkDerivation, base, containers, doctest, hedgehog }: mkDerivation { pname = "loc"; - version = "0.1.3.4"; - sha256 = "1xdqnqr4wy3xw9vyfkf6c8xsq74nryhb8z31grcwpn6ppdgzyqy2"; + version = "0.1.3.6"; + sha256 = "0bspclskqk0kzvic8y4bxagjrfzxpq53xgr0jfp6rcqacql6qvdr"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hedgehog ]; description = "Types representing line and column positions and ranges in text files"; @@ -155417,8 +156320,8 @@ self: { ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.4"; - sha256 = "1lzmyxm34zvkdz3piwmnhd7m0ijjnlwqbpi5lgbqvbrikbw579qp"; + version = "0.1.3.6"; + sha256 = "0kzr7adk85y9fcibi8rw7ix3vp2z17ig211lw820nirhwb8xj697"; libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; license = stdenv.lib.licenses.asl20; @@ -157001,6 +157904,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lsp-test_0_10_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + 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 + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default haskell-lsp hspec lens text + unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -157384,8 +158313,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 @@ -157697,8 +158626,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 ]; @@ -157726,8 +158655,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "1.0.4.0"; - sha256 = "1l7mbxh2cn8vgfxwkzrz9mv5ca2bx4ymbswvjz7b3mgjx0wiy9g8"; + version = "1.0.6.0"; + sha256 = "1qirn7kbcnxx6ihhk0r6p2jyfbs8cqsinfnmn774i3vkj1fahpn1"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -157903,6 +158832,8 @@ self: { ]; description = "A toolkit for working with macaroons"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "macbeth-lib" = callPackage @@ -159713,10 +160644,10 @@ self: { ({ mkDerivation, base, comonad, HTF, MonadRandom }: mkDerivation { pname = "markov-realization"; - version = "0.3.3"; - sha256 = "1w6rj8l40ajb5nmh3mlf99n526a17w7q9vnyn6x3j9sn0sm4csl3"; + version = "0.4"; + sha256 = "1kkydk71yhzf2q82vzal6npfs022a5x2ynj95l835kn1lh2n3vhm"; libraryHaskellDepends = [ base comonad MonadRandom ]; - testHaskellDepends = [ base HTF ]; + testHaskellDepends = [ base HTF MonadRandom ]; description = "Realizations of Markov chains"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -160000,7 +160931,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_5_0_0" = callPackage + "massiv_0_5_1_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -160008,8 +160939,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.0.0"; - sha256 = "09hyrlhcvqrhsmyl7lsm9qmp8yshia1jmjh2bqlsnw8xvwg2z13a"; + version = "0.5.1.0"; + sha256 = "062b9mg1nqsg7lfv4a85s994jg1fipikpvxdb9w6ci3dqiq41dx0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -160547,6 +161478,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matrix-sized" = callPackage + ({ mkDerivation, base, primitive, singletons, tasty + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "matrix-sized"; + 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; + }) {}; + "matrix-static" = callPackage ({ mkDerivation, base, deepseq, ghc-typelits-natnormalise, matrix , tasty, tasty-hunit, vector @@ -160647,7 +161594,8 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mattermost-api" = callPackage @@ -160675,6 +161623,8 @@ self: { ]; description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mattermost-api-qc" = callPackage @@ -160690,6 +161640,8 @@ self: { ]; description = "QuickCheck instances for the Mattermost client API library"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maude" = callPackage @@ -162878,8 +163830,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 @@ -164020,6 +164972,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 { @@ -164037,8 +165009,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"; @@ -164533,15 +165505,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; }) {}; @@ -165223,15 +166197,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 = "1"; - editedCabalFile = "19acnk2dy5zan230g268nyvdx1y8piav3x9z6jsjbi2d7zm9sr38"; + 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; @@ -165245,8 +166219,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 @@ -167796,31 +168770,22 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion - , monad-loops, openmpi, store - }: + ({ mkDerivation, base, bytestring, c2hs, monad-loops }: mkDerivation { pname = "mpi-hs"; - version = "0.5.3.0"; - sha256 = "0z2m4xfk0w1zx29jb27xb6hs01xid0ghv93yhqx7zwiw01815krk"; + version = "0.7.0.0"; + sha256 = "14c3z7ydw08cijh8mp8qfx2ybp3w283lw1jj25hdwr7b83wsl2m6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring cereal monad-loops store - ]; - librarySystemDepends = [ openmpi ]; + libraryHaskellDepends = [ base bytestring monad-loops ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base binary ]; - executableSystemDepends = [ openmpi ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base monad-loops ]; - testSystemDepends = [ openmpi ]; - benchmarkHaskellDepends = [ base criterion ]; - benchmarkSystemDepends = [ openmpi ]; description = "MPI bindings for Haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) openmpi;}; + }) {}; "mplayer-spot" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, conduit @@ -168022,6 +168987,18 @@ self: { broken = true; }) {}; + "mr-env" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "mr-env"; + version = "0.1.0.2"; + sha256 = "1bw0ga59lf1crhjx4hlmsnzllsf3nfwzzsfcll0xf04fkj0jgxlg"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "A simple way to read environment variables in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "mrifk" = callPackage ({ mkDerivation, array, base, containers, mtl }: mkDerivation { @@ -168137,6 +169114,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 @@ -168182,6 +169185,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 @@ -169841,19 +170886,21 @@ self: { }) {}; "musicScroll" = callPackage - ({ mkDerivation, async, base, bytestring, containers, dbus, gi-gtk - , gi-gtk-hs, gtk3, mtl, req, stm, tagsoup, text, transformers + ({ mkDerivation, async, base, bytestring, containers, cryptonite + , dbus, deepseq, directory, gi-gtk, gi-gtk-hs, gtk3, mtl, req + , sqlite-simple, stm, tagsoup, text, transformers, xdg-basedir }: mkDerivation { pname = "musicScroll"; - version = "0.1.2.0"; - sha256 = "0n0s9vkhfwykghniillih5qgdz4cg1rn4vn86hinxaqfgzv6m96w"; + version = "0.2.2.0"; + sha256 = "1r1n22g98sqi8hnrkwb6cyv805ggq8770iwa4bzwiq7a59x3rlm6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - async base bytestring containers dbus gi-gtk gi-gtk-hs mtl req stm - tagsoup text transformers + async base bytestring containers cryptonite dbus deepseq directory + gi-gtk gi-gtk-hs mtl req sqlite-simple stm tagsoup text + transformers xdg-basedir ]; executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ gtk3 ]; @@ -171101,8 +172148,8 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "names-th"; - version = "0.3.0.0"; - sha256 = "09m5zflpk1h7jwz40mijhnpbsd8qnnay1jm3lpfrvdmg49m8zqqb"; + version = "0.3.0.1"; + sha256 = "12ally0n6ixsxj0zwbvw439dbx29phvh0rd6l5sd0c5a514a32aa"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Manipulate name strings for TH"; license = stdenv.lib.licenses.bsd3; @@ -172203,16 +173250,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; @@ -172694,8 +173741,8 @@ self: { }: mkDerivation { pname = "netwire-input-glfw"; - version = "0.0.10"; - sha256 = "1r186xwr5lycs0snr8amvyxvbq2l5jd9p20v8n12zyjm60kmi90y"; + version = "0.0.11"; + sha256 = "1sizk0c8mbm6ad984gaf933h1bg4dgwi9k8hzrm9wp5rwbqjvcz8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174703,8 +175750,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.8"; - sha256 = "0073802yrd5f1zfhnbsll9cqcycihw9bac1psfwvcwvihsh3j413"; + version = "1.0.9"; + sha256 = "0gqrx0l6f10gwsz645dby2gascd0sanajvd2rkg65c61g8j7pxv4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -174816,6 +175863,8 @@ self: { pname = "nixfmt"; version = "0.4.0"; sha256 = "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n"; + revision = "1"; + editedCabalFile = "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177576,6 +178625,19 @@ self: { broken = true; }) {}; + "om-actor" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "om-actor"; + version = "0.1.0.0"; + sha256 = "1wiasb3f22g47n54jhxv1c74a0ghxsknrakjdgj3fqlw878g3aan"; + libraryHaskellDepends = [ base ]; + description = "Actor pattern utilities"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "om-elm" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , http-types, safe, safe-exceptions, template-haskell, text, unix @@ -177607,6 +178669,8 @@ self: { ]; description = "Monad transformer providing MonadFail"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "omaketex" = callPackage @@ -178477,6 +179541,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 @@ -178733,6 +179822,8 @@ self: { base http-client http-types opentelemetry text ]; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opentelemetry-lightstep" = callPackage @@ -178763,6 +179854,8 @@ self: { sha256 = "1n27g8xjij05g7xxx8z50k39nmclhm707xs2pfqy830zdq1ldfl4"; libraryHaskellDepends = [ base http-types opentelemetry text wai ]; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opentheory" = callPackage @@ -179208,6 +180301,8 @@ self: { pname = "optics-core"; version = "0.2"; sha256 = "19hsax8wxxgr28rjz6p9afb06f338xnyvws7salmm1dsik1ghzr8"; + revision = "1"; + editedCabalFile = "1sghrm6xyflzkv350phcm344ljv82wk2vjnwhwyvcqwirkwg8rk9"; libraryHaskellDepends = [ array base containers indexed-profunctors transformers ]; @@ -179779,29 +180874,33 @@ self: { }) {}; "org-mode" = callPackage - ({ mkDerivation, base, filepath, hashable, megaparsec - , parser-combinators, tasty, tasty-hunit, text, time + ({ mkDerivation, base, containers, filepath, hashable, megaparsec + , parser-combinators, tasty, tasty-hunit, text }: mkDerivation { pname = "org-mode"; - version = "1.0.1"; - sha256 = "0nhpb8x11w0w3jwplk3bx9a2llw77l66wbm31bpgdpr6ak2r0z75"; + version = "1.1.0"; + sha256 = "1k8k24wkvjflrg5bcv6i4ypak5m0k20hrh0gxf5c23y5s4b9dmz5"; libraryHaskellDepends = [ - base filepath hashable megaparsec parser-combinators text time - ]; - testHaskellDepends = [ - base megaparsec tasty tasty-hunit text time + base containers filepath hashable megaparsec parser-combinators + text ]; + testHaskellDepends = [ base megaparsec tasty tasty-hunit text ]; + description = "Parser for Emacs org-mode files"; license = stdenv.lib.licenses.bsd3; }) {}; "org-mode-lucid" = callPackage - ({ mkDerivation, base, hashable, lucid, org-mode, text }: + ({ mkDerivation, base, containers, hashable, lucid, org-mode, text + }: mkDerivation { pname = "org-mode-lucid"; - version = "1.1.0"; - sha256 = "066mdm9a7dkz6yy9g2yhqalvxrxhak1mw0awag3ivswv6djf528q"; - libraryHaskellDepends = [ base hashable lucid org-mode text ]; + version = "1.3.0"; + sha256 = "0a6iy2x0k9r3072zx0sf4k27xnihwckyd1h2pcqd61sxkgf3qkn3"; + libraryHaskellDepends = [ + base containers hashable lucid org-mode text + ]; + description = "Lucid integration for org-mode"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -179886,8 +180985,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.1.7"; - sha256 = "1yvzs6sdkdgi5gfdgznnz1f03sf57icnn7bb5njcam7gxwvswbkp"; + version = "0.1.8"; + sha256 = "072xdy9kg853l7lskm1knkk63pnyqh44s7zakplb37x46rcsj4jc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180972,50 +182071,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 @@ -181545,8 +182647,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.3"; - sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw"; + version = "0.2.4"; + sha256 = "06pff2nhsmlrj57g9hi1k1vnd4wkl3i9h8ijgwvf2yxpqqs42spi"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -181764,8 +182866,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.4.0.0"; - sha256 = "11n0xrk5258inzzikbapsv7752396qsrgaaf5kimpzgb67cs9k5j"; + version = "0.4.0.1"; + sha256 = "182aiwwgrsdj9f4x71q1grj674d91djp4q6bz2l51ly5dsjy5wbf"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -182357,8 +183459,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; @@ -183092,6 +184194,8 @@ self: { pname = "parsers-megaparsec"; version = "0.1.0.1"; sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8"; + revision = "1"; + editedCabalFile = "16a7h16lq27930l0hpa8z97b4p6cwrz3wdxs67mfxvz2ndngm87d"; libraryHaskellDepends = [ base fail megaparsec mtl parsers semigroups text transformers ]; @@ -183593,29 +184697,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; @@ -185294,6 +186394,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_5" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-bang-compat, th-constraint-compat, th-data-compat + , transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.5"; + sha256 = "1jm8270c7805alxa8q8pa5ql9f1ah3ns3p910j86h4bjnvgbvyqa"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-bang-compat th-constraint-compat th-data-compat + transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, dlist, HDBC , persistable-record, relational-query, relational-query-HDBC @@ -185580,8 +186701,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 @@ -185738,7 +186859,8 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-protobuf" = callPackage @@ -188736,17 +189858,18 @@ self: { "pkgtreediff" = callPackage ({ mkDerivation, async, base, directory, filepath, Glob - , http-directory, simple-cmd, simple-cmd-args, text + , http-client, http-client-tls, http-directory, simple-cmd + , simple-cmd-args, text }: mkDerivation { pname = "pkgtreediff"; - version = "0.3"; - sha256 = "0n39cn75cdxzk39hn6fiimb7rm1qrvksmqidy5fgnx997y78z8s9"; + version = "0.4"; + sha256 = "00cah2sbfx824zvg4ywm3qw8rkibflj9lmw1z0ywsalgdmmlp460"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - async base directory filepath Glob http-directory simple-cmd - simple-cmd-args text + async base directory filepath Glob http-client http-client-tls + http-directory simple-cmd simple-cmd-args text ]; description = "Package tree diff tool"; license = stdenv.lib.licenses.gpl3; @@ -188780,15 +189903,14 @@ self: { "plaid" = callPackage ({ mkDerivation, aeson, base, bytestring, casing, conduit , conduit-extra, containers, either, errors, hspec, hspec-wai - , hspec-wai-json, http-client, http-client-tls, http-conduit - , http-types, microlens, microlens-th, mtl, network, pretty-simple - , QuickCheck, raw-strings-qq, safe-exceptions, text, time - , transformers, wai + , http-client, http-client-tls, http-conduit, http-types, microlens + , microlens-th, mtl, network, pretty-simple, QuickCheck + , raw-strings-qq, safe-exceptions, text, time, transformers, wai }: mkDerivation { pname = "plaid"; - version = "0.1.0.0"; - sha256 = "125427rhy5xlaw3qinrazyyj39z4g0rbnhm2k4jrgp1jgba91lc3"; + version = "0.1.0.4"; + sha256 = "1mwwd3mnj45l1487hfhb8lhgcvik88qch7vzgk17zv77ginnifni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188802,9 +189924,8 @@ self: { safe-exceptions text time transformers ]; testHaskellDepends = [ - aeson base bytestring containers errors hspec hspec-wai - hspec-wai-json http-types microlens microlens-th pretty-simple - QuickCheck text time wai + aeson base bytestring containers errors hspec hspec-wai http-types + microlens microlens-th pretty-simple QuickCheck text time wai ]; description = "Plaid.com api integration library"; license = stdenv.lib.licenses.bsd3; @@ -190080,6 +191201,8 @@ self: { pname = "polynom"; version = "0.1.0.0"; sha256 = "1cggjbmyas3bzcs81falp50wq649nhvgxwhhnyk434s0k2h2chwh"; + revision = "1"; + editedCabalFile = "0nfrlp48rgw96bpms30d9s2qmhjmbgxszprh2xi73pmjddk26qg3"; libraryHaskellDepends = [ algebra base base-unicode-symbols containers ]; @@ -190367,8 +191490,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 ]; @@ -191245,33 +192368,33 @@ self: { "postgres-websockets" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , containers, contravariant, either, envparse, hasql, hasql-pool - , hspec, hspec-wai, hspec-wai-json, http-types, jose, jwt, lens - , lens-aeson, postgresql-libpq, protolude, retry, stm + , containers, contravariant, either, envparse, hasql + , hasql-notifications, hasql-pool, hspec, hspec-wai, hspec-wai-json + , http-types, jose, lens, postgresql-libpq, protolude, retry, stm , stm-containers, stringsearch, text, time, transformers , unordered-containers, wai, wai-app-static, wai-extra , wai-websockets, warp, websockets }: mkDerivation { pname = "postgres-websockets"; - version = "0.5.0.1"; - sha256 = "0afhrzhixy0f31050jb04w8np6935wcl3j7ckbk0dm23mqz2z3zy"; + version = "0.6.0.0"; + sha256 = "0m9fypc216qcsx596sizgxjv30w08fpfpjglmcias88ri4n3ggy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring contravariant either hasql hasql-pool - http-types jose jwt lens lens-aeson postgresql-libpq protolude - retry stm stm-containers stringsearch text time - unordered-containers wai wai-websockets websockets + aeson base bytestring contravariant either hasql + hasql-notifications hasql-pool http-types jose lens + postgresql-libpq protolude retry stm stm-containers stringsearch + text time unordered-containers wai wai-websockets websockets ]; executableHaskellDepends = [ base base64-bytestring bytestring envparse hasql hasql-pool protolude text time transformers wai wai-app-static wai-extra warp ]; testHaskellDepends = [ - aeson base containers hasql hasql-pool hspec hspec-wai - hspec-wai-json http-types protolude stm unordered-containers - wai-extra + aeson base containers hasql hasql-notifications hasql-pool hspec + hspec-wai hspec-wai-json http-types protolude stm + unordered-containers wai-extra ]; description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; @@ -194181,14 +195304,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_8_0" = callPackage + "process_1_6_8_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.8.0"; - sha256 = "07vl1j66xya4wqm3h42lpkhshpmz90b68r93i2766zhsnx0ryr5r"; + version = "1.6.8.2"; + sha256 = "1gdz227gmpax92xmwrvj9nrylybh4kk7m4yqr8qwa9i34dg1jzqx"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -195338,8 +196461,8 @@ self: { }: mkDerivation { pname = "prosidy"; - version = "1.6.0.0"; - sha256 = "19c8kz6kdd2flzi1gyddi4yp4fn62wfjahcp66saydb4ipxdxfs4"; + version = "1.6.0.1"; + sha256 = "1yd36sjs342may33fbrpzgaghql03wjgprbllkms8pr6d16z8m49"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring containers contravariant deepseq @@ -196900,7 +198023,8 @@ self: { doCheck = false; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "purescript-bridge" = callPackage @@ -197359,6 +198483,22 @@ self: { broken = true; }) {}; + "pvar" = callPackage + ({ mkDerivation, async, base, deepseq, genvalidity, hspec + , primitive, QuickCheck + }: + mkDerivation { + pname = "pvar"; + version = "0.1.1.0"; + sha256 = "1fzcv2bzm9hf879a6vcgcsmyjn4fhpl9smz8phi6bq1acfzkg026"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ + async base deepseq genvalidity hspec primitive QuickCheck + ]; + description = "Mutable variable with primitive values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pvd" = callPackage ({ mkDerivation, array, base, Codec-Image-DevIL, containers , haskell98, libdevil, mtl, network, stm, X11 @@ -198063,6 +199203,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 @@ -198478,8 +199639,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.22"; sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; - revision = "2"; - editedCabalFile = "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr"; + revision = "3"; + editedCabalFile = "0i5z5c55668hcw7xk3cgvn13qflznc5d81rd97jxn712x82d7y14"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time @@ -198663,31 +199824,37 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , directory, doctest, exceptions, filelock, filepath, http-client - , matrix, monad-logger, mtl, network, persistent - , persistent-postgresql, persistent-template, pretty-show, process - , QuickCheck, quickcheck-instances, random, resourcet, servant - , servant-client, servant-server, strict, string-conversions, tasty - , tasty-hunit, tasty-quickcheck, text, tree-diff, unliftio, vector - , wai, warp + ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bifunctors + , bytestring, containers, directory, doctest, exceptions, filelock + , filepath, generic-data, graphviz, hashable, hashtables, hs-rqlite + , HTTP, http-client, markov-chain-usage-model, matrix, monad-logger + , mtl, network, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, postgresql-simple + , pretty-show, process, QuickCheck, quickcheck-instances, random + , resource-pool, resourcet, servant, servant-client, servant-server + , sop-core, split, stm, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unliftio + , unliftio-core, vector, wai, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.6.0"; - sha256 = "0zbjap2jjd534w6cigi4xz34x3f6w8icvxyvxs35j61c52cp2pry"; + version = "0.7.0"; + sha256 = "053fc1hxkpfpmwn5dq5x5vd094g978hwc145qpzknwbk6hrc28ka"; libraryHaskellDepends = [ - ansi-wl-pprint base containers exceptions matrix mtl pretty-show - QuickCheck tree-diff unliftio vector + ansi-wl-pprint base containers directory exceptions filepath + generic-data graphviz markov-chain-usage-model matrix mtl + pretty-show process QuickCheck random sop-core split text time + tree-diff unliftio ]; testHaskellDepends = [ - base bytestring containers directory doctest filelock filepath - http-client matrix monad-logger mtl network persistent - persistent-postgresql persistent-template pretty-show process - QuickCheck quickcheck-instances random resourcet servant - servant-client servant-server strict string-conversions tasty - tasty-hunit tasty-quickcheck text tree-diff unliftio vector wai - warp + aeson array base bifunctors bytestring containers directory doctest + filelock filepath hashable hashtables hs-rqlite HTTP http-client + monad-logger mtl network persistent persistent-postgresql + persistent-sqlite persistent-template postgresql-simple pretty-show + process QuickCheck quickcheck-instances random resource-pool + resourcet servant servant-client servant-server split stm strict + string-conversions tasty tasty-hunit tasty-quickcheck text time + tree-diff unliftio unliftio-core vector wai warp ]; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; @@ -199844,6 +201011,8 @@ self: { pname = "ral"; version = "0.1"; sha256 = "0h8jqaapagrp9faixq817lib8l4nq4ycjj6ppl1ra8llnfsz5304"; + revision = "1"; + editedCabalFile = "1cazlravv7d4r5qsk9px9vrgr4rndhg43k3rbskk6p3hahigkjfd"; libraryHaskellDepends = [ adjunctions base bin deepseq distributive fin hashable QuickCheck semigroupoids @@ -199859,6 +201028,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; @@ -199923,6 +201094,19 @@ self: { broken = true; }) {}; + "rampart" = callPackage + ({ mkDerivation, base, criterion, hspec }: + mkDerivation { + pname = "rampart"; + version = "1.0.0.2"; + sha256 = "17apaldhpqwz8xdnjvz9lwsdlhpvad5107xw5d4v6ql8zvjgz0yw"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "🏰 Determine how intervals relate to each other"; + license = stdenv.lib.licenses.isc; + }) {}; + "ramus" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io }: @@ -200127,8 +201311,8 @@ self: { }: mkDerivation { pname = "random-fu"; - version = "0.2.7.3"; - sha256 = "071b3gi88kmrfiy6kyz1x67mqljwqb4l45vzg1rc2zig3iwy66ih"; + version = "0.2.7.4"; + sha256 = "13dgx069lvdfxm7l2q2l6d7q0gd3wp41b8l4l6wmhlfbl5xici3m"; libraryHaskellDepends = [ base erf math-functions monad-loops mtl random-shuffle random-source rvar syb template-haskell transformers vector @@ -200196,16 +201380,16 @@ self: { "random-source" = callPackage ({ mkDerivation, base, flexible-defaults, mersenne-random-pure64 - , mtl, mwc-random, random, stateref, syb, template-haskell - , th-extras + , mtl, mwc-random, primitive, random, stateref, syb + , template-haskell, th-extras }: mkDerivation { pname = "random-source"; - version = "0.3.0.6"; - sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk"; + version = "0.3.0.8"; + sha256 = "0kjvpmxhff6id99hhgjp3vvb4vlhs3shkrh1n5cbfm7450lpmmn2"; libraryHaskellDepends = [ - base flexible-defaults mersenne-random-pure64 mtl mwc-random random - stateref syb template-haskell th-extras + base flexible-defaults mersenne-random-pure64 mtl mwc-random + primitive random stateref syb template-haskell th-extras ]; description = "Generic basis for random number generators"; license = stdenv.lib.licenses.publicDomain; @@ -200358,6 +201542,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 @@ -200940,8 +202126,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.0.8"; - sha256 = "1a98zy1n6dlxxyfdganqfcx8hw04i4hjwdj8ggdd4g0jky62jaz2"; + version = "9.0.9"; + sha256 = "1i638s8q0vnwkn1s2gwdz98p28vg9rmlz0hc24maks80vbyjraba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202117,7 +203303,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_6" = callPackage + "rebase_1_6_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids @@ -202126,8 +203312,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.6"; - sha256 = "1hsfff3rsaigjcg8s7mvipi68xqx4ala1zdrghgyb76z1c23m6iw"; + version = "1.6.1"; + sha256 = "020aw7wlgx8nqbq6ara13szgxw2q0n0hx3vrsn2lfp53b2jdsvax"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors @@ -202905,6 +204091,8 @@ self: { pname = "refined"; version = "0.4.4"; sha256 = "1xld5fc3nzsr43agvdlv0hbdbnrrsgy0n2a7mfrcc0n3s6rjbdcw"; + revision = "1"; + editedCabalFile = "184w9aj60hxm2bq9n29zakqzhi0kf4dqj7cwib31vilpwd0vgfvx"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck template-haskell transformers @@ -203003,8 +204191,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.6.4"; - sha256 = "162gjk11z6yjdwnb7y9xhg6h851wxssz9zb548h52hdld9vdfkcf"; + version = "0.6.4.1"; + sha256 = "0zm5jgjn4r59h8r0180mkmfnggqv4mgg52vqfwpnz20dv942wzcb"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -203791,6 +204979,8 @@ self: { pname = "regex-base"; version = "0.94.0.0"; sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4"; + revision = "1"; + editedCabalFile = "13lnky4ps9as73jqrwz4aqn5sfyrcz2zj2ng52xzz512fv59baj4"; libraryHaskellDepends = [ array base bytestring containers mtl text ]; @@ -204051,6 +205241,8 @@ self: { pname = "regex-posix"; version = "0.96.0.0"; sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5"; + revision = "1"; + editedCabalFile = "1cy39n1928wv55i7k4wm7zd3xijk7p54kbrxxlfzfvgax5k163b9"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -204097,6 +205289,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 ]; @@ -204805,6 +205999,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_12_2_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-constraint-compat, th-reify-compat, time, time-locale-compat + , transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.12.2.3"; + sha256 = "0zjqk0gkzdhg1l8rw0bz7iwvp55p585xaqp8dc3sbbr0abhmsgi5"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text + th-constraint-compat th-reify-compat time time-locale-compat + transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -204871,14 +206090,15 @@ self: { "relational-schemas" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time + , sql-words, template-haskell, time }: mkDerivation { pname = "relational-schemas"; - version = "0.1.7.0"; - sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b"; + version = "0.1.8.0"; + sha256 = "012b3jqxpyv41vwxvrk6nxall7hvbczkxwmld3w3jzg20z0535l4"; libraryHaskellDepends = [ - base bytestring containers relational-query template-haskell time + base bytestring containers relational-query sql-words + template-haskell time ]; description = "RDBMSs' schema templates for relational-query"; license = stdenv.lib.licenses.bsd3; @@ -205291,8 +206511,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 ]; @@ -205628,6 +206848,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_2_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.2.1.0"; + sha256 = "0i88mylhbm3hx7rj59ms125xnzinxrcjv98df73xzzz54cjf123j"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + description = "Find, replace, and edit text patterns with Attoparsec parsers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { @@ -205721,6 +206957,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 @@ -205963,8 +207216,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.2.1.0"; - sha256 = "1fh9p7437czn7rw5jmpxlmg0zhrkkj5hwd0kzlr2jainxzvlw2b3"; + version = "0.2.2.0"; + sha256 = "0wiazimb8vpsdxrh012hczcxfapxyggq3p54f6lvcljmggh2ncdw"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -206055,12 +207308,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_6" = callPackage + "rerebase_1_6_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.6"; - sha256 = "0g2bgh30ra006w4ypsrnyvfwys4ajg2b0k6c55snci12acs2igzd"; + version = "1.6.1"; + sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -206801,6 +208054,39 @@ self: { broken = true; }) {}; + "retrie" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , data-default, deepseq, directory, filepath, ghc, ghc-exactprint + , ghc-paths, haskell-src-exts, HUnit, mtl, optparse-applicative + , process, random-shuffle, syb, tasty, tasty-hunit, temporary, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "retrie"; + version = "0.1.0.0"; + sha256 = "0x8mc4w6w1pr8k9cmhnb4wad2brqj37qfhkg1vm47zmv3r5sza3s"; + revision = "1"; + editedCabalFile = "1gxd78fpn7pw30k0p70vgrr82qcbq4397fk41c4i7rb7m0y4kk3j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers data-default + directory filepath ghc ghc-exactprint haskell-src-exts mtl + optparse-applicative process random-shuffle syb text transformers + unordered-containers + ]; + executableHaskellDepends = [ base data-default ]; + testHaskellDepends = [ + base containers data-default deepseq directory filepath ghc + ghc-paths HUnit mtl optparse-applicative process syb tasty + tasty-hunit temporary text unordered-containers + ]; + description = "A powerful, easy-to-use codemodding tool for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "retry" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time @@ -207807,6 +209093,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "RISC-V"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "risc386" = callPackage @@ -209174,6 +210462,8 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Recurrence rule parser and formatter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rsagl" = callPackage @@ -209609,6 +210899,17 @@ self: { broken = true; }) {}; + "run-haskell-module" = callPackage + ({ mkDerivation, base, data-default, filepath, process }: + mkDerivation { + pname = "run-haskell-module"; + version = "0.0.1"; + sha256 = "1zy7n1qd9bwxh432cs8aqf33h434rxv0k66fhygfycbih2s8h6gg"; + 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 { @@ -209716,10 +211017,8 @@ self: { }: mkDerivation { pname = "rvar"; - version = "0.2.0.3"; - sha256 = "1h3bii1pamkv7656280i6zx7fpdwgbn2ysfijpd2s65szlpsz2np"; - revision = "1"; - editedCabalFile = "1ifwwjlhc3l8ycjmmarw6v1nm7jxpgqw2ly0q35idlj0jc0nbxn6"; + version = "0.2.0.4"; + sha256 = "0p67lbzcbbm5bkhv0x380bdald6kaqlf968ay2q8qj69izpvk181"; libraryHaskellDepends = [ base MonadPrompt mtl random-source transformers ]; @@ -210019,6 +211318,8 @@ self: { ]; description = "Automatic JSON format versioning"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-lazy-io" = callPackage @@ -210431,6 +211732,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 @@ -210459,10 +211779,8 @@ self: { }: mkDerivation { pname = "salak"; - version = "0.3.5.3"; - sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b"; - revision = "1"; - editedCabalFile = "138c763crbfipcb9ss1lk3wx3482nm2v4zbm3k88h6jszxhmxvav"; + version = "0.3.6"; + sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -211718,15 +213036,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 @@ -211931,33 +213251,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; @@ -213262,8 +214582,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {libsecp256k1 = null;}; "secp256k1-legacy" = callPackage @@ -213275,6 +214593,8 @@ self: { pname = "secp256k1-legacy"; version = "0.5.6"; sha256 = "0p7kp7011hfc95rdchkniw3gj5i0pkwgsa5kkhwn6fjzs2clslbz"; + revision = "1"; + editedCabalFile = "0fz2nypf6p1qsvcvvfa7ya0pggvkr2jsm306ryy8grncbzy4ydgm"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base16-bytestring bytestring cereal entropy mtl QuickCheck @@ -213641,8 +214961,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 @@ -213716,6 +215036,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 @@ -213750,6 +215072,8 @@ self: { pname = "semialign-indexed"; version = "1.1"; sha256 = "1b6amfhwk968ah56w8vala3hbpzf9mfza2ajhdnvzcdiyqyxvwb0"; + revision = "1"; + editedCabalFile = "1g7b15xki938vljmkcwnz1hvqfp77ja39cxnfnwd5j507a0qp800"; libraryHaskellDepends = [ base containers hashable lens semialign these unordered-containers vector @@ -214099,6 +215423,8 @@ self: { ]; description = "A tool to send command execution results to Sensu"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sentence-jp" = callPackage @@ -217194,21 +218520,21 @@ self: { "servant-to-elm" = callPackage ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm - , http-types, protolude, servant, servant-multipart, text + , http-types, servant, servant-multipart, text }: mkDerivation { pname = "servant-to-elm"; - version = "0.4.0.0"; - sha256 = "04i4mcj41c6wzxj9kgy7x8w9f3aaa77rr91c40qbhf1lkf7jmsny"; + version = "0.4.1.0"; + sha256 = "0kxkyijkxvpb5jv815i9s6pg7rnq437jj7hrwr0xprxd709mc648"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bound elm-syntax haskell-to-elm http-types protolude - servant servant-multipart text + aeson base bound elm-syntax haskell-to-elm http-types servant + servant-multipart text ]; testHaskellDepends = [ - aeson base bound elm-syntax haskell-to-elm http-types protolude - servant servant-multipart text + aeson base bound elm-syntax haskell-to-elm http-types servant + servant-multipart text ]; description = "Automatically generate Elm clients for Servant APIs"; license = stdenv.lib.licenses.bsd3; @@ -217444,33 +218770,6 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.10.1"; - sha256 = "18iqj3c60sx6v1d8lnlv0gcd1xrpvjwqwnshsi2n823dp1j975gp"; - libraryHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive http-types iproute lens network - network-simple text time unix unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive hspec hspec-discover http-types iproute - lens network network-simple raw-strings-qq text time unix - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = stdenv.lib.licenses.mit; - }) {}; - - "serverless-haskell_0_10_2" = callPackage - ({ mkDerivation, aeson, aeson-casing, amazonka-core - , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive - , hspec, hspec-discover, http-types, iproute, lens, network - , network-simple, raw-strings-qq, text, time, unix - , unordered-containers - }: - mkDerivation { - pname = "serverless-haskell"; version = "0.10.2"; sha256 = "1iy69394dqv38dlh71m8sarcfps9gaaq90zpc4f169vnhpr59wak"; libraryHaskellDepends = [ @@ -217487,7 +218786,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession" = callPackage @@ -217816,6 +219114,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "set-cover_0_1_1" = callPackage + ({ mkDerivation, array, base, containers, enummapset, non-empty + , prelude-compat, psqueues, QuickCheck, random, semigroups, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "set-cover"; + version = "0.1.1"; + sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers enummapset non-empty prelude-compat psqueues + semigroups transformers utility-ht + ]; + testHaskellDepends = [ + array base containers enummapset QuickCheck transformers utility-ht + ]; + benchmarkHaskellDepends = [ + array base containers enummapset QuickCheck random timeit + transformers utility-ht + ]; + description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "set-extra" = callPackage ({ mkDerivation, base, containers, mtl, syb }: mkDerivation { @@ -217910,8 +219235,8 @@ self: { pname = "setgame"; version = "1.1"; sha256 = "1hr2kb4d7m22d48gh74h5z8c6shkprincf0qb9wc2fq2hj7c3c1l"; - revision = "1"; - editedCabalFile = "1shkmfmjnvc47gy9ck6knf94571if4qjm92c1p8kji9v0n24yzfw"; + revision = "2"; + editedCabalFile = "0cb1vajyh3fxrkq97cvlkvpskgrnn4zs2gk8al9dcnn3dq0j3v58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random vty ]; @@ -218512,20 +219837,20 @@ self: { }) {}; "shake-bindist" = callPackage - ({ mkDerivation, archive-sig, archive-tar, base, bytestring, bz2 - , lzlib, shake, zlib, zstd + ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake + , zlib, zstd }: mkDerivation { pname = "shake-bindist"; - version = "0.1.0.0"; - sha256 = "0f2w7bbnnigfjpfywljl6k2gcz1rq99lfz7cig0076rbjg7aifii"; - revision = "2"; - editedCabalFile = "0bk1r9qn41xhhjisvahs0fdsfiv79rb1yk545ry0vw83d0af6kl8"; + version = "1.0.0.0"; + sha256 = "0fzq62a8rjh9jc9dc7rfi6ypp0fax7fhlf632a30mrbpk1hqyfz8"; libraryHaskellDepends = [ - archive-sig archive-tar base bytestring bz2 lzlib shake zlib zstd + archive-sig base bytestring bz2 lzlib shake zlib zstd ]; description = "Rules for binary distributions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-c" = callPackage @@ -219214,6 +220539,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 @@ -219682,6 +221019,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 @@ -220300,6 +221650,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd-args_0_1_6" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "simple-cmd-args"; + version = "0.1.6"; + sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd"; + libraryHaskellDepends = [ base optparse-applicative ]; + description = "Simple command args parsing and execution"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -221324,8 +222686,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; @@ -221355,6 +222717,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-nats_0_4_4" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "singleton-nats"; + version = "0.4.4"; + sha256 = "14am0aggfrnd2w5g8cjljx0vmmrhy6r36xpkfrxpralhkr7h52m8"; + libraryHaskellDepends = [ base singletons ]; + description = "Unary natural numbers relying on the singletons infrastructure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-typelits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -221389,6 +222763,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 @@ -222040,6 +223440,8 @@ self: { ]; description = "Lucid support for Skylighting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skylighting-modding" = callPackage @@ -222767,6 +224169,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 { @@ -225283,6 +226710,8 @@ self: { pname = "some"; version = "1.0.1"; sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii"; + revision = "1"; + editedCabalFile = "0gpr24rf427l82d8gb3x97yj03vc2v8ky3b6m1gb4j3g4yvvmr96"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -225317,6 +226746,8 @@ self: { pname = "sop-core"; version = "0.5.0.0"; sha256 = "12zqdr0g4s3fr6710ngph0fr06lbc12c849izcl4cjj4g9w3v3zz"; + revision = "1"; + editedCabalFile = "050z7a0k9m0q416cqnxx0gaqrfdjpqangnfhlpdkv3nsxndffv6v"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -226047,8 +227478,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 @@ -227050,8 +228481,8 @@ self: { ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; - version = "0.1.6.3"; - sha256 = "11z6g85dzrvkhnz0g6rhv5s2ssqcyyzbi2pp5rwzp30xp0ivsx95"; + version = "0.1.6.4"; + sha256 = "1rd2rkhq56zwv3s1jzxq0vjshjnf5818f70w6ayxbmmg87kiwwy0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "SQL keywords data constructors into OverloadedString"; @@ -227139,8 +228570,6 @@ self: { ]; description = "Mid-Level SQLite client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sqlite-simple-errors" = callPackage @@ -227284,20 +228713,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; @@ -227679,35 +229109,6 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.1.0"; - sha256 = "1q34h46px7miy2kx1yzaj785ai70mkchmijpdq2iih1fffir8kvk"; - revision = "2"; - editedCabalFile = "0vzby2q8qp6z74ighqalw05b94821cl9w6dbwy4hkgd67pc38nph"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory filepath - megaparsec mtl template-haskell text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec template-haskell text yaml - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_2_1_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, file-embed, filepath, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; version = "2.1.1"; sha256 = "06pn7pm5vgk9f4bsh3m29cik514nv5w655ip04k7p5jv9xgmn4ld"; enableSeparateDataOutput = true; @@ -227725,7 +229126,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage @@ -228115,8 +229515,8 @@ self: { pname = "stack2cabal"; version = "1.0.5"; sha256 = "15swq7rv997fh1qka7ga5hc90gc889xzkx61910jz3an6sy5zx0p"; - revision = "1"; - editedCabalFile = "15qc686alcfbxjpr7iyi2bxv801cmbkqvncpb6jd0879ll9lznrh"; + revision = "2"; + editedCabalFile = "12dkq7shcsyp8yrr2vvzf968w3x11kgxqlam1h0m33zvjksbw6dq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230108,6 +231508,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storable-record_0_0_5" = callPackage + ({ mkDerivation, base, semigroups, transformers, utility-ht }: + mkDerivation { + pname = "storable-record"; + version = "0.0.5"; + sha256 = "17nf0bx3g169cpslf8prr5h5lvxl389m23rbsyb3kdai45fibpwf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base semigroups transformers utility-ht + ]; + description = "Elegant definition of Storable instances for records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storable-static-array" = callPackage ({ mkDerivation, array, base, tagged, vector }: mkDerivation { @@ -230333,15 +231749,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 = [ @@ -234777,22 +236193,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 = [ @@ -235550,6 +236966,8 @@ self: { pname = "taffybar"; version = "3.2.2"; sha256 = "02b6rmsb89c1h7fr81ljbij30pnl8z4dz6xz367g7a2b9hwq42gz"; + revision = "1"; + editedCabalFile = "0284vnzvgpjjh95p67k2b5476npa52hs8g55fvlvlcx487zpc1sc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -235999,8 +237417,8 @@ self: { pname = "tai"; version = "0"; sha256 = "1kp7m9mhawi2fbdsir4kg9z6hbmlw4kmp3kjvlk4qkhvckgl3pxw"; - revision = "1"; - editedCabalFile = "0m95bx120pjigxncbdb28y3cv4d6x05vgpjgny86vk0lkslk130y"; + revision = "3"; + editedCabalFile = "09wmlfswhs0839iq08br4i4zgjavvwxavcp0i0mldgrj82x9cxfy"; libraryHaskellDepends = [ base clock lens mtl parsers time trifecta wreq ]; @@ -236318,8 +237736,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 ]; @@ -236343,8 +237761,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 @@ -237133,8 +238551,6 @@ self: { ]; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-test-reporter" = callPackage @@ -237161,8 +238577,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; @@ -238212,7 +239628,7 @@ self: { license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) libtensorflow;}; + }) {libtensorflow = null;}; "tensorflow-core-ops" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath @@ -240137,8 +241553,8 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.0.0.4"; - sha256 = "18hiy0d18wxh8v4zd6vg69fwd8vp9b2yd3ngf04yh9y1bl8wwwhb"; + version = "0.0.0.6"; + sha256 = "05hr2185q4rcn1hvrrkqy2sbl8xzk7ij00x61vhvmyk29dbbk2cf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -240159,8 +241575,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 ]; @@ -240184,6 +241600,8 @@ self: { pname = "text-show"; version = "3.8.5"; sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg"; + revision = "1"; + editedCabalFile = "1610wjf52hlkkxwavz0gwi3bxszwv1cmnglbvspj1raxysinhgdj"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -240215,8 +241633,8 @@ self: { pname = "text-show-instances"; version = "3.8.3"; sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d"; - revision = "1"; - editedCabalFile = "104r5k4h4sdf69frpc0pr8jijk4v9dalw9c18yib653bwjw0ypl4"; + revision = "3"; + editedCabalFile = "08hdil68nn7ly82d8dk31lv4wdgrl725wkx4qfmp6kbcd2plrwvq"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -240726,6 +242144,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 { @@ -240818,20 +242259,20 @@ self: { }) {}; "th-instance-reification" = callPackage - ({ mkDerivation, base, containers, HTF, list-extras, loch-th - , placeholders, template-haskell, th-expand-syns + ({ mkDerivation, base, containers, list-extras, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, th-expand-syns }: mkDerivation { pname = "th-instance-reification"; - version = "0.1.4"; - sha256 = "0cnq7qxqpc58a59iv8sfqrkhx9wkzpgn9l7r84kh0xa21w16inki"; + version = "0.1.5.1"; + sha256 = "0jafxmd767z52my86dh1dk89h6wx2qf11vx4yk9qw563a7xzv6rm"; libraryHaskellDepends = [ - base containers list-extras loch-th placeholders template-haskell - th-expand-syns + base containers list-extras template-haskell th-expand-syns ]; testHaskellDepends = [ - base containers HTF list-extras loch-th placeholders - template-haskell th-expand-syns + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck template-haskell ]; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; @@ -241336,8 +242777,8 @@ self: { pname = "these"; version = "1.0.1"; sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r"; - revision = "1"; - editedCabalFile = "0923r86fnmgpx0msm68aszirh2n19nn5bccgjxfh2146jw4z7w3z"; + revision = "2"; + editedCabalFile = "1dk8rpm814k7fmkcff7qf2y0s7idnfswd6674kd12bs6ywmgf89n"; libraryHaskellDepends = [ aeson assoc base base-compat binary deepseq hashable QuickCheck semigroupoids unordered-containers @@ -241352,8 +242793,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; @@ -242272,14 +243713,14 @@ self: { broken = true; }) {}; - "time_1_9_3" = callPackage + "time_1_10" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.9.3"; - sha256 = "03n7lsapydivwj7lv2azb5i31ph8365kzh7zbl3kcgzzmiz9cnsp"; + version = "1.10"; + sha256 = "1000fhgcvqagvyhm587zf6y9g2ffj517w0hsvvpbzj1sggyjc93s"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -242311,10 +243752,8 @@ self: { }: mkDerivation { pname = "time-compat"; - version = "1.9.2.2"; - sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52"; - revision = "2"; - editedCabalFile = "1i94pch4zj713gxcrlb09airbh3hqqs7cscjjfkxk9lixkk6iwnc"; + version = "1.9.3"; + sha256 = "126vlfzv3z91vnjlkqarkyhs91hrx4g08gnrvsldqpclczk48smv"; libraryHaskellDepends = [ base base-orphans deepseq time ]; testHaskellDepends = [ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit @@ -244116,8 +245555,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"; @@ -244476,6 +245915,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "topograph_1_0_0_1" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , vector + }: + mkDerivation { + pname = "topograph"; + version = "1.0.0.1"; + sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; + libraryHaskellDepends = [ + base base-compat base-orphans containers vector + ]; + description = "Directed acyclic graphs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "torch" = callPackage ({ mkDerivation, base, mtl, parallel, QuickCheck }: mkDerivation { @@ -244637,6 +246092,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 @@ -244947,6 +246429,8 @@ self: { testHaskellDepends = [ base directory hspec process ]; description = "Package to list all tracked and untracked existing files via Git"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tracker" = callPackage @@ -245901,16 +247385,16 @@ 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"; @@ -247254,33 +248738,6 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.16"; - sha256 = "164cs5gsl6pmfj4yd9p4vj02n1sj5krgd6azd5zfgyw4q7bfc5jn"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ - base doctest fail system-filepath temporary - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_5_17" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, fail - , foldl, hostname, managed, optional-args, optparse-applicative - , process, semigroups, stm, streaming-commons, system-fileio - , system-filepath, temporary, text, time, transformers, unix - , unix-compat - }: - mkDerivation { - pname = "turtle"; version = "1.5.17"; sha256 = "0chj4issjbkdkj1jbcpi8v104784qnzvkq81a4wcdijk09biphq7"; libraryHaskellDepends = [ @@ -247296,7 +248753,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -250949,8 +252405,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"; @@ -250963,8 +252419,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 ]; @@ -250993,6 +252449,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.1"; sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh"; + revision = "1"; + editedCabalFile = "0g3qpvgw304yml1n9ly78qrsrrw53f6zpkciyk1xc0nmlm0dkwih"; libraryHaskellDepends = [ adjunctions base comonad containers contravariant universe-base ]; @@ -251019,8 +252477,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; @@ -251034,6 +252492,8 @@ self: { pname = "universe-some"; version = "1.2"; sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh"; + revision = "1"; + editedCabalFile = "1rx1cw40clsla3sixm0gzdbni9f13ngncl02fm9fl8kgf23w9q73"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -251346,8 +252806,8 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.2.1.0"; - sha256 = "0qhgiym7slz3n68py4izs52wfhs5d7nyxzwnj8q86rvkvy6lfm5v"; + version = "0.2.1.1"; + sha256 = "0hxxngldp4zr55qv67gf62a87yxr1f0xfyh4gfzr45q62mscs8xv"; libraryHaskellDepends = [ base resource-pool time transformers unliftio-core ]; @@ -252835,6 +254295,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "utility-ht_0_0_15" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "utility-ht"; + version = "0.0.15"; + sha256 = "148gdz6pbl1i5qjvjrq5576pg58anmh18xha37n9fncjy36pjp44"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uu-cco" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -253519,6 +254992,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation-selective" = callPackage + ({ mkDerivation, base, deepseq, doctest, hedgehog, hspec + , hspec-hedgehog, selective, text + }: + mkDerivation { + pname = "validation-selective"; + version = "0.0.0.0"; + sha256 = "01awbhfday2j0jcfgqq074yqxxasqddwxhlwigsbjgv94b4c55bd"; + libraryHaskellDepends = [ base deepseq selective ]; + testHaskellDepends = [ + base doctest hedgehog hspec hspec-hedgehog selective text + ]; + 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 ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -254160,6 +255651,8 @@ self: { pname = "vec"; version = "0.3"; sha256 = "0r2jk3jqwn0r4wnpgc8k8i664g3rrs6dkyfsysysn4w10j22j5sr"; + revision = "1"; + editedCabalFile = "1i43p5x4j2h3rza2aaz2b7cdll0mrany1g6pgsgzbqq8m92j7mhs"; libraryHaskellDepends = [ adjunctions base deepseq distributive fin hashable QuickCheck semigroupoids transformers @@ -254178,6 +255671,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; @@ -254312,8 +255807,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 = [ @@ -254736,6 +256231,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"; @@ -255998,7 +257495,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 @@ -256009,8 +257506,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.28.1"; - sha256 = "0hshmpa3n6936527wimxf3vi5v6gddp09kxjjmcxjwq39h9a640y"; + version = "5.28.2"; + sha256 = "0jfiha8hwpdpnz4i7d94dsgcrfd20y0kjp9crn3ds2jx8kln1prv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256468,27 +257965,6 @@ self: { }: mkDerivation { pname = "wai-enforce-https"; - version = "0.0.2"; - sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring case-insensitive http-types network text wai - ]; - testHaskellDepends = [ - base bytestring case-insensitive hspec http-types wai wai-extra - ]; - description = "Enforce HTTPS in Wai server app safely"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-enforce-https_0_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, hspec - , http-types, network, text, wai, wai-extra - }: - mkDerivation { - pname = "wai-enforce-https"; version = "0.0.2.1"; sha256 = "1mbhk50j1a47ydg5kd6bj3nbzqfq1abm1d1vcxc3smw4fgf39g5x"; isLibrary = true; @@ -256502,7 +257978,6 @@ self: { ]; description = "Enforce HTTPS in Wai server app safely"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-eventsource" = callPackage @@ -257087,6 +258562,25 @@ self: { broken = true; }) {}; + "wai-middleware-clacks" = callPackage + ({ mkDerivation, base, base-compat-batteries, bytestring + , case-insensitive, http-types, tasty, tasty-wai, text, wai + }: + mkDerivation { + pname = "wai-middleware-clacks"; + version = "0.1.0.1"; + sha256 = "1mx3qmyiywib8wcrccxd7wjlx4jv9wlc5w8lykivgh8q66pbcihf"; + libraryHaskellDepends = [ + base base-compat-batteries bytestring case-insensitive http-types + text wai + ]; + testHaskellDepends = [ + base base-compat-batteries http-types tasty tasty-wai wai + ]; + description = "GNU Terry Pratchett - Add the X-Clacks-Overhead Header to Wai Responses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-consul" = callPackage ({ mkDerivation, async, base, base-prelude, bytestring, conduit , conduit-extra, consul-haskell, enclosed-exceptions, http-client @@ -257446,6 +258940,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.3"; sha256 = "0l6az106r970v3jwx3z7fg7x8ja8x5hla0m5lwg7sjfs9vdh0bnl"; + revision = "1"; + editedCabalFile = "0jinswa97ll70xxj6hm4mxw7i1cfnm8jn87aczzccn9xscdpll4c"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -258184,15 +259680,16 @@ self: { "warp-grpc" = callPackage ({ mkDerivation, async, base, binary, bytestring, case-insensitive - , http-types, http2, http2-grpc-types, wai, warp, warp-tls + , http-types, http2, http2-grpc-types, unliftio-core, wai, warp + , warp-tls }: mkDerivation { pname = "warp-grpc"; - version = "0.3.0.0"; - sha256 = "15zpb9liai56i9765sf05kww7zykd68kd38vc0s0rhx9jgqk2clj"; + version = "0.4.0.1"; + sha256 = "0dajbs3gxibnllzs134wa7vqclnyfj2r3hc70dci51wgnmi4b7xr"; libraryHaskellDepends = [ async base binary bytestring case-insensitive http-types http2 - http2-grpc-types wai warp warp-tls + http2-grpc-types unliftio-core wai warp warp-tls ]; description = "A minimal gRPC server on top of Warp"; license = stdenv.lib.licenses.bsd3; @@ -259693,21 +261190,25 @@ self: { }) {}; "weeder" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq - , directory, extra, filepath, foundation, hashable, process, text - , unordered-containers, vector, yaml + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, transformers }: mkDerivation { pname = "weeder"; - version = "1.0.8"; - sha256 = "1ylwq1087x6ppn5y5krvl6q6fxcln58y8fwbah3ygp0cpgm4w816"; + version = "2.0.1"; + sha256 = "1x5hgyp3zcwz63wcwh8bqalckcb7baakj39zwymifirxvhkws1xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cmdargs deepseq directory extra filepath - foundation hashable process text unordered-containers vector yaml + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers ]; - executableHaskellDepends = [ base ]; description = "Detect dead code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -260065,6 +261566,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "wide-word_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog + , primitive, QuickCheck, quickcheck-classes, semirings + }: + mkDerivation { + pname = "wide-word"; + version = "0.1.1.1"; + sha256 = "19mxi6mfri4q96lqh3zllmacaln2wdp0ipzmhk7v9xqbphpfjrfj"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ + base bytestring ghc-prim hedgehog primitive QuickCheck + quickcheck-classes semirings + ]; + description = "Data types for large but fixed width signed and unsigned integers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wigner-symbols" = callPackage ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive , random, vector @@ -261052,8 +262571,8 @@ self: { }: mkDerivation { pname = "wordlist"; - version = "0.1.0.2"; - sha256 = "1p3pzacg4s0hx4gq2slm1bgkvr8fh3q1iqlpidbc3pc9whclr173"; + version = "0.1.0.4"; + sha256 = "0v2xnm4iqk8wh3l05vkmfblwk49q54awp2qr1cwszgxfzaz4n9zb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base optparse-applicative text ]; @@ -265014,35 +266533,6 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.2.0"; - sha256 = "035sqc2bnya3ghv5i0qk9jdg9q6jvqzgnc5gkg9mgf4drjrd5wni"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_3_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; version = "0.11.3.0"; sha256 = "01lafh83rp0v49f052vyv4gcbdgzcf42cmg0iqlykk6c586ksvh4"; configureFlags = [ "-fsystem-libyaml" ]; @@ -265061,7 +266551,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -265269,8 +266758,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "3"; - editedCabalFile = "02zzv9xlmvja8jpgnk1r7wfrh33593qbmhbwrcnw0bmjvbk28ps1"; + revision = "4"; + editedCabalFile = "0yx1g19shmrhapmyqzksh861zyyrlwvv158ls5n9imlxr21zssf3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -265637,8 +267126,8 @@ self: { }: mkDerivation { pname = "yeamer"; - version = "0.1.0.3"; - sha256 = "02v33ya0nc0qvsnc5dz33kargyprzxjhbrcdfi439psxh43rw9fp"; + version = "0.1.0.5"; + sha256 = "0c8yrh43h9qhhdiz0dnrh00frfz0cymzzz9k723jnp03b8994srq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265957,6 +267446,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_10" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.10"; + sha256 = "0nfrq61dqifzbnqx8m62j1q6nmlj04mis864yg2k36mra9njap27"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -266091,8 +267609,8 @@ self: { }: mkDerivation { pname = "yesod-auth-fb"; - version = "1.9.1"; - sha256 = "1368hxic51vnilwp6dygc98yfclqi0vn1vwkxpvdd9vzy73kdj0i"; + version = "1.10.1"; + sha256 = "01ckr3zs9bqwwskah2fd7rkpirifyl16v1xk062qx87zcwkf408r"; libraryHaskellDepends = [ aeson base bytestring conduit fb http-conduit resourcet shakespeare text time transformers unliftio wai yesod-auth yesod-core yesod-fb @@ -266774,8 +268292,8 @@ self: { }: mkDerivation { pname = "yesod-fb"; - version = "0.6.0"; - sha256 = "0anhnbwc9j11lm2sh8wi15p160vb9g0ng8lqc6g8am61jsxxw40x"; + version = "0.6.1"; + sha256 = "1nyi5jp85ysabljkds6h4w8ndrb12ac76awsih52amf60k4n7afl"; libraryHaskellDepends = [ aeson base bytestring conduit fb http-client-tls http-conduit memory text wai yesod-core @@ -269648,7 +271166,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zip_1_4_0" = callPackage + "zip_1_4_1" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory , dlist, exceptions, filepath, hspec, monad-control, mtl @@ -269657,8 +271175,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.4.0"; - sha256 = "07g17n6fr86c6c5yhs8ml53mk0g032060vja620bp32irfm00m2r"; + version = "1.4.1"; + sha256 = "0jnvqss17zjfs91flsammlx4flw527iddlav37jzqihi6j65aqp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269885,6 +271403,8 @@ self: { pname = "zlib"; version = "0.6.2.1"; sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h"; + revision = "1"; + editedCabalFile = "0i9g71jvdw22bi9bi8dm5khwzcsv6cv8yadmf7afklg4xigxykfk"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/nixpkgs/pkgs/development/idris-modules/default.nix b/nixpkgs/pkgs/development/idris-modules/default.nix index 074a260b8169..7011a513c101 100644 --- a/nixpkgs/pkgs/development/idris-modules/default.nix +++ b/nixpkgs/pkgs/development/idris-modules/default.nix @@ -177,6 +177,8 @@ test = callPackage ./test.nix {}; + tf-random = callPackage ./tfrandom.nix {}; + tlhydra = callPackage ./tlhydra.nix {}; tomladris = callPackage ./tomladris.nix {}; diff --git a/nixpkgs/pkgs/development/idris-modules/tfrandom.nix b/nixpkgs/pkgs/development/idris-modules/tfrandom.nix new file mode 100644 index 000000000000..5c6319503123 --- /dev/null +++ b/nixpkgs/pkgs/development/idris-modules/tfrandom.nix @@ -0,0 +1,23 @@ +{ stdenv +, build-idris-package +, fetchFromGitHub +, lib +}: +build-idris-package { + name = "tf-random"; + version = "2020-01-15"; + + src = fetchFromGitHub { + owner = "david-christiansen"; + repo = "idris-tf-random"; + rev = "202aac3b96757e8247f6e26945329d90dd668aed"; + sha256 = "1z8pyrsm1kdsspcs3h96k38h44ss0mv39lcz7xvwg8ickys3kqxl"; + }; + + meta = { + description = "Port of Haskell tf-random"; + homepage = "https://github.com/david-christiansen/idris-tf-random"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mikesperber ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/nixpkgs/pkgs/development/interpreters/groovy/default.nix index 67d9ecf9c61f..e1d404a6b15d 100644 --- a/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "2.5.9"; + version = "3.0.0"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "16xq8mz7270kmiq4xb0g52y7ik1bbl2nb8aaz9zw8a9h38rdr9zy"; + sha256 = "10nn04hfky4x75nss33vvslw958pjvhw35lcfb3lxvaifqg23cpl"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix index ed82f76eec24..1db2dd60197b 100644 --- a/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "joker"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' go generate ./... ''; diff --git a/nixpkgs/pkgs/development/interpreters/octave/default.nix b/nixpkgs/pkgs/development/interpreters/octave/default.nix index b32d15b2a1f9..4a63d1862014 100644 --- a/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -49,6 +49,8 @@ # - JIT compiler for loops: , enableJIT ? false , llvm ? null +, libiconv +, darwin }: let @@ -107,10 +109,13 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) + ++ (stdenv.lib.optionals (stdenv.isDarwin) [ libiconv + darwin.apple_sdk.frameworks.Accelerate + darwin.apple_sdk.frameworks.Cocoa ]) ; nativeBuildInputs = [ pkgconfig - gfortran + gfortran # Listed here as well because it's outputs are split fftw fftwSinglePrec @@ -135,6 +140,7 @@ stdenv.mkDerivation rec { "--with-blas=openblas" "--with-lapack=openblas" ] + ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] @@ -161,7 +167,7 @@ stdenv.mkDerivation rec { # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT broken = enableJIT; platforms = if overridePlatforms == null then - (with stdenv.lib.platforms; linux ++ darwin) + (with stdenv.lib; platforms.linux ++ platforms.darwin) else overridePlatforms; }; } diff --git a/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 7e0580ce063d..b568ee6751d7 100755 --- a/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/nixpkgs/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/nixpkgs/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix index 3e9716af5508..8e66bf96e8ca 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { homepage = https://racket-lang.org/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix index ca8d2b2b0dab..9d0f47d90d2a 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix +++ b/nixpkgs/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 ]; diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix index 3c5c5f2a2f27..ade97b56a648 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix index 84a214201a01..f12e60b14f06 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix index b3ae8c7aa31c..16a643e2a7ff 100644 --- a/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "5.0.1"; + version = "5.0.2"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "0mmz7kdpzs7xf40qypn4qyka4nq2dykz9sdkimfgpdka9l7lrfwv"; + sha256 = "0w97knzw85mljrmns8fxjqinx0fqwls9g91mk434ryf6ciy6yign"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix index 8be98f061a84..82d11cdc3a4a 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix @@ -8,16 +8,16 @@ in stdenv.mkDerivation rec { pname = "aqbanking"; inherit version; - src = let - qstring = "package=03&release=${releaseId}&file=02"; - mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); - in fetchurl { - name = "${pname}-${version}.tar.gz"; - urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; + src = fetchurl { + url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; inherit sha256; }; + # Set the include dir explicitly, this fixes a build error when building + # kmymoney because otherwise the includedir is overwritten by gwenhywfar's + # cmake file postPatch = '' + sed -i '/^set_and_check(AQBANKING_INCLUDE_DIRS "@aqbanking_headerdir@")/i set_and_check(includedir "@includedir@")' aqbanking-config.cmake.in sed -i -e '/^aqbanking_plugindir=/ { c aqbanking_plugindir="\''${libdir}/gwenhywfar/plugins" }' configure @@ -27,8 +27,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext ]; - configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ]; - 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; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 061ed77849f4..ee1fffdacddf 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -16,12 +16,8 @@ in stdenv.mkDerivation rec { pname = "gwenhywfar"; inherit version; - src = let - qstring = "package=01&release=${releaseId}&file=02"; - mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); - in fetchurl { - name = "${pname}-${version}.tar.gz"; - urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; + src = fetchurl { + url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix index 32ec4dd06fd6..0e01480a4bdf 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -6,12 +6,8 @@ in stdenv.mkDerivation rec { pname = "libchipcard"; inherit version; - src = let - qstring = "package=02&release=${releaseId}&file=01"; - mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); - in fetchurl { - name = "${pname}-${version}.tar.gz"; - urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; + src = fetchurl { + url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix b/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix index 884543d282a7..8016053c42de 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix @@ -1,12 +1,11 @@ -# This file is autogenerated from update.sh in the same directory. { - gwenhywfar.version = "4.20.0"; - gwenhywfar.sha256 = "1c0g3f8jk6j693774ifslx2ds4ksabgbbalhhm9gk20kpamxm22s"; - gwenhywfar.releaseId = "208"; + gwenhywfar.version = "5.1.3"; + gwenhywfar.sha256 = "0xjr9d94y46h7pfdhz5ygn01pmlm66rhiybr520h13nvjh4zid0r"; + gwenhywfar.releaseId = "242"; libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; - libchipcard.releaseId = "200"; - aqbanking.version = "5.7.8"; - aqbanking.sha256 = "0s67mysskbiw1h1p0np4ph4351r7wq3nc873vylam7lsqi66xy0n"; - aqbanking.releaseId = "217"; + libchipcard.releaseId = "158"; + aqbanking.version = "6.0.2"; + aqbanking.sha256 = "0n41n3yki1wmax4i9wi485g8zqb43z1adywcixzfq9gbdjhz05hx"; + aqbanking.releaseId = "273"; } diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/update.sh b/nixpkgs/pkgs/development/libraries/aqbanking/update.sh deleted file mode 100755 index 8929e8bc6eb4..000000000000 --- a/nixpkgs/pkgs/development/libraries/aqbanking/update.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -e -basedir="$(cd "$(dirname "$0")" && pwd)" - -getCurrentVersions() { - [ -e "$basedir/sources.nix" ] || return 0 - (cd "$basedir" && nix-instantiate --eval --strict -E ' - toString ((import ../../../../lib).mapAttrsToList - (name: info: "${name}:${info.version}!${info.sha256}!${info.releaseId}") - (import ./sources.nix)) - ' | tr -d '"') -} - -currentVersions="$(getCurrentVersions)" - -getLastestVersion() { - local baseurl="https://www.aquamaniac.de" - local pkglist="sites/download/packages.php?package=$1&showall=1" - local url="$baseurl/$pkglist" - local reVersion='[0-9]+(\.[0-9]+)+' # Only release versions, no betas! - local reHref='href=".*release=([0-9]+).*dummy=[^0-9]*('"$reVersion"')\.tar' - local reFull='s/^.*<a\>.*\<'"$reHref"'.*/\2!\1/p' - curl -s "$url" | sed -nre "$reFull" | sort -V -k 1,1 | tail -n1 -} - -getEntry() { - local name="$1" - for entry in $currentVersions; do - if [ "${entry%%:*}" = "$name" ]; then - echo "${entry#*:}" - return 0 - fi - done - return 1 -} - -prefetchNew() { - local name="$1" - local version="$2" - local package="$3" - local releaseId="$4" - - local url="http://www.aquamaniac.de/sites/download/download.php" - local qstring="package=$package&release=$releaseId&file=01"; - - nix-prefetch-url --name "$name-$version.tar.gz" "$url?$qstring" -} - -processPackage() { - local name="$1" - local package="$2" - - local latest="$(getLastestVersion "$package")" - local current="$(getEntry "$name")" - local currentTail="${current#*!}" - - local currentVersion="${current%%!*}" - local currentSha256="${currentTail%%!*}" - local currentReleaseId="${current##*!}" - - local latestVersion="${latest%%!*}" - local latestReleaseId="${latest##*!}" - - if [ "$latestVersion" = "$currentVersion" -a \ - "$latestReleaseId" = "$currentReleaseId" ]; then - echo " $name.version = \"$currentVersion\";" - echo " $name.sha256 = \"$currentSha256\";" - echo " $name.releaseId = \"$currentReleaseId\";" - return 0 - fi - - local latestSha256="$( - prefetchNew "$name" "$latestVersion" "$package" "$latestReleaseId" - )" - - echo " $name.version = \"$latestVersion\";" - echo " $name.sha256 = \"$latestSha256\";" - echo " $name.releaseId = \"$latestReleaseId\";" - return 0 -} - -generateNewSources() { - echo "# This file is autogenerated from update.sh in the same directory." - echo "{" - for package in gwenhywfar:01 libchipcard:02 aqbanking:03; do - processPackage "${package%%:*}" "${package##*:}" - done - echo "}" -} - -if newSources="$(generateNewSources)"; then - echo "$newSources" > "$basedir/sources.nix" -fi diff --git a/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix b/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix new file mode 100644 index 000000000000..d5c15ad3e38c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }: + +stdenv.mkDerivation rec { + pname = "libinstpatch"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "swami"; + repo = pname; + rev = "v${version}"; + sha256 = "0ksilyszcm7mwb6m8qyrgalvh4h2vkyz7wzj0xczcqkj15bcl4lw"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + propagatedBuildInputs = [ glib libsndfile ]; # Both are needed for includes. + + cmakeFlags = [ + "-DLIB_SUFFIX=" # Install in $out/lib. + ]; + + meta = with stdenv.lib; { + homepage = http://www.swamiproject.org/; + description = "MIDI instrument patch files support library"; + license = licenses.lgpl21; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 44be67d71b4e..233b93d6782b 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -9,8 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z"; }; + patches = [ ./lilv-pkgconfig.patch ]; + nativeBuildInputs = [ pkgconfig python3 wafHook ]; - buildInputs = [ lv2 serd sord sratom ]; + buildInputs = [ serd sord sratom ]; + propagatedBuildInputs = [ lv2 ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/lilv; diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch new file mode 100644 index 000000000000..a5a8c6007e43 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch @@ -0,0 +1,6 @@ +--- a/lilv.pc.in ++++ b/lilv.pc.in +@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins +-Requires: @LILV_PKG_DEPS@ ++Requires: lv2 ++Requires.private: @LILV_PKG_DEPS@ diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix index f26f2b07e71a..fc14236fe24a 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52"; }; + patches = [ ./rtaudio-pkgconfig.patch ]; + enableParallelBuilding = true; buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch new file mode 100644 index 000000000000..8536332d46d7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch @@ -0,0 +1,5 @@ +--- a/rtaudio.pc.in ++++ b/rtaudio.pc.in +@@ -9 +9 @@ Version: @PACKAGE_VERSION@ +-Requires: @req@ ++Requires.private: @req@ diff --git a/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix new file mode 100644 index 000000000000..559642e7485e --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix b/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix deleted file mode 100644 index 2ac3115af2aa..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix index cc338e35d832..a2b65c9bbb41 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.11.1"; + version = "2.11.3"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="1jijj72cas6k5hckkxqppbv1inlwbca37p0ixzs3vzm2jhnd7z31"; + sha256="012j7fnlsdyvg6d7gwdab7yzllkv4wqb164lfg4ixahx9l9schmp"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/dnnl/default.nix b/nixpkgs/pkgs/development/libraries/dnnl/default.nix index 23824e350016..40d9030b9534 100644 --- a/nixpkgs/pkgs/development/libraries/dnnl/default.nix +++ b/nixpkgs/pkgs/development/libraries/dnnl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dnnl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "intel"; repo = "mkl-dnn"; rev = "v${version}"; - sha256 = "17bydid5v43lgwvgxv25i67iiyirmwgbdzvv9wpjig34ryhx8hvf"; + sha256 = "0ydy7ibm6sh1awrikyj938n26cpg5magnxraz2d0pj76irv4vj5m"; }; # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631 diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 9b2d3d0e2470..da04f0b05edd 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -16,7 +16,7 @@ , libass , libkate , libmms -, librdf +, lrdf , ladspaH , libnice , webrtc-audio-processing @@ -178,13 +178,12 @@ in stdenv.mkDerivation rec { libgudev libnice libofa - librdf sbc spandsp # ladspa plug-in ladspaH - librdf # TODO: make build on Darwin + lrdf # TODO: make build on Darwin # lv2 plug-in lilv diff --git a/nixpkgs/pkgs/development/libraries/half/default.nix b/nixpkgs/pkgs/development/libraries/half/default.nix index 063d416a8fc5..b0f4c3a0e9e0 100644 --- a/nixpkgs/pkgs/development/libraries/half/default.nix +++ b/nixpkgs/pkgs/development/libraries/half/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - version = "1.12.0"; + version = "2.1.0"; pname = "half"; src = fetchzip { url = "mirror://sourceforge/half/${version}/half-${version}.zip"; - sha256 = "0096xiw8nj86vxnn3lfcl94vk9qbi5i8lnydri9ws358ly6002vc"; + sha256 = "04v4rhs1ffd4c9zcnk4yjhq0gdqy020518wb7n8ryk1ckrdd7hbm"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/development/libraries/hiredis/default.nix b/nixpkgs/pkgs/development/libraries/hiredis/default.nix index 6dc3871e1c18..4055cb8eb71e 100644 --- a/nixpkgs/pkgs/development/libraries/hiredis/default.nix +++ b/nixpkgs/pkgs/development/libraries/hiredis/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "0ik38lwpmm780jqrry95ckf6flmvd172444p3q8d1k9n99jwij9c"; + sha256 = "1r93ssniiv610pj6d78i1cngism0cdv2k8cmzy7jf9klf76jiwfq"; }; PREFIX = "\${out}"; meta = with stdenv.lib; { - homepage = https://github.com/redis/hiredis; + homepage = "https://github.com/redis/hiredis"; description = "Minimalistic C client for Redis >= 1.2"; license = licenses.bsd3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 176f28093048..ac4bdb4b14c9 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "19.3.0"; + version = "19.4.0r"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1vzh11qr7dwmi3d10nq46k754h3q1yya71nk2jgicaj2mm0ylzx6"; + sha256 = "0gnd82z0wgiw5my1hnqlk9hcjjqpsgasqq5xcdrbkfa40wpb132a"; }; cmakeFlags = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libva libpciaccess intel-gmmlib libX11 ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/media-driver; + homepage = "https://github.com/intel/media-driver"; license = with licenses; [ bsd3 mit ]; description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix index 5127231dab60..29ca85cdeb01 100644 --- a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "libeatmydata-105"; - + src = fetchurl { url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; }; - buildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/eatmydata \ - --prefix PATH : $out/bin + patches = [ ./find-shell-lib.patch ]; + patchFlags = "-p0"; + postPatch = '' + substituteInPlace eatmydata.in --replace NIX_OUT_DIR $out ''; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch b/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch new file mode 100644 index 000000000000..a6320edda29d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch @@ -0,0 +1,20 @@ +--- eatmydata.in 2020-02-01 18:10:59.618679823 -0800 ++++ eatmydata.in.new 2020-02-01 18:08:25.092620247 -0800 +@@ -15,15 +15,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-export `dpkg-architecture|grep DEB_BUILD_MULTIARCH` +- +-shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh" +-if [ -f "$shlib" ]; then +- . "$shlib" +-else +- echo "Unable to locate eatmydata shell library, it was not enabled" >&2 +- exec "$@" +-fi ++shlib="NIX_OUT_DIR/libexec/eatmydata.sh" ++. "$shlib" + + usage() + { diff --git a/nixpkgs/pkgs/development/libraries/libffi/default.nix b/nixpkgs/pkgs/development/libraries/libffi/default.nix index 86e790bb9659..183f30e179e4 100644 --- a/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchurl, fetchpatch , autoreconfHook -# libffi is used in darwin and linux with glibc stdenv -# we cannot run checks within it -, doCheck ? stdenv.hostPlatform.isMusl, dejagnu }: stdenv.mkDerivation rec { @@ -28,10 +25,6 @@ stdenv.mkDerivation rec { NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} ''; - checkInputs = [ dejagnu ]; - - inherit doCheck; - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling. meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index 772027de0fb3..76887347a182 100644 --- a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }: +{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod +, enable-tools ? true +, enablePython ? false, python3, ncurses }: stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.4.2"; + version = "1.5"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "0r0hdindy6pi1va3mhk2lg5dis0qbi535k790w76dxfx1hyavk70"; + sha256 = "1r337ici2nvi9v2h33nf3b7nisirc4s8p31cpv1cg8jbzn3wi15g"; }; - buildInputs = [ kmod ]; + buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive pkgconfig @@ -20,16 +22,16 @@ stdenv.mkDerivation rec { "--enable-tools=${if enable-tools then "yes" else "no"}" "--enable-bindings-cxx" "--prefix=${placeholder "out"}" - ]; + ] ++ lib.optional enablePython "--enable-bindings-python"; - meta = with stdenv.lib; { + meta = with lib; { description = "C library and tools for interacting with the linux GPIO character device"; longDescription = '' Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use the character device instead. This library encapsulates the ioctl calls and data structures behind a straightforward API. ''; - homepage = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/; + homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; license = licenses.lgpl2; maintainers = [ maintainers.expipiplus1 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libite/default.nix b/nixpkgs/pkgs/development/libraries/libite/default.nix index 26d7e1e961d4..240636d518c3 100644 --- a/nixpkgs/pkgs/development/libraries/libite/default.nix +++ b/nixpkgs/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "0pvki6cm3ia27nsd6dljddjgz1bd6avf6c0ppj63fa3sz52lfmga"; + sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libkml/default.nix b/nixpkgs/pkgs/development/libraries/libkml/default.nix new file mode 100644 index 000000000000..eca412fda6cb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libkml/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchFromGitHub +, cmake +, boost +, expat +, zlib +, uriparser +, minizip +, gtest +}: + +stdenv.mkDerivation rec { + pname = "libkml"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "libkml"; + repo = pname; + rev = version; + sha256 = "0gl4cqfps9mzx6hzf3dc10hy5y8smpyf1s31sqm7w343hgsllv0z"; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DBUILD_TESTING=ON" + ]; + + buildInputs = [ + gtest + boost + expat + zlib + uriparser + minizip + ]; + + preCheck = '' + export LD_LIBRARY_PATH=$PWD/lib + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Reference implementation of OGC KML 2.2"; + homepage = https://github.com/libkml/libkml; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/nixpkgs/pkgs/development/libraries/libslirp/default.nix new file mode 100644 index 000000000000..27a4d6ceb64c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libslirp/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, glib +}: + +stdenv.mkDerivation rec { + pname = "libslirp"; + version = "4.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "slirp"; + repo = pname; + rev = "v${version}"; + sha256 = "1qk513fgfh4hwb1ajjmvg9m1bl97m3n731ymxqsh1c3fj468a2am"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ glib ]; + + meta = with stdenv.lib; { + description = "General purpose TCP-IP emulator"; + homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; + license = licenses.bsd3; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix index 35d45845ce62..1b10ac5fdaab 100644 --- a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libx86emu"; - version = "2.6"; + version = "3.1"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "1a43xrgxyl1bawcyf4qnvasgjrmnl1npzlz07yz90vyg56x5c102"; + sha256 = "104xqc6nj9rpi7knl3dfqvasf087hlz2n5yndb1iycw35a6j509b"; }; nativeBuildInputs = [ perl ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "x86 emulation library"; license = licenses.bsd2; - homepage = https://github.com/wfeldt/libx86emu; + homepage = "https://github.com/wfeldt/libx86emu"; maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/librdf/default.nix b/nixpkgs/pkgs/development/libraries/lrdf/default.nix index 5b39940bb3f7..264c18b09ee4 100644 --- a/nixpkgs/pkgs/development/libraries/librdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/lrdf/default.nix @@ -1,29 +1,31 @@ -{ config, stdenv, fetchurl, pkgconfig, autoreconfHook +{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib , doCheck ? config.doCheckByDefault or false, ladspaPlugins }: stdenv.mkDerivation rec { - version = "0.5.0"; - pname = "liblrdf"; + pname = "lrdf"; + version = "0.6.1"; - src = fetchurl { - url = "https://github.com/swh/LRDF/archive/${version}.tar.gz"; - sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"; + src = fetchFromGitHub { + owner = "swh"; + repo = "LRDF"; + rev = "v${version}"; + sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4"; }; postPatch = stdenv.lib.optionalString doCheck '' sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c ''; - preAutoreconf = "rm m4/*"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ladspaH openssl zlib ]; propagatedBuildInputs = [ librdf_raptor2 ]; inherit doCheck; + enableParallelBuilding = true; + meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = https://sourceforge.net/projects/lrdf/; diff --git a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix index dec4e61a7bc8..e79ef1a0cded 100644 --- a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.8"; + name = "nss_wrapper-1.1.10"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1cnzhnz68ywx1jwj6xaxv8hg8hpm63ssxmrlhsz3sfgjhfkmw95l"; + sha256 = "1fifl3allz4hwl331j6fwacc4z2fqwyxdnnkadv518ir8nza3xl8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix new file mode 100644 index 000000000000..667f3d94e05a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "nvidia-optical-flow-sdk"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "NVIDIAOpticalFlowSDK"; + rev = "79c6cee80a2df9a196f20afd6b598a9810964c32"; + sha256 = "1y6igwv75v1ynqm7j6la3ky0f15mgnj1jyyak82yvhcsx1aax0a1"; + }; + + # # We only need the header files. The library files are + # # in the nvidia_x11 driver. + installPhase = '' + mkdir -p $out/include + cp -R * $out/include + ''; + + meta = with stdenv.lib; { + description = "Nvidia optical flow headers for computing the relative motion of pixels between images"; + homepage = "https://developer.nvidia.com/opticalflow-sdk"; + license = licenses.bsd3; # applies to the header files only + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix index 5ed2dd5e23d2..cb8d9c788ca9 100644 --- a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencl-clhpp"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; rev = "v${version}"; - sha256 = "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm"; + sha256 = "0a0n0f1lb86cwfm0ndzykcn965vz1v0n9n3rfmkiwrzkdhc9iy2y"; }; nativeBuildInputs = [ cmake python ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenCL Host API C++ bindings"; - homepage = http://github.khronos.org/OpenCL-CLHPP/; + homepage = "http://github.khronos.org/OpenCL-CLHPP/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 9fffd3d94770..519d4ecd2155 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -15,7 +15,7 @@ , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && - stdenv.hostPlatform.isx86_64, cudatoolkit + stdenv.hostPlatform.isx86_64, cudatoolkit, nvidia-optical-flow-sdk , enableUnfree ? false , enableIpp ? false @@ -166,6 +166,7 @@ stdenv.mkDerivation { # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with # what appears to be some stray headers in dnn/misc/tensorflow # in contrib when generating the Python bindings: + patches = lib.optional enableCuda ./cuda_opt_flow.patch; postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py @@ -213,7 +214,7 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optional enableCuda cudatoolkit + ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ] ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; @@ -249,6 +250,7 @@ stdenv.mkDerivation { "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + "-DNVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" diff --git a/nixpkgs/pkgs/development/libraries/opencv/cuda_opt_flow.patch b/nixpkgs/pkgs/development/libraries/opencv/cuda_opt_flow.patch new file mode 100644 index 000000000000..cb96721fb530 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/opencv/cuda_opt_flow.patch @@ -0,0 +1,26 @@ +diff --git a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt +index e5b823ab4a..a728060d0b 100644 +--- a/opencv_contrib/cudaoptflow/CMakeLists.txt ++++ b/opencv_contrib/cudaoptflow/CMakeLists.txt +@@ -11,18 +11,6 @@ ocv_define_module(cudaoptflow opencv_video opencv_optflow opencv_cudaarithm open + set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT "79c6cee80a2df9a196f20afd6b598a9810964c32") + set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5 "ca5acedee6cb45d0ec610a6732de5c15") + set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_1_0_Headers") +-ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}.zip" +- HASH ${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5} +- URL +- "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/" +- DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}" +- STATUS NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS +- ID "NVIDIA_OPTICAL_FLOW" +- UNPACK RELATIVE_URL) + +-if(NOT NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS) +- message(STATUS "Failed to download NVIDIA_Optical_Flow_1_0 Headers") +-else() +- add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) +- ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}") +-endif() +\ No newline at end of file ++add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) ++ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}") diff --git a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix new file mode 100644 index 000000000000..5cecc33564e4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, tbb, python }: + +stdenv.mkDerivation rec { + pname = "openimagedenoise"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "OpenImageDenoise"; + repo = "oidn"; + rev = "v${version}"; + sha256 = "032s7vablqnmrcc4xf2c94kwj0kbcd64bram10g0yc42fg0a3r9m"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake python ]; + buildInputs = [ tbb ]; + + meta = with stdenv.lib; { + homepage = "https://openimagedenoise.github.io"; + description = "High-Performance Denoising Library for Ray Tracing"; + license = licenses.asl20; + maintainers = [ maintainers.leshainc ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 3c952d601654..a2a0c68c316e 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -59,7 +59,9 @@ let (stdenv.hostPlatform.parsed.cpu.bits != 32) (toString stdenv.hostPlatform.parsed.cpu.bits)}" else if stdenv.hostPlatform.isLinux - then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + then (if stdenv.hostPlatform.isx86_64 + then "./Configure linux-x86_64" + else "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}") else if stdenv.hostPlatform.isiOS then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" else diff --git a/nixpkgs/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix index 4482a9cd312d..b0c7ac3cab6b 100644 --- a/nixpkgs/pkgs/development/libraries/packr/default.nix +++ b/nixpkgs/pkgs/development/libraries/packr/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { @@ -16,9 +17,11 @@ buildGoModule rec { subPackages = [ "packr" "v2/packr2" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index d8aff555e556..a07c3c19a1bb 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,28 +1,41 @@ -{ stdenv, fetchurl, cmake, coreutils, root }: +{ stdenv, fetchurl, cmake, coreutils, python, root }: + +let + pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}"; + withPython = python != null; +in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "1izcldnjbyn6myr7nv7b4jivf2vmdi64ng9gk1vjh998755hfcs1"; + sha256 = "1z491x3blqs0a2jxmhzhmh4kqdw3ddcbvw69gidg4w6icdvkhcpi"; }; - buildInputs = [ cmake root ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ root ] + ++ stdenv.lib.optional withPython python; + + cmakeFlags = [ + "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals withPython [ + "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}" + "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}" + ]; postInstall = '' substituteInPlace "$out"/bin/HepMC3-config \ - --replace 'greadlink' '${coreutils}/bin/readlink' + --replace 'greadlink' '${coreutils}/bin/readlink' \ + --replace 'readlink' '${coreutils}/bin/readlink' ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; - license = licenses.gpl3; - homepage = http://hepmc.web.cern.ch/hepmc/; - platforms = platforms.unix; + license = licenses.gpl3; + homepage = "http://hepmc.web.cern.ch/hepmc/"; + platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix index ecd20d545d58..1f43be20cfb6 100644 --- a/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index ea89dbee0f61..41b6192a9ed3 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "proj"; - version = "6.1.1"; + version = "6.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - sha256 = "0w2v2l22kv0xzq5hwl7n8ki6an8vfsr0lg0cdbkwcl4xv889ysma"; + sha256 = "1ildcp57qsa01kvv2qxd05nqw5mg0wfkksiv9l138dbhp0s7rkxp"; }; outputs = [ "out" "dev"]; diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 3f0dc18f157b..66a7b95e334f 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.4"; + version = "6.0.5"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0cp7sbj20z0vl99qhs3hi5bd6akjd9l7lqdky0p6la4c9y9w5n1w"; + sha256 = "1f2nir1qb0d6r1ndpsg7vpskdw08szq82mqvbwm5bi160xkrqhjf"; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/nixpkgs/pkgs/development/libraries/rubberband/default.nix b/nixpkgs/pkgs/development/libraries/rubberband/default.nix index c9ba339ae0ea..29233a1ad3f5 100644 --- a/nixpkgs/pkgs/development/libraries/rubberband/default.nix +++ b/nixpkgs/pkgs/development/libraries/rubberband/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw -, vampSDK, ladspaH }: +, vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation { name = "rubberband-1.8.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; 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"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 4ffe147b27f2..90d7357cc07e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.7"; + version = "1.2.8"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm"; + sha256 = "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y"; }; # FIXME package boost-test and enable checks @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/BRiAl/BRiAl; + homepage = "https://github.com/BRiAl/BRiAl"; description = "Legacy version of PolyBoRi maintained by sagemath developers"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix index 2bb284477e6d..e70462cd9efc 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix @@ -1,43 +1,42 @@ { stdenv , fetchurl +, fetchpatch , boost , cmake , doxygen , eigen +, mpi4py , numpy -, pkgconfig +, pkg-config +, pybind11 , pytest , pythonPackages , six , sympy -, gtest ? null -, hdf5 ? null -, mpi ? null -, ply ? null -, python ? null -, sphinx ? null -, suitesparse ? null -, swig ? null -, vtk ? null -, zlib ? null -, docs ? false -, pythonBindings ? false -, doCheck ? true }: - -assert pythonBindings -> python != null && ply != null && swig != null; - +, gtest +, hdf5 +, mpi +, ply +, python +, scotch +, setuptools +, sphinx +, suitesparse +, swig +, zlib +}: let - version = "2017.1.0"; + version = "2019.1.0"; dijitso = pythonPackages.buildPythonPackage { pname = "dijitso"; inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; - sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg"; + sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a"; }; - buildInputs = [ numpy six ]; - nativeBuildInputs = [ pytest ]; + propagatedBuildInputs = [ numpy six ]; + checkInputs = [ pytest ]; preCheck = '' export HOME=$PWD ''; @@ -59,11 +58,22 @@ let inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; - sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l"; + sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il"; }; - buildInputs = [ numpy pytest six sympy ]; + propagatedBuildInputs = [ numpy six sympy ]; + checkInputs = [ pytest ]; + + preCheck = '' + # Workaround pytest 4.6.3 issue. + # See: https://bitbucket.org/fenics-project/fiat/pull-requests/59 + rm test/unit/test_quadrature.py + rm test/unit/test_reference_element.py + rm test/unit/test_fiat.py + ''; checkPhase = '' + runHook preCheck py.test test/unit/ + runHook postCheck ''; meta = { description = "Automatic generation of finite element basis functions"; @@ -78,11 +88,14 @@ let inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; - sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg"; + sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1"; }; - buildInputs = [ numpy pytest six ]; + propagatedBuildInputs = [ numpy six ]; + checkInputs = [ pytest ]; checkPhase = '' + runHook preCheck py.test test/ + runHook postCheck ''; meta = { description = "A domain-specific language for finite element variational forms"; @@ -97,12 +110,29 @@ let inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; - sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0"; + sha256 = "1zdg6pziss4va74pd7jjl8sc3ya2gmhpypccmyd8p7c66ji23y2g"; }; - buildInputs = [ dijitso fiat numpy pytest six sympy ufl ]; - checkPhase = '' + nativeBuildInputs = [ + pybind11 + ]; + propagatedBuildInputs = [ + dijitso + fiat + numpy + six + sympy + ufl + setuptools + ]; + checkInputs = [ pytest ]; + preCheck = '' export HOME=$PWD + rm test/unit/ufc/finite_element/test_evaluate.py + ''; + checkPhase = '' + runHook preCheck py.test test/unit/ + runHook postCheck ''; meta = { description = "A compiler for finite element variational forms"; @@ -111,66 +141,118 @@ let license = stdenv.lib.licenses.lgpl3; }; }; - - instant = pythonPackages.buildPythonPackage { - pname = "instant"; + dolfin = stdenv.mkDerivation { + pname = "dolfin"; inherit version; src = fetchurl { - url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz"; - sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q"; + url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; + sha256 = "0kbyi4x5f6j4zpasch0swh0ch81w2h92rqm1nfp3ydi4a93vky33"; }; - buildInputs = [ numpy six ]; + patches = [ + (fetchpatch { + name = "fix-double-prefix.patch"; + url = "https://bitbucket.org/josef_kemetmueller/dolfin/commits/328e94acd426ebaf2243c072b806be3379fd4340/raw"; + sha256 = "1zj7k3y7vsx0hz3gwwlxhq6gdqamqpcw90d4ishwx5ps5ckcsb9r"; + }) + ]; + propagatedBuildInputs = [ + dijitso + fiat + numpy + six + ufl + ]; + nativeBuildInputs = [ + cmake + doxygen + pkg-config + ]; + buildInputs = [ + boost + dijitso + eigen + ffc + fiat + hdf5 + mpi + numpy + (numpy.blas) + ply + python + scotch + six + sphinx + (suitesparse.override { openblas = numpy.blas; }) + swig + sympy + ufl + zlib + ]; + cmakeFlags = [ + "-DDOLFIN_CXX_FLAGS=-std=c++11" + "-DDOLFIN_AUTO_DETECT_MPI=ON" + "-DDOLFIN_ENABLE_CHOLMOD=ON" + "-DDOLFIN_ENABLE_DOCS=ON" + "-DDOLFIN_ENABLE_HDF5=ON" + "-DDOLFIN_ENABLE_MPI=ON" + "-DDOLFIN_ENABLE_SCOTCH=ON" + "-DDOLFIN_ENABLE_UMFPACK=ON" + "-DDOLFIN_ENABLE_ZLIB=ON" + "-DDOLFIN_SKIP_BUILD_TESTS=ON" # Otherwise SCOTCH is not found + # TODO: Enable the following features + "-DDOLFIN_ENABLE_PARMETIS=OFF" + "-DDOLFIN_ENABLE_PETSC=OFF" + "-DDOLFIN_ENABLE_SLEPC=OFF" + "-DDOLFIN_ENABLE_TRILINOS=OFF" + ]; + installCheckPhase = '' + source $out/share/dolfin/dolfin.conf + make runtests + ''; meta = { - description = "Instant inlining of C and C++ code in Python"; + description = "The FEniCS Problem Solving Environment in Python and C++"; homepage = https://fenicsproject.org/; - platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; }; + python-dolfin = pythonPackages.buildPythonPackage rec { + pname = "dolfin"; + inherit version; + disabled = pythonPackages.isPy27; + src = dolfin.src; + sourceRoot = "${pname}-${version}/python"; + nativeBuildInputs = [ + pybind11 + cmake + ]; + dontUseCmakeConfigure = true; + preConfigure = '' + export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH + substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" + substituteInPlace dolfin/jit/jit.py \ + --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ + --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' + ''; + buildInputs = [ + dolfin + boost + ]; -in -stdenv.mkDerivation { - pname = "dolfin"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; - sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds"; - }; - propagatedBuildInputs = [ dijitso fiat numpy six ufl ]; - buildInputs = [ - boost cmake dijitso doxygen eigen ffc fiat gtest hdf5 instant mpi - numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib - ] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ]; - patches = [ ./unicode.patch ]; - cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11" - "-DDOLFIN_AUTO_DETECT_MPI=OFF" - ("-DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF")) - ("-DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF")) - ("-DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF")) - ("-DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF")) - ("-DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF")) - "-DDOLFIN_ENABLE_PARMETIS=OFF" - "-DDOLFIN_ENABLE_PETSC4PY=OFF" - "-DDOLFIN_ENABLE_PETSC=OFF" - ("-DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF")) - "-DDOLFIN_ENABLE_SCOTCH=OFF" - "-DDOLFIN_ENABLE_SLEPC4PY=OFF" - "-DDOLFIN_ENABLE_SLEPC=OFF" - ("-DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF")) - ("-DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF")) - "-DDOLFIN_ENABLE_TRILINOS=OFF" - ("-DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF")) - ("-DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF")) - ("-DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF")) - ]; - checkPhase = '' - make runtests - ''; - postInstall = "source $out/share/dolfin/dolfin.conf"; - meta = { - description = "The FEniCS Problem Solving Environment in Python and C++"; - homepage = https://fenicsproject.org/; - platforms = stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.lgpl3; + propagatedBuildInputs = [ + dijitso + ffc + mpi4py + numpy + ufl + pythonPackages.pkgconfig + pythonPackages.pybind11 + ]; + 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/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl3; + }; }; -} +in python-dolfin diff --git a/nixpkgs/pkgs/development/libraries/science/math/fenics/unicode.patch b/nixpkgs/pkgs/development/libraries/science/math/fenics/unicode.patch deleted file mode 100644 index 2ef2709263ab..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/fenics/unicode.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0cc9e68de1181d950d4185bf3a87b69a87e4358f Mon Sep 17 00:00:00 2001 -From: "James D. Trotter" <james@simula.no> -Date: Mon, 14 Aug 2017 16:43:53 +0200 -Subject: [PATCH] Use a UTF-8 encoding to avoid errors with decoding non-ascii - characters - ---- - cmake/scripts/generate-swig-interface.py | 6 +++--- - utils/pylit/pylit.py | 10 +++++++--- - 2 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/cmake/scripts/generate-swig-interface.py b/cmake/scripts/generate-swig-interface.py -index 843a49229..7b85453d0 100644 ---- a/cmake/scripts/generate-swig-interface.py -+++ b/cmake/scripts/generate-swig-interface.py -@@ -212,10 +212,10 @@ def extract_swig_modules_dependencies(module_to_submodules, submodule_info): - continue - - # Read code -- with open(header_file) as f: -- code = f.read() -- - try: -+ with open(header_file, encoding='utf-8') as f: -+ code = f.read() -+ - # Extract type info - used_types, declared_types = parse_and_extract_type_info(code) - except Exception as e: -diff --git a/utils/pylit/pylit.py b/utils/pylit/pylit.py -index bcd8ec5e0..8c2964fbd 100755 ---- a/utils/pylit/pylit.py -+++ b/utils/pylit/pylit.py -@@ -1496,7 +1496,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw): - if infile == '-': - in_stream = sys.stdin - else: -- in_stream = open(infile, 'r') -+ in_stream = open(infile, 'r', encoding='utf-8') - - if outfile == '-': - out_stream = sys.stdout -@@ -1505,7 +1505,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw): - elif overwrite == 'update' and is_newer(outfile, infile): - raise IOError((1, "Output file is newer than input file!", outfile)) - else: -- out_stream = open(outfile, 'w') -+ out_stream = open(outfile, 'w', encoding='utf-8') - return (in_stream, out_stream) - - # is_newer -@@ -1731,7 +1731,11 @@ def main(args=sys.argv[1:], **defaults): - - # Convert and write to out_stream:: - -- out_stream.write(str(converter)) -+ try: -+ out_stream.write(str(converter)) -+ except Exception as e: -+ print("Failed to write extract to", out_stream.name) -+ raise - - if out_stream is not sys.stdout: - print("extract written to", out_stream.name) --- -2.14.0 - diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 604413c96d8a..82109b4ba342 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/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 "0"; + rel = if stdenvNoCC.isDarwin then "199" else "166"; 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/16318/l_mkl_${version}.tgz"; + sha256 = "1q4ab87qzraksn8mm4117vj7l3sgpdi2qszj7nx122zi7zmjvngn"; }); 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/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix new file mode 100644 index 000000000000..36c53b2994f5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "mongoose"; + version = "2.0.4"; + + outputs = [ "bin" "out" "dev" ]; + + src = fetchFromGitHub { + owner = "ScottKolo"; + repo = "Mongoose"; + rev = "v${version}"; + sha256 = "0ymwd4n8p8s0ndh1vcbmjcsm0x2cc2b7v3baww5y6as12873bcrh"; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with stdenv.lib; { + description = "Graph Coarsening and Partitioning Library"; + homepage = "https://github.com/ScottKolo/Mongoose"; + license = licenses.gpl3; + maintainers = with maintainers; []; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix new file mode 100644 index 000000000000..599c1be66461 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchFromGitHub +, cmake +, gnum4 +}: + +stdenv.mkDerivation rec { + pname = "suitesparse-graphblas"; + version = "3.2.1"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "DrTimothyAldenDavis"; + repo = "GraphBLAS"; + rev = "v${version}"; + sha256 = "AAwwzrpKFHy40Ldm6hTO6L0FWPYwi3kJj3zrshFwYas="; + }; + + nativeBuildInputs = [ + cmake + gnum4 + ]; + + meta = with stdenv.lib; { + description = "Graph algorithms in the language of linear algebra"; + homepage = "http://faculty.cse.tamu.edu/davis/GraphBLAS.html"; + license = licenses.asl20; + maintainers = with maintainers; []; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index f72574cff583..f4adafd0f387 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,96 +1,65 @@ -{ stdenv, fetchurl, gfortran, openblas, cmake, fixDarwinDylibNames +{ stdenv +, fetchFromGitHub +, gfortran +, openblas +, metis +, fixDarwinDylibNames , gnum4 -, enableCuda ? false, cudatoolkit +, enableCuda ? false +, cudatoolkit }: -let - version = "5.4.0"; - name = "suitesparse-${version}"; - - SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; -in stdenv.mkDerivation rec { - inherit name; - - src = fetchurl { - url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; - sha256 = "1lfvjj787yqyhk25w7brlrkrl7dnnn5dq4ijxws3wrbcd4vd2k9p"; - }; + pname = "suitesparse"; + version = "5.7.1"; - dontUseCmakeConfigure = true; + outputs = [ "out" "dev" "doc" ]; - preConfigure = '' - mkdir -p $out/lib - mkdir -p $out/include - mkdir -p $out/share/doc/${name} - - sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ - -e 's/METIS .*$/METIS =/' \ - -e 's/METIS_PATH .*$/METIS_PATH =/' \ - -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION/' - '' - + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ - -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' - '' - + stdenv.lib.optionalString enableCuda '' - sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ - -e 's|^[[:space:]]*\(CUDA_ROOT =\)|CUDA_ROOT = ${cudatoolkit}|' \ - -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \ - -e 's|^[[:space:]]*\(GPU_CONFIG =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \ - -e 's|^[[:space:]]*\(CUDA_PATH =\)|CUDA_PATH = $(CUDA_ROOT)|' \ - -e 's|^[[:space:]]*\(CUDART_LIB =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \ - -e 's|^[[:space:]]*\(CUBLAS_LIB =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \ - -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \ - -e 's|^[[:space:]]*\(NV20 =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \ - -e 's|^[[:space:]]*\(NV30 =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \ - -e 's|^[[:space:]]*\(NV35 =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \ - -e 's|^[[:space:]]*\(NVCC =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \ - -e 's|^[[:space:]]*\(NVCCFLAGS =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|' - ''; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; - - buildPhase = '' - runHook preBuild + src = fetchFromGitHub { + owner = "DrTimothyAldenDavis"; + repo = "SuiteSparse"; + rev = "v${version}"; + sha256 = "SA9SQKRDKUI1GilNMuCXljcvovLUwRKBUi/tiQ4dl5w="; + }; - # Build individual shared libraries - make library \ - JOBS=$NIX_BUILD_CORES \ - BLAS=-lopenblas \ - LAPACK="" \ - ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"} + nativeBuildInputs = [ + gnum4 + ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - # Build libsuitesparse.so which bundles all the individual libraries. - # Bundling is done by building the static libraries, extracting objects from - # them and combining the objects into one shared library. - mkdir -p static - make static JOBS=$NIX_BUILD_CORES AR_TARGET=$(pwd)/static/'$(LIBRARY).a' - ( - cd static - for i in lib*.a; do - ar -x $i - done - ) - ${if enableCuda then "${cudatoolkit}/bin/nvcc" else "${stdenv.cc.outPath}/bin/cc"} \ - static/*.o \ - ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} \ - -o "lib/libsuitesparse${SHLIB_EXT}" \ - -lopenblas \ - ${stdenv.lib.optionalString enableCuda "-lcublas"} + buildInputs = [ + openblas + metis + gfortran.cc.lib + ] ++ stdenv.lib.optional enableCuda cudatoolkit; - runHook postBuild + preConfigure = '' + # Mongoose and GraphBLAS are packaged separately + sed -i "Makefile" -e '/GraphBLAS\|Mongoose/d' ''; - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r lib $out/ - cp -r include $out/ - cp -r share $out/ - '' - + stdenv.lib.optionalString stdenv.isDarwin '' + makeFlags = [ + "INSTALL=${placeholder "out"}" + "INSTALL_INCLUDE=${placeholder "dev"}/include" + "JOBS=$(NIX_BUILD_CORES)" + "BLAS=-lopenblas" + "MY_METIS_LIB=-lmetis" + "LAPACK=" + ] ++ stdenv.lib.optionals openblas.blas64 [ + "CFLAGS=-DBLAS64" + ] ++ stdenv.lib.optionals enableCuda [ + "CUDA_PATH=${cudatoolkit}" + "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so" + "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" + ]; + + buildFlags = [ + # Build individual shared libraries, not demos + "library" + ]; + + # Likely fixed after 5.7.1 + # https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/f6daae26ee391e475e2295e77c839aa7c1a8b784 + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' # The fixDarwinDylibNames in nixpkgs can't seem to fix all the libraries. # We manually fix them up here. fixDarwinDylibNames() { @@ -109,28 +78,10 @@ stdenv.mkDerivation rec { } fixDarwinDylibNames $(find "$out" -name "*.dylib") - '' - + stdenv.lib.optionalString (!stdenv.isDarwin) '' - # Fix rpaths - cd $out - find -name \*.so\* -type f -exec \ - patchelf --set-rpath "$out/lib:${stdenv.lib.makeLibraryPath buildInputs}" {} \; - '' - + - '' - runHook postInstall - ''; - - nativeBuildInputs = [ - cmake - gnum4 - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - buildInputs = [ openblas gfortran.cc.lib ] - ++ stdenv.lib.optional enableCuda cudatoolkit; + ''; 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/nixpkgs/pkgs/development/libraries/sord/default.nix b/nixpkgs/pkgs/development/libraries/sord/default.nix index 2113d7bd49b4..746054e5939c 100644 --- a/nixpkgs/pkgs/development/libraries/sord/default.nix +++ b/nixpkgs/pkgs/development/libraries/sord/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python3 wafHook ]; - buildInputs = [ serd pcre ]; + buildInputs = [ pcre ]; + propagatedBuildInputs = [ serd ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/sord; diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index 215e26ec43c2..e8d4f3eb4e07 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "20.01"; + version = "20.01.1"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "13pbl46bfzc3z10ydr1crimklyj7f0s73873bjknglw474gm52h8"; + sha256 = "1ci0kj0bv5jp5yipa8g0q0ah71qv6pjvvban1ad0v24f7lq4xh0w"; }; patches = [ ./spdk-dpdk-meson.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix index c32f336939cb..cae975b9a589 100644 --- a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spice-protocol"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; - sha256 = "1b3f44c13pqsp7aabmcinfbmgl79038bp5548l5pjs16lcfam95n"; + sha256 = "0ahk5hlanwhbc64r80xmchdav3ls156cvh9l68a0l22bhdhxmrkr"; }; postInstall = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Protocol headers for the SPICE protocol"; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bluescreen303 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix index d1aea0c82a2c..a20e4383278b 100644 --- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "1fx0db4x0vcahzk5lk2p0ls644s48vfz7mf9qgsr72pplyn1kcnc"; + sha256 = "0khxd1w5piqkxjiibnfvxcpk9lb8pi5x95zll5qs7vpbznn56b18"; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data"; - homepage = https://github.com/TileDB-Inc/TileDB; + homepage = "https://github.com/TileDB-Inc/TileDB"; license = licenses.mit; platforms = [ "x86_64-linux"]; maintainers = with maintainers; [ rakesh4g ]; diff --git a/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix index 8a79dab45b2a..e78e72bf9b87 100644 --- a/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.2.7"; + name = "uid_wrapper-1.2.8"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0mpzr70n24b0khri89hipxiqqay370m93syhnywrdmdxr3dhw2d8"; + sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index 5c508f133e14..8951ed4b002a 100644 --- a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4"; + sha256 = "07vfzg99wq92yg2phza9jc0zvps34yy9gc8v4hibqchdl77fmspx"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; - homepage = https://virgil3d.github.io/; + homepage = "https://virgil3d.github.io/"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.xeji ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index c12c3ca640ba..b1f2663e7f8f 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; + preConfigure = '' + substituteInPlace loader/vulkan.pc.in --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' + ''; + cmakeFlags = [ "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" diff --git a/nixpkgs/pkgs/development/libraries/yder/default.nix b/nixpkgs/pkgs/development/libraries/yder/default.nix index 924a06e9551d..11eda01a76a8 100644 --- a/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -4,13 +4,13 @@ assert withSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "06kxkq8ydgbb6b827hkvmaqd0irpal0n4hm96r3inq1bigz9gnvx"; + sha256 = "1m1aw4im1vvddkl7mknq0h0nj0x2zpql3r17lxhw4mmib05zbdgj"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/nixpkgs/pkgs/development/libraries/zchunk/default.nix index ee07133b7aa0..b7787650e7cc 100644 --- a/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.5"; + version = "1.1.6"; outputs = [ "out" "lib" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - sha256 = "13sqjslk634mkklnmzdlzk9l9rc6g6migig5rln3irdnjrxvjf69"; + sha256 = "1j05f26xppwbkxrm11895blm75i1a6p9q23x7wlkqw198mpnpbbv"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl index 9623e01abcd7..5c36deb73c08 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl +++ b/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl @@ -28,7 +28,7 @@ { <!-- Convert all remote packages --> - <xsl:for-each select="remotePackage"><xsl:sort select="@path" /> + <xsl:for-each select="remotePackage[not(contains(@path, ';') and substring-after(@path, ';') = 'latest')]"><xsl:sort select="@path" /> <!-- Extract the package name from the path --> <xsl:variable name="name"> diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl index 42d19cb69651..de57041f1923 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl +++ b/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl @@ -6,7 +6,7 @@ <xsl:param name="imageType" /> - <xsl:output omit-xml-declaration="yes" indent="no" /> + <xsl:output method="text" omit-xml-declaration="yes" indent="no" /> <xsl:template name="repository-url"> <xsl:variable name="raw-url" select="complete/url"/> @@ -15,33 +15,62 @@ <xsl:value-of select="$raw-url"/> </xsl:when> <xsl:otherwise> - https://dl.google.com/android/repository/sys-img/<xsl:value-of select="$imageType" />/<xsl:value-of select="$raw-url"/> + <xsl:text>https://dl.google.com/android/repository/sys-img/</xsl:text><xsl:value-of select="$imageType" /><xsl:text>/</xsl:text><xsl:value-of select="$raw-url"/> </xsl:otherwise> </xsl:choose> </xsl:template> + <xsl:template mode="revision" match="type-details[codename]"> + <xsl:value-of select="codename" />-<xsl:value-of select="tag/id" />-<xsl:value-of select="abi" /> + </xsl:template> + + <xsl:template mode="revision" match="type-details[not(codename)]"> + <xsl:value-of select="api-level" />-<xsl:value-of select="tag/id" />-<xsl:value-of select="abi" /> + </xsl:template> + + <xsl:template mode="attrkey" match="type-details[codename]"> + <xsl:text>"</xsl:text> + <xsl:value-of select="codename" /> + <xsl:text>".</xsl:text> + <xsl:value-of select="tag/id" /> + <xsl:text>."</xsl:text> + <xsl:value-of select="abi" /> + <xsl:text>"</xsl:text> + </xsl:template> + + <xsl:template mode="attrkey" match="type-details[not(codename)]"> + <xsl:text>"</xsl:text> + <xsl:value-of select="api-level" /> + <xsl:text>".</xsl:text> + <xsl:value-of select="tag/id" /> + <xsl:text>."</xsl:text> + <xsl:value-of select="abi" /> + <xsl:text>"</xsl:text> + </xsl:template> + <xsl:template match="/sys-img:sdk-sys-img"> -{fetchurl}: +<xsl:text>{fetchurl}: { - <xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]"> - <xsl:variable name="revision"> - <xsl:value-of select="type-details/api-level" />-<xsl:value-of select="type-details/tag/id" />-<xsl:value-of select="type-details/abi" /> - </xsl:variable> - - "<xsl:value-of select="type-details/api-level" />".<xsl:value-of select="type-details/tag/id" />."<xsl:value-of select="type-details/abi" />" = { - name = "system-image-<xsl:value-of select="$revision" />"; - path = "<xsl:value-of select="translate(@path, ';', '/')" />"; - revision = "<xsl:value-of select="$revision" />"; - displayName = "<xsl:value-of select="display-name" />"; - archives.all = fetchurl { - <xsl:for-each select="archives/archive"> - url = <xsl:call-template name="repository-url"/>; - sha1 = "<xsl:value-of select="complete/checksum" />"; - </xsl:for-each> - }; +</xsl:text><xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]"> + <xsl:variable name="revision"><xsl:apply-templates mode="revision" select="type-details" /></xsl:variable> + + <xsl:variable name="attrkey"><xsl:apply-templates mode="attrkey" select="type-details" /></xsl:variable> + + <xsl:text> </xsl:text><xsl:value-of select="$attrkey" /><xsl:text> = { + name = "system-image-</xsl:text><xsl:value-of select="$revision" /><xsl:text>"; + path = "</xsl:text><xsl:value-of select="translate(@path, ';', '/')" /><xsl:text>"; + revision = "</xsl:text><xsl:value-of select="$revision" /><xsl:text>"; + displayName = "</xsl:text><xsl:value-of select="display-name" /><xsl:text>"; + archives.all = fetchurl {</xsl:text> + <xsl:for-each select="archives/archive"><xsl:text> + url = </xsl:text><xsl:call-template name="repository-url"/><xsl:text>; + sha1 = "</xsl:text><xsl:value-of select="complete/checksum" /><xsl:text>";</xsl:text> + </xsl:for-each><xsl:text> + }; }; +</xsl:text> </xsl:for-each> -} +<xsl:text>}</xsl:text> </xsl:template> </xsl:stylesheet> diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generate.sh b/nixpkgs/pkgs/development/mobile/androidenv/generate.sh index 1c55734f5f42..895a741adffe 100644..100755 --- a/nixpkgs/pkgs/development/mobile/androidenv/generate.sh +++ b/nixpkgs/pkgs/development/mobile/androidenv/generate.sh @@ -1,16 +1,36 @@ -#!/bin/sh -e +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl libxslt + +set -e + +die() { + echo "$1" >&2 + exit 1 +} + +fetch() { + local url="https://dl.google.com/android/repository/$1" + echo "$url -> $2" + curl -s "$url" -o "$2" || die "Failed to fetch $url" +} + +pushd "$(dirname "$0")" &>/dev/null || exit 1 + +mkdir -p xml # Convert base packages -curl https://dl.google.com/android/repository/repository2-1.xml -o xml/repository2-1.xml +fetch repository2-1.xml xml/repository2-1.xml xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix # Convert system images for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore do - curl https://dl.google.com/android/repository/sys-img/$img/sys-img2-1.xml -o xml/$img-sys-img2-1.xml + fetch sys-img/$img/sys-img2-1.xml xml/$img-sys-img2-1.xml xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix done # Convert system addons -curl https://dl.google.com/android/repository/addon2-1.xml -o xml/addon2-1.xml +fetch addon2-1.xml xml/addon2-1.xml xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix + +popd &>/dev/null diff --git a/nixpkgs/pkgs/development/node-packages/composition-v10.nix b/nixpkgs/pkgs/development/node-packages/composition-v10.nix index 534f42e37d7c..ecb9e5413237 100644 --- a/nixpkgs/pkgs/development/node-packages/composition-v10.nix +++ b/nixpkgs/pkgs/development/node-packages/composition-v10.nix @@ -14,4 +14,4 @@ in import ./node-packages-v10.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/node-packages/composition-v12.nix b/nixpkgs/pkgs/development/node-packages/composition-v12.nix index 3f4fbb7f7cb5..a3a7bc256772 100644 --- a/nixpkgs/pkgs/development/node-packages/composition-v12.nix +++ b/nixpkgs/pkgs/development/node-packages/composition-v12.nix @@ -14,4 +14,4 @@ in import ./node-packages-v12.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/node-packages/composition-v13.nix b/nixpkgs/pkgs/development/node-packages/composition-v13.nix index 7100e8d74742..6eddeb468dbb 100644 --- a/nixpkgs/pkgs/development/node-packages/composition-v13.nix +++ b/nixpkgs/pkgs/development/node-packages/composition-v13.nix @@ -14,4 +14,4 @@ in import ./node-packages-v13.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/node-packages/generate.sh b/nixpkgs/pkgs/development/node-packages/generate.sh index 3b1626f9afb3..66a51721ac81 100755 --- a/nixpkgs/pkgs/development/node-packages/generate.sh +++ b/nixpkgs/pkgs/development/node-packages/generate.sh @@ -1,15 +1,11 @@ #!/usr/bin/env nix-shell -#! nix-shell shell-generate.nix -i bash +#! nix-shell -p nodePackages.node2nix -i bash set -eu -o pipefail -cd "$NODE_NIXPKGS_PATH/pkgs/development/node-packages" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +cd ${DIR} rm -f ./node-env.nix for version in 10 12 13; do - tmpdir=$(mktemp -d) - node2nix --nodejs-$version -i node-packages-v$version.json -o $tmpdir/node-packages-v$version.nix -c $tmpdir/composition-v$version.nix - if [ $? -eq 0 ]; then - mv $tmpdir/node-packages-v$version.nix . - mv $tmpdir/composition-v$version.nix . - fi + node2nix --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix done -cd - diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix index 9c812bf9a733..d70b133fd405 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix @@ -22,31 +22,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.900.6" = { + "@angular-devkit/architect-0.900.7" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.900.6"; + version = "0.900.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.6.tgz"; - sha512 = "WK8e09DgNP1NHP1gqVQ9w+9rlRMVDJxAh4qZGJRjZBXd3LY7y84WWRmTpfuhOSu+82fR3/n76+urxraU3ZVphw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.7.tgz"; + sha512 = "hfiTVYc72kzbXrzK4tea6jnTDnSKpE1D+vEptBXN2tdXEVNEAQI5Qm5L1zVDtt16UdqoUTUypIgUc9jcNH1mUQ=="; }; }; - "@angular-devkit/core-9.0.6" = { + "@angular-devkit/core-9.0.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.6.tgz"; - sha512 = "hCZJbnqLEm1F5Bx+ILcdd3LPgQTn4WFWpfUqMEGGj7UirRInWcz+6UpYotKGTJw85/mV01LrIbtWIkAUXbkkhg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.7.tgz"; + sha512 = "tMrz36sM1xrwvFf9Qm59GwALscVlMP7rQBjtd0fIR/QbsiOAIX4AQbV+vN6Vtwnzo5NIRZY1IXJUhesWms+h5w=="; }; }; - "@angular-devkit/schematics-9.0.6" = { + "@angular-devkit/schematics-9.0.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.6.tgz"; - sha512 = "X7qZDJVrFcPUn+jNUeOH7Bx1D7YTpTFr0d3DBIsQzseReSGu7ugWziQPS4gc5Xm5K0nb8vx6DYtyW0FaIvX0ZA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.7.tgz"; + sha512 = "ryPC+l24f3gX5DFMTLkDM/q2Kp6LPzBn6400k7j4qVdb1cIrZx+JUQd7F4iAksTTkX15EQPanptQXeztUrl9Ng=="; }; }; "@antora/asciidoc-loader-2.2.0" = { @@ -256,22 +256,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.8.6" = { + "@babel/compat-data-7.9.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz"; - sha512 = "CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz"; + sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g=="; }; }; - "@babel/core-7.8.7" = { + "@babel/core-7.9.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.8.7"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz"; - sha512 = "rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; + sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -292,13 +292,13 @@ let sha512 = "4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg=="; }; }; - "@babel/generator-7.8.8" = { + "@babel/generator-7.9.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.8.8"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz"; - sha512 = "HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; + sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA=="; }; }; "@babel/helper-annotate-as-pure-7.8.3" = { @@ -319,22 +319,22 @@ let sha512 = "5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw=="; }; }; - "@babel/helper-builder-react-jsx-7.8.3" = { + "@babel/helper-builder-react-jsx-7.9.0" = { name = "_at_babel_slash_helper-builder-react-jsx"; packageName = "@babel/helper-builder-react-jsx"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz"; - sha512 = "JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha512 = "weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw=="; }; }; - "@babel/helper-call-delegate-7.8.7" = { - name = "_at_babel_slash_helper-call-delegate"; - packageName = "@babel/helper-call-delegate"; - version = "7.8.7"; + "@babel/helper-builder-react-jsx-experimental-7.9.0" = { + name = "_at_babel_slash_helper-builder-react-jsx-experimental"; + packageName = "@babel/helper-builder-react-jsx-experimental"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz"; - sha512 = "doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz"; + sha512 = "3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ=="; }; }; "@babel/helper-compilation-targets-7.8.7" = { @@ -427,13 +427,13 @@ let sha512 = "R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg=="; }; }; - "@babel/helper-module-transforms-7.8.6" = { + "@babel/helper-module-transforms-7.9.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz"; - sha512 = "RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha512 = "0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA=="; }; }; "@babel/helper-optimise-call-expression-7.8.3" = { @@ -499,6 +499,15 @@ let sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA=="; }; }; + "@babel/helper-validator-identifier-7.9.0" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; + sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="; + }; + }; "@babel/helper-wrap-function-7.8.3" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; @@ -508,31 +517,31 @@ let sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ=="; }; }; - "@babel/helpers-7.8.4" = { + "@babel/helpers-7.9.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.8.4"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz"; - sha512 = "VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; + sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA=="; }; }; - "@babel/highlight-7.8.3" = { + "@babel/highlight-7.9.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; - "@babel/parser-7.8.8" = { + "@babel/parser-7.9.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.8.8"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz"; - sha512 = "mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; + sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -589,13 +598,22 @@ let sha512 = "TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.8.3" = { + "@babel/plugin-proposal-numeric-separator-7.8.3" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz"; + sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.9.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz"; - sha512 = "8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; + sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { @@ -607,13 +625,13 @@ let sha512 = "0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.8.3" = { + "@babel/plugin-proposal-optional-chaining-7.9.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz"; - sha512 = "QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha512 = "NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.8.8" = { @@ -688,6 +706,15 @@ let sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; }; }; + "@babel/plugin-syntax-numeric-separator-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; + sha512 = "H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw=="; + }; + }; "@babel/plugin-syntax-object-rest-spread-7.8.3" = { name = "_at_babel_slash_plugin-syntax-object-rest-spread"; packageName = "@babel/plugin-syntax-object-rest-spread"; @@ -769,13 +796,13 @@ let sha512 = "pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w=="; }; }; - "@babel/plugin-transform-classes-7.8.6" = { + "@babel/plugin-transform-classes-7.9.2" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.8.6"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz"; - sha512 = "k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; + sha512 = "TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ=="; }; }; "@babel/plugin-transform-computed-properties-7.8.3" = { @@ -823,22 +850,22 @@ let sha512 = "zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.8.3" = { + "@babel/plugin-transform-flow-strip-types-7.9.0" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz"; - sha512 = "g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha512 = "7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg=="; }; }; - "@babel/plugin-transform-for-of-7.8.6" = { + "@babel/plugin-transform-for-of-7.9.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz"; - sha512 = "M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha512 = "lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ=="; }; }; "@babel/plugin-transform-function-name-7.8.3" = { @@ -868,40 +895,40 @@ let sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA=="; }; }; - "@babel/plugin-transform-modules-amd-7.8.3" = { + "@babel/plugin-transform-modules-amd-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz"; - sha512 = "MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; + sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.8.3" = { + "@babel/plugin-transform-modules-commonjs-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz"; - sha512 = "JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; + sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.8.3" = { + "@babel/plugin-transform-modules-systemjs-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz"; - sha512 = "8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; + sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.8.3" = { + "@babel/plugin-transform-modules-umd-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz"; - sha512 = "evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha512 = "uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ=="; }; }; "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { @@ -931,13 +958,13 @@ let sha512 = "57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ=="; }; }; - "@babel/plugin-transform-parameters-7.8.8" = { + "@babel/plugin-transform-parameters-7.9.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.8.8"; + version = "7.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz"; - sha512 = "hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz"; + sha512 = "fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg=="; }; }; "@babel/plugin-transform-property-literals-7.8.3" = { @@ -949,13 +976,13 @@ let sha512 = "uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg=="; }; }; - "@babel/plugin-transform-react-jsx-7.8.3" = { + "@babel/plugin-transform-react-jsx-7.9.4" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.8.3"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz"; - sha512 = "r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz"; + sha512 = "Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw=="; }; }; "@babel/plugin-transform-regenerator-7.8.7" = { @@ -976,13 +1003,13 @@ let sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A=="; }; }; - "@babel/plugin-transform-runtime-7.8.3" = { + "@babel/plugin-transform-runtime-7.9.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz"; - sha512 = "/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha512 = "pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw=="; }; }; "@babel/plugin-transform-shorthand-properties-7.8.3" = { @@ -1030,13 +1057,13 @@ let sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg=="; }; }; - "@babel/plugin-transform-typescript-7.8.7" = { + "@babel/plugin-transform-typescript-7.9.4" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.8.7"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz"; - sha512 = "7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz"; + sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w=="; }; }; "@babel/plugin-transform-unicode-regex-7.8.3" = { @@ -1057,22 +1084,31 @@ let sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.8.7" = { + "@babel/preset-env-7.9.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.8.7"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz"; - sha512 = "BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha512 = "712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ=="; }; }; - "@babel/preset-flow-7.8.3" = { + "@babel/preset-flow-7.9.0" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.8.3.tgz"; - sha512 = "iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.9.0.tgz"; + sha512 = "88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA=="; + }; + }; + "@babel/preset-modules-0.1.3" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; }; }; "@babel/preset-stage-2-7.8.3" = { @@ -1084,22 +1120,22 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.8.3" = { + "@babel/preset-typescript-7.9.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz"; - sha512 = "qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha512 = "S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg=="; }; }; - "@babel/register-7.8.6" = { + "@babel/register-7.9.0" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.8.6.tgz"; - sha512 = "7IDO93fuRsbyml7bAafBQb3RcBGlCpU4hh5wADA2LJEEcYk92WkwFZ0pHyIi2fb5Auoz1714abETdZKCOxN0CQ=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.9.0.tgz"; + sha512 = "Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q=="; }; }; "@babel/runtime-7.7.7" = { @@ -1111,22 +1147,22 @@ let sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA=="; }; }; - "@babel/runtime-7.8.7" = { + "@babel/runtime-7.9.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.8.7"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz"; - sha512 = "+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; + sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; }; }; - "@babel/runtime-corejs3-7.8.7" = { + "@babel/runtime-corejs3-7.9.2" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.8.7"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz"; - sha512 = "sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; + sha512 = "HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA=="; }; }; "@babel/template-7.8.6" = { @@ -1138,13 +1174,13 @@ let sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; }; }; - "@babel/traverse-7.8.6" = { + "@babel/traverse-7.9.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz"; - sha512 = "2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz"; + sha512 = "jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1165,13 +1201,13 @@ let sha512 = "wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA=="; }; }; - "@babel/types-7.8.7" = { + "@babel/types-7.9.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.8.7"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz"; - sha512 = "k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; + sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng=="; }; }; "@chemzqm/neovim-5.1.9" = { @@ -2587,22 +2623,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.0.6" = { + "@schematics/angular-9.0.7" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.6.tgz"; - sha512 = "oYIfSJF9ISAJWJjIiUnj8Rp1m4t9T3oqKl1FzkMWXvUmR1BfkO2S2/Moi2RQ0aHG6D9Oz4CJjrsQRmjaqBpEZw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.7.tgz"; + sha512 = "3UCeexYx/YVo3kboyPZ8KgqBTduMA18AAm3s2yrC0qj41fBFVVZAZLa74uouTf4RYVgy9kR7J3uv6VLxrJPOnQ=="; }; }; - "@schematics/update-0.900.6" = { + "@schematics/update-0.900.7" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.900.6"; + version = "0.900.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.6.tgz"; - sha512 = "54Xi3FIJQWFBM91vxD9ciKkTlNWaIV7wsjKSImg53h2m2/l2VPPHyIZWI4j79dWXlfJVTNeaqPNYGzJlRvaEmA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.7.tgz"; + sha512 = "e9tX2DGNYfj/k9mVICpQt2bWIYyD92dlsip7LzPeZGt+R9zCp5w19uBLa8Z00OgEGzFR1krhRvkQE5OxkkAnVw=="; }; }; "@serverless/cli-1.4.0" = { @@ -2641,13 +2677,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.5.0" = { + "@serverless/enterprise-plugin-3.6.0" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.5.0.tgz"; - sha512 = "AyY7ADtUItSQFQjNRaXZ5ZgMVeeUJZ05UJHxN3WbO9c3fY6/6TxAQRlrDB2O5hfSPkBDfqhUOSp2xbBwIVg/Tw=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.0.tgz"; + sha512 = "nOefmzh6fz1vY9tfUzDNYVyg1jlsOVdmbp3JVMZMsMhIKQvBpGZYcaAboSyU97pIOFYUlsSBVQsc57IuLsIeiQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2839,6 +2875,15 @@ let sha512 = "dlled3mfpnAt3cQb5hxkFiqfPCj4Yk0xV8Yl5P8PeVv1pUmO7vI4Ka4Mjs4r6CYM5f9kZhviFPQQcWOIDlMRcw=="; }; }; + "@sorg/log-2.1.0" = { + name = "_at_sorg_slash_log"; + packageName = "@sorg/log"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sorg/log/-/log-2.1.0.tgz"; + sha512 = "weyuceH7eLZGlQLwA9+c2vxCWtWLe0vt4ma9qHzvB7aIbEZkAUXsONytEza6vNq2hIeL3/lRFRoGeiuBbnFfaA=="; + }; + }; "@starptech/expression-parser-0.10.0" = { name = "_at_starptech_slash_expression-parser"; packageName = "@starptech/expression-parser"; @@ -2848,15 +2893,6 @@ let sha512 = "HcNE5lqbBd0CNMArErVboWZ9PyJ8Hqp0VGnLJXkA3e38r6/VjhFa2pcsoJQGQiiuHj6napSMr3s+Gc34WUGhzw=="; }; }; - "@starptech/expression-parser-0.9.0" = { - name = "_at_starptech_slash_expression-parser"; - packageName = "@starptech/expression-parser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/expression-parser/-/expression-parser-0.9.0.tgz"; - sha512 = "a4CFSYZ3klnflR/rkvN87T2r/n+RxfMhDaZlrWYBaCHcbPhX+2THWyKAn82vT6Ari3SPp3XOsTqUZK4Vx2qcTA=="; - }; - }; "@starptech/hast-util-from-webparser-0.10.0" = { name = "_at_starptech_slash_hast-util-from-webparser"; packageName = "@starptech/hast-util-from-webparser"; @@ -2866,15 +2902,6 @@ let sha512 = "ebBrqxnkk4uhOkYXi0EMsHLrUrpGUjAMGz++04HPZmZYfpEZjaHxF3VmhfTWnS6u8SGUtsDPMQ+RxHSvrsNxZg=="; }; }; - "@starptech/hast-util-from-webparser-0.9.0" = { - name = "_at_starptech_slash_hast-util-from-webparser"; - packageName = "@starptech/hast-util-from-webparser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/hast-util-from-webparser/-/hast-util-from-webparser-0.9.0.tgz"; - sha512 = "evqGr0KOXB27vu/KiNv6gmd/ggygzwYvINVsCWF6GAd1SFQNS4Vz2wv4tmiktX6rcr6Qq+jBwVXvVwe60d5Z3g=="; - }; - }; "@starptech/prettyhtml-0.10.0" = { name = "_at_starptech_slash_prettyhtml"; packageName = "@starptech/prettyhtml"; @@ -2884,15 +2911,6 @@ let sha512 = "d79qc81gX5oyiv0Ioz82NEMnO/waltC7HAOlZ8r/es/zPuRilWMRo5ZCV00/80ZsQ0MiCIuhAnvUcg7rVzFDLg=="; }; }; - "@starptech/prettyhtml-0.9.0" = { - name = "_at_starptech_slash_prettyhtml"; - packageName = "@starptech/prettyhtml"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml/-/prettyhtml-0.9.0.tgz"; - sha512 = "GekZtpBSdlFo732AxrpO7W8ue1dEZdpMK0kNHD/NVDBNU/50/D0NJ72FD2HKLh0Aune9uK+x8b+9MbBFJ2JT9A=="; - }; - }; "@starptech/prettyhtml-formatter-0.10.0" = { name = "_at_starptech_slash_prettyhtml-formatter"; packageName = "@starptech/prettyhtml-formatter"; @@ -2902,15 +2920,6 @@ let sha512 = "AEpBQTRHhgB9NmQZNXINo/ObavGLATEvS41MgiJljsiSHzfUX3ltOPLI2fy9VfDB3E76mjUqIfmEQ/v5lJ5Cfw=="; }; }; - "@starptech/prettyhtml-formatter-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-formatter"; - packageName = "@starptech/prettyhtml-formatter"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-formatter/-/prettyhtml-formatter-0.9.0.tgz"; - sha512 = "uyG90dzyERExzQg7VTYJm3uBs6hIW81MDvqACgiFgmaafTrveKebJxAZpkbkAgTesvNmApM2I0b5Tu4OKHmaKQ=="; - }; - }; "@starptech/prettyhtml-hast-to-html-0.10.0" = { name = "_at_starptech_slash_prettyhtml-hast-to-html"; packageName = "@starptech/prettyhtml-hast-to-html"; @@ -2920,15 +2929,6 @@ let sha512 = "TAbm1q6bCBl13i8FbY/1eHMnTHWr/kLM5RcOD1S6F3T12DwhMwcqagMzqPQc4tT1DmyLzGWY8SA/p3HrB0iPcg=="; }; }; - "@starptech/prettyhtml-hast-to-html-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-hast-to-html"; - packageName = "@starptech/prettyhtml-hast-to-html"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-hast-to-html/-/prettyhtml-hast-to-html-0.9.0.tgz"; - sha512 = "PcMRqtwXBDsliBC6nesNlDaO0a4uqC2uwfqbz/1VRaFVEInudMQ00fbRjv3Fql5C2YZ1MObMwre/+W7UDuzcIw=="; - }; - }; "@starptech/prettyhtml-hastscript-0.10.0" = { name = "_at_starptech_slash_prettyhtml-hastscript"; packageName = "@starptech/prettyhtml-hastscript"; @@ -2938,15 +2938,6 @@ let sha512 = "oSZB/CXRagbJ1UAGihSsdDcvHIGa+ivdVVmljWtJDqO5+FfFn9utzCw/QI9NAV3m9cgFWRdW/6TkXwbdPrIQ4A=="; }; }; - "@starptech/prettyhtml-hastscript-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-hastscript"; - packageName = "@starptech/prettyhtml-hastscript"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-hastscript/-/prettyhtml-hastscript-0.9.0.tgz"; - sha512 = "ifXB3oqZl5LMMaFuQvfUYF0e+XdGDeQoIzFQYdA59cJ+RgjGdsjgFMmvkW+kxZwMWRYyAsLsYuJ19UfIWO8ymQ=="; - }; - }; "@starptech/prettyhtml-sort-attributes-0.10.0" = { name = "_at_starptech_slash_prettyhtml-sort-attributes"; packageName = "@starptech/prettyhtml-sort-attributes"; @@ -2956,15 +2947,6 @@ let sha512 = "ctsjmEEsxzW4dzMOIwYRWQvqfilgdGFaZn+lIxiNuPJIL4V4ZpgQhT96Us5BQcalHYQqQsKF+nRelCWFhd67IQ=="; }; }; - "@starptech/prettyhtml-sort-attributes-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-sort-attributes"; - packageName = "@starptech/prettyhtml-sort-attributes"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-sort-attributes/-/prettyhtml-sort-attributes-0.9.0.tgz"; - sha512 = "jj4btXkDU0dnY8llM6Cv+6arqVIjfaHhrfLnaaiVdLLb02f1eazMIr8+4jfK0Dol4Bfg3AC3RIYAyu2Kd7FF6g=="; - }; - }; "@starptech/rehype-minify-whitespace-0.10.0" = { name = "_at_starptech_slash_rehype-minify-whitespace"; packageName = "@starptech/rehype-minify-whitespace"; @@ -2974,15 +2956,6 @@ let sha512 = "11k2dW0ju2hMuSfQ9znXqeCjyBtkfY7BRoyPjDLiVCsGIlqM2JpZhx46sFTF3JJOsJz9pr2HQ8Cvf4oTt9hgvg=="; }; }; - "@starptech/rehype-minify-whitespace-0.9.0" = { - name = "_at_starptech_slash_rehype-minify-whitespace"; - packageName = "@starptech/rehype-minify-whitespace"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/rehype-minify-whitespace/-/rehype-minify-whitespace-0.9.0.tgz"; - sha512 = "z4CL6TCdHyXVZGU6I632Un5g2MmIsYhnsYVerAW4DKf3Zyc5Nam2U+wVdbE2nLqTInDUpUr4vmzksD8tHsY9Ew=="; - }; - }; "@starptech/rehype-webparser-0.10.0" = { name = "_at_starptech_slash_rehype-webparser"; packageName = "@starptech/rehype-webparser"; @@ -2992,15 +2965,6 @@ let sha512 = "1CPMVKrgXjKnehAouQBa2wWkikR6jD+BZ+8/v1RDH1S1a293fOzItU63W3VIx4zv3n0iMgrTWeeyfpk/9cT4LQ=="; }; }; - "@starptech/rehype-webparser-0.9.0" = { - name = "_at_starptech_slash_rehype-webparser"; - packageName = "@starptech/rehype-webparser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/rehype-webparser/-/rehype-webparser-0.9.0.tgz"; - sha512 = "Ndv/excuCjdRIUWtzD5YQMvuZudMvjtYmNhLllzYEzMq6+nkPrhaORuUNihDG1SYZI260CXV1khDTGqPc581Yg=="; - }; - }; "@starptech/webparser-0.10.0" = { name = "_at_starptech_slash_webparser"; packageName = "@starptech/webparser"; @@ -3010,15 +2974,6 @@ let sha512 = "vA/p1LTVfuK8dP+EhBglMS7ll3dZahBjnvjwUiJ8NNUCqH5pSAj3tcRtOG3k7k1Wx1hWHJpGgZVj0VNQIo99bA=="; }; }; - "@starptech/webparser-0.9.0" = { - name = "_at_starptech_slash_webparser"; - packageName = "@starptech/webparser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/webparser/-/webparser-0.9.0.tgz"; - sha512 = "QEC1yjpsOtj3leNCWZGirAyVCN7WJDH+rUhfMVGQuLEfoJNKK66t/UWAOrXeGxR2jdU5IffAGnqZIHbFMX6SNw=="; - }; - }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -3352,13 +3307,13 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.42" = { + "@types/estree-0.0.44" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.42"; + version = "0.0.44"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz"; - sha512 = "K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz"; + sha512 = "iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g=="; }; }; "@types/events-3.0.0" = { @@ -3379,13 +3334,13 @@ let sha512 = "5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA=="; }; }; - "@types/express-serve-static-core-4.17.2" = { + "@types/express-serve-static-core-4.17.3" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.2"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.3.tgz"; + sha512 = "sHEsvEzjqN+zLbqP+8OXTipc10yH1QLR+hnr5uw29gi9AhCAAAdri8ClNV7iMdrJrIzXIQtlkPvq8tJGhj3QJQ=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3577,13 +3532,13 @@ let sha512 = "gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q=="; }; }; - "@types/node-13.9.1" = { + "@types/node-13.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.9.1"; + version = "13.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz"; - sha512 = "E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; + sha512 = "01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="; }; }; "@types/node-6.14.9" = { @@ -3757,6 +3712,15 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; + "@types/yoga-layout-1.9.1" = { + name = "_at_types_slash_yoga-layout"; + packageName = "@types/yoga-layout"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.1.tgz"; + sha512 = "OpfgQXWLZn5Dl7mOd8dBNcV8NywXbYYoHjUpa64vJ/RQABaxMzJ5bVicKLGIvIiMnQPtPgKNgXb5jkv9fkOQtw=="; + }; + }; "@types/zen-observable-0.8.0" = { name = "_at_types_slash_zen-observable"; packageName = "@types/zen-observable"; @@ -3793,6 +3757,15 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; + "@typescript-eslint/typescript-estree-2.25.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "2.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz"; + sha512 = "VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg=="; + }; + }; "@vue/cli-shared-utils-4.2.3" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -3838,15 +3811,6 @@ let sha512 = "gDrC14Ae2b4gP9vYdCzx6ytY4LuYoH3I0h0QzU9RPifGPgjXz8F3s5g9632P7Wf39vQQg6XQ0Bfv29rc5RoTmw=="; }; }; - "@webassemblyjs/ast-1.8.5" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz"; - sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ=="; - }; - }; "@webassemblyjs/ast-1.9.0" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -3865,15 +3829,6 @@ let sha512 = "g50x4xV7o2b39pB+uppF3kibFXhb9Dl4Jj3fj18eqWPGBgabreIwQmw3B5Uc6Y7Ec7ZZJ8TrUe79swN3iBaPDQ=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.8.5" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; - sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="; - }; - }; "@webassemblyjs/floating-point-hex-parser-1.9.0" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; @@ -3892,15 +3847,6 @@ let sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w=="; }; }; - "@webassemblyjs/helper-api-error-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; - sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="; - }; - }; "@webassemblyjs/helper-api-error-1.9.0" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; @@ -3919,13 +3865,13 @@ let sha512 = "ex3cnmE6V0JfCBIesxF70vsPvh/QNOfaIsL5N0lkiJjVDl65YjH/WZxLe0nTuIuvVQhZH7DdRzUm0G9g12YACg=="; }; }; - "@webassemblyjs/helper-buffer-1.8.5" = { + "@webassemblyjs/helper-buffer-1.9.0" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; - sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; "@webassemblyjs/helper-code-frame-1.8.1" = { @@ -3937,15 +3883,6 @@ let sha512 = "vSs2ObU/pbPXrvMqfpEUnvTcvlhwHT3ochBdekn+cv5zYR1wtmAIj+UXrmzbkBQYff/yTrZgaeqkFaT3fLLOrA=="; }; }; - "@webassemblyjs/helper-code-frame-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; - sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ=="; - }; - }; "@webassemblyjs/helper-code-frame-1.9.0" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; @@ -3982,15 +3919,6 @@ let sha512 = "WeXD3ZkKi2wpAXqPW+COawoNb0Vcu3OGoaQv8/cL3VpTfGO85ZN30h/6CjUHLISGZtpZxQu3D7AuJmI/rlEqAw=="; }; }; - "@webassemblyjs/helper-fsm-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; - sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="; - }; - }; "@webassemblyjs/helper-fsm-1.9.0" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; @@ -4009,15 +3937,6 @@ let sha512 = "657xpRy6lptA7oCIgOKQAHElsgAXliqutMPLjoEL2T5Uyp1cIDUH7axmphu7bb5U+ZUpwApnZHvdvyJYGDOxsQ=="; }; }; - "@webassemblyjs/helper-module-context-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-module-context"; - packageName = "@webassemblyjs/helper-module-context"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; - sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g=="; - }; - }; "@webassemblyjs/helper-module-context-1.9.0" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -4036,15 +3955,6 @@ let sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; - sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="; - }; - }; "@webassemblyjs/helper-wasm-bytecode-1.9.0" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; @@ -4063,13 +3973,13 @@ let sha512 = "FlNdlARr+mcP8XL+wg6bXqgC+0ZwnltqXExw63e9cgK84bAdTwKnfX9k6CKg8qvK5e/d9dUmk0dkVrkyEpKx5w=="; }; }; - "@webassemblyjs/helper-wasm-section-1.8.5" = { + "@webassemblyjs/helper-wasm-section-1.9.0" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; - sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; "@webassemblyjs/ieee754-1.8.1" = { @@ -4081,15 +3991,6 @@ let sha512 = "Pq3IQR3uay+rFC0qIgg6xvD+uu0a9QEWDCRihHuU9wmOBFW3Lda/ObnO0HjC7XUJ8A9h4xExaa1w5TsSk+DxIQ=="; }; }; - "@webassemblyjs/ieee754-1.8.5" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; - sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g=="; - }; - }; "@webassemblyjs/ieee754-1.9.0" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; @@ -4108,15 +4009,6 @@ let sha512 = "Ir8M3hgTzFLEOKmMMH44neM6sLESfEoSCjNsOInETxbSpPY1MKOsFSAxCUaeXhjtLQfflCCdjgSsU+2veP6SGw=="; }; }; - "@webassemblyjs/leb128-1.8.5" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; - sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A=="; - }; - }; "@webassemblyjs/leb128-1.9.0" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; @@ -4135,15 +4027,6 @@ let sha512 = "I5QQEb5ajQ99ARiyDrVQM/2nvyFFG0tF1TX2Ql7dOjw5GRT6P4FF+gRk7OeAUtI1CLyffUNWbIvpJz13crGSxw=="; }; }; - "@webassemblyjs/utf8-1.8.5" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; - sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="; - }; - }; "@webassemblyjs/utf8-1.9.0" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; @@ -4162,13 +4045,13 @@ let sha512 = "ysKeFNEWX8r45OXHtH0UPkqFM5qeUd+887+KnDob6kCrryqjNNyW3Ew+fTI8u1vzg7VUXYOJqxXplRUF6cfsfA=="; }; }; - "@webassemblyjs/wasm-edit-1.8.5" = { + "@webassemblyjs/wasm-edit-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; - sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; "@webassemblyjs/wasm-gen-1.8.1" = { @@ -4180,22 +4063,22 @@ let sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug=="; }; }; - "@webassemblyjs/wasm-gen-1.8.5" = { + "@webassemblyjs/wasm-gen-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; - sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; - "@webassemblyjs/wasm-opt-1.8.5" = { + "@webassemblyjs/wasm-opt-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; - sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; "@webassemblyjs/wasm-parser-1.8.1" = { @@ -4207,15 +4090,6 @@ let sha512 = "k63WJZdIjTQgZt+cn8rsIEvW0aNKttGip6ygTE/ZPXKZsMTk0G5xyw+MQxphbvt/GYbNu5DdxGN/7WGybO95TA=="; }; }; - "@webassemblyjs/wasm-parser-1.8.5" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; - sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw=="; - }; - }; "@webassemblyjs/wasm-parser-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; @@ -4234,15 +4108,6 @@ let sha512 = "iXjhXGhZeZIAnWkHD2G4ZOx8x5GYux5dwHuQL/AU8jb2H3BxolxVvNdpDmBTQPKDAgAAEeCFDnftNf4xNR9KMQ=="; }; }; - "@webassemblyjs/wast-parser-1.8.5" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; - sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg=="; - }; - }; "@webassemblyjs/wast-parser-1.9.0" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; @@ -4261,15 +4126,6 @@ let sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA=="; }; }; - "@webassemblyjs/wast-printer-1.8.5" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; - sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg=="; - }; - }; "@webassemblyjs/wast-printer-1.9.0" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; @@ -5827,6 +5683,15 @@ let sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg=="; }; }; + "append-type-1.0.2" = { + name = "append-type"; + packageName = "append-type"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/append-type/-/append-type-1.0.2.tgz"; + sha512 = "hac740vT/SAbrFBLgLIWZqVT5PUAcGTWS5UkDDhr+OCizZSw90WKw6sWAEgGaYd2viIblggypMXwpjzHXOvAQg=="; + }; + }; "appendable-cli-menu-2.0.0" = { name = "appendable-cli-menu"; packageName = "appendable-cli-menu"; @@ -6547,6 +6412,15 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; + "ast-module-types-2.6.0" = { + name = "ast-module-types"; + packageName = "ast-module-types"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz"; + sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA=="; + }; + }; "ast-types-0.13.2" = { name = "ast-types"; packageName = "ast-types"; @@ -6799,6 +6673,15 @@ let sha1 = "ef249dc869d6c07e7dfd4a22c8a18850bb39d7f1"; }; }; + "at-least-node-1.0.0" = { + name = "at-least-node"; + packageName = "at-least-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; + }; + }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -6889,13 +6772,13 @@ let sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; }; }; - "autoprefixer-9.7.4" = { + "autoprefixer-9.7.5" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "9.7.4"; + version = "9.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz"; - sha512 = "g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz"; + sha512 = "URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg=="; }; }; "await-semaphore-0.1.3" = { @@ -6925,13 +6808,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.639.0" = { + "aws-sdk-2.644.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.639.0"; + version = "2.644.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.639.0.tgz"; - sha512 = "cbH69oV0ObZ4tapbjDqu0j3I779uscQNhRaewjIJY5O5At4RULtd7us24n72FtT4HIwM9cwORzVxA9rK6DHKOA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.644.0.tgz"; + sha512 = "FkglRU5fvWHwT2Ll0caXS/QzRNzh5ZCS5cs4pF2nP0OjdD7VNJhNtu5lOnSzvMHAtZQJMsG3k0em8PoI8vk1AQ=="; }; }; "aws-sign2-0.6.0" = { @@ -7078,13 +6961,13 @@ let sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg=="; }; }; - "babel-loader-8.0.6" = { + "babel-loader-8.1.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.0.6"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz"; - sha512 = "4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; + sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; "babel-plugin-dynamic-import-node-2.3.0" = { @@ -7735,13 +7618,13 @@ let sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; }; }; - "bezier-js-2.5.1" = { + "bezier-js-2.6.0" = { name = "bezier-js"; packageName = "bezier-js"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.5.1.tgz"; - sha512 = "a+U+hOQWIx1aM37TZLGbAH1Hw0YdsuBTWYNlFudz/V/CvOM56gl5RyPoH0pUwuIqg1LAhDtoA3uRVYl0ZJpi5w=="; + url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.6.0.tgz"; + sha512 = "BBnddaIUivrZYXUIbyEJrFWkjU0hFkqJyqfIbANPwUQfFr3Ec61qLaFEys7VmNIwsdHL24FJZsS6MKrY7HyudQ=="; }; }; "biased-opener-0.2.8" = { @@ -7969,13 +7852,13 @@ let sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; - "bl-4.0.1" = { + "bl-4.0.2" = { name = "bl"; packageName = "bl"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.1.tgz"; - sha512 = "FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA=="; + url = "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz"; + sha512 = "j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ=="; }; }; "blake2b-2.1.3" = { @@ -8581,13 +8464,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.9.1" = { + "browserslist-4.11.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.9.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz"; - sha512 = "Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.0.tgz"; + sha512 = "WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A=="; }; }; "bser-2.1.1" = { @@ -8851,6 +8734,15 @@ let sha512 = "jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ=="; }; }; + "build-purescript-0.4.1" = { + name = "build-purescript"; + packageName = "build-purescript"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/build-purescript/-/build-purescript-0.4.1.tgz"; + sha512 = "wHoafIs4c1yDJspybVilXRQZUauaxdGPkZU0HdJdu968uei7O4yS/cp/h1O4zIMVDu9MN6/sYDCLnhQA3iLAYA=="; + }; + }; "builtin-modules-1.1.1" = { name = "builtin-modules"; packageName = "builtin-modules"; @@ -9040,13 +8932,13 @@ let sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; }; }; - "cacache-12.0.3" = { + "cacache-12.0.4" = { name = "cacache"; packageName = "cacache"; - version = "12.0.3"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz"; - sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw=="; + url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz"; + sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; "cacache-15.0.0" = { @@ -9076,13 +8968,13 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; - "cacheable-lookup-2.0.0" = { + "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.0.tgz"; - sha512 = "s2piO6LvA7xnL1AR03wuEdSx3BZT3tIJpZ56/lcJwzO/6DTJZlTs7X3lrvPxk6d1PlDe6PrVe2TjlUIZNFglAQ=="; + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; "cacheable-request-2.1.4" = { @@ -9310,6 +9202,24 @@ let sha512 = "BPCNVH56RVIxQQIXskp5tLQXUNGQ6sXr7iCv1FHDt81xBOQ/1r6H8SPxf19InVP6DexWar4s87q9thfuk8X9HA=="; }; }; + "cancelable-pipeline-1.0.0" = { + name = "cancelable-pipeline"; + packageName = "cancelable-pipeline"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cancelable-pipeline/-/cancelable-pipeline-1.0.0.tgz"; + sha512 = "vsimf+py0scGFJyZXsawF7h2ZJ6A1p5FXjieXjQ36kZyigWKYTDW3VjiYPTj+tFqdzQzYz+XV8J24Dtc88pmGQ=="; + }; + }; + "cancelable-pump-0.4.0" = { + name = "cancelable-pump"; + packageName = "cancelable-pump"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cancelable-pump/-/cancelable-pump-0.4.0.tgz"; + sha512 = "7Yvp8ADC9exD0Kdq/Q35UD5wOiuXTTLp159gFHC+uMQvjRMllrsM6EUKnozmIe43yesLBiH/ni0KD69k07yzZQ=="; + }; + }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -9319,13 +9229,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001035" = { + "caniuse-lite-1.0.30001036" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001035"; + version = "1.0.30001036"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz"; - sha512 = "C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz"; + sha512 = "jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w=="; }; }; "capture-exit-2.0.0" = { @@ -10282,13 +10192,13 @@ let sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA=="; }; }; - "clipboardy-2.2.0" = { + "clipboardy-2.3.0" = { name = "clipboardy"; packageName = "clipboardy"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz"; - sha512 = "9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg=="; + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz"; + sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; }; "clipper-lib-1.0.0" = { @@ -10579,13 +10489,13 @@ let sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; }; - "coc.nvim-0.0.76" = { + "coc.nvim-0.0.77" = { name = "coc.nvim"; packageName = "coc.nvim"; - version = "0.0.76"; + version = "0.0.77"; src = fetchurl { - url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.76.tgz"; - sha512 = "URa4r4dXcvotXJDKwgzHgMk9+vRFjO7tePKnznKF7XK+ApewV4aoibQ3NzC4xMWuDGto5RWWlHlWWOd5orDiOQ=="; + url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.77.tgz"; + sha512 = "wwn3ca7iMKuH/a6NAV7HL95xkEK5DzrKJ1dWGKBs+HZHFLhzXVYhjA0RL8x8Xf62TBEQGhH1wlKtBxkluGd1oQ=="; }; }; "code-point-at-1.1.0" = { @@ -12407,6 +12317,15 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; + "css-tree-1.0.0-alpha.39" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.39"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; + }; + }; "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; @@ -12506,13 +12425,13 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; - "csso-4.0.2" = { + "csso-4.0.3" = { name = "csso"; packageName = "csso"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz"; - sha512 = "kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg=="; + url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; + sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; }; }; "cssom-0.3.8" = { @@ -12524,6 +12443,15 @@ let sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; }; }; + "cssom-0.4.4" = { + name = "cssom"; + packageName = "cssom"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz"; + sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; + }; + }; "cssstyle-0.2.37" = { name = "cssstyle"; packageName = "cssstyle"; @@ -12542,6 +12470,24 @@ let sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; }; }; + "cssstyle-2.2.0" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz"; + sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA=="; + }; + }; + "csstype-2.6.9" = { + name = "csstype"; + packageName = "csstype"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.9.tgz"; + sha512 = "xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q=="; + }; + }; "csurf-1.11.0" = { name = "csurf"; packageName = "csurf"; @@ -12938,13 +12884,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.22" = { + "dayjs-1.8.23" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.22"; + version = "1.8.23"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.22.tgz"; - sha512 = "N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.23.tgz"; + sha512 = "NmYHMFONftoZbeOhVz6jfiXI4zSiPN6NoVWJgC0aZQfYVwzy/ZpESPHuCcI0B8BUMpSJQ08zenHDbofOLKq8hQ=="; }; }; "de-indent-1.0.2" = { @@ -13163,6 +13109,15 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; + "decomment-0.9.2" = { + name = "decomment"; + packageName = "decomment"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/decomment/-/decomment-0.9.2.tgz"; + sha512 = "sblyUmOJZxiL7oJ2ogJS6jtl/67+CTOW87SrYE/96u3PhDYikYoLCdLzcnceToiQejOLlqNnLCkaxx/+nE/ehg=="; + }; + }; "decompress-4.2.0" = { name = "decompress"; packageName = "decompress"; @@ -13559,6 +13514,24 @@ let sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; + "del-5.1.0" = { + name = "del"; + packageName = "del"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; + sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; + }; + }; + "del-cli-3.0.0" = { + name = "del-cli"; + packageName = "del-cli"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del-cli/-/del-cli-3.0.0.tgz"; + sha512 = "J4HDC2mpcN5aopya4VdkyiFXZaqAoo7ua9VpKbciX3DDUSbtJbPMc3ivggJsAAgS6EqonmbenIiMhBGtJPW9FA=="; + }; + }; "delay-4.3.0" = { name = "delay"; packageName = "delay"; @@ -13649,6 +13622,15 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; + "dependency-tree-7.2.1" = { + name = "dependency-tree"; + packageName = "dependency-tree"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.2.1.tgz"; + sha512 = "nBxnjkqDW4LqAzBazy60V4lE0mAtIQ+oers/GIIvVvGYVdCD9+RNNd4G9jjstyz7ZFVg/j/OiYCvK5MjoVqA2w=="; + }; + }; "deprecated-0.0.1" = { name = "deprecated"; packageName = "deprecated"; @@ -13802,6 +13784,87 @@ let sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; + "detective-amd-3.0.0" = { + name = "detective-amd"; + packageName = "detective-amd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz"; + sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ=="; + }; + }; + "detective-cjs-3.1.1" = { + name = "detective-cjs"; + packageName = "detective-cjs"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz"; + sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; + }; + }; + "detective-es6-2.1.0" = { + name = "detective-es6"; + packageName = "detective-es6"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.1.0.tgz"; + sha512 = "QSHqKGOp/YBIfmIqKXaXeq2rlL+bp3bcIQMfZ+0PvKzRlELSOSZxKRvpxVcxlLuocQv4QnOfuWGniGrmPbz8MQ=="; + }; + }; + "detective-less-1.0.2" = { + name = "detective-less"; + packageName = "detective-less"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz"; + sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA=="; + }; + }; + "detective-postcss-3.0.1" = { + name = "detective-postcss"; + packageName = "detective-postcss"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz"; + sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw=="; + }; + }; + "detective-sass-3.0.1" = { + name = "detective-sass"; + packageName = "detective-sass"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz"; + sha512 = "oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw=="; + }; + }; + "detective-scss-2.0.1" = { + name = "detective-scss"; + packageName = "detective-scss"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz"; + sha512 = "VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ=="; + }; + }; + "detective-stylus-1.0.0" = { + name = "detective-stylus"; + packageName = "detective-stylus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz"; + sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd"; + }; + }; + "detective-typescript-5.7.0" = { + name = "detective-typescript"; + packageName = "detective-typescript"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.7.0.tgz"; + sha512 = "4SQeACXWAjIOsd2kJykPL8gWC9nVA+z8w7KtAdtd/7BCpDfrpI2ZA7pdhsmHv/zxf3ofeqpYi72vCkZ65bAjtA=="; + }; + }; "dezalgo-1.0.3" = { name = "dezalgo"; packageName = "dezalgo"; @@ -14000,13 +14063,13 @@ let sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; }; }; - "discord.js-11.6.2" = { + "discord.js-11.6.3" = { name = "discord.js"; packageName = "discord.js"; - version = "11.6.2"; + version = "11.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.2.tgz"; - sha512 = "QwN7RBb705qqvxletW41aw8ScZJh4LUVWtGNdLA1/N4od1pf8pueDWdnKLqw9pAud6cg9AADcCkm8os1YHWESg=="; + url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.3.tgz"; + sha512 = "dwIzHB5GPU9O/WiNw42d0yco0JED5bOjCPiHwU9VSSCkEhnyOdx5iqt7Dl2PQZAMNzWPI/t9oyCziOuzFlwm3Q=="; }; }; "discovery-channel-5.5.1" = { @@ -14054,6 +14117,15 @@ let sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; + "dl-tar-0.8.1" = { + name = "dl-tar"; + packageName = "dl-tar"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dl-tar/-/dl-tar-0.8.1.tgz"; + sha512 = "1EdwnDJmqStX85PuVhcrqdeB3b7k4pn3WhMjPEL1lHuPEf0Mf8Cqdo76hgUPX60QWtCbPPTrDl8JFGrPMc1grw=="; + }; + }; "dlnacasts-0.1.0" = { name = "dlnacasts"; packageName = "dlnacasts"; @@ -14549,6 +14621,33 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; + "download-or-build-purescript-0.3.4" = { + name = "download-or-build-purescript"; + packageName = "download-or-build-purescript"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/download-or-build-purescript/-/download-or-build-purescript-0.3.4.tgz"; + sha512 = "8P4vNgbLTZi07s3uRnUCI+kE7lAERyIexVYwAHsAw7AQhooFnVbypq/yiP1vSZVibQ4Fl74LdOWnJKbqe9Mnow=="; + }; + }; + "download-purescript-0.8.5" = { + name = "download-purescript"; + packageName = "download-purescript"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/download-purescript/-/download-purescript-0.8.5.tgz"; + sha512 = "m2avp1YMDTxZW3mtlG7U09bmgCrLbBIsuBEglywew0uoG7VHVdtOwlTXEdvQQTqpW9iylrz8PokfPlqzc6AYiA=="; + }; + }; + "download-purescript-source-0.6.5" = { + name = "download-purescript-source"; + packageName = "download-purescript-source"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/download-purescript-source/-/download-purescript-source-0.6.5.tgz"; + sha512 = "RyOSTL7B3qzrhCOfhgzxNrcZD1klFOAJcw2YG345AIB4su1KC4WSk6fzRz3xpg1tp/plr5v8aDlvZy+LDtf6uA=="; + }; + }; "draftlog-1.0.12" = { name = "draftlog"; packageName = "draftlog"; @@ -14810,13 +14909,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.376" = { + "electron-to-chromium-1.3.383" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.376"; + version = "1.3.383"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz"; - sha512 = "cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.383.tgz"; + sha512 = "EHYVJl6Ox1kFy/SzGVbijHu8ksQotJnqHCFFfaVhXiC+erOSplwhCtOTSocu1jRwirlNsSn/aZ9Kf84Z6s5qrg=="; }; }; "elegant-spinner-1.0.1" = { @@ -15324,13 +15423,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-get-iterator-1.1.0" = { @@ -15459,6 +15558,15 @@ let sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; }; }; + "es6-promisify-6.1.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz"; + sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -15666,15 +15774,6 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "eslint-plugin-vue-5.2.3" = { - name = "eslint-plugin-vue"; - packageName = "eslint-plugin-vue"; - version = "5.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz"; - sha512 = "mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw=="; - }; - }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -15765,15 +15864,6 @@ let sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; }; - "espree-4.1.0" = { - name = "espree"; - packageName = "espree"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz"; - sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w=="; - }; - }; "espree-5.0.1" = { name = "espree"; packageName = "espree"; @@ -15846,13 +15936,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.1.0" = { + "esquery-1.2.0" = { name = "esquery"; packageName = "esquery"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz"; - sha512 = "MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz"; + sha512 = "weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q=="; }; }; "esrecurse-4.2.1" = { @@ -15918,6 +16008,15 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; + "estraverse-5.0.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz"; + sha512 = "j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="; + }; + }; "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; @@ -16296,6 +16395,15 @@ let sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; }; }; + "executing-npm-path-1.0.0" = { + name = "executing-npm-path"; + packageName = "executing-npm-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/executing-npm-path/-/executing-npm-path-1.0.0.tgz"; + sha512 = "d/dZlFCLkKm8nwdzpfQ7JBL2BISg4Fu0bVpZ5nacuT3e6DIxYVb+8tx0eQ+jxquvV/8I+VjJ9g6aEAqjukogkw=="; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -16980,6 +17088,15 @@ let sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; }; }; + "feint-1.0.3" = { + name = "feint"; + packageName = "feint"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/feint/-/feint-1.0.3.tgz"; + sha512 = "BY1jwDlOx4uA9rtn2H9bZSuHT7yyOtSRDVwUwprRpRXvpm1F73gSGuHznEu50lT6epscULOknphOprG9ljoARg=="; + }; + }; "fields-0.1.24" = { name = "fields"; packageName = "fields"; @@ -16998,13 +17115,13 @@ let sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; }; }; - "figgy-pudding-3.5.1" = { + "figgy-pudding-3.5.2" = { name = "figgy-pudding"; packageName = "figgy-pudding"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="; + url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; }; }; "figures-1.7.0" = { @@ -17052,6 +17169,24 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; + "file-exists-dazinatorfork-1.0.2" = { + name = "file-exists-dazinatorfork"; + packageName = "file-exists-dazinatorfork"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/file-exists-dazinatorfork/-/file-exists-dazinatorfork-1.0.2.tgz"; + sha512 = "r70c72ln2YHzQINNfxDp02hAhbGkt1HffZ+Du8oetWDLjDtFja/Lm10lUaSh9e+wD+7VDvPee0b0C9SAy8pWZg=="; + }; + }; + "file-to-npm-cache-0.1.0" = { + name = "file-to-npm-cache"; + packageName = "file-to-npm-cache"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-to-npm-cache/-/file-to-npm-cache-0.1.0.tgz"; + sha512 = "2/aq3BD1pkd6b4pafmTaO8EzRCiQKfFmJxg+zKAdDMAcqqJMC0nQYcuCU29say0ZTzXxafKXcJB50N+yb0WIoQ=="; + }; + }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -17178,6 +17313,15 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; + "filesize-4.2.1" = { + name = "filesize"; + packageName = "filesize"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-4.2.1.tgz"; + sha512 = "bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA=="; + }; + }; "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; @@ -17187,6 +17331,15 @@ let sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A=="; }; }; + "filing-cabinet-2.5.1" = { + name = "filing-cabinet"; + packageName = "filing-cabinet"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.1.tgz"; + sha512 = "GWOdObzou2L0HrJUk8MpJa01q0ZOwuTwTssM2+P+ABJWEGlVWd6ueEatANFdin94/3rdkVSdqpH14VqCNqp3RA=="; + }; + }; "fill-range-2.2.4" = { name = "fill-range"; packageName = "fill-range"; @@ -17250,6 +17403,15 @@ let sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; }; }; + "find-0.3.0" = { + name = "find"; + packageName = "find"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find/-/find-0.3.0.tgz"; + sha512 = "iSd+O4OEYV/I36Zl8MdYJO0xD82wH528SaCieTVHhclgiYNe9y+yPKSwK+A7/WsmHL1EZ+pYUJBXWTL5qofksw=="; + }; + }; "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -17268,6 +17430,24 @@ let sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; }; }; + "find-pkg-dir-1.0.1" = { + name = "find-pkg-dir"; + packageName = "find-pkg-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-pkg-dir/-/find-pkg-dir-1.0.1.tgz"; + sha512 = "pIXIrZshXst3hpg5nXDYALHlN4ikh4IwoM0QRnMnYIALChamvpPCJS1Mpwp27GpXXTL/647LDS4JkH1yfAKctw=="; + }; + }; + "find-process-1.4.3" = { + name = "find-process"; + packageName = "find-process"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/find-process/-/find-process-1.4.3.tgz"; + sha512 = "+IA+AUsQCf3uucawyTwMWcY+2M3FXq3BRvw3S+j5Jvydjk31f/+NPWpYZOJs+JUs2GvxH4Yfr6Wham0ZtRLlPA=="; + }; + }; "find-requires-1.0.0" = { name = "find-requires"; packageName = "find-requires"; @@ -17529,6 +17709,15 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; + "flatten-1.0.3" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"; + sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; + }; + }; "flow-bin-0.118.0" = { name = "flow-bin"; packageName = "flow-bin"; @@ -17538,13 +17727,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.120.1" = { + "flow-parser-0.121.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.120.1"; + version = "0.121.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.120.1.tgz"; - sha512 = "t5y9QoOegJuY+LCIjh0p6SGF7ItsxG5ycQApTSqWloutUZQ2gC0f6wMu91dab0/SSj2vH41bu5pDTLuvtP49ng=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.121.0.tgz"; + sha512 = "1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18141,6 +18330,15 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; + "fs-extra-9.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz"; + sha512 = "pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g=="; + }; + }; "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -18213,13 +18411,13 @@ let sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw=="; }; }; - "fsevents-1.2.11" = { + "fsevents-1.2.12" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz"; - sha512 = "+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz"; + sha512 = "Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q=="; }; }; "fsevents-2.1.2" = { @@ -18447,6 +18645,15 @@ let sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; }; }; + "get-amd-module-type-3.0.0" = { + name = "get-amd-module-type"; + packageName = "get-amd-module-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz"; + sha512 = "99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw=="; + }; + }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -18492,6 +18699,15 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; + "get-own-enumerable-property-symbols-3.0.2" = { + name = "get-own-enumerable-property-symbols"; + packageName = "get-own-enumerable-property-symbols"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; + }; + }; "get-pkg-repo-1.4.0" = { name = "get-pkg-repo"; packageName = "get-pkg-repo"; @@ -18942,13 +19158,13 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "glob-parent-5.1.0" = { + "glob-parent-5.1.1" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; - sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; "glob-stream-3.1.18" = { @@ -20194,13 +20410,13 @@ let sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="; }; }; - "hast-util-is-body-ok-link-1.0.2" = { + "hast-util-is-body-ok-link-1.0.3" = { name = "hast-util-is-body-ok-link"; packageName = "hast-util-is-body-ok-link"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.2.tgz"; - sha512 = "eSxO9rgtb7dfKxNa8NAFS3VEYWHXnJWVsoH/Z4jSsq1J2i4H1GkdJ43kXv++xuambrtI5XQwcAx6jeZVMjoBMQ=="; + url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.3.tgz"; + sha512 = "NB8jW4iqT+iVld2oCjSk0T2S2FyR86rDZ7nKHx3WNf/WX16fjjdfoog6T+YeJFsPzszVKsNlVJL+k5c4asAHog=="; }; }; "hast-util-is-element-1.0.4" = { @@ -20221,13 +20437,13 @@ let sha512 = "gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA=="; }; }; - "hast-util-to-string-1.0.2" = { + "hast-util-to-string-1.0.3" = { name = "hast-util-to-string"; packageName = "hast-util-to-string"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.2.tgz"; - sha512 = "fQNr0n5KJmZW1TmBfXbc4DO0ucZmseUw3T6K4PDsUUTMtTGGLZMUYRB8mOKgPgtw7rtICdxxpRQZmWwo8KxlOA=="; + url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.3.tgz"; + sha512 = "3lDgDE5OdpTfP3aFeKRWEwdIZ4vprztvp+AoD+RhF7uGOBs1yBDWZFadxnjcUV4KCoI3vB9A7gdFO98hEXA90w=="; }; }; "hast-util-whitespace-1.0.4" = { @@ -20572,13 +20788,13 @@ let sha512 = "uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w=="; }; }; - "html-whitespace-sensitive-tag-names-1.0.1" = { + "html-whitespace-sensitive-tag-names-1.0.2" = { name = "html-whitespace-sensitive-tag-names"; packageName = "html-whitespace-sensitive-tag-names"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.1.tgz"; - sha512 = "TMdAWVry7Ld0k2sLqpHkWsFAHmU+VZZq/nR4bfwfxThD8q3ibhrpRTywyQkEiunYiZXmJ6gRcJiLbZm+jbQPgQ=="; + url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.2.tgz"; + sha512 = "9jCcAq9ZsjUkZjNFDvxalDPhktOijpfzLyzBcqMLOFSbtcDNrPlKDvZeH7KdEbP7C6OjPpIdDMMPm0oq2Dpk0A=="; }; }; "htmlescape-1.1.1" = { @@ -21293,6 +21509,15 @@ let sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; }; + "import-package-1.0.0" = { + name = "import-package"; + packageName = "import-package"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-package/-/import-package-1.0.0.tgz"; + sha512 = "EEDT2ucOWI/9z/h2mLTRkkusM30/pxSoBT6YvomYpEb/UGll6wOvdFagYraCSBHD+dZSKoVFNYCAgC3V7Nvf1Q=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -21302,13 +21527,13 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "in-publish-2.0.0" = { + "in-publish-2.0.1" = { name = "in-publish"; packageName = "in-publish"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz"; - sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51"; + url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz"; + sha512 = "oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="; }; }; "increment-buffer-1.0.1" = { @@ -21698,6 +21923,24 @@ let sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g=="; }; }; + "install-purescript-0.7.0" = { + name = "install-purescript"; + packageName = "install-purescript"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/install-purescript/-/install-purescript-0.7.0.tgz"; + sha512 = "AOmIq8rPEOLn5Bo8RQngvDXWeo6USKIt+28UhcAmQJNvj63MqdNBIQRTgNyypbsniv7d7VWjz53pw2+kTgh3mg=="; + }; + }; + "install-purescript-cli-0.4.2" = { + name = "install-purescript-cli"; + packageName = "install-purescript-cli"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/install-purescript-cli/-/install-purescript-cli-0.4.2.tgz"; + sha512 = "y62GvwsMksz7aSJQsK2pPelmBByp0eDgpI+uFheEU05wpekM6WtCgq7WkTAc+Ar/nt+7Y5lYzGOqSOWnGAEIBQ=="; + }; + }; "int53-1.0.0" = { name = "int53"; packageName = "int53"; @@ -22877,6 +23120,15 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; + "is-relative-path-1.0.2" = { + name = "is-relative-path"; + packageName = "is-relative-path"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz"; + sha1 = "091b46a0d67c1ed0fe85f1f8cfdde006bb251d46"; + }; + }; "is-relative-url-3.0.0" = { name = "is-relative-url"; packageName = "is-relative-url"; @@ -23228,13 +23480,13 @@ let sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; }; - "isbinaryfile-4.0.4" = { + "isbinaryfile-4.0.5" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.4.tgz"; - sha512 = "pEutbN134CzcjlLS1myKX/uxNjwU5eBVSprvkpv3+3dqhBHUZLIWJQowC40w5c0Zf19vBY8mrZl88y5J4RAPbQ=="; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.5.tgz"; + sha512 = "Jvz0gpTh1AILHMCBUyqq7xv1ZOQrxTDwyp1/QUq1xFpOBvp4AH5uEobPePJht8KnBGqQIH7We6OR73mXsjG0cA=="; }; }; "isemail-3.2.0" = { @@ -23552,13 +23804,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-turndown-4.0.23" = { + "joplin-turndown-4.0.24" = { name = "joplin-turndown"; packageName = "joplin-turndown"; - version = "4.0.23"; + version = "4.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.23.tgz"; - sha512 = "Dh93R7G/S/KRbOu4/+FIxoUcUDcoUL4QDsqGhperOi/cUxUeg8fngrmEzdP8kEpQzqm5+8jkq9Cc1w6695owpQ=="; + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.24.tgz"; + sha512 = "mKd2rAFzJKnhTVjEpHomG+T01//uz5rXVSAOYRh3/JKXpY7QUhVp8jCmFfO+kaadrLABTz04mvTmyyoOadxdTA=="; }; }; "joplin-turndown-plugin-gfm-1.0.12" = { @@ -23606,13 +23858,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "jquery.terminal-2.15.0" = { + "jquery.terminal-2.15.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.15.0"; + version = "2.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.0.tgz"; - sha512 = "Dp8ahqK1lcphpmx9veb+S/ZxEt5mk4rHcVTbslCgngIiqH4LX7VtnSIQ2Lm5O0y/lp4eMPaNSTgPniCziF6ACQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.2.tgz"; + sha512 = "/G5L/laZLLO0tEQ+a94mLnvDXB5+PbC9IuZB+ikbw4E7W3GQkRpa0I15Z3xA+WbOaVZj+hEtPcKyyQLcKdjULQ=="; }; }; "js-base64-2.5.2" = { @@ -23777,6 +24029,15 @@ let sha512 = "O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng=="; }; }; + "jsdom-15.2.1" = { + name = "jsdom"; + packageName = "jsdom"; + version = "15.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz"; + sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -24056,13 +24317,13 @@ let sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; }; }; - "json5-2.1.1" = { + "json5-2.1.2" = { name = "json5"; packageName = "json5"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz"; - sha512 = "l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ=="; + url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz"; + sha512 = "MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ=="; }; }; "jsonata-1.8.1" = { @@ -24128,6 +24389,15 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; + "jsonfile-6.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz"; + sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="; + }; + }; "jsonify-0.0.0" = { name = "jsonify"; packageName = "jsonify"; @@ -25264,6 +25534,15 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; + "load-from-cwd-or-npm-3.0.4" = { + name = "load-from-cwd-or-npm"; + packageName = "load-from-cwd-or-npm"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/load-from-cwd-or-npm/-/load-from-cwd-or-npm-3.0.4.tgz"; + sha512 = "tdDJgh1zVmxOV24gcj+AEagjTc30Jim9ywX2OxfABdOoTU4UK8b0B371ZNbpj27njP8LQ6U5FH1aNwC2+VRxQg=="; + }; + }; "load-ip-set-2.1.0" = { name = "load-ip-set"; packageName = "load-ip-set"; @@ -25318,6 +25597,15 @@ let sha512 = "dYB1lbwqHgPTrruy9glukCu8Ya9vzj6TMfouCtj2H/GuJ+8syioisgKTBPxnCi6m8K8jINKfTOxOHngFkUYqHw=="; }; }; + "load-request-from-cwd-or-npm-3.0.0" = { + name = "load-request-from-cwd-or-npm"; + packageName = "load-request-from-cwd-or-npm"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-request-from-cwd-or-npm/-/load-request-from-cwd-or-npm-3.0.0.tgz"; + sha512 = "UsYAoXQV3UeL75Rl5IppBGOcKK5iKpvWooUPUHdxcQg9IKIkfg6PWpBQ4EhoRxTioIqrz587Ur2+c2uB/KGpng=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -27091,15 +27379,6 @@ let sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; }; }; - "mamacro-0.0.3" = { - name = "mamacro"; - packageName = "mamacro"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz"; - sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="; - }; - }; "map-age-cleaner-0.1.3" = { name = "map-age-cleaner"; packageName = "map-age-cleaner"; @@ -27604,6 +27883,15 @@ let sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; }; + "mdn-data-2.0.6" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; + sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; + }; + }; "mdns-js-0.5.0" = { name = "mdns-js"; packageName = "mdns-js"; @@ -27865,13 +28153,13 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.0.1" = { + "meow-6.1.0" = { name = "meow"; packageName = "meow"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.0.1.tgz"; - sha512 = "kxGTFgT/b7/oSRSQsJ0qsT5IMU+bgZ1eAdSA3kIV7onkW0QWo/hL5RbGlMfvBjHJKPE1LaPX0kdecYFiqYWjUw=="; + url = "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz"; + sha512 = "iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg=="; }; }; "merge-1.2.1" = { @@ -28558,6 +28846,24 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; + "mkdirp-0.5.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; + sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; + }; + }; + "mkdirp-0.5.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; + sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; + }; + }; "mkdirp-1.0.3" = { name = "mkdirp"; packageName = "mkdirp"; @@ -28621,6 +28927,15 @@ let sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; }; }; + "module-definition-3.3.0" = { + name = "module-definition"; + packageName = "module-definition"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz"; + sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg=="; + }; + }; "module-deps-6.2.2" = { name = "module-deps"; packageName = "module-deps"; @@ -28630,6 +28945,15 @@ let sha512 = "a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w=="; }; }; + "module-lookup-amd-6.2.0" = { + name = "module-lookup-amd"; + packageName = "module-lookup-amd"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-6.2.0.tgz"; + sha512 = "uxHCj5Pw9psZiC1znjU2qPsubt6haCSsN9m7xmIdoTciEgfxUkE1vhtDvjHPuOXEZrVJhjKgkmkP+w73rRuelQ=="; + }; + }; "mold-source-map-0.4.0" = { name = "mold-source-map"; packageName = "mold-source-map"; @@ -28702,13 +29026,13 @@ let sha512 = "IrhznRheWtDcT/TEL3cqaT4UJOqc5G3K8TnGq29PRXZil+sWGPkcM6SHVUZVirTKFKceuCadfyDMjmRoXCN21A=="; }; }; - "morgan-1.9.1" = { + "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; - sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "mout-0.5.0" = { @@ -29570,6 +29894,15 @@ let sha512 = "+T6UtYItDTE1L30g/nLRjP55dFlvldrzCRsn4CrcNHIbhg5JUe0hnOx1DHFViysUC7I1cevBQVjdGJ9ZftY9DA=="; }; }; + "neat-stack-1.0.1" = { + name = "neat-stack"; + packageName = "neat-stack"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-stack/-/neat-stack-1.0.1.tgz"; + sha512 = "nl0eft4etsbFowZVP+1lNqZsNKb2SIC+PnAr/ODBln6RNVaJh0YYu8P3j8Iuh4XeIAgyWn3xCSizbTobRjocIA=="; + }; + }; "neat-tasks-1.1.1" = { name = "neat-tasks"; packageName = "neat-tasks"; @@ -30184,6 +30517,15 @@ let sha512 = "hwaTaFPUwNKns5qXwGJpLQM3Z5zRluYeAxpYy1L8fWmWdT/DjLmsnW8/oGlSN8Vo4R28c2znfUoBUiB/RlPptw=="; }; }; + "node-source-walk-4.2.0" = { + name = "node-source-walk"; + packageName = "node-source-walk"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz"; + sha512 = "hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA=="; + }; + }; "node-ssdp-2.9.1" = { name = "node-ssdp"; packageName = "node-ssdp"; @@ -30472,6 +30814,15 @@ let sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; }; }; + "npcache-1.0.2" = { + name = "npcache"; + packageName = "npcache"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npcache/-/npcache-1.0.2.tgz"; + sha512 = "h42LqKZvSbykPoCyAwEKbJAXUpt1SZ7O8GvA0XRqb26VtWQuKLJtp+Rt4jqkq1Y+ZRErINdyeZ3Ijc5lDtqkSg=="; + }; + }; "npm-2.15.12" = { name = "npm"; packageName = "npm"; @@ -30490,6 +30841,51 @@ let sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; }; }; + "npm-cache-env-2.0.0" = { + name = "npm-cache-env"; + packageName = "npm-cache-env"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cache-env/-/npm-cache-env-2.0.0.tgz"; + sha512 = "t5cz/NY4IPmiKBRFry3U3M8Ypwdx4LJ3w7te/49LWB2R4wPf5QAAGB1zNoH9IbGtC/wiOeE8b/HsoG2lLAOYaQ=="; + }; + }; + "npm-cache-path-2.0.0" = { + name = "npm-cache-path"; + packageName = "npm-cache-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cache-path/-/npm-cache-path-2.0.0.tgz"; + sha512 = "7OJzaenruC1PffVJ7onG0u4aTQLaykT4gF5n61j9fot58J4ppoglkrv+pY4BsFR2drPWb6vbEpJH7/Xviv7h+Q=="; + }; + }; + "npm-cli-dir-3.0.1" = { + name = "npm-cli-dir"; + packageName = "npm-cli-dir"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cli-dir/-/npm-cli-dir-3.0.1.tgz"; + sha512 = "t9V9Gz/Q5a5KOSynLpKKnLxJzWLnHtAZvaLmNSbNeNR+qEpCmu/n5J74lyz4QQ/XIGEEYWIoVXR8scqbUWaMrQ=="; + }; + }; + "npm-cli-path-3.1.2" = { + name = "npm-cli-path"; + packageName = "npm-cli-path"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cli-path/-/npm-cli-path-3.1.2.tgz"; + sha512 = "JdiFz8kpCf9WD01zRx5u29EP5UYjKp9osSVMflPkamlplgsuaagkwqY3JpzDySl/VDpGUva8q8YoSG6AatFkIg=="; + }; + }; + "npm-cli-version-1.0.0" = { + name = "npm-cli-version"; + packageName = "npm-cli-version"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cli-version/-/npm-cli-version-1.0.0.tgz"; + sha512 = "VqqnMzMfcZ0UZFDki7ZR8E4U8Pz7VbTOGSMk8KJbQ+oUlJlon8IXhb6BIdMJClRArHn216useYM1kvqgZmDvtQ=="; + }; + }; "npm-conf-1.1.3" = { name = "npm-conf"; packageName = "npm-conf"; @@ -30697,6 +31093,15 @@ let sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; + "npm-version-compare-1.0.1" = { + name = "npm-version-compare"; + packageName = "npm-version-compare"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-version-compare/-/npm-version-compare-1.0.1.tgz"; + sha512 = "X+/Oz2OkF6KzMqyFyNBV5MC1ScPxtl5bJTkUcIp9Bz5Wv2Yf8uqDIq+vu+/gy2DRb11Q2Z6jfHbav7Ux0t99JQ=="; + }; + }; "npm-which-3.0.1" = { name = "npm-which"; packageName = "npm-which"; @@ -31472,6 +31877,15 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; + "optional-0.1.4" = { + name = "optional"; + packageName = "optional"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz"; + sha512 = "gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw=="; + }; + }; "optionator-0.3.0" = { name = "optionator"; packageName = "optionator"; @@ -32939,6 +33353,24 @@ let sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }; }; + "pause-fn-1.0.0" = { + name = "pause-fn"; + packageName = "pause-fn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-fn/-/pause-fn-1.0.0.tgz"; + sha512 = "23uUK11+go9zE7ij4Qh45HPvqanTt22viyNsHnWrRFVgcT5TV4MFtfMhx/wL2aMt0LYbqTsJJZgG3V4C57+NQw=="; + }; + }; + "pause-methods-1.0.0" = { + name = "pause-methods"; + packageName = "pause-methods"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-methods/-/pause-methods-1.0.0.tgz"; + sha512 = "RA8T1+kt1wbD8p0y9/x0BuCMBwNRJzp08euseZ7ZSLGeBUSNHh4yLIsq9J+7fCSDAwnHTjQPSzShwoFnBj0QNQ=="; + }; + }; "pause-stream-0.0.11" = { name = "pause-stream"; packageName = "pause-stream"; @@ -33056,13 +33488,13 @@ let sha1 = "18de2f97e4bf7a9551ad7511942b5496f7aba660"; }; }; - "picomatch-2.2.1" = { + "picomatch-2.2.2" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz"; - sha512 = "ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; }; "picture-tuber-1.0.2" = { @@ -33272,6 +33704,15 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; + "platform-name-1.0.0" = { + name = "platform-name"; + packageName = "platform-name"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/platform-name/-/platform-name-1.0.0.tgz"; + sha512 = "ZRbqJ30uRRKGKW2O1XnG/Ls1K/aBGlnyjq1Z0BbjqDPTNN+XZKFaugCsCm3/mq6XGR5DZNVdV75afpQEvNNY3Q=="; + }; + }; "playerui-1.3.0" = { name = "playerui"; packageName = "playerui"; @@ -33957,6 +34398,15 @@ let sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; }; }; + "postcss-values-parser-1.5.0" = { + name = "postcss-values-parser"; + packageName = "postcss-values-parser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz"; + sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ=="; + }; + }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -34002,6 +34452,15 @@ let sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g=="; }; }; + "precinct-6.2.0" = { + name = "precinct"; + packageName = "precinct"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/precinct/-/precinct-6.2.0.tgz"; + sha512 = "BCAmnOxZzobF3H1/h/gq70pEyvX/BVLWCrzi8beFD22dqu5Z14qOghNUsI24Wg8oaTsGFcIjOGtFX5L9ttmjVg=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -34416,13 +34875,13 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; - "promisify-child-process-3.1.3" = { + "promisify-child-process-3.1.4" = { name = "promisify-child-process"; packageName = "promisify-child-process"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.3.tgz"; - sha512 = "qVox3vW2hqbktVw+IN7YZ/kgGA+u426ekmiZxiofNe9O4GSewjROwRQ4MQ6IbvhpeYSLqiLS0kMn+FWCz6ENlg=="; + url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.4.tgz"; + sha512 = "tLifJs99E4oOXUz/dKQjRgdchfiepmYQzBVrcVX9BtUWi9aGJeGSf2KgXOWBW1JFsSYgLkl1Z9HRm8i0sf4cTg=="; }; }; "promisize-1.1.2" = { @@ -34452,13 +34911,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.3.1" = { + "prompts-2.3.2" = { name = "prompts"; packageName = "prompts"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz"; - sha512 = "qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz"; + sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA=="; }; }; "promzard-0.3.0" = { @@ -34488,15 +34947,6 @@ let sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; }; }; - "proper-lockfile-3.2.0" = { - name = "proper-lockfile"; - packageName = "proper-lockfile"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz"; - sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA=="; - }; - }; "properties-1.2.1" = { name = "properties"; packageName = "properties"; @@ -35415,6 +35865,15 @@ let sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA=="; }; }; + "purescript-0.12.5" = { + name = "purescript"; + packageName = "purescript"; + version = "0.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/purescript/-/purescript-0.12.5.tgz"; + sha512 = "L0N0KrRgZm8pXYqT8Dc5m6BzjnYvkOaxx9Tms874NUivm8DYSs3oLtDrnNM8cVrjCCXCvS0g8l73CKNymaL6qw=="; + }; + }; "purgecss-1.4.2" = { name = "purgecss"; packageName = "purgecss"; @@ -35586,13 +36045,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.1" = { + "qs-6.9.2" = { name = "qs"; packageName = "qs"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz"; - sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.2.tgz"; + sha512 = "2eQ6zajpK7HwqrY1rRtGw5IZvjgtELXzJECaEDuzDFo2jjnIXpJSimzd4qflWZq6bLLi+Zgfj5eDrAzl/lptyg=="; }; }; "query-string-1.0.1" = { @@ -35892,6 +36351,15 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; + "rate-map-1.0.5" = { + name = "rate-map"; + packageName = "rate-map"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rate-map/-/rate-map-1.0.5.tgz"; + sha512 = "u/oBh01ZgCZM8Dqkm+xUh9mLl5t/9wxBNpVDZUSKjYvPSOOwYCeVheS5esvdyVnR0k3sLh+H9v16h1Z7FRy2Fw=="; + }; + }; "raven-1.2.1" = { name = "raven"; packageName = "raven"; @@ -35982,22 +36450,22 @@ let sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA=="; }; }; - "react-16.13.0" = { + "react-16.13.1" = { name = "react"; packageName = "react"; - version = "16.13.0"; + version = "16.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/react/-/react-16.13.0.tgz"; - sha512 = "TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ=="; + url = "https://registry.npmjs.org/react/-/react-16.13.1.tgz"; + sha512 = "YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="; }; }; - "react-is-16.13.0" = { + "react-is-16.13.1" = { name = "react-is"; packageName = "react-is"; - version = "16.13.0"; + version = "16.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz"; - sha512 = "GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; + sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; "react-reconciler-0.24.0" = { @@ -36486,13 +36954,13 @@ let sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; }; - "regenerator-transform-0.14.3" = { + "regenerator-transform-0.14.4" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.3.tgz"; - sha512 = "zXHNKJspmONxBViAb3ZUmFoFPnTBs3zFhCEZJiwp/gkNzxVbTqNJVjYKx6Qk1tQ1P4XLf4TbH9+KBB7wGoAaUw=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; }; }; "regex-cache-0.4.4" = { @@ -36630,6 +37098,15 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; + "reject-unsatisfied-npm-version-1.0.0" = { + name = "reject-unsatisfied-npm-version"; + packageName = "reject-unsatisfied-npm-version"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reject-unsatisfied-npm-version/-/reject-unsatisfied-npm-version-1.0.0.tgz"; + sha512 = "8cl35x8i3W1+RubvIq9CM7fJkdMwBOdjne4b7eFBoo4vvN1QoXbgusQw6VVv2DBmm6NDyMhUmp9FBxaMWU9s7Q=="; + }; + }; "relateurl-0.2.7" = { name = "relateurl"; packageName = "relateurl"; @@ -36693,13 +37170,13 @@ let sha512 = "K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw=="; }; }; - "remark-frontmatter-1.3.2" = { + "remark-frontmatter-1.3.3" = { name = "remark-frontmatter"; packageName = "remark-frontmatter"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.2.tgz"; - sha512 = "2eayxITZ8rezsXdgcXnYB3iLivohm2V/ZT4Ne8uhua6A4pk6GdLE2ZzJnbnINtD1HRLaTdB7RwF9sgUbMptJZA=="; + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.3.tgz"; + sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag=="; }; }; "remark-html-2.0.2" = { @@ -37080,6 +37557,15 @@ let sha512 = "ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg=="; }; }; + "requirejs-config-file-3.1.2" = { + name = "requirejs-config-file"; + packageName = "requirejs-config-file"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/requirejs-config-file/-/requirejs-config-file-3.1.2.tgz"; + sha512 = "sdLWywcDuNz7EIOhenSbRfT4YF84nItDv90coN2htbokjmU2QeyQuSBZILQUKNksepl8UPVU+hgYySFaDxbJPQ=="; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -37134,6 +37620,15 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; + "resolve-dependency-path-2.0.0" = { + name = "resolve-dependency-path"; + packageName = "resolve-dependency-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dependency-path/-/resolve-dependency-path-2.0.0.tgz"; + sha512 = "DIgu+0Dv+6v2XwRaNWnumKu7GPufBBOr5I1gRPJHkvghrfCGOooJODFvgFimX/KRxk9j0whD2MnKHzM1jYvk9w=="; + }; + }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -37188,6 +37683,15 @@ let sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; }; }; + "resolve-from-npm-3.1.0" = { + name = "resolve-from-npm"; + packageName = "resolve-from-npm"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from-npm/-/resolve-from-npm-3.1.0.tgz"; + sha512 = "HVhEcznfeFWM7T3HWCT7vCjwkv0R1ruC4Ref5jTlTvz2X8GKeUZTqjvZWlefmKQvQfKYOJhQo90Yjhpcr8aclg=="; + }; + }; "resolve-options-1.1.0" = { name = "resolve-options"; packageName = "resolve-options"; @@ -37674,13 +38178,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "rss-parser-3.7.5" = { + "rss-parser-3.7.6" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.7.5"; + version = "3.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.5.tgz"; - sha512 = "bUbAJfiuNyR/IGpYie6ro6x7X26QMWHxz1Sy9qkPyU/vYwbf3YdopQJIIELwdp3FCU4evcyetOD8bA8fgS+SqA=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.6.tgz"; + sha512 = "wWWh3/pPLAPgWyfkCC9jB83jSBenU6VPMymfXiysi8wJxaN7KNkW4vU3Jm8jQxExAribFvXREy+RtaL3XQubeA=="; }; }; "rsvp-3.6.2" = { @@ -37737,6 +38241,15 @@ let sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; }; }; + "run-in-dir-0.3.0" = { + name = "run-in-dir"; + packageName = "run-in-dir"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-in-dir/-/run-in-dir-0.3.0.tgz"; + sha512 = "5aPpxad3Jq9r6OK6rw+Gs5HVuZsEeQM/M4I9CdCWyThkstLAUCJSc3IRs8dT0p/z9mxAJgU5ELRQL2q/ddY6PQ=="; + }; + }; "run-parallel-1.1.9" = { name = "run-parallel"; packageName = "run-parallel"; @@ -37863,6 +38376,15 @@ let sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; }; }; + "s.color-0.0.13" = { + name = "s.color"; + packageName = "s.color"; + version = "0.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/s.color/-/s.color-0.0.13.tgz"; + sha512 = "56rTWlPg3jQX5n2wv201gUBn8fSgnGwbNjN159FV+JeD4EeqZiVnhDASmivhE4+f9Ivzj59y5AgoFflsf25KwA=="; + }; + }; "s3-stream-upload-2.0.2" = { name = "s3-stream-upload"; packageName = "s3-stream-upload"; @@ -37989,6 +38511,24 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; + "sass-formatter-0.4.4" = { + name = "sass-formatter"; + packageName = "sass-formatter"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.4.tgz"; + sha512 = "pI/2olF5F3AMkAXbn71nJK7yAsWfRYLlyp7Suhiy4hzuNga05XaUzLO74lplCpvS8GVeUdFgef+8lU5+cHr60g=="; + }; + }; + "sass-lookup-3.0.0" = { + name = "sass-lookup"; + packageName = "sass-lookup"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-lookup/-/sass-lookup-3.0.0.tgz"; + sha512 = "TTsus8CfFRn1N44bvdEai1no6PqdmDiQUiqW5DlpmtT+tYnIt1tXtDIph5KA1efC+LmioJXSnCtUVpcK9gaKIg=="; + }; + }; "sax-0.5.8" = { name = "sax"; packageName = "sax"; @@ -38052,6 +38592,15 @@ let sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; + "schema-utils-2.6.5" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; + sha512 = "5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ=="; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -39015,13 +39564,22 @@ let sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; }; }; - "sisteransi-1.0.4" = { + "sisteransi-1.0.5" = { name = "sisteransi"; packageName = "sisteransi"; - version = "1.0.4"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"; + sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; + }; + }; + "size-rate-0.3.1" = { + name = "size-rate"; + packageName = "size-rate"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz"; - sha512 = "/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig=="; + url = "https://registry.npmjs.org/size-rate/-/size-rate-0.3.1.tgz"; + sha512 = "gs1+6r1P1w00Qv00qC4Be2pbl70/cIVCtsZJPQhEzH3vNss8QbkGIVh6/SCC7atSlX7hkuwH93TyWL1iyXjurQ=="; }; }; "skin-tone-1.0.0" = { @@ -39258,13 +39816,13 @@ let sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; }; }; - "snyk-docker-plugin-2.2.2" = { + "snyk-docker-plugin-2.6.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "2.2.2"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.2.2.tgz"; - sha512 = "ufeACGqtypUJ3AV5+bQw/mZLo40MC9tVHdRxpBw95w0F0Oa1MT5DATQj/K8RHpkEy8X6rlMmnxH8swyryFgRhg=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.6.1.tgz"; + sha512 = "v3LIPILRL5faZ+qiIhF9on0rAxuFaQku3UwaiGumoTrfXywLkv7x8PJgdMnrsWUxDwB8EZFc1k2qvI6V6rTF5g=="; }; }; "snyk-go-parser-1.4.0" = { @@ -39915,6 +40473,15 @@ let sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; + "spawn-stack-0.7.0" = { + name = "spawn-stack"; + packageName = "spawn-stack"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-stack/-/spawn-stack-0.7.0.tgz"; + sha512 = "lV3XTrZqR76y9voQq3g0NfCCd4dylXtgQW+xcoZkRYe/6IZJM20G//s2+4JYojJoHQQKKuoU+lUZkO5/tEJe4A=="; + }; + }; "spawn-sync-1.0.15" = { name = "spawn-sync"; packageName = "spawn-sync"; @@ -41247,6 +41814,15 @@ let sha512 = "fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A=="; }; }; + "stringify-object-3.3.0" = { + name = "stringify-object"; + packageName = "stringify-object"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; + }; + }; "stringify-parameters-0.0.4" = { name = "stringify-parameters"; packageName = "stringify-parameters"; @@ -41634,6 +42210,15 @@ let sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug=="; }; }; + "stylus-lookup-3.0.2" = { + name = "stylus-lookup"; + packageName = "stylus-lookup"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-3.0.2.tgz"; + sha512 = "oEQGHSjg/AMaWlKe7gqsnYzan8DLcGIHe0dUaFkucZZ14z4zjENRlQMCHT4FNsiWnJf17YN9OvrCfCoi7VvOyg=="; + }; + }; "stylus-supremacy-2.14.0" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; @@ -41679,6 +42264,33 @@ let sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; }; }; + "suf-cli-0.1.1" = { + name = "suf-cli"; + packageName = "suf-cli"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.1.tgz"; + sha512 = "0znmYibLknX0bWsnqW9rzM8IvKux3rTSnW52l5teIC+QAgS/StUl5f4WyLPBw+posfbOgoX+03xHPV4sMxY64Q=="; + }; + }; + "suf-node-1.1.1" = { + name = "suf-node"; + packageName = "suf-node"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/suf-node/-/suf-node-1.1.1.tgz"; + sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; + }; + }; + "suf-regex-0.0.14" = { + name = "suf-regex"; + packageName = "suf-regex"; + version = "0.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.14.tgz"; + sha512 = "+WE5PZTfD6lVNCNsyBInJIAbok8LpqgOhvCbSViZeQ/JTxdxq7Lw+tSJXGM+jrIp81jj9GCMYvkl00JAkn2CtA=="; + }; + }; "sugarss-1.0.1" = { name = "sugarss"; packageName = "sugarss"; @@ -42454,13 +43066,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.35.1" = { + "terminal-kit-1.35.2" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.35.1"; + version = "1.35.2"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.1.tgz"; - sha512 = "36q0frqenTb1kWuq+vJU+xbGB8KPX1+05kxnbVZxeu9cXDL68qR5w2NzsliogHweplRI7XP0Zc/FITMMA8/BHA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.2.tgz"; + sha512 = "PCNmMKjlcGQN/OlQ+nzdgPmrS0kmPcOqPCmHPrxCfOuvz0fQ1fZLiyivRIcwzY9bnm624VVsywUis+iPA3Hq5A=="; }; }; "terser-3.17.0" = { @@ -42472,13 +43084,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.6.6" = { + "terser-4.6.7" = { name = "terser"; packageName = "terser"; - version = "4.6.6"; + version = "4.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz"; - sha512 = "4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g=="; + url = "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz"; + sha512 = "fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g=="; }; }; "terser-webpack-plugin-1.4.3" = { @@ -42742,6 +43354,15 @@ let sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; + "tilde-path-3.0.0" = { + name = "tilde-path"; + packageName = "tilde-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tilde-path/-/tilde-path-3.0.0.tgz"; + sha512 = "jHGx1beQCxoIuyg1LDKxqL3J0zNA57eGjlXsqtcjj6Q9EKXh4Sz895VxXW/psJW1PYIF79XViZEEWrvmhaZ61g=="; + }; + }; "tildify-1.2.0" = { name = "tildify"; packageName = "tildify"; @@ -43147,15 +43768,6 @@ let sha512 = "Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA=="; }; }; - "to-vfile-5.0.3" = { - name = "to-vfile"; - packageName = "to-vfile"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-5.0.3.tgz"; - sha512 = "z1Lfx60yAMDMmr+f426Y4yECsHdl8GVEAE+LymjRF5oOIZ7T4N20IxWNAxXLMRzP9jSSll38Z0fKVAhVLsdLOw=="; - }; - }; "to-vfile-6.1.0" = { name = "to-vfile"; packageName = "to-vfile"; @@ -43588,13 +44200,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.7.0" = { + "ts-node-8.8.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.7.0"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz"; - sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz"; + sha512 = "10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg=="; }; }; "ts-process-promises-1.0.2" = { @@ -43651,6 +44263,15 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; + "tsutils-3.17.1" = { + name = "tsutils"; + packageName = "tsutils"; + version = "3.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz"; + sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="; + }; + }; "ttf2woff-2.0.1" = { name = "ttf2woff"; packageName = "ttf2woff"; @@ -43705,6 +44326,24 @@ let sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; + "tty-truncate-1.0.5" = { + name = "tty-truncate"; + packageName = "tty-truncate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-truncate/-/tty-truncate-1.0.5.tgz"; + sha512 = "ftM6dBJyEXLMspVSO2huTtGQapxsljpmQh5jYMaUFeCgETOWNT/KZcBGXtoBEYRBO2JRdxsSSHPloa6Fy/AWXw=="; + }; + }; + "tty-width-frame-1.0.3" = { + name = "tty-width-frame"; + packageName = "tty-width-frame"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-width-frame/-/tty-width-frame-1.0.3.tgz"; + sha512 = "k3DeWv+GnKYcFaFLK87Ecum4AWxySB0lfzQaonlHKaoum7A2DlTkWw8mfgWtz4o8Hoa4Ab/ZdDitR74LhbOK8A=="; + }; + }; "tunnel-0.0.6" = { name = "tunnel"; packageName = "tunnel"; @@ -43930,15 +44569,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.7.3" = { - name = "typescript"; - packageName = "typescript"; - version = "3.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz"; - sha512 = "Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw=="; - }; - }; "typescript-3.7.5" = { name = "typescript"; packageName = "typescript"; @@ -44704,6 +45334,15 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "universalify-1.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz"; + sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; + }; + }; "unix-crypt-td-js-1.1.4" = { name = "unix-crypt-td-js"; packageName = "unix-crypt-td-js"; @@ -44713,13 +45352,13 @@ let sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw=="; }; }; - "unix-dgram-2.0.3" = { + "unix-dgram-2.0.4" = { name = "unix-dgram"; packageName = "unix-dgram"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.3.tgz"; - sha512 = "Bay5CkSLcdypcBCsxvHEvaG3mftzT5FlUnRToPWEAVxwYI8NI/8zSJ/Gknlp86MPhV6hBA8I8TBsETj2tssoHQ=="; + url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.4.tgz"; + sha512 = "7tpK6x7ls7J7pDrrAU63h93R0dVhRbPwiRRCawR10cl+2e1VOvF3bHlVJc6WI1dl/8qk5He673QU+Ogv7bPNaw=="; }; }; "unixify-1.0.0" = { @@ -45658,13 +46297,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.0.0-12" = { + "verda-1.0.0" = { name = "verda"; packageName = "verda"; - version = "1.0.0-12"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.0.0-12.tgz"; - sha512 = "pNfCbq1WlBTE0SsyajJFzkQtp+E/opy5/+8405XHE4VMQ+3Xr/h2s9OijnbHPwPDJvybV4+JCktJhc6Ru6yg7w=="; + url = "https://registry.npmjs.org/verda/-/verda-1.0.0.tgz"; + sha512 = "kr/M1CkBepFQP/jIWh9QB8x/2Ly7qzsZMJwbjUurJAhbn+FQkGxiDMcCGRGYpMGl0oL8kLmEQDVNyzFzE9AUVw=="; }; }; "verror-1.1.0" = { @@ -45712,6 +46351,15 @@ let sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; }; }; + "vertical-meter-1.0.0" = { + name = "vertical-meter"; + packageName = "vertical-meter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vertical-meter/-/vertical-meter-1.0.0.tgz"; + sha512 = "xvtone0DHRBrWSBVF2p3+/KSz/mzHvDZ7+HYB3g68hBpqIC3tIF8J1maf5osHPKHB/45iq2B+T4ju/mfxArd/Q=="; + }; + }; "vfile-1.4.0" = { name = "vfile"; packageName = "vfile"; @@ -45973,6 +46621,15 @@ let sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; }; }; + "vls-0.2.0" = { + name = "vls"; + packageName = "vls"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vls/-/vls-0.2.0.tgz"; + sha512 = "B6xMWi3sOVSitcLx4zKWB5vh1DLL0Okkqy5Fa7rHSmqvPhDDn7idU+vwjWZW8IzHQO1T+brxvDjbKuSnEXNPRw=="; + }; + }; "vm-browserify-1.1.2" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -46225,13 +46882,13 @@ let sha512 = "ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw=="; }; }; - "vscode-nls-4.1.1" = { + "vscode-nls-4.1.2" = { name = "vscode-nls"; packageName = "vscode-nls"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.1.tgz"; - sha512 = "4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A=="; + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz"; + sha512 = "7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="; }; }; "vscode-textbuffer-1.0.0" = { @@ -46279,6 +46936,15 @@ let sha512 = "eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A=="; }; }; + "vscode-web-custom-data-0.1.3" = { + name = "vscode-web-custom-data"; + packageName = "vscode-web-custom-data"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.1.3.tgz"; + sha512 = "u9RdZ3aIjx5f0WYSb8EIcmo7trgrJk+bVfGDfjyBSlfG59XWg8xw/JVfHNpO5AklustCez3vixnGLAOWzhPkZg=="; + }; + }; "vstream-0.1.0" = { name = "vstream"; packageName = "vstream"; @@ -46315,15 +46981,6 @@ let sha512 = "ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw=="; }; }; - "vue-eslint-parser-5.0.0" = { - name = "vue-eslint-parser"; - packageName = "vue-eslint-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz"; - sha512 = "JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g=="; - }; - }; "vue-eslint-parser-6.0.5" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -46351,15 +47008,6 @@ let sha512 = "RXv0lrDG2CAx3yAQCoD9beU8nAoT3rhh/fgb+xlYM0Qlm+cpkWSLTdfOt1x2j2wHI08uEsi0q7x6rjhn54EbNA=="; }; }; - "vue-language-server-0.0.62" = { - name = "vue-language-server"; - packageName = "vue-language-server"; - version = "0.0.62"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.62.tgz"; - sha512 = "Q/nwAVlBfLKz4CSA4vkA14jJcXElP1Vf+O5GZhG7sPlNKMEy91rdVwYc7IfMRZV/SCAZRak9/oo0Zy4+39dwrg=="; - }; - }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -46549,13 +47197,13 @@ let sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; - "webpack-4.42.0" = { + "webpack-4.42.1" = { name = "webpack"; packageName = "webpack"; - version = "4.42.0"; + version = "4.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz"; - sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; + sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; }; }; "webpack-cli-3.3.11" = { @@ -46873,6 +47521,15 @@ let sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; }; }; + "win-user-installed-npm-cli-path-3.0.1" = { + name = "win-user-installed-npm-cli-path"; + packageName = "win-user-installed-npm-cli-path"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-user-installed-npm-cli-path/-/win-user-installed-npm-cli-path-3.0.1.tgz"; + sha512 = "Us1ZlMmWDInXihJ+SWP8/L0ArqsLqPtWK9Q67x6+q+z7C2c22viVgCmbH+x0BeMsosmPS9OKHvka519XbO51Rw=="; + }; + }; "window-size-0.1.0" = { name = "window-size"; packageName = "window-size"; @@ -47864,15 +48521,6 @@ let sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg=="; }; }; - "yargs-13.3.0" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -47900,13 +48548,13 @@ let sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg=="; }; }; - "yargs-15.3.0" = { + "yargs-15.3.1" = { name = "yargs"; packageName = "yargs"; - version = "15.3.0"; + version = "15.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz"; - sha512 = "g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; + sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; }; }; "yargs-3.10.0" = { @@ -47990,15 +48638,6 @@ let sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; }; }; - "yargs-parser-13.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -48026,13 +48665,13 @@ let sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg=="; }; }; - "yargs-parser-18.1.0" = { + "yargs-parser-18.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.0"; + version = "18.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz"; - sha512 = "o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz"; + sha512 = "KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA=="; }; }; "yargs-parser-2.4.1" = { @@ -48188,13 +48827,13 @@ let sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; - "yoga-layout-prebuilt-1.9.3" = { + "yoga-layout-prebuilt-1.9.5" = { name = "yoga-layout-prebuilt"; packageName = "yoga-layout-prebuilt"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.3.tgz"; - sha512 = "9SNQpwuEh2NucU83i2KMZnONVudZ86YNcFk9tq74YaqrQfgJWO3yB9uzH1tAg8iqh5c9F5j0wuyJ2z72wcum2w=="; + url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.5.tgz"; + sha512 = "+G5Ojl4/sG78mk5masCL3SRaZtkKXRBhMGf5c+4C1j32jN9KpS4lxVFdYyBi15EHN4gMeK5sIRf83T33TOaDkA=="; }; }; "yosay-2.0.2" = { @@ -48302,17 +48941,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.6.tgz"; - sha512 = "uDXhkPcHhE4G4FlY7+LJWhXErHnkn63V8lqkKD7juivs+Epmx8oXCOVObEQTbbtw7sF6s0dM8uTzHKgoefTlaA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.7.tgz"; + sha512 = "/9CUNSSVyTtTNUADZ/VXJDEdhineMN/rfd35w6VsHiob49tKkeOTggaoiSne3RY4VCTqlo7GGf4KhhVXEMGnDQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.900.6" - sources."@angular-devkit/core-9.0.6" - sources."@angular-devkit/schematics-9.0.6" - sources."@schematics/angular-9.0.6" - (sources."@schematics/update-0.900.6" // { + sources."@angular-devkit/architect-0.900.7" + sources."@angular-devkit/core-9.0.7" + sources."@angular-devkit/schematics-9.0.7" + sources."@schematics/angular-9.0.7" + (sources."@schematics/update-0.900.7" // { dependencies = [ (sources."npm-package-arg-7.0.0" // { dependencies = [ @@ -48343,7 +48982,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - (sources."cacache-12.0.3" // { + (sources."cacache-12.0.4" // { dependencies = [ sources."rimraf-2.7.1" ]; @@ -48381,7 +49020,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."err-code-1.1.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -48391,7 +49030,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."flush-write-stream-1.1.1" sources."forever-agent-0.6.1" @@ -48464,11 +49103,11 @@ in sources."mime-types-2.1.26" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mississippi-3.0.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -48656,7 +49295,7 @@ in sources."deep-freeze-node-1.1.3" sources."esprima-4.0.1" sources."js-yaml-3.13.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."lodash.clonedeep-4.5.0" sources."map-obj-4.1.0" sources."minimist-1.2.5" @@ -48706,9 +49345,14 @@ in sources."async-lock-1.2.2" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" - sources."bl-4.0.1" + sources."bl-4.0.2" sources."bops-0.0.7" sources."brace-expansion-1.1.11" + (sources."buffer-5.5.0" // { + dependencies = [ + sources."base64-js-1.3.1" + ]; + }) sources."buffer-crc32-0.2.13" sources."buffer-equal-1.0.0" sources."cache-directory-2.0.0" @@ -48828,6 +49472,7 @@ in sources."handlebars-4.5.3" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" + sources."ieee754-1.1.13" sources."ignore-5.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -48846,7 +49491,7 @@ in sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonfile-4.0.0" sources."keyv-3.1.0" (sources."lazystream-1.0.0" // { @@ -49185,26 +49830,21 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.8.3" - (sources."@babel/compat-data-7.8.6" // { + (sources."@babel/compat-data-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.8.7" // { + (sources."@babel/core-7.9.0" // { dependencies = [ - sources."@babel/generator-7.8.8" - sources."@babel/types-7.8.7" + sources."@babel/generator-7.9.4" + sources."@babel/types-7.9.0" sources."semver-5.7.1" ]; }) sources."@babel/generator-7.8.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - (sources."@babel/helper-call-delegate-7.8.7" // { - dependencies = [ - sources."@babel/types-7.8.7" - ]; - }) (sources."@babel/helper-compilation-targets-7.8.7" // { dependencies = [ sources."semver-5.7.1" @@ -49219,7 +49859,11 @@ in sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.8.6" + (sources."@babel/helper-module-transforms-7.9.0" // { + dependencies = [ + sources."@babel/types-7.9.0" + ]; + }) sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" @@ -49227,24 +49871,31 @@ in sources."@babel/helper-replace-supers-7.8.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + (sources."@babel/helpers-7.9.2" // { + dependencies = [ + sources."@babel/types-7.9.0" + ]; + }) + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/plugin-proposal-numeric-separator-7.8.3" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-optional-chaining-7.8.3" + sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-flow-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" @@ -49254,25 +49905,25 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.8.6" + sources."@babel/plugin-transform-classes-7.9.2" sources."@babel/plugin-transform-computed-properties-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-flow-strip-types-7.8.3" - sources."@babel/plugin-transform-for-of-7.8.6" + sources."@babel/plugin-transform-flow-strip-types-7.9.0" + sources."@babel/plugin-transform-for-of-7.9.0" sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.8.3" - sources."@babel/plugin-transform-modules-systemjs-7.8.3" - sources."@babel/plugin-transform-modules-umd-7.8.3" + sources."@babel/plugin-transform-modules-amd-7.9.0" + sources."@babel/plugin-transform-modules-commonjs-7.9.0" + sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.8.8" + sources."@babel/plugin-transform-parameters-7.9.3" sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" @@ -49281,30 +49932,36 @@ in sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-typescript-7.8.7" + sources."@babel/plugin-transform-typescript-7.9.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - (sources."@babel/preset-env-7.8.7" // { + (sources."@babel/preset-env-7.9.0" // { dependencies = [ - sources."@babel/types-7.8.7" + sources."@babel/types-7.9.0" sources."semver-5.7.1" ]; }) - sources."@babel/preset-flow-7.8.3" - sources."@babel/preset-typescript-7.8.3" - (sources."@babel/register-7.8.6" // { + sources."@babel/preset-flow-7.9.0" + sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-typescript-7.9.0" + (sources."@babel/register-7.9.0" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - (sources."@babel/runtime-7.8.7" // { + (sources."@babel/runtime-7.9.2" // { dependencies = [ sources."regenerator-runtime-0.13.5" ]; }) sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" + (sources."@babel/traverse-7.9.0" // { + dependencies = [ + sources."@babel/generator-7.9.4" + sources."@babel/types-7.9.0" + ]; + }) sources."@babel/types-7.8.6" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" @@ -49391,7 +50048,7 @@ in sources."@types/cors-2.8.6" sources."@types/events-3.0.0" sources."@types/express-4.17.2" - sources."@types/express-serve-static-core-4.17.2" + sources."@types/express-serve-static-core-4.17.3" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.1" sources."@types/graphql-upload-8.0.3" @@ -49402,7 +50059,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" (sources."@types/node-fetch-2.5.5" // { dependencies = [ sources."form-data-3.0.0" @@ -49566,7 +50223,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" sources."buffer-5.5.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -49584,7 +50241,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -49748,7 +50405,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -49757,7 +50414,7 @@ in sources."env-ci-3.2.2" sources."envinfo-7.5.0" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -49832,7 +50489,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.120.1" + sources."flow-parser-0.121.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -49845,7 +50502,7 @@ in sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."fswin-2.17.1227" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -50006,7 +50663,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.4" + sources."isbinaryfile-4.0.5" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" @@ -50025,7 +50682,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."kind-of-6.0.3" @@ -50119,11 +50776,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" @@ -50250,6 +50903,7 @@ in sources."pinkie-promise-2.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" + sources."pkg-up-3.1.0" (sources."portfinder-1.0.25" // { dependencies = [ sources."debug-3.2.6" @@ -50296,7 +50950,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.10.5" - sources."regenerator-transform-0.14.3" + sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -50325,7 +50979,7 @@ in sources."ret-0.1.15" sources."retry-0.12.0" sources."rimraf-2.7.1" - sources."rss-parser-3.7.5" + sources."rss-parser-3.7.6" sources."run-async-2.4.0" sources."rxjs-6.5.4" sources."safe-buffer-5.2.0" @@ -50545,7 +51199,7 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.7.0" + sources."ts-node-8.8.1" sources."tslib-1.11.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" @@ -50793,11 +51447,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/generator-7.8.8" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/generator-7.9.4" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/types-7.9.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -50819,7 +51474,6 @@ in sources."color-name-1.1.3" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -50878,25 +51532,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.8.7" // { + (sources."@babel/core-7.9.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.8.8" // { + (sources."@babel/generator-7.9.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.8.3" sources."@babel/helper-get-function-arity-7.8.3" + sources."@babel/helper-member-expression-to-functions-7.8.3" + sources."@babel/helper-module-imports-7.8.3" + sources."@babel/helper-module-transforms-7.9.0" + sources."@babel/helper-optimise-call-expression-7.8.3" + sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -50915,7 +51576,6 @@ in sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."fs-extra-5.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" @@ -50942,7 +51602,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" sources."lodash-4.17.15" @@ -50990,20 +51650,20 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.0.1.tgz"; - sha512 = "43sVUKSX0VLNfavair0OLzPoVX5rRdqAxcUUhtwKLGkKQPs2ePreOG7zpp3gZOLvZGhZxixD9JZBxWKgqH8r1g=="; + url = "https://registry.npmjs.org/asar/-/asar-3.0.2.tgz"; + sha512 = "nFtY0kToUcMEAY8f6qmeyqn+HZzovwlKsbzf5yjEnzOksFzJLTxWvP2jbzItFT04BdaL3CZKRApTr5iRofVq6g=="; }; dependencies = [ sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" - sources."commander-4.1.1" + sources."commander-5.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -51251,11 +51911,7 @@ in sources."mime-db-1.43.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."natives-1.1.6" sources."normalize-package-data-2.5.0" @@ -51374,11 +52030,7 @@ in sources."defined-1.0.0" sources."deps-sort-2.0.1" sources."des.js-1.0.1" - (sources."detective-5.2.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."detective-5.2.0" sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" @@ -51413,8 +52065,8 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."module-deps-6.2.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -51460,11 +52112,7 @@ in }) sources."stream-splicer-2.0.1" sources."string_decoder-1.3.0" - (sources."subarg-1.0.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."subarg-1.0.0" sources."syntax-error-1.4.0" sources."through-2.3.8" sources."through2-2.0.5" @@ -51629,8 +52277,7 @@ in sources."form-data-2.3.3" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."thunky-1.1.0" ]; }) @@ -51772,8 +52419,7 @@ in sources."query-string-1.0.1" (sources."random-access-file-2.1.3" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."random-access-storage-1.4.1" @@ -52164,13 +52810,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.2.tgz"; - sha512 = "j0pzvL9swPwN4sW/abHRAtm1Pc0TNMT7YwItkA8F90kaUxdfF0JQaR3AvDe1/YxFUlNHU92F2R0g2VAdcSzWEg=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.4.tgz"; + sha512 = "5gE7m9/Cm/HYFfW4QcpGdVK9waWTQT0pyxSSrvhIjbRjAYv+uspsCUrg6ODxruIakHaRpvqrdhodRt2cnF0NJg=="; }; dependencies = [ - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@chemzqm/neovim-5.1.9" sources."async-2.6.3" sources."await-semaphore-0.1.3" @@ -52178,7 +52824,7 @@ in sources."brace-expansion-1.1.11" sources."bser-2.1.1" sources."chownr-1.1.4" - sources."coc.nvim-0.0.76" + sources."coc.nvim-0.0.77" sources."concat-map-0.0.1" sources."date-format-2.1.0" sources."debounce-1.2.0" @@ -52224,10 +52870,10 @@ in ]; }) sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."msgpack-lite-0.1.26" (sources."mv-2.1.1" // { @@ -52241,12 +52887,8 @@ in sources."node-int64-0.4.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."promisify-child-process-3.1.3" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."promisify-child-process-3.1.4" + sources."rc-1.2.8" sources."regenerator-runtime-0.13.5" sources."rfc-3986-1.0.1" sources."rfdc-1.1.4" @@ -52314,7 +52956,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" @@ -52369,7 +53012,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -52455,7 +53098,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -52471,7 +53114,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -52738,23 +53385,19 @@ in sources."mimic-fn-2.1.0" ]; }) - (sources."meow-3.7.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."meow-3.7.0" sources."merge2-1.3.0" sources."micromatch-2.3.11" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.7" (sources."nanomatch-1.2.13" // { @@ -52896,11 +53539,7 @@ in sources."kind-of-6.0.3" ]; }) - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -53046,7 +53685,6 @@ in sources."load-json-file-4.0.0" sources."map-obj-2.0.0" sources."meow-4.0.1" - sources."minimist-1.2.5" sources."parse-json-4.0.0" sources."path-type-3.0.0" sources."read-pkg-3.0.0" @@ -53291,27 +53929,34 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.8.7" // { + (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.8.8" + sources."@babel/generator-7.9.4" sources."@babel/helper-function-name-7.8.3" sources."@babel/helper-get-function-arity-7.8.3" + sources."@babel/helper-member-expression-to-functions-7.8.3" + sources."@babel/helper-module-imports-7.8.3" + sources."@babel/helper-module-transforms-7.9.0" + sources."@babel/helper-optimise-call-expression-7.8.3" + sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -53336,7 +53981,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."atob-2.1.2" - (sources."autoprefixer-9.7.4" // { + (sources."autoprefixer-9.7.5" // { dependencies = [ sources."postcss-value-parser-4.0.3" ]; @@ -53354,7 +53999,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -53362,7 +54007,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -53421,13 +54066,12 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."execall-2.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -53474,7 +54118,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."flat-cache-2.0.1" sources."flatted-2.0.1" sources."for-in-1.0.2" @@ -53565,11 +54209,7 @@ in sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - (sources."json5-2.1.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-2.1.2" sources."kind-of-6.0.3" sources."known-css-properties-0.14.0" sources."leven-3.1.0" @@ -53578,7 +54218,7 @@ in sources."pify-3.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."log-symbols-3.0.0" sources."longest-streak-2.0.4" @@ -53601,14 +54241,14 @@ in ]; }) sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."nanomatch-1.2.13" sources."node-releases-1.1.52" @@ -53636,9 +54276,9 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."parse-entities-1.2.2" sources."parse-json-4.0.0" sources."pascalcase-0.1.1" @@ -53651,8 +54291,9 @@ in sources."pify-3.0.0" ]; }) - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pify-4.0.1" + sources."pkg-up-3.1.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.27" // { dependencies = [ @@ -53680,7 +54321,15 @@ in sources."punycode-2.1.1" sources."quick-lru-1.1.0" sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" + (sources."read-pkg-up-3.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) sources."readable-stream-3.6.0" sources."redent-2.0.0" sources."regex-not-1.0.2" @@ -53894,7 +54543,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -53908,7 +54558,6 @@ in sources."diff-4.0.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."has-flag-3.0.0" @@ -53917,8 +54566,8 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -53978,13 +54627,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.4.11"; + version = "1.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.11.tgz"; - sha512 = "BMqtvulotRQwgQ/UkpGDz7b+tXXQGbxYJLo3SdmFeDeVkWLBGl/oP1ythlT3aY5K3kuCv0JnDgqpoAc175CERg=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.12.tgz"; + sha512 = "JMlIDCgTBXAWh6jsY1c6aMXw50jGRMZoiAYKhX0sYVKrDZznS2ocjKw4m/9yoNPWHIH6gk89BGXXT+7XhtsGWw=="; }; dependencies = [ - sources."typescript-3.7.3" + sources."typescript-3.8.3" ]; buildInputs = globalBuildInputs; meta = { @@ -53999,38 +54648,80 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.7"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.7.tgz"; - sha512 = "QhVgqvOAMR/ehil8o+FezjRO6D0j8t/f5Uhn3bBY4dkAoJ0LbYHz+YNT+N0JPRYVgAJQFfRjHVdymWXRuf16wA=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.9.tgz"; + sha512 = "lF5s1hBM/92ZKW9JEjkYrbYYuvjcYirBy+8YgDH0s50iV0pVxd8vBGS/x3z50VNRLx2yp6Elu6bDXAQclp/X5g=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" + (sources."@nodelib/fs.scandir-2.1.3" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + ]; + }) sources."@nodelib/fs.stat-1.1.3" - sources."@starptech/expression-parser-0.9.0" - sources."@starptech/hast-util-from-webparser-0.9.0" - sources."@starptech/prettyhtml-0.9.0" - sources."@starptech/prettyhtml-formatter-0.9.0" - sources."@starptech/prettyhtml-hast-to-html-0.9.0" - sources."@starptech/prettyhtml-hastscript-0.9.0" - sources."@starptech/prettyhtml-sort-attributes-0.9.0" - sources."@starptech/rehype-minify-whitespace-0.9.0" - sources."@starptech/rehype-webparser-0.9.0" - sources."@starptech/webparser-0.9.0" - sources."@types/node-13.9.1" + sources."@nodelib/fs.walk-1.2.4" + sources."@sindresorhus/is-0.14.0" + sources."@sorg/log-2.1.0" + sources."@starptech/expression-parser-0.10.0" + sources."@starptech/hast-util-from-webparser-0.10.0" + sources."@starptech/prettyhtml-0.10.0" + sources."@starptech/prettyhtml-formatter-0.10.0" + sources."@starptech/prettyhtml-hast-to-html-0.10.0" + sources."@starptech/prettyhtml-hastscript-0.10.0" + sources."@starptech/prettyhtml-sort-attributes-0.10.0" + sources."@starptech/rehype-minify-whitespace-0.10.0" + sources."@starptech/rehype-webparser-0.10.0" + sources."@starptech/webparser-0.10.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" + sources."@types/eslint-visitor-keys-1.0.0" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/json-schema-7.0.4" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.9.3" + sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" + (sources."@typescript-eslint/experimental-utils-1.13.0" // { + dependencies = [ + sources."eslint-scope-4.0.3" + ]; + }) + sources."@typescript-eslint/parser-1.13.0" + (sources."@typescript-eslint/typescript-estree-1.13.0" // { + dependencies = [ + sources."semver-5.5.0" + ]; + }) sources."abbrev-1.1.1" - sources."acorn-6.4.1" + sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" + (sources."aggregate-error-3.0.1" // { + dependencies = [ + sources."indent-string-4.0.0" + ]; + }) sources."ajv-6.12.0" - sources."ajv-keywords-2.1.1" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + (sources."ansi-escapes-4.3.1" // { + dependencies = [ + sources."type-fest-0.11.0" + ]; + }) sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" (sources."anymatch-1.3.2" // { @@ -54062,17 +54753,6 @@ in sources."async-1.5.2" sources."async-each-1.0.3" sources."atob-2.1.2" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."babel-runtime-6.26.0" sources."bail-1.0.5" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -54083,7 +54763,14 @@ in sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."bootstrap-vue-helper-json-1.1.1" - sources."boxen-1.3.0" + (sources."boxen-3.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."camelcase-5.3.1" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -54094,16 +54781,16 @@ in sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" - sources."call-me-maybe-1.0.1" - (sources."caller-path-0.1.0" // { + (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."callsites-0.2.0" + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" ]; }) + sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54118,8 +54805,7 @@ in sources."is-glob-2.0.1" ]; }) - sources."ci-info-1.6.0" - sources."circular-json-0.3.3" + sources."ci-info-2.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -54138,12 +54824,13 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" + sources."clean-stack-2.2.0" + sources."cli-boxes-2.2.0" + sources."cli-cursor-3.1.0" sources."cli-width-2.2.0" sources."cliui-4.1.0" sources."clone-1.0.4" - sources."co-4.6.0" + sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.6" sources."collection-visit-1.0.0" @@ -54162,11 +54849,10 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-3.6.4" sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" (sources."css-2.2.4" // { @@ -54175,6 +54861,7 @@ in ]; }) sources."css-parse-2.0.0" + sources."csstype-2.6.9" sources."currently-unhandled-0.4.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -54184,10 +54871,32 @@ in ]; }) sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" sources."define-property-2.0.2" + (sources."del-5.1.0" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.2" + sources."fill-range-7.0.1" + sources."globby-10.0.2" + sources."ignore-5.1.4" + sources."is-number-7.0.0" + sources."is-path-inside-3.0.2" + sources."micromatch-4.0.2" + sources."path-type-4.0.0" + sources."rimraf-3.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."del-cli-3.0.0" sources."diff-4.0.2" sources."dir-glob-2.0.0" sources."dlv-1.1.3" @@ -54200,26 +54909,32 @@ in sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-5.16.0" // { + (sources."eslint-6.8.0" // { dependencies = [ - sources."cross-spawn-6.0.5" + sources."ansi-regex-4.1.0" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."debug-4.1.1" sources."ignore-4.0.6" + sources."semver-6.3.0" + sources."strip-ansi-5.2.0" + sources."strip-json-comments-3.0.1" ]; }) - (sources."eslint-plugin-vue-5.2.3" // { - dependencies = [ - sources."debug-4.1.1" - sources."espree-4.1.0" - sources."vue-eslint-parser-5.0.0" - ]; - }) - sources."eslint-scope-4.0.3" + sources."eslint-plugin-vue-6.2.2" + sources."eslint-scope-5.0.0" sources."eslint-utils-1.4.3" sources."eslint-visitor-keys-1.1.0" - sources."espree-5.0.1" + sources."espree-6.2.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -54268,11 +54983,20 @@ in ]; }) sources."fast-deep-equal-3.1.1" - sources."fast-glob-2.2.7" + (sources."fast-glob-2.2.7" // { + dependencies = [ + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.6.1" sources."fault-1.0.4" - sources."figures-2.0.0" + sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" @@ -54290,7 +55014,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -54304,16 +55028,20 @@ in sources."is-glob-2.0.1" ]; }) - (sources."glob-parent-3.1.0" // { + sources."glob-parent-5.1.1" + sources."glob-to-regexp-0.3.0" + sources."global-dirs-0.1.1" + (sources."globals-12.4.0" // { dependencies = [ - sources."is-glob-3.1.0" + sources."type-fest-0.8.1" ]; }) - sources."glob-to-regexp-0.3.0" - sources."global-dirs-0.1.1" - sources."globals-11.12.0" sources."globby-8.0.2" - sources."got-6.7.1" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) sources."graceful-fs-4.2.3" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" @@ -54330,16 +55058,18 @@ in sources."kind-of-4.0.0" ]; }) + sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.2" + sources."hast-util-is-body-ok-link-1.0.3" sources."hast-util-is-element-1.0.4" sources."hast-util-parse-selector-2.2.4" - sources."hast-util-to-string-1.0.2" + sources."hast-util-to-string-1.0.3" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" - sources."html-whitespace-sensitive-tag-names-1.0.1" + sources."html-whitespace-sensitive-tag-names-1.0.2" + sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" (sources."import-fresh-3.2.1" // { @@ -54353,10 +55083,19 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.2" // { + (sources."inquirer-7.1.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" ]; }) sources."invert-kv-2.0.0" @@ -54366,7 +55105,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-2.0.4" - sources."is-ci-1.2.1" + sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -54380,7 +55119,7 @@ in sources."is-hexadecimal-1.0.4" sources."is-hidden-1.1.3" sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" + sources."is-npm-3.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."is-buffer-1.1.6" @@ -54389,33 +55128,35 @@ in }) sources."is-obj-1.0.1" sources."is-object-1.0.1" + sources."is-path-cwd-2.2.0" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-promise-2.1.0" - sources."is-redirect-1.0.0" - sources."is-resolvable-1.1.0" - sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" + sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."js-beautify-1.10.3" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" + sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonc-parser-1.0.3" + sources."keyv-3.1.0" sources."kind-of-6.0.3" - sources."latest-version-3.1.0" + sources."latest-version-5.1.0" sources."lcid-2.0.0" sources."levn-0.3.0" + sources."lines-and-columns-1.1.6" sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" @@ -54448,11 +55189,7 @@ in sources."map-visit-1.0.0" sources."markdown-table-0.4.0" sources."math-random-1.0.4" - (sources."mem-4.3.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) + sources."mem-4.3.0" (sources."meow-5.0.0" // { dependencies = [ sources."read-pkg-up-3.0.0" @@ -54460,7 +55197,8 @@ in }) sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minimist-options-3.0.2" @@ -54469,21 +55207,19 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."mout-0.5.0" sources."ms-2.1.2" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" + sources."node-fetch-2.6.0" sources."nopt-4.0.3" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" + sources."normalize-url-4.5.0" sources."npm-prefix-1.2.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -54507,7 +55243,7 @@ in sources."object.omit-2.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" + sources."onetime-5.1.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" (sources."os-locale-3.1.0" // { @@ -54519,13 +55255,19 @@ in }) sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" + sources."p-map-3.0.0" sources."p-try-1.0.0" - sources."package-json-4.0.1" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."parent-module-1.0.1" sources."parse-entities-1.2.2" sources."parse-gitignore-1.0.1" @@ -54544,6 +55286,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-type-3.0.0" + sources."picomatch-2.2.2" sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -54557,38 +55300,45 @@ in sources."strip-bom-2.0.0" ]; }) - sources."pluralize-7.0.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" - sources."prepend-http-1.0.4" + sources."prepend-http-2.0.0" sources."preserve-0.2.0" sources."prettier-1.19.1" - (sources."prettier-eslint-8.8.2" // { + (sources."prettier-eslint-9.0.1" // { dependencies = [ - sources."acorn-5.7.4" + sources."acorn-6.4.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) - sources."ajv-5.5.2" - sources."chardet-0.4.2" - sources."doctrine-2.1.0" - sources."eslint-4.19.1" - sources."eslint-scope-3.7.3" - sources."espree-3.5.4" - sources."external-editor-2.2.0" - sources."fast-deep-equal-1.1.0" - sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.4" - sources."inquirer-3.3.0" - sources."json-schema-traverse-0.3.1" - sources."regexpp-1.1.0" - sources."slice-ansi-1.0.0" - sources."table-4.0.2" - sources."typescript-2.9.2" - sources."vue-eslint-parser-2.0.3" - sources."write-0.2.1" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + sources."cli-cursor-2.1.0" + sources."cross-spawn-6.0.5" + sources."debug-4.1.1" + sources."eslint-5.16.0" + sources."eslint-scope-4.0.3" + sources."espree-5.0.1" + sources."figures-2.0.0" + sources."globals-11.12.0" + sources."ignore-4.0.6" + sources."indent-string-4.0.0" + sources."inquirer-6.5.2" + sources."mimic-fn-1.2.0" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + sources."strip-ansi-5.2.0" + (sources."vue-eslint-parser-2.0.3" // { + dependencies = [ + sources."acorn-5.7.4" + sources."debug-3.2.6" + sources."eslint-scope-3.7.3" + sources."espree-3.5.4" + ]; + }) ]; }) sources."prettier-tslint-0.4.2" @@ -54608,24 +55358,31 @@ in }) sources."rc-1.2.8" sources."read-pkg-3.0.0" - (sources."read-pkg-up-4.0.0" // { + (sources."read-pkg-up-7.0.1" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."parse-json-5.0.0" + sources."path-exists-4.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."type-fest-0.8.1" ]; }) sources."readable-stream-2.3.7" sources."readdirp-2.2.1" sources."redent-2.0.0" - sources."regenerator-runtime-0.11.1" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexpp-2.0.1" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" + sources."registry-auth-token-4.1.1" + sources."registry-url-5.1.0" sources."rehype-sort-attribute-values-2.0.1" (sources."remark-5.1.0" // { dependencies = [ @@ -54646,24 +55403,22 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - (sources."require-uncached-1.0.3" // { - dependencies = [ - sources."resolve-from-1.0.1" - ]; - }) sources."resolve-1.15.1" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" + sources."reusify-1.0.4" sources."rimraf-2.6.3" sources."run-async-2.4.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" + sources."run-parallel-1.1.9" sources."rxjs-6.5.4" + sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" + sources."sass-formatter-0.4.4" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -54788,6 +55543,9 @@ in ]; }) sources."stylus-supremacy-2.14.0" + sources."suf-cli-0.1.1" + sources."suf-node-1.1.1" + sources."suf-regex-0.0.14" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -54800,7 +55558,6 @@ in sources."term-size-1.2.0" sources."text-table-0.2.0" sources."through-2.3.8" - sources."timed-out-4.0.1" sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -54808,13 +55565,10 @@ in sources."kind-of-3.2.2" ]; }) + sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - (sources."to-vfile-5.0.3" // { - dependencies = [ - sources."vfile-3.0.1" - ]; - }) + sources."to-vfile-6.1.0" sources."trim-0.0.1" sources."trim-newlines-2.0.0" sources."trim-trailing-lines-1.1.3" @@ -54823,23 +55577,28 @@ in sources."tslint-5.20.1" sources."tsutils-2.29.0" sources."type-check-0.3.2" + sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."typescript-3.8.3" - (sources."typescript-eslint-parser-16.0.1" // { - dependencies = [ - sources."semver-5.5.0" - ]; - }) sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ + sources."unist-util-stringify-position-1.1.2" sources."vfile-3.0.1" + sources."vfile-message-1.1.1" ]; }) (sources."unified-engine-6.0.1" // { dependencies = [ sources."to-vfile-4.0.0" + sources."unist-util-stringify-position-1.1.2" sources."vfile-3.0.1" + sources."vfile-message-1.1.1" + (sources."vfile-reporter-5.1.2" // { + dependencies = [ + sources."unist-util-stringify-position-2.0.3" + ]; + }) ]; }) sources."union-value-1.0.1" @@ -54849,7 +55608,7 @@ in sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" sources."unist-util-remove-position-1.1.4" - sources."unist-util-stringify-position-1.1.2" + sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -54867,30 +55626,31 @@ in ]; }) sources."untildify-2.1.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" + sources."update-notifier-3.0.1" sources."uri-js-4.2.2" sources."urix-0.1.0" - sources."url-parse-lax-1.0.0" + sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.1.0" sources."validate-npm-package-license-3.0.4" - (sources."vfile-4.0.3" // { - dependencies = [ - sources."unist-util-stringify-position-2.0.3" - sources."vfile-message-2.0.3" - ]; - }) + sources."vfile-4.0.3" sources."vfile-location-2.0.6" - sources."vfile-message-1.1.1" - (sources."vfile-reporter-5.1.2" // { + sources."vfile-message-2.0.3" + (sources."vfile-reporter-6.0.1" // { dependencies = [ - sources."unist-util-stringify-position-2.0.3" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-6.1.0" ]; }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" + sources."vls-0.2.0" (sources."vscode-css-languageservice-4.1.1" // { dependencies = [ sources."vscode-uri-2.1.1" @@ -54898,19 +55658,18 @@ in }) sources."vscode-emmet-helper-1.2.17" sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-5.3.0-next.10" + sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" - sources."vscode-textbuffer-1.0.0" + sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" - (sources."vue-eslint-parser-6.0.5" // { + sources."vscode-web-custom-data-0.1.3" + (sources."vue-eslint-parser-7.0.0" // { dependencies = [ sources."debug-4.1.1" ]; }) - sources."vue-language-server-0.0.62" sources."vue-onsenui-helper-json-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -55023,7 +55782,7 @@ in }) sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.1" sources."yaml-ast-parser-custom-tags-0.0.43" sources."yaml-language-server-0.7.2" @@ -55040,10 +55799,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.3.tgz"; - sha512 = "m+hjR2e1Pc4CikJCh1u+XiyeWK7O9aBWWqk6nSkJp22wC8moIVgRa1PYbGpzKAAXem+Ts0BzVw2IRF5EES0MQg=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.4.tgz"; + sha512 = "8qonhyBfipzni6Fbbdm9hOjUIdLtwPGqnVGxA5DV+Kd4ctvD+FiBRuaWnXWf4QqxC8ATHQyTyoSqrvdXdko4PA=="; }; buildInputs = globalBuildInputs; meta = { @@ -55208,7 +55967,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.0" @@ -55818,7 +56577,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."aggregate-error-3.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -56179,7 +56938,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -56267,7 +57026,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -56321,10 +57080,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.0.tgz"; - sha512 = "BR5jXjJH6Bz0vHAIoF0pH2K+hX+Frd93UGZjjCUB1k1JJDZbM+QyigTXZ08ddJ02AQ+iYfNyM77WgDwKQBl00g=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.1.tgz"; + sha512 = "i0Zxiqj8Q2tMJkMousrZdB/vlvtoAZyN49bgAfM4yHhWQUzrpM1rZU7TX1Rg5bbDQ1R8Gk/usNnpkDzEHJdVXg=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -56386,8 +57145,8 @@ in sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."once-1.4.0" @@ -56880,11 +57639,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."multi-random-access-2.1.1" sources."multicast-dns-7.2.1" @@ -57402,7 +58157,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.639.0" + sources."aws-sdk-2.644.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -57555,24 +58310,33 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.8.7" - sources."@babel/generator-7.8.8" - sources."@babel/helper-builder-react-jsx-7.8.3" + sources."@babel/core-7.9.0" + sources."@babel/generator-7.9.4" + sources."@babel/helper-annotate-as-pure-7.8.3" + sources."@babel/helper-builder-react-jsx-7.9.0" + sources."@babel/helper-builder-react-jsx-experimental-7.9.0" sources."@babel/helper-function-name-7.8.3" sources."@babel/helper-get-function-arity-7.8.3" + sources."@babel/helper-member-expression-to-functions-7.8.3" + sources."@babel/helper-module-imports-7.8.3" + sources."@babel/helper-module-transforms-7.9.0" + sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" + sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-syntax-jsx-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" - sources."@babel/plugin-transform-react-jsx-7.8.3" + sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@sindresorhus/is-2.1.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -57580,9 +58344,10 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" + sources."@types/yoga-layout-1.9.1" sources."ajv-6.12.0" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -57595,7 +58360,7 @@ in sources."arrify-2.0.1" sources."astral-regex-2.0.0" sources."auto-bind-4.0.0" - sources."cacheable-lookup-2.0.0" + sources."cacheable-lookup-2.0.1" (sources."cacheable-request-7.0.1" // { dependencies = [ sources."get-stream-5.1.0" @@ -57610,7 +58375,7 @@ in sources."ci-info-2.0.0" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" - sources."clipboardy-2.2.0" + sources."clipboardy-2.3.0" (sources."clone-response-1.0.2" // { dependencies = [ sources."mimic-response-1.0.1" @@ -57643,7 +58408,6 @@ in sources."env-paths-2.2.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."execa-1.0.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" @@ -57698,7 +58462,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."keyv-4.0.0" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" @@ -57734,7 +58498,7 @@ in sources."mimic-fn-3.0.0" ]; }) - (sources."meow-6.0.1" // { + (sources."meow-6.1.0" // { dependencies = [ sources."type-fest-0.8.1" ]; @@ -57773,8 +58537,8 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."quick-lru-4.0.1" - sources."react-16.13.0" - sources."react-is-16.13.0" + sources."react-16.13.1" + sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -57845,8 +58609,8 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."yargs-parser-16.1.0" - sources."yoga-layout-prebuilt-1.9.3" + sources."yargs-parser-18.1.1" + sources."yoga-layout-prebuilt-1.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -57885,7 +58649,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" @@ -57924,7 +58689,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -57939,7 +58708,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -57972,8 +58741,8 @@ in sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" @@ -58050,14 +58819,15 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.0.tgz"; - sha512 = "cNZFOYG+Quphqj+GPoTNe9nsDCRJo2AjHVpu4RkvAxH8+vR2ckvm7ksr+Lwi+kkKuMf4h+QifTAXJ0HuBkJ7FA=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.1.tgz"; + sha512 = "eYr8vOwCQynnI8b5e5R07D2JI6jCItT9QZzWKGZnqMs9lKN+z0bvn1ULCNKp0u4mz1V+lLRglIDiSGIkIDDcLw=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" @@ -58098,7 +58868,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -58113,7 +58887,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -58146,8 +58920,8 @@ in sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nanolru-1.0.0" @@ -58419,7 +59193,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helper-validator-identifier-7.9.0" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -58460,7 +59235,6 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."execa-4.0.0" sources."external-editor-3.1.0" sources."figures-3.2.0" @@ -58503,7 +59277,7 @@ in sources."lodash-4.17.15" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" - (sources."meow-6.0.1" // { + (sources."meow-6.1.0" // { dependencies = [ sources."type-fest-0.8.1" ]; @@ -58595,7 +59369,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-2.1.2" - sources."yargs-parser-16.1.0" + sources."yargs-parser-18.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -58703,7 +59477,7 @@ in sources."define-property-2.0.2" sources."defined-0.0.0" sources."director-1.2.7" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" (sources."event-stream-0.5.3" // { @@ -58756,7 +59530,7 @@ in sources."forever-monitor-2.0.0" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-value-2.0.6" (sources."glob-7.1.6" // { @@ -58825,9 +59599,9 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.1" // { + (sources."mkdirp-0.5.4" // { dependencies = [ - sources."minimist-0.0.8" + sources."minimist-1.2.5" ]; }) sources."ms-2.0.0" @@ -59108,11 +59882,7 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."moo-0.5.1" sources."ms-2.1.2" @@ -59277,7 +60047,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helper-validator-identifier-7.9.0" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -59352,7 +60123,6 @@ in sources."error-ex-1.3.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."execa-4.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.1" @@ -59429,7 +60199,7 @@ in sources."lowercase-keys-1.0.1" sources."make-dir-3.0.2" sources."map-obj-4.1.0" - (sources."meow-6.0.1" // { + (sources."meow-6.1.0" // { dependencies = [ sources."type-fest-0.8.1" ]; @@ -59526,7 +60296,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."yargs-parser-16.1.0" + sources."yargs-parser-18.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -59994,11 +60764,7 @@ in sources."yallist-4.0.0" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.2" @@ -60820,7 +61586,7 @@ in sources."fragment-cache-0.2.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-value-2.0.6" @@ -61625,11 +62391,7 @@ in sources."lodash-4.17.15" sources."mime-1.6.0" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."opener-1.5.1" (sources."optimist-0.6.1" // { @@ -61638,7 +62400,7 @@ in ]; }) sources."portfinder-1.0.25" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."union-0.5.0" @@ -61738,9 +62500,9 @@ in sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mkdirp-0.5.1" // { + (sources."mkdirp-0.5.4" // { dependencies = [ - sources."minimist-0.0.8" + sources."minimist-1.2.5" ]; }) sources."moment-2.24.0" @@ -61829,7 +62591,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.4.1" - sources."jquery.terminal-2.15.0" + sources."jquery.terminal-2.15.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -62046,11 +62808,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-1.0.6" @@ -62076,7 +62834,7 @@ in sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -62202,26 +62960,28 @@ in name = "iosevka-build-deps"; packageName = "iosevka-build-deps"; version = "2.3.3"; - src = ../../../pkgs/data/fonts/iosevka; + src = ../../data/fonts/iosevka; dependencies = [ + sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."ajv-6.12.0" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bezier-js-2.5.1" + sources."bezier-js-2.6.0" sources."bindings-1.5.0" sources."block-stream-0.0.9" sources."bluebird-3.7.2" @@ -62230,9 +62990,9 @@ in sources."camelcase-4.1.0" sources."caryll-shapeops-0.3.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."child-process-promise-2.2.1" - sources."cli-cursor-2.1.0" + sources."cli-cursor-3.1.0" sources."clipper-lib-1.0.0" (sources."cliui-3.2.0" // { dependencies = [ @@ -62241,8 +63001,8 @@ in }) sources."clone-2.1.2" sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."complex.js-2.0.11" @@ -62262,11 +63022,9 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" - sources."emoji-regex-7.0.3" - sources."end-of-stream-1.4.4" + sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-latex-1.2.0" - sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.1" (sources."escope-1.0.3" // { dependencies = [ @@ -62324,7 +63082,7 @@ in sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.8" sources."http-signature-1.2.0" @@ -62353,7 +63111,6 @@ in sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lru-cache-4.1.5" - sources."map-age-cleaner-0.1.3" sources."mathjs-5.10.3" sources."megaminx-0.9.0" sources."mem-1.1.0" @@ -62362,11 +63119,10 @@ in sources."mime-types-2.1.26" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."nan-2.14.0" - sources."nice-try-1.0.5" (sources."node-gyp-3.8.0" // { dependencies = [ sources."semver-5.3.0" @@ -62381,7 +63137,11 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-2.0.1" + (sources."onetime-5.1.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" @@ -62400,9 +63160,7 @@ in sources."yargs-8.0.2" ]; }) - sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -62440,10 +63198,8 @@ in sources."primitive-quadify-off-curves-0.4.1" sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" - sources."proper-lockfile-3.2.0" sources."pseudomap-1.0.2" sources."psl-1.7.0" - sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-2.0.0" @@ -62454,9 +63210,8 @@ in sources."require-main-filename-1.0.1" sources."resolve-1.15.1" sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."resumer-0.0.0" - sources."retry-0.12.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -62498,7 +63253,7 @@ in sources."source-map-0.7.3" ]; }) - sources."supports-color-5.5.0" + sources."supports-color-7.1.0" sources."tar-2.2.2" sources."temp-0.8.4" sources."through-2.3.8" @@ -62522,35 +63277,31 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.0.0-12" // { + (sources."verda-1.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."camelcase-5.3.1" - (sources."cliui-4.1.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."cross-spawn-6.0.5" - sources."execa-1.0.0" - sources."fast-deep-equal-2.0.1" - sources."find-up-3.0.0" - sources."fs-extra-6.0.1" - sources."get-stream-4.1.0" - sources."invert-kv-2.0.0" - sources."jsonfile-4.0.0" - sources."lcid-2.0.0" - sources."locate-path-3.0.0" - sources."mem-4.3.0" - sources."mimic-fn-2.1.0" - sources."os-locale-3.1.0" + sources."cliui-6.0.0" + sources."find-up-4.1.0" + sources."fs-extra-9.0.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."jsonfile-6.0.1" + sources."locate-path-5.0.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."strip-ansi-5.2.0" - sources."yargs-12.0.5" - sources."yargs-parser-11.1.1" + sources."path-exists-4.0.0" + sources."require-main-filename-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."tslib-1.11.1" + sources."universalify-1.0.0" + sources."which-2.0.2" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.1" ]; }) sources."verror-1.10.0" @@ -62570,8 +63321,12 @@ in (sources."yargs-14.2.3" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" sources."camelcase-5.3.1" sources."cliui-5.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."emoji-regex-7.0.3" sources."find-up-3.0.0" sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-2.0.0" @@ -62737,7 +63492,7 @@ in sources."@yarnpkg/lockfile-1.1.0" sources."abab-2.0.3" sources."abbrev-1.1.1" - sources."acorn-5.7.4" + sources."acorn-7.1.1" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -62776,7 +63531,6 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-limiter-1.0.1" sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -62789,9 +63543,10 @@ in ]; }) sources."base-64-0.1.0" + sources."base64-js-1.3.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bl-4.0.1" + sources."bl-4.0.2" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -62799,6 +63554,7 @@ in ]; }) sources."browser-process-hrtime-1.0.0" + sources."buffer-5.5.0" sources."cache-base-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -62859,15 +63615,15 @@ in sources."cross-spawn-6.0.5" sources."crypt-0.0.2" sources."css-2.2.4" - sources."cssom-0.3.8" - sources."cssstyle-1.4.0" - sources."cwise-compiler-1.1.3" - sources."dashdash-1.14.1" - (sources."data-urls-1.1.0" // { + sources."cssom-0.4.4" + (sources."cssstyle-2.2.0" // { dependencies = [ - sources."whatwg-url-7.1.0" + sources."cssom-0.3.8" ]; }) + sources."cwise-compiler-1.1.3" + sources."dashdash-1.14.1" + sources."data-urls-1.1.0" sources."debug-3.2.6" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" @@ -63014,6 +63770,7 @@ in sources."http-errors-1.7.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" sources."ignore-walk-3.0.3" (sources."image-data-uri-2.0.1" // { dependencies = [ @@ -63052,6 +63809,7 @@ in ]; }) sources."iota-array-1.0.0" + sources."ip-regex-2.1.0" sources."is-absolute-0.2.6" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.3.2" @@ -63081,12 +63839,12 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."joplin-turndown-4.0.23" + sources."joplin-turndown-4.0.24" sources."joplin-turndown-plugin-gfm-1.0.12" sources."jpeg-js-0.1.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" - sources."jsdom-11.12.0" + sources."jsdom-15.2.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -63102,7 +63860,6 @@ in sources."klaw-1.3.1" sources."klaw-sync-6.0.0" sources."lazyness-1.1.1" - sources."left-pad-1.3.0" sources."levenshtein-1.0.5" sources."levn-0.3.0" sources."linkify-it-2.2.0" @@ -63162,11 +63919,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."ms-2.1.2" (sources."multiparty-4.2.1" // { @@ -63234,7 +63987,7 @@ in sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."param-case-2.1.1" - sources."parse5-4.0.0" + sources."parse5-5.1.0" sources."pascalcase-0.1.1" (sources."patch-package-6.2.1" // { dependencies = [ @@ -63276,10 +64029,15 @@ in (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" + sources."tough-cookie-2.5.0" ]; }) sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" + (sources."request-promise-native-1.0.8" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -63289,6 +64047,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" + sources."saxes-3.1.11" sources."semver-5.7.1" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" @@ -63424,7 +64183,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.35.1" + sources."terminal-kit-1.35.2" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -63441,7 +64200,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" - sources."tough-cookie-2.5.0" + sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."tree-kit-0.6.2" sources."tunnel-agent-0.6.0" @@ -63482,10 +64241,11 @@ in sources."valid-url-1.0.9" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" + sources."w3c-xmlserializer-1.1.2" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-6.5.0" + sources."whatwg-url-7.1.0" sources."which-1.3.1" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" @@ -63498,10 +64258,11 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-5.2.2" + sources."ws-7.2.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xmlchars-2.2.0" sources."yallist-4.0.0" sources."yargs-parser-7.0.0" ]; @@ -63538,8 +64299,8 @@ in sources."ini-1.3.5" sources."lru-cache-4.1.5" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."nopt-4.0.3" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -63595,7 +64356,7 @@ in sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A=="; }; dependencies = [ - sources."@babel/parser-7.8.8" + sources."@babel/parser-7.9.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -63610,8 +64371,8 @@ in sources."markdown-it-anchor-5.2.5" sources."marked-0.7.0" sources."mdurl-1.0.1" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."requizzle-0.2.3" sources."sprintf-js-1.0.3" sources."strip-json-comments-3.0.1" @@ -63761,7 +64522,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -63944,7 +64705,11 @@ in sources."mime-types-2.1.26" sources."mimic-response-1.0.1" sources."minimist-1.2.5" - sources."morgan-1.9.1" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) sources."ms-2.0.0" sources."nanoid-2.1.11" sources."negotiator-0.6.2" @@ -64045,8 +64810,8 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."y18n-4.0.0" - sources."yargs-15.3.0" - sources."yargs-parser-18.1.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -64160,7 +64925,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.1.2" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."graceful-fs-4.2.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" @@ -64203,7 +64968,7 @@ in sources."parseuri-0.0.5" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pseudomap-1.0.2" sources."qjobs-1.2.0" sources."qs-6.7.0" @@ -64751,7 +65516,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -64804,7 +65569,7 @@ in sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-5.0.1" - sources."cacache-12.0.3" + sources."cacache-12.0.4" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -64888,7 +65653,6 @@ in dependencies = [ sources."concat-stream-2.0.0" sources."meow-4.0.1" - sources."minimist-1.2.5" sources."readable-stream-3.6.0" ]; }) @@ -64940,7 +65704,7 @@ in sources."envinfo-7.5.0" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -64993,7 +65757,7 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -65029,7 +65793,6 @@ in sources."load-json-file-1.1.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."minimist-1.2.5" sources."parse-json-2.2.0" sources."path-exists-2.1.0" sources."path-type-1.1.0" @@ -65050,7 +65813,6 @@ in (sources."git-raw-commits-2.0.0" // { dependencies = [ sources."meow-4.0.1" - sources."minimist-1.2.5" ]; }) (sources."git-remote-origin-url-2.0.0" // { @@ -65061,14 +65823,13 @@ in (sources."git-semver-tags-2.0.3" // { dependencies = [ sources."meow-4.0.1" - sources."minimist-1.2.5" ]; }) sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" (sources."globby-9.2.0" // { dependencies = [ @@ -65208,7 +65969,7 @@ in sources."mime-types-2.1.26" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minimist-options-3.0.2" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -65218,7 +65979,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."mkdirp-promise-5.0.1" sources."modify-values-1.0.1" sources."move-concurrently-1.0.1" @@ -65284,7 +66045,11 @@ in sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optimist-0.6.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -65485,11 +66250,7 @@ in sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-indent-2.0.0" - (sources."strong-log-transformer-2.1.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."strong-log-transformer-2.1.0" sources."supports-color-5.5.0" sources."tar-4.4.13" sources."temp-dir-1.0.0" @@ -65646,8 +66407,8 @@ in sources."mime-1.6.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" @@ -65771,7 +66532,7 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."destroy-1.0.4" sources."duplexer-0.1.1" sources."ee-first-1.1.1" @@ -65819,7 +66580,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -65834,7 +66595,11 @@ in ]; }) sources."http-auth-3.1.3" - sources."http-errors-1.7.3" + (sources."http-errors-1.7.3" // { + dependencies = [ + sources."depd-1.1.2" + ]; + }) sources."http-parser-js-0.4.10" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" @@ -65864,7 +66629,7 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."mixin-deep-1.3.2" - sources."morgan-1.9.1" + sources."morgan-1.10.0" sources."ms-2.0.0" sources."nan-2.14.0" sources."nanomatch-1.2.13" @@ -65910,11 +66675,13 @@ in sources."safe-regex-1.1.0" (sources."send-0.17.1" // { dependencies = [ + sources."depd-1.1.2" sources."ms-2.1.1" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -66168,7 +66935,7 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.3.0" @@ -66542,15 +67309,14 @@ in name = "lumo-build-deps"; packageName = "lumo-build-deps"; version = "1.10.1"; - src = ../../../pkgs/development/interpreters/clojurescript/lumo; + src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.8.6" - sources."@babel/core-7.8.7" - sources."@babel/generator-7.8.8" + sources."@babel/compat-data-7.9.0" + sources."@babel/core-7.9.0" + sources."@babel/generator-7.9.4" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-call-delegate-7.8.7" sources."@babel/helper-compilation-targets-7.8.7" sources."@babel/helper-create-class-features-plugin-7.8.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" @@ -66561,7 +67327,7 @@ in sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.8.6" + sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" @@ -66569,29 +67335,32 @@ in sources."@babel/helper-replace-supers-7.8.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.8.4" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helpers-7.9.2" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.8.8" + sources."@babel/parser-7.9.4" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/plugin-proposal-numeric-separator-7.8.3" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-optional-chaining-7.8.3" + sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" @@ -66600,43 +67369,51 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.8.6" + sources."@babel/plugin-transform-classes-7.9.2" sources."@babel/plugin-transform-computed-properties-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-for-of-7.8.6" + sources."@babel/plugin-transform-for-of-7.9.0" sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.8.3" - sources."@babel/plugin-transform-modules-systemjs-7.8.3" - sources."@babel/plugin-transform-modules-umd-7.8.3" + sources."@babel/plugin-transform-modules-amd-7.9.0" + sources."@babel/plugin-transform-modules-commonjs-7.9.0" + sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.8.8" + sources."@babel/plugin-transform-parameters-7.9.3" sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" - sources."@babel/plugin-transform-runtime-7.8.3" + sources."@babel/plugin-transform-runtime-7.9.0" sources."@babel/plugin-transform-shorthand-properties-7.8.3" sources."@babel/plugin-transform-spread-7.8.3" sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.8.7" + sources."@babel/preset-env-7.9.0" + sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" - sources."@istanbuljs/load-nyc-config-1.0.0" + (sources."@istanbuljs/load-nyc-config-1.0.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + ]; + }) sources."@istanbuljs/schema-0.1.2" (sources."@jest/transform-25.1.0" // { dependencies = [ @@ -66649,33 +67426,33 @@ in sources."@types/babel__template-7.0.2" sources."@types/babel__traverse-7.0.9" sources."@types/color-name-1.1.1" - sources."@types/estree-0.0.42" + sources."@types/estree-0.0.44" sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.4" sources."@types/yargs-parser-15.0.0" - sources."@webassemblyjs/ast-1.8.5" - sources."@webassemblyjs/floating-point-hex-parser-1.8.5" - sources."@webassemblyjs/helper-api-error-1.8.5" - sources."@webassemblyjs/helper-buffer-1.8.5" - sources."@webassemblyjs/helper-code-frame-1.8.5" - sources."@webassemblyjs/helper-fsm-1.8.5" - sources."@webassemblyjs/helper-module-context-1.8.5" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" - sources."@webassemblyjs/helper-wasm-section-1.8.5" - sources."@webassemblyjs/ieee754-1.8.5" - sources."@webassemblyjs/leb128-1.8.5" - sources."@webassemblyjs/utf8-1.8.5" - sources."@webassemblyjs/wasm-edit-1.8.5" - sources."@webassemblyjs/wasm-gen-1.8.5" - sources."@webassemblyjs/wasm-opt-1.8.5" - sources."@webassemblyjs/wasm-parser-1.8.5" - sources."@webassemblyjs/wast-parser-1.8.5" - sources."@webassemblyjs/wast-printer-1.8.5" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."JSONStream-1.3.5" @@ -66723,10 +67500,9 @@ in sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" sources."babel-jest-25.1.0" - (sources."babel-loader-8.0.6" // { + (sources."babel-loader-8.1.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."babel-plugin-dynamic-import-node-2.3.0" @@ -66774,7 +67550,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - (sources."bl-4.0.1" // { + (sources."bl-4.0.2" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -66796,8 +67572,8 @@ in }) (sources."browserify-16.5.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" + sources."punycode-1.4.1" ]; }) sources."browserify-aes-1.2.0" @@ -66806,23 +67582,22 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" sources."bser-2.1.1" sources."buffer-5.5.0" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-modules-3.1.0" sources."builtin-status-codes-3.0.0" - (sources."cacache-12.0.3" // { + (sources."cacache-12.0.4" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -66841,7 +67616,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."micromatch-3.1.10" ]; }) @@ -66891,8 +67666,7 @@ in sources."convert-source-map-1.7.0" (sources."copy-concurrently-1.0.5" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."copy-descriptor-0.1.1" @@ -66937,7 +67711,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -66949,7 +67723,7 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" @@ -67001,7 +67775,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fb-watchman-2.0.1" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -67009,7 +67783,7 @@ in ]; }) sources."find-cache-dir-2.1.0" - sources."find-up-4.1.0" + sources."find-up-3.0.0" (sources."findup-sync-3.0.0" // { dependencies = [ sources."micromatch-3.1.10" @@ -67134,8 +67908,7 @@ in sources."jest-serializer-25.1.0" (sources."jest-util-25.1.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) (sources."jest-worker-25.1.0" // { @@ -67153,7 +67926,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" @@ -67170,7 +67943,7 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-5.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" @@ -67178,7 +67951,6 @@ in sources."magic-string-0.25.7" sources."make-dir-2.1.0" sources."makeerror-1.0.11" - sources."mamacro-0.0.3" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -67212,8 +67984,7 @@ in sources."module-deps-6.2.2" (sources."move-concurrently-1.0.1" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."ms-2.1.2" @@ -67229,6 +68000,7 @@ in sources."buffer-4.9.2" sources."events-3.1.0" sources."inherits-2.0.3" + sources."punycode-1.4.1" sources."stream-http-2.8.3" sources."timers-browserify-2.0.11" sources."tty-browserify-0.0.0" @@ -67272,7 +68044,7 @@ in sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.2.2" - sources."p-locate-4.1.0" + sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" @@ -67284,7 +68056,7 @@ in sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-4.0.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -67292,19 +68064,13 @@ in sources."pbkdf2-3.0.17" sources."peek-stream-1.1.3" sources."performance-now-2.1.0" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pify-4.0.1" sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" sources."pirates-4.0.1" - (sources."pkg-dir-3.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."pkg-dir-3.0.0" + sources."pkg-up-3.1.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prettier-1.19.1" @@ -67322,7 +68088,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-1.4.1" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -67344,7 +68110,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - sources."regenerator-transform-0.14.3" + sources."regenerator-transform-0.14.4" sources."regex-not-1.0.2" sources."regexpu-core-4.7.0" sources."regjsgen-0.5.1" @@ -67396,7 +68162,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-1.0.0" + sources."schema-utils-2.6.5" sources."semver-5.7.1" sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" @@ -67509,13 +68275,14 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.6.6" // { + (sources."terser-4.6.7" // { dependencies = [ sources."source-map-0.6.1" ]; }) (sources."terser-webpack-plugin-1.4.3" // { dependencies = [ + sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; }) @@ -67533,11 +68300,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - (sources."tough-cookie-2.5.0" // { - dependencies = [ - sources."punycode-2.1.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tslib-1.11.1" sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" @@ -67565,11 +68328,7 @@ in ]; }) sources."upath-1.2.0" - (sources."uri-js-4.2.2" // { - dependencies = [ - sources."punycode-2.1.1" - ]; - }) + sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -67592,12 +68351,12 @@ in sources."vm-browserify-1.1.2" sources."walker-1.0.7" sources."watchpack-1.6.0" - (sources."webpack-4.42.0" // { + (sources."webpack-4.42.1" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" + sources."schema-utils-1.0.0" ]; }) (sources."webpack-cli-3.3.11" // { @@ -67639,14 +68398,7 @@ in sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" - (sources."yargs-13.2.4" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."yargs-13.2.4" sources."yargs-parser-13.1.2" ]; buildInputs = globalBuildInputs; @@ -68296,11 +69048,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" @@ -68560,10 +69308,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz"; - sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz"; + sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -68598,7 +69346,7 @@ in sources."define-properties-1.1.3" sources."diff-3.5.0" sources."emoji-regex-7.0.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -68610,7 +69358,7 @@ in sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.3" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -68634,8 +69382,8 @@ in sources."lodash-4.17.15" sources."log-symbols-3.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.3" sources."ms-2.1.1" sources."node-environment-flags-1.0.6" sources."normalize-path-3.0.0" @@ -68649,7 +69397,7 @@ in sources."p-try-2.2.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."readdirp-3.2.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -68675,14 +69423,14 @@ in }) sources."wrappy-1.0.2" sources."y18n-4.0.0" - (sources."yargs-13.3.0" // { + (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-13.1.1" + sources."yargs-parser-13.1.2" sources."yargs-unparser-1.6.0" ]; buildInputs = globalBuildInputs; @@ -68736,7 +69484,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -68906,10 +69654,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."nopt-4.0.3" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -69119,11 +69867,7 @@ in sources."mime-types-2.1.26" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."nan-2.14.0" sources."negotiator-0.6.2" @@ -69314,10 +70058,10 @@ in sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."needle-2.4.0" sources."nopt-4.0.3" @@ -69333,11 +70077,7 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" @@ -69375,7 +70115,7 @@ in sha512 = "7cRGr69ibl7vnEMWEO2qHhO4L6ft2XsySoE+mMSW7h2tODNTNECelCQtTA+kYfX1wlFS3axu52Y2Br0AV5D+ww=="; }; dependencies = [ - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@node-red/editor-api-1.0.4" sources."@node-red/editor-client-1.0.4" (sources."@node-red/nodes-1.0.4" // { @@ -69660,11 +70400,7 @@ in ]; }) sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."moment-timezone-0.5.28" (sources."mqtt-2.18.8" // { @@ -69941,10 +70677,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" @@ -70088,7 +70824,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.1.2" sources."get-stream-3.0.0" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.3" @@ -70125,7 +70861,7 @@ in sources."package-json-4.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pify-3.0.0" sources."prepend-http-1.0.4" sources."pseudomap-1.0.2" @@ -70178,10 +70914,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.2"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.2.tgz"; - sha512 = "eBVjzvGJ9v2/jRJZFtIkvUVKmJ0sCJNNwc9Z1gI6llwaT7EBYWJe5o61Ipc1QR0FaDCKM3l1GizI09Ro3STJEw=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.3.tgz"; + sha512 = "3tQYVEEdSGQGYoXhZvNqW8faqCidfMMaL387RdDo4Uu5kQy4IgvJ13NIsWVMQ6e3QWlbicNMSpFiyzYfMUuPDw=="; }; buildInputs = globalBuildInputs; meta = { @@ -70196,10 +70932,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.4.tgz"; - sha512 = "o1Db+kfi8Vvs345Xxpn+3WSUJtLa85F2hMF6v6kYfQuvTulsphvDzgbiVkp4vEKC8+BQETCag730XPJudYf4mA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.5.tgz"; + sha512 = "dO2jeEmD1DAa/8NKxQAuhVsICDYWKTL1kZkvUFyRNphK4NiLk1HA7Jk5mCfl2L2xU5FxiGhNq5vgYlivu+2kjw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" @@ -70248,12 +70984,12 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.0.3" - sources."commander-4.1.1" + sources."commander-5.0.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" (sources."copy-concurrently-1.0.5" // { dependencies = [ - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."core-util-is-1.0.2" @@ -70275,7 +71011,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fast-diff-1.2.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."find-up-4.1.0" sources."fs-minipass-2.1.0" sources."fs-write-stream-atomic-1.0.10" @@ -70321,11 +71057,7 @@ in sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.2.0" sources."json-parse-helpfulerror-1.0.3" - (sources."json5-2.1.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-2.1.2" sources."jsonparse-1.3.1" sources."keyv-3.1.0" sources."kleur-3.0.3" @@ -70350,7 +71082,7 @@ in sources."make-fetch-happen-8.0.4" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" (sources."minipass-3.1.1" // { dependencies = [ sources."yallist-4.0.0" @@ -70370,7 +71102,7 @@ in sources."mkdirp-1.0.3" (sources."move-concurrently-1.0.1" // { dependencies = [ - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."ms-2.1.2" @@ -70410,14 +71142,10 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."prompts-2.3.1" + sources."prompts-2.3.2" sources."pump-3.0.0" sources."pupa-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."rc-config-loader-3.0.0" sources."read-package-json-fast-1.1.3" sources."readable-stream-2.3.7" @@ -70441,7 +71169,7 @@ in }) sources."semver-utils-1.1.4" sources."signal-exit-3.0.2" - sources."sisteransi-1.0.4" + sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" sources."socks-2.3.3" sources."socks-proxy-agent-5.0.0" @@ -70554,7 +71282,7 @@ in (sources."fstream-0.1.31" // { dependencies = [ sources."graceful-fs-3.0.12" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."gauge-2.7.4" @@ -70581,7 +71309,7 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."mkdirp-0.3.5" sources."natives-1.1.6" sources."ncp-0.4.2" @@ -70718,22 +71446,22 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.8.6" - (sources."@babel/core-7.8.7" // { + sources."@babel/compat-data-7.9.0" + (sources."@babel/core-7.9.0" // { dependencies = [ - sources."json5-2.1.1" + sources."json5-2.1.2" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.8.8" // { + (sources."@babel/generator-7.9.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-builder-react-jsx-7.8.3" - sources."@babel/helper-call-delegate-7.8.7" + sources."@babel/helper-builder-react-jsx-7.9.0" + sources."@babel/helper-builder-react-jsx-experimental-7.9.0" sources."@babel/helper-compilation-targets-7.8.7" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" @@ -70743,7 +71471,7 @@ in sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.8.6" + sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" @@ -70751,17 +71479,19 @@ in sources."@babel/helper-replace-supers-7.8.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/plugin-proposal-numeric-separator-7.8.3" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-optional-chaining-7.8.3" + sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -70769,6 +71499,7 @@ in sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-jsx-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" @@ -70777,27 +71508,27 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.8.6" + sources."@babel/plugin-transform-classes-7.9.2" sources."@babel/plugin-transform-computed-properties-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-flow-strip-types-7.8.3" - sources."@babel/plugin-transform-for-of-7.8.6" + sources."@babel/plugin-transform-flow-strip-types-7.9.0" + sources."@babel/plugin-transform-for-of-7.9.0" sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.8.3" - sources."@babel/plugin-transform-modules-systemjs-7.8.3" - sources."@babel/plugin-transform-modules-umd-7.8.3" + sources."@babel/plugin-transform-modules-amd-7.9.0" + sources."@babel/plugin-transform-modules-commonjs-7.9.0" + sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.8.8" + sources."@babel/plugin-transform-parameters-7.9.3" sources."@babel/plugin-transform-property-literals-7.8.3" - sources."@babel/plugin-transform-react-jsx-7.8.3" + sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" sources."@babel/plugin-transform-shorthand-properties-7.8.3" @@ -70806,11 +71537,12 @@ in sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.8.7" - sources."@babel/runtime-7.8.7" + sources."@babel/preset-env-7.9.0" + sources."@babel/preset-modules-0.1.3" + sources."@babel/runtime-7.9.2" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -70899,7 +71631,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -70916,7 +71648,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -70990,7 +71722,12 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - sources."csso-4.0.2" + (sources."csso-4.0.3" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.39" + sources."mdn-data-2.0.6" + ]; + }) sources."cssom-0.3.8" sources."cssstyle-1.4.0" sources."dashdash-1.14.1" @@ -71044,14 +71781,14 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."envinfo-7.5.0" sources."error-ex-1.3.2" - (sources."es-abstract-1.17.4" // { + (sources."es-abstract-1.17.5" // { dependencies = [ sources."object-inspect-1.7.0" ]; @@ -71097,7 +71834,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" sources."get-caller-file-2.0.5" @@ -71142,7 +71879,7 @@ in (sources."htmlnano-0.2.5" // { dependencies = [ sources."posthtml-0.12.0" - sources."terser-4.6.6" + sources."terser-4.6.7" ]; }) (sources."htmlparser2-3.10.1" // { @@ -71271,11 +72008,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { @@ -71339,6 +72072,7 @@ in sources."pbkdf2-3.0.17" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" + sources."pkg-up-3.1.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.27" // { @@ -71435,7 +72169,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - sources."regenerator-transform-0.14.3" + sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -71815,9 +72549,9 @@ in sources."mime-types-2.1.26" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mkdirp-0.5.1" // { + (sources."mkdirp-0.5.4" // { dependencies = [ - sources."minimist-0.0.8" + sources."minimist-1.2.5" ]; }) sources."moment-2.24.0" @@ -71910,7 +72644,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uglify-js-3.8.0" - sources."unix-dgram-2.0.3" + sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" @@ -72026,7 +72760,7 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" @@ -72036,8 +72770,7 @@ in sources."flatten-0.0.1" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."fs.realpath-1.0.0" @@ -72163,8 +72896,7 @@ in sources."pump-2.0.1" (sources."random-access-file-2.1.3" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."random-access-storage-1.4.1" @@ -72307,12 +73039,11 @@ in (sources."bittorrent-tracker-7.7.0" // { dependencies = [ sources."bencode-0.8.0" - sources."minimist-1.2.5" sources."ultron-1.0.2" sources."ws-1.1.5" ]; }) - sources."bl-4.0.1" + sources."bl-4.0.2" sources."blob-0.0.5" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -72469,9 +73200,13 @@ in sources."mime-types-2.1.26" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."morgan-1.9.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) sources."ms-2.0.0" sources."multiparty-4.2.1" sources."negotiator-0.6.2" @@ -72635,10 +73370,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.11.6"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.11.6.tgz"; - sha512 = "SJkYVP7BRVR/Q+J13RmB1/WC9dQDOTU6H9uTOmIFE5hbkdh83HqqvOBs7SjT+bUObqMicZ9csfreKxuZhGVvKw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.12.0.tgz"; + sha512 = "Sjvf66dfk2d7kRssvHX6x+d0j9NgIE9262vCKviJC+kTPcpZEwxsF/RjQ/CX07UmlDYAX2TWqNZz7jeiksMKSA=="; }; buildInputs = globalBuildInputs; meta = { @@ -72653,10 +73388,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.19.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"; - sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz"; + sha512 = "5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72708,16 +73443,21 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "13.0.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-13.0.0.tgz"; - sha512 = "wjjAVuN1Shx6783NvTd8aPwWZ1pE94+isiWtdAJhedvbLqJuwe8p5CSNul9FS0WvBz7ejdrW0vc6wLDLsKX7Yw=="; + url = "https://registry.npmjs.org/pulp/-/pulp-14.0.0.tgz"; + sha512 = "K/s/BRG+AJpp+D3VES/c08kdxzMRKJYdZHIBnC27+6NS+3htwPPGRNTpPig+Sd6WKd5uZH3NASrBX+zgR5SQ6Q=="; }; dependencies = [ sources."JSONStream-1.3.5" sources."acorn-7.1.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."append-type-1.0.2" + sources."arch-2.1.1" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -72725,6 +73465,7 @@ in sources."util-0.10.3" ]; }) + sources."astral-regex-1.0.0" sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" @@ -72759,11 +73500,22 @@ in sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" + sources."build-purescript-0.4.1" sources."builtin-status-codes-3.0.0" + sources."byline-5.0.0" sources."cached-path-relative-1.0.2" + sources."cancelable-pipeline-1.0.0" + sources."cancelable-pump-0.4.0" + sources."chalk-2.4.2" + sources."chownr-1.1.4" sources."cipher-base-1.0.4" + sources."clean-stack-2.2.0" + sources."cli-cursor-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."colors-1.4.0" sources."combine-source-map-0.8.0" + sources."commander-2.20.3" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ @@ -72777,38 +73529,52 @@ in sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" sources."defined-1.0.0" sources."deps-sort-2.0.1" sources."des.js-1.0.1" - (sources."detective-5.2.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."detective-5.2.0" sources."diffie-hellman-5.0.3" + sources."dl-tar-0.8.1" sources."domain-browser-1.2.0" + sources."download-or-build-purescript-0.3.4" + sources."download-purescript-0.8.5" + sources."download-purescript-source-0.6.5" sources."duplexer2-0.1.4" sources."elliptic-6.5.2" + sources."emoji-regex-7.0.3" + sources."end-of-stream-1.4.4" sources."es6-promise-3.3.1" + sources."escape-string-regexp-1.0.5" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + sources."executing-npm-path-1.0.0" sources."fast-safe-stringify-2.0.7" + sources."feint-1.0.3" + sources."file-to-npm-cache-0.1.0" + sources."filesize-4.2.1" + sources."find-pkg-dir-1.0.1" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" + sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globule-1.3.1" sources."graceful-fs-4.2.3" sources."has-1.0.3" + sources."has-flag-3.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" + sources."import-package-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inline-source-map-0.6.2" @@ -72817,23 +73583,37 @@ in sources."concat-stream-1.6.2" ]; }) + sources."inspect-with-kind-1.0.5" + sources."install-purescript-0.7.0" + sources."install-purescript-cli-0.4.2" sources."is-buffer-1.1.6" + sources."is-fullwidth-code-point-2.0.0" + sources."is-plain-obj-1.1.0" + sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" + sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" + sources."load-from-cwd-or-npm-3.0.4" + sources."load-request-from-cwd-or-npm-3.0.0" sources."lodash-4.17.15" sources."lodash.memoize-3.0.4" + sources."log-symbols-3.0.0" + sources."log-update-3.4.0" sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" sources."mime-1.6.0" + sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.4" (sources."module-deps-6.2.2" // { dependencies = [ sources."concat-stream-1.6.2" @@ -72844,32 +73624,54 @@ in sources."through-2.2.7" ]; }) + sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."neat-stack-1.0.1" + sources."nice-try-1.0.5" sources."node-static-0.7.11" + sources."npcache-1.0.2" + sources."npm-cache-env-2.0.0" + sources."npm-cache-path-2.0.0" + sources."npm-cli-dir-3.0.1" + sources."npm-cli-path-3.1.2" + sources."npm-cli-version-1.0.0" + sources."npm-run-path-2.0.2" + sources."npm-version-compare-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" + sources."onetime-2.0.1" (sources."optimist-0.6.1" // { dependencies = [ + sources."minimist-0.0.10" sources."wordwrap-0.0.3" ]; }) + sources."optional-0.1.4" sources."os-browserify-0.3.0" + sources."p-finally-1.0.0" sources."pako-1.0.11" sources."parents-1.0.1" sources."parse-asn1-5.1.5" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-platform-0.11.15" + sources."pause-fn-1.0.0" + sources."pause-methods-1.0.0" sources."pbkdf2-3.0.17" + sources."platform-name-1.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."public-encrypt-4.0.3" + sources."pump-3.0.0" sources."punycode-1.4.1" + sources."purescript-0.12.5" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" + sources."rate-map-1.0.5" sources."read-1.0.7" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.7" // { @@ -72878,23 +73680,35 @@ in sources."string_decoder-1.1.1" ]; }) + sources."reject-unsatisfied-npm-version-1.0.0" sources."resolve-1.15.1" + sources."resolve-from-npm-3.1.0" + sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" + sources."run-in-dir-0.3.0" sources."safe-buffer-5.2.0" sources."sander-0.5.1" + sources."semver-5.7.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" + sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - (sources."sorcery-0.10.0" // { + sources."size-rate-0.3.1" + sources."slice-ansi-2.1.0" + sources."sorcery-0.10.0" + sources."source-map-0.5.7" + (sources."source-map-support-0.5.16" // { dependencies = [ - sources."minimist-1.2.5" + sources."source-map-0.6.1" ]; }) - sources."source-map-0.5.7" sources."sourcemap-codec-1.4.8" + sources."spawn-stack-0.7.0" sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" (sources."stream-http-3.1.0" // { @@ -72903,23 +73717,43 @@ in ]; }) sources."stream-splicer-2.0.1" + sources."string-width-3.1.0" sources."string_decoder-1.3.0" - (sources."subarg-1.0.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."strip-ansi-5.2.0" + sources."strip-eof-1.0.0" + sources."subarg-1.0.0" + sources."supports-color-5.5.0" sources."syntax-error-1.4.0" + sources."tar-4.4.13" (sources."temp-0.9.1" // { dependencies = [ sources."rimraf-2.6.3" ]; }) + (sources."terser-4.6.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."through-2.3.8" sources."through2-2.0.5" + sources."tilde-path-3.0.0" sources."timers-browserify-1.4.2" sources."tree-kill-1.2.2" sources."tty-browserify-0.0.1" + (sources."tty-truncate-1.0.5" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) + ]; + }) + sources."tty-width-frame-1.0.3" sources."typedarray-0.0.6" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" @@ -72934,11 +73768,16 @@ in ]; }) sources."util-deprecate-1.0.2" + sources."vertical-meter-1.0.0" sources."vm-browserify-1.1.2" sources."which-1.3.1" + sources."win-user-installed-npm-cli-path-3.0.1" sources."wordwrap-1.0.0" + sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."xtend-4.0.2" + sources."yallist-3.1.1" + sources."zen-observable-0.8.15" ]; buildInputs = globalBuildInputs; meta = { @@ -72988,7 +73827,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.1" sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -73019,11 +73858,7 @@ in sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.7.0" @@ -73098,8 +73933,8 @@ in ]; }) sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."private-0.1.8" @@ -73396,13 +74231,14 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.66.0"; + version = "1.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.66.0.tgz"; - sha512 = "Syl/WikZfx+g6mIKb7XgwJO8S00XBYQCLJnrYxfM2VYRsp4dMx202n+/1XBgKXLeViLRx0ofEe/Xjn9GxRpSUQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.67.0.tgz"; + sha512 = "ocnzEW2op4KrdjnZ7aeadnX1/E6PdlsW8vv67/3sGlni1ep8JiKSRU0aPQqUmood98kEIo/sKvUlHrJcAm3eXg=="; }; dependencies = [ sources."2-thenable-1.0.0" + sources."@babel/parser-7.9.4" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -73425,7 +74261,7 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.5.0" // { + (sources."@serverless/enterprise-plugin-3.6.0" // { dependencies = [ sources."fs-extra-8.1.0" sources."node-fetch-2.6.0" @@ -73453,7 +74289,12 @@ in sources."@types/glob-7.1.1" sources."@types/lodash-4.14.149" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" + (sources."@typescript-eslint/typescript-estree-2.25.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."adm-zip-0.4.14" sources."agent-base-6.0.0" sources."ansi-align-3.0.0" @@ -73461,6 +74302,7 @@ in sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" + sources."app-module-path-2.2.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -73483,11 +74325,12 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" + sources."ast-module-types-2.6.0" sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.639.0" // { + (sources."aws-sdk-2.644.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -73529,7 +74372,11 @@ in sources."camelcase-5.3.1" sources."capture-stack-trace-1.0.1" sources."caw-2.0.1" - sources."chalk-2.4.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) sources."chardet-0.7.0" (sources."child-process-ext-2.1.0" // { dependencies = [ @@ -73579,7 +74426,12 @@ in }) sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + (sources."configstore-3.1.2" // { + dependencies = [ + sources."make-dir-1.3.0" + sources."pify-3.0.0" + ]; + }) sources."content-disposition-0.5.3" sources."cookie-0.3.1" sources."cookiejar-2.1.2" @@ -73595,11 +74447,21 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.8.22" + sources."dayjs-1.8.23" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."decompress-4.2.0" + sources."decomment-0.9.2" + (sources."decompress-4.2.0" // { + dependencies = [ + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-2.3.0" + ]; + }) sources."decompress-response-3.3.0" sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { @@ -73612,13 +74474,25 @@ in dependencies = [ sources."file-type-3.9.0" sources."get-stream-2.3.1" + sources."pify-2.3.0" ]; }) sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" + sources."dependency-tree-7.2.1" + sources."detective-amd-3.0.0" + sources."detective-cjs-3.1.1" + sources."detective-es6-2.1.0" + sources."detective-less-1.0.2" + sources."detective-postcss-3.0.1" + sources."detective-sass-3.0.1" + sources."detective-scss-2.0.1" + sources."detective-stylus-1.0.0" + sources."detective-typescript-5.7.0" sources."dir-glob-3.0.1" sources."dot-prop-4.2.0" sources."dotenv-8.2.0" @@ -73632,6 +74506,7 @@ in sources."http-cache-semantics-3.8.1" sources."keyv-3.0.0" sources."lowercase-keys-1.0.0" + sources."make-dir-1.3.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."pify-3.0.0" @@ -73643,9 +74518,11 @@ in sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.1.1" + sources."errno-0.1.7" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" - sources."es6-promisify-6.0.2" + sources."es6-promisify-6.1.0" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -73654,9 +74531,13 @@ in sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.14.1" + sources."eslint-visitor-keys-1.1.0" sources."esniff-1.1.0" sources."esprima-4.0.1" sources."essentials-1.1.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."events-1.1.1" (sources."execa-0.7.0" // { @@ -73675,13 +74556,23 @@ in sources."fastq-1.6.1" sources."fd-slicer-1.1.0" sources."figures-3.2.0" + sources."file-exists-dazinatorfork-1.0.2" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."filesize-3.6.1" + sources."filing-cabinet-2.5.1" sources."fill-range-7.0.1" + sources."find-0.3.0" + (sources."find-process-1.4.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."find-requires-1.0.0" sources."flat-5.0.0" + sources."flatten-1.0.3" (sources."follow-redirects-1.5.10" // { dependencies = [ sources."debug-3.1.0" @@ -73706,16 +74597,24 @@ in ]; }) sources."fsevents-2.1.2" + sources."get-amd-module-type-3.0.0" + sources."get-own-enumerable-property-symbols-3.0.2" sources."get-proxy-2.1.0" sources."get-stdin-5.0.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."global-dirs-0.1.1" (sources."globby-6.1.0" // { dependencies = [ sources."array-union-1.0.2" + sources."pify-2.3.0" + ]; + }) + (sources."gonzales-pe-4.2.4" // { + dependencies = [ + sources."minimist-1.1.3" ]; }) sources."got-9.6.0" @@ -73749,6 +74648,7 @@ in sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -73787,8 +74687,11 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" + sources."is-regexp-1.0.0" + sources."is-relative-path-1.0.2" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" + sources."is-url-1.2.4" sources."is-windows-1.0.2" sources."is-wsl-2.1.1" sources."isarray-1.0.0" @@ -73827,6 +74730,7 @@ in ]; }) sources."lazystream-1.0.0" + sources."levn-0.3.0" sources."lie-3.3.0" sources."lodash-4.17.15" (sources."log-6.0.0" // { @@ -73838,14 +74742,11 @@ in sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" sources."lsmod-1.0.0" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."memoizee-0.4.14" + sources."memory-fs-0.5.0" sources."merge2-1.3.0" sources."methods-1.1.2" sources."micromatch-4.0.2" @@ -73857,11 +74758,9 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" + sources."module-definition-3.3.0" + sources."module-lookup-amd-6.2.0" sources."moment-2.24.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -73873,6 +74772,7 @@ in sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-1.7.3" + sources."node-source-walk-4.2.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" (sources."npm-conf-1.1.3" // { @@ -73906,6 +74806,7 @@ in sources."is-wsl-1.1.0" ]; }) + sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-event-2.3.1" @@ -73925,21 +74826,27 @@ in sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-loader-1.0.10" + sources."path-parse-1.0.6" sources."path-type-4.0.0" sources."pend-1.2.0" - sources."picomatch-2.2.1" - sources."pify-2.3.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."postcss-7.0.27" + sources."postcss-values-parser-1.5.0" + sources."precinct-6.2.0" + sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" sources."proto-list-1.2.4" + sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-1.3.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."query-string-5.1.1" sources."querystring-0.2.0" sources."ramda-0.26.1" @@ -73957,6 +74864,10 @@ in sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" sources."replaceall-0.1.6" + sources."requirejs-2.3.6" + sources."requirejs-config-file-3.1.2" + sources."resolve-1.15.1" + sources."resolve-dependency-path-2.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -73969,6 +74880,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" + sources."sass-lookup-3.0.0" sources."sax-1.2.1" (sources."seek-bzip-1.0.5" // { dependencies = [ @@ -74051,18 +74963,21 @@ in sources."strict-uri-encode-1.1.0" sources."string-width-3.1.0" sources."string_decoder-1.1.1" + sources."stringify-object-3.3.0" sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" + sources."stylus-lookup-3.0.2" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.6" ]; }) - sources."supports-color-5.5.0" + sources."supports-color-6.1.0" sources."tabtab-3.0.2" + sources."tapable-1.1.3" sources."tar-stream-1.6.2" sources."term-size-1.2.0" sources."through-2.3.8" @@ -74080,17 +74995,22 @@ in sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."traverse-0.6.6" + sources."traverse-chain-0.1.0" sources."trim-repeated-1.0.0" sources."tslib-1.11.1" + sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."type-2.0.0" + sources."type-check-0.3.2" sources."type-fest-0.11.0" + sources."typescript-3.8.3" sources."unbzip2-stream-1.3.3" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" ]; }) + sources."uniq-1.0.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { @@ -74138,6 +75058,7 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-7.2.3" @@ -74289,8 +75210,8 @@ in sources."mime-1.6.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."moment-2.7.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" @@ -74689,8 +75610,8 @@ in sources."lru-cache-2.2.0" sources."mime-1.6.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."mv-2.1.1" sources."nan-2.14.0" sources."ncp-2.0.0" @@ -74789,10 +75710,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.299.0"; + version = "1.304.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.299.0.tgz"; - sha512 = "K2dlmwlmJpD7CZE8B8GguwIJmjOWdXzQ7UlcFIscg8y0tP8OT9a1gouLgBaU4uyS5J5wByipGNX1Cpwi6WRt5w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.304.0.tgz"; + sha512 = "1wAkvgvzOyUbbKEMXGgY2UULcfvAYPywlC7Whm3DCffAdx8i1ZMT9hWaOZxhj5K94h3doY3LRb6Xq6lbfb0jDw=="; }; dependencies = [ sources."@snyk/cli-interface-2.3.2" @@ -74813,7 +75734,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.2" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -74831,7 +75752,8 @@ in sources."ast-types-0.13.2" sources."async-1.5.2" sources."balanced-match-1.0.0" - (sources."bl-4.0.1" // { + sources."base64-js-1.3.1" + (sources."bl-4.0.2" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -74839,6 +75761,7 @@ in }) sources."boxen-1.3.0" sources."brace-expansion-1.1.11" + sources."buffer-5.5.0" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."camelcase-4.1.0" @@ -74938,6 +75861,7 @@ in }) sources."https-proxy-agent-3.0.1" sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -75066,7 +75990,7 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-4.1.0" sources."snyk-config-2.2.3" - (sources."snyk-docker-plugin-2.2.2" // { + (sources."snyk-docker-plugin-2.6.1" // { dependencies = [ sources."debug-4.1.1" ]; @@ -75608,7 +76532,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" @@ -75655,7 +76579,7 @@ in sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-6.0.4" @@ -75813,11 +76737,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" @@ -76346,7 +77266,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.639.0" // { + (sources."aws-sdk-2.644.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -76592,7 +77512,7 @@ in sources."https-proxy-agent-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."in-publish-2.0.0" + sources."in-publish-2.0.1" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -76635,11 +77555,7 @@ in sources."json-schema-faker-0.2.16" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."json5-1.0.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-1.0.1" sources."jsonpointer-4.0.1" sources."jspath-0.3.4" (sources."jsprim-1.4.1" // { @@ -76712,9 +77628,9 @@ in sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."ms-2.1.2" sources."multer-1.4.2" @@ -76945,7 +77861,7 @@ in dependencies = [ sources."debug-3.2.6" sources."form-data-2.5.1" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -76958,7 +77874,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.9.1" + sources."qs-6.9.2" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -77141,7 +78057,12 @@ in sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.37" sources."css-what-3.2.1" - sources."csso-4.0.2" + (sources."csso-4.0.3" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.39" + sources."mdn-data-2.0.6" + ]; + }) sources."define-properties-1.1.3" (sources."dom-serializer-0.2.2" // { dependencies = [ @@ -77151,7 +78072,7 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."entities-2.0.0" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -77165,8 +78086,8 @@ in sources."is-symbol-1.0.3" sources."js-yaml-3.13.1" sources."mdn-data-2.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."nth-check-1.0.2" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" @@ -77388,7 +78309,7 @@ in sources."fresh-0.5.2" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -77589,7 +78510,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."superagent-3.8.3" ]; }) @@ -77837,7 +78758,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."ajv-6.12.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -77864,7 +78785,7 @@ in sources."debug-4.1.1" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" - sources."discord.js-11.6.2" + sources."discord.js-11.6.3" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."esprima-4.0.1" @@ -78057,7 +78978,7 @@ in sources."define-properties-1.1.3" sources."diff-4.0.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -78101,11 +79022,7 @@ in sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" - (sources."json5-2.1.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-2.1.2" sources."jsonify-0.0.0" sources."levn-0.3.0" sources."load-json-file-1.1.0" @@ -78116,8 +79033,8 @@ in sources."markdown-escapes-1.0.4" sources."md5-2.2.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" @@ -78157,7 +79074,7 @@ in }) sources."readable-stream-2.3.7" sources."regexp.prototype.flags-1.3.0" - sources."remark-frontmatter-1.3.2" + sources."remark-frontmatter-1.3.3" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" @@ -78268,7 +79185,7 @@ in }; dependencies = [ sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78480,7 +79397,7 @@ in sources."redent-1.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."remark-frontmatter-1.3.2" + sources."remark-frontmatter-1.3.3" sources."remark-message-control-4.2.0" sources."remark-parse-4.0.0" sources."remark-retext-3.1.3" @@ -78745,7 +79662,7 @@ in sources."buffer-from-1.1.1" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78798,7 +79715,7 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78894,7 +79811,7 @@ in dependencies = [ sources."array-includes-3.1.1" sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78978,7 +79895,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -79022,7 +79939,7 @@ in sources."buffer-equal-constant-time-1.0.1" sources."busboy-0.3.1" sources."bytes-3.1.0" - sources."cacheable-lookup-2.0.0" + sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" sources."callsite-1.0.0" sources."caseless-0.12.0" @@ -79195,11 +80112,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.14.0" @@ -79915,7 +80828,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -80198,7 +81111,7 @@ in sources."debug-4.1.1" sources."mime-2.4.4" sources."ms-2.1.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."semver-6.3.0" ]; }) @@ -80263,7 +81176,7 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; @@ -80288,12 +81201,12 @@ in sources."typescript-2.9.2" (sources."vscode-css-languageservice-3.0.13" // { dependencies = [ - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" ]; }) (sources."vscode-html-languageservice-2.1.12" // { dependencies = [ - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" ]; }) sources."vscode-jsonrpc-5.0.1" @@ -80487,8 +81400,8 @@ in sources."mime-types-2.1.26" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" sources."neo-async-2.6.1" @@ -80501,7 +81414,11 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optimist-0.6.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) sources."ora-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -80616,7 +81533,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -80632,7 +81550,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -80853,7 +81771,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -80924,7 +81846,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -80971,14 +81893,14 @@ in sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.2" + sources."hast-util-is-body-ok-link-1.0.3" sources."hast-util-is-element-1.0.4" sources."hast-util-parse-selector-2.2.4" - sources."hast-util-to-string-1.0.2" + sources."hast-util-to-string-1.0.3" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" - sources."html-whitespace-sensitive-tag-names-1.0.1" + sources."html-whitespace-sensitive-tag-names-1.0.2" sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" @@ -81050,7 +81972,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonc-parser-1.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -81111,11 +82033,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -81556,7 +82474,7 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { @@ -81615,7 +82533,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helper-validator-identifier-7.9.0" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -81627,14 +82546,14 @@ in }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.8.7" + sources."@babel/runtime-corejs3-7.9.2" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" @@ -81773,7 +82692,7 @@ in sources."cheerio-1.0.0-rc.3" (sources."chokidar-2.1.8" // { dependencies = [ - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."normalize-path-3.0.0" ]; }) @@ -81894,7 +82813,7 @@ in sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-error-4.1.1" @@ -81980,7 +82899,11 @@ in ]; }) sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -82700,30 +83623,30 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.42.0"; + version = "4.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz"; - sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; + sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.5" - sources."@webassemblyjs/floating-point-hex-parser-1.8.5" - sources."@webassemblyjs/helper-api-error-1.8.5" - sources."@webassemblyjs/helper-buffer-1.8.5" - sources."@webassemblyjs/helper-code-frame-1.8.5" - sources."@webassemblyjs/helper-fsm-1.8.5" - sources."@webassemblyjs/helper-module-context-1.8.5" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" - sources."@webassemblyjs/helper-wasm-section-1.8.5" - sources."@webassemblyjs/ieee754-1.8.5" - sources."@webassemblyjs/leb128-1.8.5" - sources."@webassemblyjs/utf8-1.8.5" - sources."@webassemblyjs/wasm-edit-1.8.5" - sources."@webassemblyjs/wasm-gen-1.8.5" - sources."@webassemblyjs/wasm-opt-1.8.5" - sources."@webassemblyjs/wasm-parser-1.8.5" - sources."@webassemblyjs/wast-parser-1.8.5" - sources."@webassemblyjs/wast-printer-1.8.5" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" @@ -82779,7 +83702,7 @@ in sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."cacache-12.0.3" + sources."cacache-12.0.4" sources."cache-base-1.0.1" sources."chokidar-2.1.8" sources."chownr-1.1.4" @@ -82870,7 +83793,7 @@ in }) sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -82885,7 +83808,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -82937,7 +83860,6 @@ in sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" - sources."mamacro-0.0.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" @@ -82954,11 +83876,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."move-concurrently-1.0.1" sources."ms-2.0.0" sources."nan-2.14.0" @@ -83104,7 +84022,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.6.6" // { + (sources."terser-4.6.7" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -83519,7 +84437,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."accepts-1.3.7" sources."ajv-6.12.0" sources."ajv-errors-1.0.1" @@ -83644,7 +84562,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errno-0.1.7" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -83713,7 +84631,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" @@ -83813,9 +84731,9 @@ in sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" @@ -84128,7 +85046,7 @@ in sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."cacache-12.0.3" + sources."cacache-12.0.4" sources."chownr-1.1.4" sources."commondir-1.0.1" sources."concat-map-0.0.1" @@ -84142,7 +85060,7 @@ in sources."end-of-stream-1.4.4" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" @@ -84171,19 +85089,15 @@ in sources."is-glob-4.0.1" sources."isarray-1.0.0" sources."json-schema-traverse-0.4.1" - (sources."json5-1.0.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-1.0.1" sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."mississippi-3.0.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."move-concurrently-1.0.1" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -84399,11 +85313,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" @@ -84628,7 +85538,7 @@ in }) sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.1" sources."yaml-ast-parser-custom-tags-0.0.43" ]; @@ -84669,7 +85579,7 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" @@ -85043,11 +85953,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" @@ -85440,4 +86346,4 @@ in bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix index faf2cd7d21f6..f2e633300c7e 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix @@ -1309,15 +1309,6 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; @@ -1381,13 +1372,13 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.4" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; + sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; }; }; "mkdirp-1.0.3" = { @@ -2863,10 +2854,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" @@ -3034,10 +3025,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."nopt-4.0.3" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -3143,10 +3134,10 @@ in sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."needle-2.4.0" sources."nopt-4.0.3" @@ -3162,11 +3153,7 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v13.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v13.nix index e83aa90962c1..f87526382b93 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages-v13.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages-v13.nix @@ -598,13 +598,13 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { + "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; - version = "0.0.8"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "minipass-3.1.1" = { @@ -634,13 +634,13 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.4" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; + sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; }; }; "mkdirp-1.0.3" = { @@ -1342,10 +1342,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" diff --git a/nixpkgs/pkgs/development/node-packages/shell-generate.nix b/nixpkgs/pkgs/development/node-packages/shell-generate.nix deleted file mode 100644 index aa635b2a81e3..000000000000 --- a/nixpkgs/pkgs/development/node-packages/shell-generate.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ nixpkgs ? import ../../.. {} }: -with nixpkgs; -mkShell { - buildInputs = [ - bash nodePackages.node2nix - ]; - NODE_NIXPKGS_PATH = builtins.toString ../../../.; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix index d84c21565db8..aa12ebc8d796 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -3,6 +3,8 @@ buildDunePackage rec { pname = "dune-configurator"; + useDune2 = true; + inherit (dune_2) src version; dontAddPrefix = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 1c3503f11a15..14059070c9a0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -3,6 +3,8 @@ buildDunePackage rec { pname = "dune-private-libs"; + useDune2 = true; + inherit (dune_2) src version; dontAddPrefix = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix index 3922b5cfec75..dacd3a758623 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildDune2Package, fetchFromGitHub, ctypes, libcxx }: +{ stdenv, buildDunePackage, fetchFromGitHub, ctypes, libcxx }: -buildDune2Package rec { +buildDunePackage rec { pname = "eigen"; version = "0.2.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "owlbarn"; repo = pname; diff --git a/nixpkgs/pkgs/development/ocaml-modules/graphics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/graphics/default.nix new file mode 100644 index 000000000000..6a3217431b43 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/graphics/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildDunePackage, dune-configurator, libX11 }: + +buildDunePackage rec { + + pname = "graphics"; + version = "5.1.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz"; + sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ libX11 ]; + + meta = { + homepage = "https://github.com/ocaml/graphics"; + description = "A set of portable drawing primitives"; + license = lib.licenses.lgpl2; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix index 4b35ce25fde4..e576fa998c2e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix @@ -4,13 +4,13 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lacaml"; - version = "11.0.3"; + version = "11.0.6"; src = fetchFromGitHub { owner = "mmottl"; repo = "lacaml"; rev = version; - sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb"; + sha256 = "1vn5441fg45d0ni9x87dhz2x4jrmvg3w7qk3vvcrd436snvh07g0"; }; buildInputs = [ ocaml findlib dune base stdio ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix index ce6ee124466c..9d2bf74a3ace 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildDune2Package, fetchFromGitHub, stdlib-shims }: +{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }: -buildDune2Package rec { +buildDunePackage rec { pname = "owl-base"; version = "0.8.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "owlbarn"; repo = "owl"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix index c6eaf69b704b..7fa912d808db 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildDune2Package +, buildDunePackage , dune-configurator , fetchFromGitHub , alcotest @@ -11,10 +11,10 @@ , npy }: -buildDune2Package rec { +buildDunePackage rec { pname = "owl"; - inherit (owl-base) version src meta; + inherit (owl-base) version src meta useDune2; checkInputs = [ alcotest ]; buildInputs = [ dune-configurator ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix index a37120b2496b..5127dc3b1e6d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix @@ -1,12 +1,12 @@ -{ lib, buildDunePackage, fetchzip }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { pname = "parmap"; - version = "1.1"; + version = "1.1.1"; - src = fetchzip { + src = fetchurl { url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "13ahqaga1palf0s0dll512cl7k43sllmwvw6r03y70kfmky1j114"; + sha256 = "1pci7b1jqxkgmrbhr0p5j98i4van5nfmmb3sak8cyvxhwgna93j4"; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index 049a9a97c8e2..87e88cbf496e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,10 +1,12 @@ -{ stdenv, buildDune2Package, fetchFromGitHub, ppx_deriving +{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving , alcotest, biocaml, gnuplot, lacaml, menhir, owl }: -buildDune2Package rec { +buildDunePackage rec { pname = "phylogenetics"; version = "unstable-2019-11-15"; + useDune2 = true; + src = fetchFromGitHub { owner = "biocaml"; repo = pname; diff --git a/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix index 36a1c1b76e4f..6e867d0b0f65 100644 --- a/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.15"; + version = "0.1.16"; src = fetchPypi { inherit pname version; - sha256 = "0gbl08p89959g8dqy2vainppg3kyf948xlh18p7iwk5p0mw5d3j9"; + sha256 = "0yk4ghvg47drfvdrrcw7nk14pg4shccmyhln9d8hy1lyafcqmnd5"; }; # hardcodes a test dependency on an old version of pytest-asyncio @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Asynchronous console and interfaces for asyncio"; - homepage = https://github.com/vxgmichel/aioconsole; + homepage = "https://github.com/vxgmichel/aioconsole"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.catern ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix index 782238c3f832..792db7091d07 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.4"; + version = "0.3.6"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "1gc74a0i0slq3gn9kv3scn7c9x444z5nwjm3d14qilsgq6civsnd"; + sha256 = "0js7p9qj5x6k8i2cby4c6mw6xrp4dy4m82f3n1l8rz00qibmj37j"; }; propagatedBuildInputs = [ aiohttp attrs ]; @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = { description = "SOCKS proxy connector for aiohttp"; license = lib.licenses.asl20; - homepage = https://github.com/romis2012/aiohttp-socks; + homepage = "https://github.com/romis2012/aiohttp-socks"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index 6f978778f7da..b34b878a839c 100644 --- a/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/nixpkgs/pkgs/development/python-modules/arrow/default.nix index af3e4547628a..04295dce261f 100644 --- a/nixpkgs/pkgs/development/python-modules/arrow/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index c15beffca80d..b10bd6d7c1a1 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "0.7.0"; + version = "0.8.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "0g133yxh3bgvdjcpar65x5pyx2bcx0kg173rbq5iwmmpw388f47a"; + sha256 = "1akiv92cd7ciky0aay94lh9azr73jajn0x0x6ywaf3qm5c4hyvys"; }; # Package is not compatible with Python 3.5 diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 846c7d9954f7..1fdfc4d4358c 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.20.1"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "17n7kajqf35g0bxqd30jpm2vq275l3b45l77lfh6r9llpkd1zxnx"; + sha256 = "0diyqiwas9fhkj7p5hm08lvkd5h9yn9zqilwww2av04mclfk82ij"; }; # Tests are not included in the PyPI package diff --git a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index b842a66cd278..abf27b5d7ef2 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.24"; + version = "1.1.25"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "184ad6a05a3089dfdc1ce07c1cbfa489bbc45b5f6f56e848cac0851e6443da21"; + sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 24675200b5b1..2e87db4fb6ce 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , aiodns , aiohttp +, mock , msrest , pytest , pytestCheckHook @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - version = "1.2.2"; + version = "1.3.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0bz4m6kmqymxlxf9qk6jw8v895d13rsggbgsjpsbvi9px6w15nwb"; + sha256 = "98d03a35845fe5b6abaa32f5961214da3e16c4c82b8c601926fc5e7f3a39549e"; }; propagatedBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { checkInputs = [ aiodns aiohttp + mock msrest pytest pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index e4b894eca64b..78fd74020980 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.1.0"; + version = "1.3.0"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1xn4nwi4vly8n3mmphv0wbdg9k55gsgmk3fdwma8rm3m3c7593hc"; + sha256 = "17fa904e0447fd2a2dc19909379edb769b05656dbaf4863b8c4fdfb2bb54350c"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 34629e6eb48d..de2b87ecb5c8 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1l1fwm8plzr5zbv02nlvs0i8ssmd88cxm5lb19i54b3scci77hiq"; + sha256 = "f9967b4deb48e619f6c40558f69e48978779cc09c8a7fad33d536cfc41cd68f9"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index e2b40c29d850..b4749711b9f2 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "066p4x2ixasz6qbxss2ilchl73w1kh2nc32lgh8qygl3d90059lp"; + sha256 = "4f3bfac60e025e01dd1c1998b73649d45d706975356c0cf147174cf5a6ddf8be"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index c535971c7bf5..2dadb1d2cb81 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "5.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; + sha256 = "d03641336f4b2ec561112655c93ee80bc28d8e8daa45a57abc36169bd19c07a0"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 41124e448541..20861a9efe3a 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "8.2.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0czn781ywbwi8px54nlccsvw5s13y4wqmxhcrxkkl0y7rblqi5pr"; + sha256 = "6f05948bbd19ceb894f46f037b77c54116183364a671e180c007b5737c8d4590"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 0d610eebe9c1..e7da7541dd98 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.8.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0rv3443h4f9n88ky0fkfrp6jhf7ck9w3v96q040g3c2vkkywsnwa"; + sha256 = "48b1ec81f30f4b5f38dd17f68f0dfc968db96e0a04fdcfc99f43f80ca041f14b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index 789784babfb4..c23ebfc2ce9c 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cc844a152079e0d18fb5f47663a24cb204982925425c1fb51bac53894885000b"; + sha256 = "cc4058174e371a0b68b305cd5a082fcca47f3446dd9aefd9ada72da4bd637da9"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 29069d71b88a..5ba25e11a89e 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1fql0j28d2r6slgabb7b438gdga513iskqh4al6c7dsmj1yzdzwa"; + sha256 = "f6dacf442ccae2f18f1082e80bcbdcaa8c0efa2ba92b48c5db6ee01d37240047"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 1e4c8923d7d3..57ec64f3d562 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1xms5wf21z9i28xl0p515xb08mrlsqnzhxcwv7pjlf26lwxadfi0"; + sha256 = "f6fbb87d9bf29ce325543c9a3a125fbe45f4797f3a7f260c6c21ca60dc3f0885"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 43f0394669b7..336bba6a1709 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "2.1.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0ga6lzqlinfxlzx1g35a5sv5chjx4im0m4b8i33hqrhmdv9m7ypg"; + sha256 = "1883e12eeb5819064dc52bf3a3ade05c791f4b66e4aeec948bda28df6ce2bce4"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 53aeff46c585..08a9b6b507ef 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.7.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0r6j3yp7ys0zgszqdjm6y90nigsapni4xhfpfgyk5c5qbgdpl93w"; + sha256 = "40f8e62db145d31731018b83baf2d1a78b585514c373dd3c095f1f6835d17d23"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 252760950e5b..ccefd96ce73b 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2"; + sha256 = "09bhk6kpf1j1kgsyfdrfmfixrdj0iikx25dr1mh9dc6lci07i1cx"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index ac99b98f0e5e..00480ac38bc2 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "10.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; + sha256 = "3978da4641b3396d4a00c7ddd53d87ece7e7d45b5bc41a157639bdd2f2c5b9b3"; }; postInstall = if isPy3k then "" else '' diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix index 37c7e46cbf3a..ad8a2a0fbe23 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-policyinsights"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; + sha256 = "ed229e3845c477e88dde413825d4fba0d38b3a5ffab4e694c7d0da995f3db0f3"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 6a7b6df24185..858bde764402 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb"; + sha256 = "7826601507878e77f5d5cd805c6ad1d6483c375b545d5e9e1694b5a6c5e12fe3"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 990f494ecedc..ece93025b571 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; + sha256 = "6355d9234d87422d57bf2ea8d1cc242463c203e4bb79b8930f22f29f4e025fa1"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 5d13acb6ec83..3873f08e3ce2 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; + sha256 = "f65c1985a47e0ac55e7d5d9cc1bd5e95335a111566edc289d460aa2bc8f80991"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index a81f336df066..1b6649a36f23 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0"; + sha256 = "99ca085eb523a5c27933060ccb04d7a6b60864f98d87bf5b63ac17d419b43445"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 0b2442b087de..48af270a9d70 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "7.2.0"; + version = "8.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl"; + sha256 = "636778912823cebed1c212e4feacc4885d9e49e19a047da20fca9393bc6fac33"; }; postInstall = if isPy3k then "" else '' diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index ea6c1502123f..3b25c93a1bd1 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.44.0"; + version = "0.45.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; + sha256 = "04wdb7vksjhcvv0gkjjr37lmb5ads5pr00cjac8r3szimr64zspr"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index 78950d2971e8..a4f8e161ba3b 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.0.0"; + version = "12.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "15f5vk3vd2amggqqznx186raak9wgr57j0l1p9qa62kcl10bs9lg"; + sha256 = "661ed9669b9fbb3163899294d28f11f7c135336e1513aab6bd1ff9ef3c6febb3"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix b/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix new file mode 100644 index 000000000000..141dbf241f25 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub +, wheel, pytestCheckHook, pytestrunner }: + +buildPythonPackage rec { + version = "0.18.0"; + pname = "bacpypes"; + + src = fetchFromGitHub { + owner = "JoelBender"; + repo = "bacpypes"; + rev = "${version}"; + sha256 = "1nz0qi46z6n455mw2ppxgz091qh0irizlxpvkx7iw1l7f6mmgj0x"; + }; + + propagatedBuildInputs = [ wheel ]; + + # Using pytes instead of setuptools check hook allows disabling specific tests + checkInputs = [ pytestCheckHook pytestrunner ]; + dontUseSetuptoolsCheck = true; + disabledTests = [ + # Test fails with a an error: AssertionError: assert 30 == 31 + "test_recurring_task_5" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/JoelBender/bacpypes"; + description = "BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces."; + license = licenses.mit; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/nixpkgs/pkgs/development/python-modules/bayespy/default.nix index 210fbbe2176e..b1cf34959342 100644 --- a/nixpkgs/pkgs/development/python-modules/bayespy/default.nix +++ b/nixpkgs/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 = '' diff --git a/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/nixpkgs/pkgs/development/python-modules/billiard/default.nix index e53aa40446eb..91624210bb56 100644 --- a/nixpkgs/pkgs/development/python-modules/billiard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/billiard/default.nix @@ -1,16 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest_4, case, psutil }: +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }: buildPythonPackage rec { pname = "billiard"; - version = "3.6.1.0"; + version = "3.6.3.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "b8809c74f648dfe69b973c8e660bcec00603758c9db8ba89d7719f88d5f01f26"; + sha256 = "0spssl3byzqsplra166d59jx8iqfxyzvcbx7vybkmwr5ck72a5yr"; }; - checkInputs = [ pytest_4 case psutil ]; + checkInputs = [ pytest case psutil ]; + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { homepage = https://github.com/celery/billiard; diff --git a/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix b/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix index c33006377df0..cf8b13823015 100644 --- a/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.2"; + version = "2.13.3"; src = fetchPypi { inherit pname version; - sha256 = "5dd4de86dda684c46ef8ee9cc84e335ca7f6275d4363a684de82225270d1e328"; + sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn"; }; patches = [ ./nix.patch ]; @@ -14,7 +14,7 @@ buildPythonPackage rec { postInstall = "mv $out/bin/buildout{,-nix}"; meta = { - homepage = http://www.buildout.org; + homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = stdenv.lib.licenses.zpl21; maintainers = [ stdenv.lib.maintainers.goibhniu ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildout/default.nix b/nixpkgs/pkgs/development/python-modules/buildout/default.nix index 419e8dce2126..20731e76c814 100644 --- a/nixpkgs/pkgs/development/python-modules/buildout/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildout/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.2"; + version = "2.13.3"; src = fetchPypi { inherit pname version; - sha256 = "0a73s5q548l2vs2acqs3blkzd9sw6d7ci77fz1pc9156vn3dxm2x"; + sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn"; }; meta = with stdenv.lib; { - homepage = http://www.buildout.org; + homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpl21; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/python-modules/carbon/default.nix b/nixpkgs/pkgs/development/python-modules/carbon/default.nix index c471240c87ad..427108a93910 100644 --- a/nixpkgs/pkgs/development/python-modules/carbon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/carbon/default.nix @@ -6,17 +6,19 @@ buildPythonPackage rec { pname = "carbon"; version = "1.1.6"; - disabled = isPy3k; - src = fetchPypi { inherit pname version; sha256 = "9ecda1469e497e3fed346b23ac94fd576e1bd9962677ab88975f4f598186e851"; }; + # Carbon-s default installation is /opt/graphite. This env variable ensures + # carbon is installed as a regular python module. + GRAPHITE_NO_PREFIX="True"; + propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ]; meta = with stdenv.lib; { - homepage = http://graphite.wikidot.com/; + homepage = "http://graphiteapp.org/"; description = "Backend data caching and persistence daemon for Graphite"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/cchardet/default.nix b/nixpkgs/pkgs/development/python-modules/cchardet/default.nix index 1fb506682baf..5256d6050490 100644 --- a/nixpkgs/pkgs/development/python-modules/cchardet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cchardet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cchardet"; - version = "2.1.5"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "240efe3f255f916769458343840b9c6403cf3192720bc5129792cbcb88bf72fb"; + sha256 = "1cs6y59qhbal8fgbyjk2lpjykh8kfjhq16clfssylsddb4hgnsmp"; }; checkInputs = [ nose ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "High-speed universal character encoding detector"; - homepage = https://github.com/PyYoshi/cChardet; + homepage = "https://github.com/PyYoshi/cChardet"; license = lib.licenses.mpl11; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 4522379fa64a..68c6c282c9b9 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.4.0"; + version = "4.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d3363bb5df72d74420986a435449f3c3979285941dff57d5d97ecba352a0e3e2"; + sha256 = "0ps1c6ill7q0m5kzb87hisgshdk3kzpa6cvcjch1d1wa07whp2hh"; }; postPatch = '' @@ -21,7 +21,7 @@ buildPythonPackage rec { # test_eventlet touches network # test_mongodb requires pymongo checkPhase = '' - pytest -k 'not restore_current_app_fallback and not msgpack' \ + pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply' \ --ignore=t/unit/concurrency/test_eventlet.py \ --ignore=t/unit/backends/test_mongodb.py ''; diff --git a/nixpkgs/pkgs/development/python-modules/clikit/default.nix b/nixpkgs/pkgs/development/python-modules/clikit/default.nix index 94f3fa08b138..054b6edee6da 100644 --- a/nixpkgs/pkgs/development/python-modules/clikit/default.nix +++ b/nixpkgs/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 = [ diff --git a/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix index ed25c2c73717..4c2db1f52146 100644 --- a/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix @@ -3,6 +3,7 @@ , colorlover , ipython , ipywidgets +, pytest , nose , numpy , pandas @@ -12,11 +13,11 @@ buildPythonPackage rec { pname = "cufflinks"; - version = "0.16"; + version = "0.17.3"; src = fetchPypi { inherit pname version; - sha256 = "163lag5g4micpqm3m4qy9b5r06a7pw45nq80x4skxc7dcrly2ygd"; + sha256 = "0i56062k54dlg5iz3qyl1ykww62mpkp8jr4n450h0c60dm0b7ha8"; }; propagatedBuildInputs = [ @@ -30,24 +31,12 @@ buildPythonPackage rec { statsmodels ]; - patches = [ - # Plotly 4 compatibility. Remove with next release, assuming it gets merged. - (fetchpatch { - url = "https://github.com/santosjorge/cufflinks/pull/202/commits/e291dce14181858cb457404adfdaf2624b6d0594.patch"; - sha256 = "1l0dahwqn3cxg49v3i3amwi80dmx2bi5zrazmgzpwsfargmk2kd1"; - }) - ]; - - # in plotly4+, the plotly.plotly module was moved to chart-studio.plotly - postPatch = '' - substituteInPlace requirements.txt \ - --replace "plotly>=3.0.0,<4.0.0a0" "chart-studio" - ''; - - checkInputs = [ nose ]; + checkInputs = [ pytest nose ]; + # ignore tests which are incompatible with pandas>=1.0 + # https://github.com/santosjorge/cufflinks/issues/236 checkPhase = '' - nosetests -xv tests.py + pytest tests.py -k 'not bar_row' ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix index a842baca2289..fd44f49b53c9 100644 --- a/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib export CVXOPT_BLAS_LIB=openblas export CVXOPT_LAPACK_LIB=openblas - export CVXOPT_SUITESPARSE_LIB_DIR=${suitesparse}/lib - export CVXOPT_SUITESPARSE_INC_DIR=${suitesparse}/include + export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib + export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include '' + lib.optionalString withGsl '' export CVXOPT_BUILD_GSL=1 export CVXOPT_GSL_LIB_DIR=${gsl}/lib diff --git a/nixpkgs/pkgs/development/python-modules/deap/default.nix b/nixpkgs/pkgs/development/python-modules/deap/default.nix index 9c49057398c9..5a09c42a9bbf 100644 --- a/nixpkgs/pkgs/development/python-modules/deap/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/dipy/default.nix b/nixpkgs/pkgs/development/python-modules/dipy/default.nix new file mode 100644 index 000000000000..939f0912fe1f --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 951593bac972..d85b4496e22a 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/django/1_8.nix b/nixpkgs/pkgs/development/python-modules/django/1_8.nix deleted file mode 100644 index d575599cbe1d..000000000000 --- a/nixpkgs/pkgs/development/python-modules/django/1_8.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchurl -}: - -buildPythonPackage rec { - pname = "Django"; - version = "1.8.19"; - - src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz"; - sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k"; - }; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - license = licenses.bsd0; - knownVulnerabilities = [ - # The patches were not backported due to Django 1.8 having reached EOL - https://www.djangoproject.com/weblog/2018/aug/01/security-releases/ - https://www.djangoproject.com/weblog/2019/jan/04/security-releases/ - https://www.djangoproject.com/weblog/2019/feb/11/security-releases/ - https://www.djangoproject.com/weblog/2019/jun/03/security-releases/ - https://www.djangoproject.com/weblog/2019/jul/01/security-releases/ - ]; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/nixpkgs/pkgs/development/python-modules/django/2_2.nix index 3a591e7009bd..63a0f33d8f93 100644 --- a/nixpkgs/pkgs/development/python-modules/django/2_2.nix +++ b/nixpkgs/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.10"; + version = "2.2.11"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "16h7lw9vnmwarl4pjwc7xnkwmcjq1c79prvfwv8fzixiw65ic9hj"; + sha256 = "0l0gndky4nwc1jk68b31m583a9g0fhmll903p0xislyyddz3iqk5"; }; patches = stdenv.lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/nixpkgs/pkgs/development/python-modules/doc8/default.nix index 307496cc65ce..f7e620f491cb 100644 --- a/nixpkgs/pkgs/development/python-modules/doc8/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index ade485c91dc6..3ca9d59e27f0 100644 --- a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "9.4.0"; + version = "9.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0qid094qna6bl4zpd08f6snvipwjls1yadacvmwri11djgp0wvj3"; + sha256 = "0iz9hg1j7q9chka6fyzgpzqg2v4nbjx61xfvn9ixprxrdhvhr2hi"; }; # Set DROPBOX_TOKEN environment variable to a valid token. @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = https://www.dropbox.com/developers/core/docs; + homepage = "https://www.dropbox.com/developers/core/docs"; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/python-modules/etesync/default.nix b/nixpkgs/pkgs/development/python-modules/etesync/default.nix index f96c3e10883c..4edf0f71cf20 100644 --- a/nixpkgs/pkgs/development/python-modules/etesync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/etesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "etesync"; - version = "0.9.3"; + version = "0.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1i6v7i4xmbpkc1pgpzq8gyl2kvg3a1kpdwp8q6l3l0vf9p5qm06w"; + sha256 = "09sdqviv9jyd013gxjjcw6vd4si860304haylvw4dp9kljsd94qa"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix b/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix index d69c320ccaac..f1588690a774 100644 --- a/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/faulthandler/disable-env-test.patch b/nixpkgs/pkgs/development/python-modules/faulthandler/disable-env-test.patch new file mode 100644 index 000000000000..5824652f6175 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/filetype/default.nix b/nixpkgs/pkgs/development/python-modules/filetype/default.nix index 34f7ac4e4a93..40bbc688e205 100644 --- a/nixpkgs/pkgs/development/python-modules/filetype/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index abc0853b4c71..cd4ed57d792c 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.13"; + version = "1.8.13.post1"; src = fetchPypi { inherit pname version; - sha256 = "5ec34898c8b983a723fb4e949dd3e0ed7e691c303e51f6bfd61e52ac9ac813ae"; + sha256 = "00366f2j21b5r4r8310sadf7jjhdr44s0381dhjqkw2nzpwjnhqs"; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix index c9cf3fe4ca84..0a60761b9433 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,30 +1,27 @@ -{ lib, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }: +{ lib, isPy27, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }: buildPythonPackage rec { pname = "flake8-future-import"; - version = "0.4.5"; + version = "0.4.6"; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { owner = "xZise"; repo = "flake8-future-import"; rev = version; - sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr"; + sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; }; - patches = [ - # Add Python 3.7 support. Remove with the next release - (fetchpatch { - url = https://github.com/xZise/flake8-future-import/commit/cace194a44d3b95c9c1ed96640bae49183acca04.patch; - sha256 = "17pkqnh035j5s5c53afs8bk49bq7lnmdwqp5k7izx7sw80z73p9r"; - }) - ]; - propagatedBuildInputs = [ flake8 six ]; - meta = { - homepage = https://github.com/xZise/flake8-future-import; + # Upstream disables this test case naturally on python 3, but it also fails + # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it + # on py2 as well. + patches = lib.optionals isPy27 [ ./skip-test.patch ]; + + meta = with lib; { description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; - license = lib.licenses.mit; + homepage = "https://github.com/xZise/flake8-future-import"; + license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flake8-future-import/skip-test.patch b/nixpkgs/pkgs/development/python-modules/flake8-future-import/skip-test.patch new file mode 100644 index 000000000000..300358f9158b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flake8-future-import/skip-test.patch @@ -0,0 +1,13 @@ +diff --git a/test_flake8_future_import.py b/test_flake8_future_import.py +index 84fde59..345f23f 100644 +--- a/test_flake8_future_import.py ++++ b/test_flake8_future_import.py +@@ -230,7 +230,7 @@ class TestBadSyntax(TestCaseBase): + """Test using various bad syntax examples from Python's library.""" + + +-@unittest.skipIf(sys.version_info[:2] >= (3, 7), 'flake8 supports up to 3.6') ++@unittest.skip("Has issue with installed path for flake8 in python2") + class Flake8TestCase(TestCaseBase): + + """ diff --git a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index 46841f68d60f..01bd180a5ae4 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "2.1.6"; + version = "2.3.0"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "a37d7d6a62407a2e0975af5305c795f2fb5c06ecc34e3cf64659d083b1b2dd5f"; + sha256 = "04bsswi7daaqda01a83rd1f2gq6asii520f9arjf7bsy24pmbprc"; }; checkInputs = [ @@ -60,12 +60,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace "jsonschema>=3.0.1<4" "jsonschema" \ - --replace "marshmallow>=2.18.0,<2.20" "marshmallow" \ - --replace "PyJWT>=1.7.1" "PyJWT" \ - --replace "Flask-SQLAlchemy>=2.4,<3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18,<4" "Flask-JWT-Extended" + substituteInPlace setup.py \ + --replace "apispec[yaml]>=1.1.1, <2" "apispec" \ + --replace "jsonschema>=3.0.1, <4" "jsonschema" \ + --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ + --replace "PyJWT>=1.7.1" "PyJWT" \ + --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ + --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" ''; # majority of tests require network access or mongo @@ -73,8 +74,8 @@ buildPythonPackage rec { meta = with lib; { description = "Simple and rapid application development framework, built on top of Flask"; - homepage = https://github.com/dpgaspar/flask-appbuilder/; + homepage = "https://github.com/dpgaspar/flask-appbuilder/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix index caaf0a61152b..307b670fa7f1 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.12.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii"; + sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix index 4064fc494b12..38faa5f12db4 100644 --- a/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , botocore , boto3 , docutils @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "flowlogs_reader"; version = "2.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index 32e9e9393ce6..d8f1a52d465a 100644 --- a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index 250942a84884..02d00461e26f 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1viq85fsb119w4lmxn2iacxf2w35b8cgzamlrb685z50pp1cdi2d"; + sha256 = "0lnmj9jky9pz227scmjxgvd8243higl24ndc0cc668mm36cnwapc"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index b7dea183b0e2..6b1b74cae8a8 100644 --- a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -1,16 +1,17 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , pandas, shapely, fiona, descartes, pyproj , pytest, Rtree }: buildPythonPackage rec { pname = "geopandas"; - version = "0.6.3"; + version = "0.7.0"; + disabled = isPy27; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "11mzb5spwa06h1zhn7z905wcwya2x5srghv82jp5zjka9zdhsycd"; + sha256 = "0cfdvl4cvi0nim1qbmzf7vg0all272i8r0kj4xgdd0hr2j4jdg9p"; }; checkInputs = [ pytest Rtree ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 54498ba1a853..cf83bd4d0ed6 100644 --- a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -27,8 +27,9 @@ buildPythonPackage rec { google_auth requests_oauthlib ]; + doCheck = isPy3k; checkPhase = '' - rm -fr tests/__pycache__/ + rm -fr tests/__pycache__/ google py.test ''; diff --git a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix index 1f86c2a2af2e..d8c6a12aeaaf 100644 --- a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix @@ -1,18 +1,43 @@ { stdenv, buildPythonPackage, fetchpatch, fetchPypi -, pytest, mock, oauth2client, flask, requests, setuptools, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa, freezegun }: +, cachetools +, flask +, freezegun +, mock +, oauth2client +, pyasn1-modules +, pytest +, pytest-localserver +, requests +, responses +, rsa +, setuptools +, six +, urllib3 +}: buildPythonPackage rec { pname = "google-auth"; - version = "1.10.0"; + version = "1.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1xs8ch6bz57vs6j0p8061c7wj9ahkvrfpf1y9v7r009979507ckv"; + sha256 = "05av4clwv7kdk1v55ibcv8aim6dwfg1mi4wy0vv91fr6wq3205zc"; }; - checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver freezegun ]; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; + checkInputs = [ + flask + freezegun + mock + oauth2client + pytest + pytest-localserver + requests + responses + urllib3 + ]; + checkPhase = '' py.test ''; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix index 3fc0fc8598d5..e081d4e3c317 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -3,24 +3,27 @@ , fetchPypi , enum34 , google_api_core +, google_cloud_storage +, pandas , pytest , mock }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "6541245cdee3e3ba5d98bb3ecd0b343fd5d3de1e880cfc5daf59f4a69a045171"; + sha256 = "031331fs97jpyxacwsmhig0ndidn97r288qnkrzfdvg1wxw5rdhi"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ pandas pytest mock google_cloud_storage ]; propagatedBuildInputs = [ enum34 google_api_core ]; + # ignore tests which need credentials checkPhase = '' - pytest tests/unit + pytest tests/unit -k 'not upload and not prediction_client_client_info' ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix index e361b4436ee8..0b7c5d5c16ef 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, freezegun , google_resumable_media , google_api_core , google_cloud_core @@ -13,23 +14,29 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.23.1"; + version = "1.24.0"; src = fetchPypi { inherit pname version; - sha256 = "99c341592d711d8f131fe80d842f7e1b04b2ca1faefa1ffedf4dec1b382cebf6"; + sha256 = "1ca22hzql8x1z6bx9agidx0q09w24jwzkgg49k5j1spcignwxz3z"; }; - checkInputs = [ pytest mock ipython ]; + checkInputs = [ pytest mock ipython freezegun ]; propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ]; + # prevent local directory from shadowing google imports + # call_api_applying_custom_retry_on_timeout requires credentials + # test_magics requires modifying sys.path checkPhase = '' - pytest tests/unit + rm -r google + pytest tests/unit \ + -k 'not call_api_applying_custom_retry_on_timeout' \ + --ignore=tests/unit/test_magics.py ''; meta = with stdenv.lib; { description = "Google BigQuery 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/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix index a71d2e493ddd..0eb606bf7f4b 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,23 +10,24 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "eea9d4aca54499b555a893fa441deac1bd7ae9cbc8e03bdd681fd33fad72e170"; + sha256 = "1wwhjfhvz5g4720qcdrj01fqb8kh3n36sxjpz8pzwhc7z4z5srs8"; }; checkInputs = [ pytest mock ]; propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ]; checkPhase = '' - pytest tests/unit + rm -r google + pytest tests/unit -k 'not policy' ''; meta = with stdenv.lib; { description = "Google Cloud Bigtable 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/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix index d0994ce5e0bf..5afaf97cfaad 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix @@ -2,21 +2,22 @@ , buildPythonPackage , fetchPypi , google_api_core +, grpc_google_iam_v1 , pytest , mock }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "90cceceb487f1f4f2336b3674d594bc5e492fadbe27a5f06ca056d7148fd90ba"; + sha256 = "07zjwwliz8wx83l3bv7244qzrv0s3fchp8kgsy5xy41kmkg79a2d"; }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ]; checkPhase = '' pytest tests/unit @@ -24,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Container Engine 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/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix index 2a9a13b26307..c5a0ead7c50f 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0vfhvpiiigfldi3vb0730w13md1c90irpdx5kypmnfszrrzg7q2a"; + sha256 = "1n19q57y4d89cjgmrg0f2a7yp7l1np2448mrhpndq354h389m3w7"; }; propagatedBuildInputs = [ google_api_core grpcio setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix index 7f47725cde35..859e2271824f 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,23 +9,24 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "cae213e3817f37fdc3ac27c3a162024de3319ad0faf87a536fce375c4a1c1dc9"; + sha256 = "1p0ifkhj48fa3m1y5990412s8msnn6mbz5p5g8ffln7jq7dvn57j"; }; checkInputs = [ pytest mock ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; checkPhase = '' + rm -r google pytest tests/unit ''; meta = with stdenv.lib; { description = "Google Cloud Datastore 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/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix index 3ed34303a727..833dfed4d6b2 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix @@ -9,23 +9,24 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.31.0"; + version = "0.32.0"; src = fetchPypi { inherit pname version; - sha256 = "0dc0244c96378615b19679ab001a85fe74b564233d4f3e185a0f8fe333530fe2"; + sha256 = "1shaj1x9ccwz1ad41f8hkldibpg313raqlhwky7wij4gn2nix22i"; }; checkInputs = [ pytest mock ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; checkPhase = '' + rm -r google pytest tests/unit ''; meta = with stdenv.lib; { description = "Google Cloud DNS 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/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index ef07bf1a3cec..724539c55a0f 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -19,12 +19,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ google_cloud_logging ]; checkPhase = '' + rm -r google pytest tests/unit ''; meta = with stdenv.lib; { description = "Stackdriver Error Reporting 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/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix index c4d9a1cb8d55..7ea418977dfb 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -12,17 +12,18 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "3c12d4421df8e4e77b5e029b1341ae80d180cfda0f9cbef417f36438630cc35f"; + sha256 = "0smpvzdbz3ih3vc0nmn9619xa40mmqk9rs9ic1mwwyh1iyi44waz"; }; checkInputs = [ pytest mock webapp2 django flask ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; checkPhase = '' + rm -r google pytest tests/unit ''; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index 70dd5475c216..d1d4217b3ccc 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -9,23 +9,24 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.0"; + version = "0.30.1"; src = fetchPypi { inherit pname version; - sha256 = "6e4f1d618d8934ee9011e97db940bb177770b430fd29e58848599a416d9f6590"; + sha256 = "03n9ahf4qiyamblh217m5bjc8n57gh09xz87l2iw84c81xxdfcpg"; }; checkInputs = [ pytest mock ]; propagatedBuildInputs = [ google_cloud_core google_api_core ]; checkPhase = '' + rm -r google pytest tests/unit ''; meta = with stdenv.lib; { description = "Google Cloud Resource Manager 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/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index a1628b991400..f8962e6fa5d9 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -19,13 +19,15 @@ buildPythonPackage rec { checkInputs = [ pytest mock ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; + # ignore tests which require credentials or network checkPhase = '' - pytest tests/unit + rm -r google + pytest tests/unit -k 'not client and not extra_headers' ''; meta = with stdenv.lib; { description = "Google Cloud RuntimeConfig 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/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix index 80e88d53f1fc..f6c54be1279a 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -11,23 +11,25 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.13.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "eafa09cc344339a23702ee74eac5713974fefafdfd56afb589bd25548c79c80d"; + sha256 = "1ra1cim9kcs680yrhvfn5hjx8y1sccp3lw7id5j5pj53sshdng8h"; }; checkInputs = [ pytest mock ]; propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; + # avoid importing local package checkPhase = '' + rm -r google pytest tests/unit ''; meta = with stdenv.lib; { description = "Cloud Spanner 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/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix index ff750602465b..856de74dd938 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.23.0"; + version = "1.26.0"; src = fetchPypi { inherit pname version; - sha256 = "c66e876ae9547884fa42566a2ebfec51d280f488d7a058af9611ba90c78bed78"; + sha256 = "0caxqf6vda89cmc81fxhmfk3n61aypqz2sswnbsylzf436rsxpzz"; }; propagatedBuildInputs = [ @@ -26,8 +26,11 @@ buildPythonPackage rec { ]; checkInputs = [ pytest mock ]; + # remove directory from interferring with importing modules + # ignore tests which require credentials checkPhase = '' - pytest tests/unit + rm -r google + pytest tests/unit -k 'not create' ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix index 99494b6886cb..7537b6fe52d9 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0nfc628nr2k6kd3q9qpgwz7c12l0191rv5x4pvca8q82jl96gip5"; + sha256 = "02wlqlrxk0x6a9wifcly2pr84r6k8i97ws0prx21379fss39gf2a"; }; # google_cloud_core[grpc] -> grpcio @@ -23,12 +23,12 @@ buildPythonPackage rec { checkInputs = [ pytest mock ]; checkPhase = '' cd tests # prevent local google/__init__.py from getting loaded - pytest unit + pytest unit -k 'not extra_headers' ''; meta = with stdenv.lib; { description = "Google Cloud Translation 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/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix b/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix index e069c8f8c7b6..88e0902529c0 100644 --- a/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/nixpkgs/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.30"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c"; + sha256 = "1gy8xhwfms0psdji7vzqjbzj3l0k743aw20db27zxyq89cvz6g42"; }; 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/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index 88e3118d4561..9499a9a6fe2c 100644 --- a/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -1,52 +1,35 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, which +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir }: -if django.version != "1.8.19" -|| django_tagging.version != "0.4.3" -then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3" -else buildPythonPackage rec { +buildPythonPackage rec { pname = "graphite-web"; version = "1.1.6"; - disabled = isPy3k; - src = fetchPypi { inherit pname version; sha256 = "f4c293008ad588456397cd125cdad7f47f4bab5b6dd82b5fb69f5467e7346a2a"; }; + patches = [ + ./update-django-tagging.patch + ]; + propagatedBuildInputs = [ django django_tagging whisper pycairo cairocffi ldap memcached pytz urllib3 scandir ]; - postInstall = '' - wrapProgram $out/bin/run-graphite-devel-server.py \ - --prefix PATH : ${which}/bin - ''; + # Carbon-s default installation is /opt/graphite. This env variable ensures + # carbon is installed as a regular python module. + GRAPHITE_NO_PREFIX="True"; preConfigure = '' - # graphite is configured by storing a local_settings.py file inside the - # graphite python package. Since that package is stored in the immutable - # Nix store we can't modify it. So how do we configure graphite? - # - # First of all we rename "graphite.local_settings" to - # "graphite_local_settings" so that the settings are not looked up in the - # graphite package anymore. Secondly we place a directory containing a - # graphite_local_settings.py on the PYTHONPATH in the graphite module - # <nixpkgs/nixos/modules/services/monitoring/graphite.nix>. - substituteInPlace webapp/graphite/settings.py \ - --replace "graphite.local_settings" " graphite_local_settings" - substituteInPlace webapp/graphite/settings.py \ --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; - # error: invalid command 'test' - doCheck = false; - meta = with stdenv.lib; { - homepage = http://graphite.wikidot.com/; + homepage = "http://graphiteapp.org/"; description = "Enterprise scalable realtime graphing"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/graphite-web/update-django-tagging.patch b/nixpkgs/pkgs/development/python-modules/graphite-web/update-django-tagging.patch new file mode 100644 index 000000000000..48d16d50f420 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/graphite-web/update-django-tagging.patch @@ -0,0 +1,12 @@ +diff -Nur a/setup.py b/setup.py +--- a/setup.py 2020-03-12 18:45:34.654296302 +0100 ++++ b/setup.py 2020-03-12 18:46:17.476893828 +0100 +@@ -115,7 +115,7 @@ + ['templates/*', 'local_settings.py.example']}, + scripts=glob('bin/*'), + data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, +- install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], ++ install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], + classifiers=[ + 'Intended Audience :: Developers', + 'Natural Language :: English', diff --git a/nixpkgs/pkgs/development/python-modules/graphitepager/default.nix b/nixpkgs/pkgs/development/python-modules/graphitepager/default.nix deleted file mode 100644 index d2ab8d547fdb..000000000000 --- a/nixpkgs/pkgs/development/python-modules/graphitepager/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, jinja2, markupsafe, pagerduty, pushbullet, python_magic, python-simple-hipchat -, pyyaml, redis, requests, six, websocket_client, nose -}: -buildPythonPackage rec { - pname = "graphitepager"; - version = "0.2.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "0v3g1qcgnkpgjzh6phnv13lnk8qjrcs9sq2qg6k0dk5ik31jfk3d"; - }; - - propagatedBuildInputs = [ - jinja2 markupsafe pagerduty pushbullet python_magic python-simple-hipchat - pyyaml redis requests six websocket_client - ]; - - postPatch = '' - substituteInPlace requirements.txt --replace "==" ">=" - ''; - - checkInputs = [ nose ]; - checkPhase = "nosetests"; - - meta = with stdenv.lib; { - description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/seatgeek/graphite-pager; - maintainers = with maintainers; [ offline basvandijk ]; - license = licenses.bsd2; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 2a20d6104853..cebb48f43943 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.3.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; + sha256 = "1nlmg7lnj162nql1acw9z7n1043sk49j11arlfn766i9ykvq6hng"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix index 79c0fbfcac8a..ee0e598a9ac2 100644 --- a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { pname = "httpretty"; version = "0.9.7"; + # drop this for version > 0.9.7 + # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 + doCheck = stdenv.lib.versionAtLeast version "0.9.8"; + src = fetchPypi { inherit pname version; sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; diff --git a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index 1d445f83b082..1418c925ebf8 100644 --- a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.4"; + version = "4.0.5"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "16gjvqv0n05jrb9g228pdjgzd3amz2pdhvcgsn1jypszjg5m2w9l"; + sha256 = "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q"; }; buildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/imapclient/default.nix b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix index e45cdb3eab8a..ea9bc4844fad 100644 --- a/nixpkgs/pkgs/development/python-modules/imapclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix @@ -1,32 +1,35 @@ { stdenv , buildPythonPackage -, fetchurl -, isPy34 -, isPy35 +, fetchFromGitHub , mock +, six }: buildPythonPackage rec { pname = "IMAPClient"; - version = "0.13"; - disabled = isPy34 || isPy35; + version = "2.1.0"; - src = fetchurl { - url = "https://freshfoo.com/projects/IMAPClient/${pname}-${version}.tar.gz"; - sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is"; + src = fetchFromGitHub { + owner = "mjs"; + repo = "imapclient"; + rev = version; + sha256 = "1zc8qj8ify2zygbz255b6fcg7jhprswf008ccwjmbrnj08kh9l4x"; }; - buildInputs = [ mock ]; - - preConfigure = '' - sed -i '/distribute_setup/d' setup.py - substituteInPlace setup.py --replace "mock==0.8.0" "mock" + # fix test failing in python 36 + postPatch = '' + substituteInPlace tests/test_imapclient.py \ + --replace "if sys.version_info >= (3, 7):" "if sys.version_info >= (3, 6, 4):" ''; + propagatedBuildInputs = [ six ]; + + checkInputs = [ mock ]; + meta = with stdenv.lib; { - homepage = https://imapclient.readthedocs.io/en/2.1.0/; + homepage = "https://imapclient.readthedocs.io"; description = "Easy-to-use, Pythonic and complete IMAP client library"; license = licenses.bsd3; + maintainers = [ maintainers.almac ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index 1773a077fdd5..0c4d2062901d 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jc"; - version = "1.7.5"; + version = "1.9.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "16ndzvyvx4s3b6cnhxbd5fs3fkc3fwygz7qzaw7ws76sag1zpx67"; + sha256 = "1zn6skiv5nm7g8cs86n152ni79ck538bwdjynlh8n2k9dvfd5i8l"; }; propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; diff --git a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix index cc0a78872b2d..848437b453d8 100644 --- a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jmespath"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c"; + sha256 = "1nf2ipzvigspy17r16dpkhzn1bqdmlak162rm8dy4wri2n6mr9fc"; }; buildInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index 5caab5a377e1..e0ac9e0fc18d 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.7"; + version = "4.6.8"; src = fetchPypi { inherit pname version; - sha256 = "67b32ccb6fea030f8799f8fd50dd08e03a4b99464ebc4952d71d8747b1a52ad1"; + sha256 = "0xlv1rsfc3vn22l35csaj939zygd15nzmxbz3bcl981685vxl71d"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 153398bdd8ed..6827480b9df4 100644 --- a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { sed -e '/ipaddress/d' -i requirements.txt '' else ""); + doCheck = pythonAtLeast "3"; checkPhase = '' py.test ''; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix index cb0b9e9e60d2..3b18c10cbc31 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix b/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix new file mode 100644 index 000000000000..e9362f4e077b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix @@ -0,0 +1,52 @@ +{ buildPythonPackage +, cython +, fetchFromGitHub +, h5py +, imgaug +, ipython +, Keras +, lib +, matplotlib +, numpy +, opencv3 +, pillow +, scikitimage +, scipy +, tensorflow +}: + +buildPythonPackage rec { + pname = "mask-rcnn"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "matterport"; + repo = "Mask_RCNN"; + rev = "3deaec5d902d16e1daf56b62d5971d428dc920bc"; + sha256 = "13s3q9yh2q9m9vyksd269mww3bni4q2w7q5l419q70ca075qp8zp"; + }; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ + h5py + imgaug + ipython + Keras + matplotlib + numpy + opencv3 + pillow + scikitimage + scipy + tensorflow + ]; + + meta = with lib; { + description = "Mask R-CNN for object detection and instance segmentation on Keras and TensorFlow"; + homepage = "https://github.com/matterport/Mask_RCNN"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index beca4fed17db..658388eabae4 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index f8c1222fb3ff..9320efc91a23 100644 --- a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "nio"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "151c59a913y6kx99g7g3mhpgbgavwic1mh21nfrr9x0rm98ilay9"; + sha256 = "0gqhk9d06w1in6dj7aqy45skzyg8018nmclqd5r0m5nnw8yns6gz"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix b/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix index ad3f30a66daa..c8531299620e 100644 --- a/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "v${version}"; - sha256 = "1bnpgx629rxqf0yhn0jn68ypj3dqv6njc3981j1g8j8rsm5lycrn"; + sha256 = "1b4dkkl439rfaa86ywzc2zf9ifawhvdlaiqcg0il83cn5bzs7g5z"; }; MKLROOT = mkl; diff --git a/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 90b00ba17179..bcd0ab4a6c62 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix index 12412860f880..dbbbc04d1413 100644 --- a/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,16 +5,16 @@ }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.3.0"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "0fznrg32rk6fmvpfdxwwhadh526gdjivmdifg2hiciil2gr8n1s3"; + sha256 = "1cbd885n3sf4qg1dv3mk1ggr5ssk48yzrzssznr92dh53g04ly7g"; }; - # tests not packaged with source dist as of 1.2.3/1.2.3, and + # tests not packaged with source dist as of 1.3.0/1.3.0, and # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) doCheck = false; pythonImportsCheck = [ "nest_asyncio" ]; diff --git a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index a379f236f3f0..4a92ec7109d1 100644 --- a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/development/python-modules/opuslib/default.nix b/nixpkgs/pkgs/development/python-modules/opuslib/default.nix new file mode 100644 index 000000000000..aa7fc4add493 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opuslib/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage, + fetchFromGitHub, + isPy27, + libopus, + nose, + stdenv, + substituteAll, +}: + +buildPythonPackage rec { + pname = "opuslib"; + version = "3.0.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "orion-labs"; + repo = "opuslib"; + rev = "92109c528f9f6c550df5e5325ca0fcd4f86b0909"; + sha256 = "0kd37wimwd1g6c0w5hq2hiiljgbi1zg3rk5prval086khkzq469p"; + }; + + patches = [ + (substituteAll { + src = ./opuslib-paths.patch; + opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Python bindings to the libopus, IETF low-delay audio codec"; + homepage = "https://github.com/orion-labs/opuslib"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ thelegy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/opuslib/opuslib-paths.patch b/nixpkgs/pkgs/development/python-modules/opuslib/opuslib-paths.patch new file mode 100644 index 000000000000..fd2cfc8dbde2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opuslib/opuslib-paths.patch @@ -0,0 +1,26 @@ +diff --git a/opuslib/api/__init__.py b/opuslib/api/__init__.py +index 323a2a4..4c8a8fe 100644 +--- a/opuslib/api/__init__.py ++++ b/opuslib/api/__init__.py +@@ -7,20 +7,12 @@ + + import ctypes # type: ignore + +-from ctypes.util import find_library # type: ignore +- + __author__ = 'Никита Кузнецов <self@svartalf.info>' + __copyright__ = 'Copyright (c) 2012, SvartalF' + __license__ = 'BSD 3-Clause License' + + +-lib_location = find_library('opus') +- +-if lib_location is None: +- raise Exception( +- 'Could not find Opus library. Make sure it is installed.') +- +-libopus = ctypes.CDLL(lib_location) ++libopus = ctypes.CDLL('@opusLibPath@') + + c_int_pointer = ctypes.POINTER(ctypes.c_int) + c_int16_pointer = ctypes.POINTER(ctypes.c_int16) diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index de046d942c83..d0e932dec1bc 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.0.1"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "3c07765308f091d81b6735d4f2242bb43c332cc3461cae60543df6b10967fe27"; + sha256 = "11j5s6hz29yh3rwa2rjgric0knbhp9shphd4i7hx00xr5wr2xx1j"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; @@ -67,6 +67,12 @@ in buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; + setupPyBuildFlags = [ + # As suggested by + # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment + "--parallel=$NIX_BUILD_CORES" + ]; + disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat diff --git a/nixpkgs/pkgs/development/python-modules/pastel/default.nix b/nixpkgs/pkgs/development/python-modules/pastel/default.nix index 532970c62c28..a44b4253ca56 100644 --- a/nixpkgs/pkgs/development/python-modules/pastel/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix b/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix new file mode 100644 index 000000000000..726df160929d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchurl +}: + +buildPythonPackage rec { + version = "1.17.2"; # note: `conan` package may require a hardcoded one + pname = "patch-ng"; + + src = fetchurl { + url = "mirror://pypi/p/${pname}/${pname}-${version}.tar.gz"; + sha256 = "02nadk70sk51liv0qav88kx8rzfdjc1x52023zayanz44kkcjl2i"; + }; + + meta = with stdenv.lib; { + description = "Library to parse and apply unified diffs."; + homepage = "https://github.com/conan-io/python-patch"; + license = licenses.mit; + maintainers = with maintainers; [ HaoZeke ]; + }; + +} diff --git a/nixpkgs/pkgs/development/python-modules/pid/default.nix b/nixpkgs/pkgs/development/python-modules/pid/default.nix index 20e9390861dc..8e45c43954d6 100644 --- a/nixpkgs/pkgs/development/python-modules/pid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.5"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "96eb7dba326b88f5164bc1afdc986c7793e0d32d7f62366256a3903c7b0614ef"; + sha256 = "0pdp8h1m4brxalcsmzzzmjj66vj98g6wigwmcdj5sf8p7insklgn"; }; buildInputs = [ nose ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pidfile featuring stale detection and file-locking"; - homepage = https://github.com/trbs/pid/; + homepage = "https://github.com/trbs/pid/"; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 0a8d679ae5f9..20a42cddcf9c 100644 --- a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "4.3.0"; + version = "4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0x36mp3a3f3wandfc0g8d53gg2jkc14nhisbryzspcl9f05sbvq6"; + sha256 = "166crncd9zrk9wgk9dss9968mx2c1dzj80sjnaqrcmw7a7j30gv9"; }; LC_ALL = "en_US.UTF-8"; @@ -27,6 +27,7 @@ buildPythonPackage rec { "test_generate_hashes_with_editable" "test_generate_hashes_with_url" "test_generate_hashes_without_interfering_with_each_other" + "test_get_file_hash_without_interfering_with_each_other" "test_get_hashes_local_repository_cache_miss" "test_realistic_complex_sub_dependencies" "test_stdin" diff --git a/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/nixpkgs/pkgs/development/python-modules/poetry/default.nix index 2828cb6b3f97..481fd2c5feb7 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry/default.nix @@ -31,12 +31,12 @@ let in buildPythonPackage rec { pname = "poetry"; - version = "1.0.3"; + version = "1.0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0fx1ilgkrsqjjnpgv5zljsp0wpcsywdqvvi8im9z396qq6qpk830"; + sha256 = "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pproxy/default.nix b/nixpkgs/pkgs/development/python-modules/pproxy/default.nix new file mode 100644 index 000000000000..9f97d7df1356 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pproxy/default.nix @@ -0,0 +1,45 @@ +{ lib +, isPy27 +, buildPythonPackage +, fetchFromGitHub +, pycryptodome +, uvloop +}: + +buildPythonPackage rec { + pname = "pproxy"; + version = "2.3.2"; + + disabled = isPy27; + + # doesn't use tagged releases. Tests not in PyPi versioned releases + src = fetchFromGitHub { + owner = "qwj"; + repo = "python-proxy"; + rev = "818ab9cc10565789fe429a7be50ddefb9c583781"; + sha256 = "0g3cyi5lzakhs5p3fpwywbl8jpapnr8890zw9w45dqg8k0svc1fi"; + }; + + propagatedBuildInputs = [ + pycryptodome + uvloop + ]; + + pythonImportsCheck = [ "pproxy" ]; + disabledTests = [ "api_server" "api_client" ]; # try to connect to outside Internet, so disabled + # test suite doesn't use test runner. so need to run ``python ./tests/*`` + checkPhase = '' + shopt -s extglob + for f in ./tests/!(${builtins.concatStringsSep "|" disabledTests}).py ; do + echo "***Testing $f***" + eval "python $f" + done + ''; + + meta = with lib; { + description = "Proxy server that can tunnel among remote servers by regex rules"; + homepage = "https://github.com/qwj/python-proxy"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/protego/default.nix b/nixpkgs/pkgs/development/python-modules/protego/default.nix new file mode 100644 index 000000000000..ad7e4aa4af6e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/protego/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, pytest +}: + +buildPythonPackage rec { + pname = "Protego"; + version = "0.1.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "a682771bc7b51b2ff41466460896c1a5a653f9a1e71639ef365a72e66d8734b4"; + }; + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "A pure-Python robots.txt parser with support for modern conventions"; + homepage = "https://github.com/scrapy/protego"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix index c90f81ae28f8..ae2f5ae9d6db 100644 --- a/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "py-cpuinfo"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "workhorsy"; repo = pname; rev = "v${version}"; - sha256 = "1pp561lj80jnvr2038nrzhmks2akxsbdqxvfrqa6n340x81981lm"; + sha256 = "0lxl9n6djaz5h1zrb2jca4qwl41c2plxy8chr7yhcxnzg0srddqi"; }; checkInputs = [ @@ -27,7 +27,14 @@ buildPythonPackage rec { meta = { description = "Get CPU info with pure Python 2 & 3"; - homepage = https://github.com/workhorsy/py-cpuinfo; + longDescription = '' + Py-cpuinfo gets CPU info with pure Python and should work without any + extra programs or libraries, beyond what your OS provides. It does not + require any compilation (C/C++, assembly, etc.) to use and works with + Python 2 and 3. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 9ce934c84676..4939cd18e43a 100644 --- a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/nixpkgs/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; diff --git a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index e6be92c0efb5..a37872d90945 100644 --- a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -11,6 +11,7 @@ , gdk-pixbuf , fontconfig , freetype +, ffmpeg-full }: buildPythonPackage rec { @@ -52,6 +53,8 @@ buildPythonPackage rec { path = '${fontconfig.lib}/lib/libfontconfig${ext}' elif name == 'freetype': path = '${freetype}/lib/libfreetype${ext}' + elif name[0:2] == 'av' or name[0:2] == 'sw': + path = '${ffmpeg-full}/lib/lib' + name + '${ext}' if path is not None: return ctypes.cdll.LoadLibrary(path) raise Exception("Could not load library {}".format(names)) diff --git a/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix b/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix index e409282980d6..b40305c0dce2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyhcl"; - version = "0.4.0"; + version = "0.4.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "virtuald"; repo = pname; rev = version; - sha256 = "09kwm3digbwn3kmbk76jswxgwfcfchik6cfa2xbhjanh4xs893hs"; + sha256 = "13nszg2plfvza3syki1rxnx3k3h90qq4wkgv86l1xpz31k3pf6k4"; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 diff --git a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix deleted file mode 100644 index 26a91a313ee4..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, fetchFromBitbucket -, isPy3k -, pkgs -, python -}: - -buildPythonPackage rec { - pname = "pyhepmc"; - version = "1.0.1"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1210fd7e20d4abc1d9166147a9f7645a2a58b655fe030ad54ab3ea0d0c6e0834"; - }; - - srcMissing = fetchFromBitbucket { - owner = "andybuckley"; - repo = "pyhepmc"; - rev = "pyhepmc-1.0.0"; - sha256 = "0vxad143pz45q94w5p0dycpk24insdsv1m5k867y56xy24bi0d4w"; - }; - - prePatch = '' - cp -r $srcMissing/hepmc . - chmod +w hepmc - ''; - - patches = [ - # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff - ./pyhepmc_export_edges.patch - # add bindings to Flow class - ./pyhepmc_export_flow.patch - ]; - - # regenerate python wrapper - preConfigure = '' - swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i - ''; - - nativeBuildInputs = [ pkgs.swig ]; - buildInputs = [ pkgs.hepmc2 ]; - - HEPMCPATH = pkgs.hepmc2; - - checkPhase = '' - ${python.interpreter} test/test1.py - ''; - - meta = with stdenv.lib; { - description = "A simple wrapper on the main classes of the HepMC event simulation representation, making it possible to create, read and manipulate HepMC events from Python code"; - license = licenses.gpl2; - maintainers = with maintainers; [ veprbl ]; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch b/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch deleted file mode 100644 index 5c6e56566a34..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch +++ /dev/null @@ -1,204 +0,0 @@ -# HG changeset patch -# User Lukas Heinrich <lukas.heinrich@gmail.com> -# Date 1430606843 14400 -# Node ID 325f89b7b72922e9add9ca9dd0f7ca4a6c83bf00 -# Parent e4fd953257e0d38511f2177de7ffaef662358af2 -add incoming/outgoing generators for GenVertex - -diff --git a/hepmc/generators.i b/hepmc/generators.i -new file mode 100644 ---- /dev/null -+++ b/hepmc/generators.i -@@ -0,0 +1,171 @@ -+/*! -+ * \file generators.i -+ * \author Seth R. Johnson -+ * \brief Define generator/iterator for any type -+ -+Example: -+\code -+ SETUP_GENERATOR( std::vector<Cell>::const_iterator ) -+ ADD_GENERATOR( Mesh, cells, -+ std::vector<Cell>::const_iterator, Cell, beginCells, endCells) -+\endcode -+would be a method to add a \c cells generator method method to the Python class -+\c Mesh, when the C++ class \c Mesh has a \c std::vector<Cell> accessed through -+methods \c beginCells and \c endCells. -+ -+The macro \c ADD_GENERATOR_P would be if the underlying storage were \c -+std::vector<Cell*> instead. -+ -+Alternatively, for containers of regular objects that provide \c begin(), \c end(), and \c const_iterator, you can use the \c ADD_CONTAINER_ITERATOR macro: -+\code -+ADD_CONTAINER_ITERATOR( QuadratureSet ) -+\endcode -+ -+\section License -+ -+Copyright (c) 2010, Seth R. Johnson -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are met: -+ * Redistributions of source code must retain the above copyright notice, this -+ list of conditions and the following disclaimer. -+ * Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ * Neither the name of the this project nor the names of its contributors -+ may be used to endorse or promote products derived from this software -+ without specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+ This material is based upon work supported under a National Science -+ Foundation Graduate Research Fellowship. Any opinions, findings, conclusions -+ or recommendations expressed in this publication are those of the author -+ and do not necessarily reflect the views of the National Science -+ Foundation. -+*/ -+#ifndef tools_SWIG_generators_i -+#define tools_SWIG_generators_i -+/*----------------------------------------------------------------------------*/ -+ -+// Add a Python class to provide iterator objects -+%insert("python") %{ -+class GenericIterator: -+ def __init__(self, begin_iter_method, deref_method, incr_method): -+ self.it = begin_iter_method() -+ self.incr = incr_method -+ self.deref = deref_method -+ -+ def __iter__(self): -+ return self -+ -+ def next(self): -+ obj = self.deref( self.it ) -+ if obj is not None: -+ self.incr( self.it ) -+ return obj -+ else: -+ raise StopIteration -+%} -+ -+//============== GENERIC GENERATOR/ITERATOR WRAPPER SUPPORT ============ -+//! Thin wrapper for incrementing a certain type of iterator -+// only need to define once per iterator type, and we can use the same name -+// thanks to overloading (even though this may decrease efficiency) -+%define SETUP_GENERATOR( ITERATOR... ) -+%inline %{ -+void _iter_incr( ITERATOR* iter ) -+{ -+ ++(*iter); -+} -+%} -+%enddef -+ -+/*----------------------------------------------------------------------------*/ -+// Internal method for adding common parts of the generator -+%define PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) -+ %extend CLASS { -+%insert("python") %{ -+ def PYMETHOD(self): -+ "Returns an iterator for PYMETHOD." -+ return GenericIterator( -+ self._begin_ ## PYMETHOD, -+ self._deref_ ## PYMETHOD, -+ _iter_incr -+ ) -+%} -+// get the first element in the vector -+ITERATOR* _begin_ ## PYMETHOD() -+{ -+ return new ITERATOR( ($self)->CBEGIN() ); -+} -+ } -+%enddef -+/*----------------------------------------------------------------------------*/ -+// If the dereferenced iterator is an object -+%define ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND ) -+ -+// add the python and begin method -+PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) -+ -+ %extend CLASS { -+//! Dereference the iterator; return NULL if at the end -+const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter ) -+{ -+ // if at the end, return NULL -+ if (*iter == ($self)->CEND() ) { -+ return NULL; -+ } -+ // otherwise, return the POINTER to the dereferenced iterator -+ return &(**iter); -+} -+ } -+%enddef -+/*----------------------------------------------------------------------------*/ -+// If the dereferenced iterator is a pointer -+%define ADD_GENERATOR_P( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND ) -+ -+// add the python and begin method -+PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) -+ -+ %extend CLASS { -+//! Dereference the iterator; return NULL if at the end -+const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter ) -+{ -+ // if at the end, return NULL -+ if (*iter == ($self)->CEND() ) { -+ return NULL; -+ } -+ // otherwise, return the dereferenced iterator (a pointer) -+ return **iter; -+} -+ } -+%enddef -+/*----------------------------------------------------------------------------*/ -+//! For a regular container with "begin" and "end" and "size" -+%define ADD_CONTAINER_ITERATOR( CLASS ) -+ SETUP_GENERATOR( CLASS::const_iterator ); -+ ADD_GENERATOR( CLASS, __iter__, -+ CLASS ## ::const_iterator, CLASS ## ::value_type, -+ begin, end) -+ %extend CLASS { -+ %insert("python") %{ -+ def __len__(self): -+ return self.size() -+ %} -+ } -+%enddef -+ -+/*============================================================================*/ -+#endif -+ -diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i ---- a/hepmc/hepmcwrap.i -+++ b/hepmc/hepmcwrap.i -@@ -1,5 +1,7 @@ - %module hepmcwrap - -+%include generators.i -+ - %{ - #include "HepMC/GenEvent.h" - #include "HepMC/GenVertex.h" -@@ -251,3 +253,9 @@ - return ss.str(); - } - } -+ -+SETUP_GENERATOR( std::vector< HepMC::GenParticle* >::const_iterator ) -+ADD_GENERATOR_P( HepMC::GenVertex, incoming, -+std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_in_const_begin, particles_in_const_end) -+ADD_GENERATOR_P( HepMC::GenVertex, outgoing, -+std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_out_const_begin, particles_out_const_end) diff --git a/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch b/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch deleted file mode 100644 index 85e26a1a1607..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i -index cf35c1b..b94fbe2 100644 ---- a/hepmc/hepmcwrap.i -+++ b/hepmc/hepmcwrap.i -@@ -1,6 +1,7 @@ - %module hepmcwrap - - %{ -+ #include "HepMC/Flow.h" - #include "HepMC/GenEvent.h" - #include "HepMC/GenVertex.h" - #include "HepMC/GenParticle.h" -@@ -93,6 +94,7 @@ namespace HepMC { - // headers before importing headers that use those classes. - // Result is that headers should probably be %included in an order - // which sees "contents before containers" -+%include "HepMC/Flow.h" - %include "HepMC/HepMCDefs.h" - %include "HepMC/SimpleVector.h" - // #ifdef HEPMC_HAS_ITERATOR_RANGES diff --git a/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index ef47699053cb..8530e6f8543d 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.0.13"; + version = "2.0.14"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "16xfn8zs5khdfh5pdsv3wjjhywzc1qhx7mxi5kpbcvmd6an9qi7s"; + sha256 = "07fkwb4phfr71dpajnq6l64phjxvljx2nf8ibs12n9gwjdvm9i52"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index b909886ddb5b..d47ea812ca8f 100644 --- a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.3"; + version = "2.4.6"; src = fetchPypi { inherit pname version; - sha256 = "332d3d0291b4482641a5b3cd97e879817f50eb9c2b2ddcc30d51d619bad01b51"; + sha256 = "1c8bxbm18h4idfdxqgklcz4n5bgsyl9y14gl9314fpflwa2c7ds8"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymetno/default.nix b/nixpkgs/pkgs/development/python-modules/pymetno/default.nix new file mode 100644 index 000000000000..129ec21e05ce --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pymetno/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, async-timeout +, pytz +, xmltodict +}: + +buildPythonPackage rec { + pname = "PyMetno"; + version = "0.5.0"; + + src = fetchFromGitHub { + repo = pname; + owner = "Danielhiversen"; + rev = version; + sha256 = "00v2r3nn48svni9rbmbf0a4ylgfcf93gk2wg7qnm1fv1qrkgscvg"; + }; + + propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ]; + + pythonImportsCheck = [ "metno"]; + + meta = with stdenv.lib; { + description = "A library to communicate with the met.no api"; + homepage = "https://github.com/Danielhiversen/pyMetno/"; + license = licenses.mit; + maintainers = with maintainers; [ flyfloh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pymumble/default.nix b/nixpkgs/pkgs/development/python-modules/pymumble/default.nix new file mode 100644 index 000000000000..6e72309a58d3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pymumble/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, + fetchFromGitHub, + isPy27, + lib, + opuslib, + protobuf, +}: + +buildPythonPackage rec { + pname = "pymumble"; + version = "0.3.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "azlux"; + repo = "pymumble"; + rev = "1dd6d6d4df2fdef33202f17e2acf3ba9678a5737"; + sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz"; + }; + + propagatedBuildInputs = [ opuslib protobuf ]; + + pythonImportsCheck = [ "pymumble_py3" ]; + + meta = with lib; { + description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot."; + homepage = "https://github.com/azlux/pymumble"; + license = licenses.gpl3; + maintainers = with maintainers; [ thelegy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index 7cd504dec810..a3286b31461e 100644 --- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.11"; + version = "1.16.12"; src = fetchPypi { inherit pname version; - sha256 = "006m31qvvdwbpmxnhj1gs7rpd1jb214mf2hacqmisryx8dnb2jm7"; + sha256 = "0mywnhn8ylm9xy23yfgnxiq4akk1rq3n7bl1m7pw6imsgbdhzrwg"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyproj/001.proj.patch b/nixpkgs/pkgs/development/python-modules/pyproj/001.proj.patch index b024c28156c1..52e0a80f739d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyproj/001.proj.patch +++ b/nixpkgs/pkgs/development/python-modules/pyproj/001.proj.patch @@ -1,47 +1,62 @@ -diff a/pyproj/datadir.py b/pyproj/datadir.py ---- a/pyproj/datadir.py -+++ b/pyproj/datadir.py -@@ -52,6 +52,7 @@ def get_data_dir(): - str: The valid data directory. - - """ -+ return "@proj@/share/proj" - # to avoid re-validating - global _VALIDATED_PROJ_DATA +diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py +--- a/pyproj/datadir.py 2020-03-24 12:53:39.417440608 +0100 ++++ b/pyproj/datadir.py 2020-03-24 12:56:19.870089479 +0100 +@@ -66,9 +66,7 @@ if _VALIDATED_PROJ_DATA is not None: -diff a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -16,7 +16,7 @@ INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ - + return _VALIDATED_PROJ_DATA + global _USER_PROJ_DATA +- internal_datadir = os.path.join( +- os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj" +- ) ++ internal_datadir = "@proj@/share/proj" + proj_lib_dirs = os.environ.get("PROJ_LIB", "") + prefix_datadir = os.path.join(sys.prefix, "share", "proj") + +diff -Nur a/setup.py b/setup.py +--- a/setup.py 2020-03-24 12:53:39.415440624 +0100 ++++ b/setup.py 2020-03-24 12:52:05.311232522 +0100 +@@ -11,7 +11,7 @@ + PROJ_MIN_VERSION = parse_version("6.2.0") + CURRENT_FILE_PATH = os.path.dirname(os.path.abspath(__file__)) + BASE_INTERNAL_PROJ_DIR = "proj_dir" +-INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ_DIR) ++INTERNAL_PROJ_DIR = "@proj@" + + def check_proj_version(proj_dir): - """checks that the PROJ library meets the minimum version""" -- proj = os.path.join(proj_dir, "bin", "proj") -+ proj = "@proj@/bin/proj" - proj_ver_bytes = subprocess.check_output(proj, stderr=subprocess.STDOUT) - proj_ver_bytes = (proj_ver_bytes.decode("ascii").split()[1]).strip(",") - proj_version = parse_version(proj_ver_bytes) -@@ -33,6 +33,7 @@ def get_proj_dir(): - """ - This function finds the base PROJ directory. - """ -+ return "@proj@" - proj_dir = os.environ.get("PROJ_DIR") - if proj_dir is None and os.path.exists(INTERNAL_PROJ_DIR): - proj_dir = INTERNAL_PROJ_DIR -@@ -56,6 +57,7 @@ def get_proj_libdirs(proj_dir): - """ - This function finds the library directories - """ -+ return ["@proj@/lib"] - proj_libdir = os.environ.get("PROJ_LIBDIR") - libdirs = [] - if proj_libdir is None: -@@ -77,6 +79,7 @@ def get_proj_incdirs(proj_dir): - """ - This function finds the include directories - """ -+ return ["@proj@/include"] - proj_incdir = os.environ.get("PROJ_INCDIR") - incdirs = [] - if proj_incdir is None: +@@ -146,7 +146,7 @@ + # By default we'll try to get options PROJ_DIR or the local version of proj + proj_dir = get_proj_dir() + library_dirs = get_proj_libdirs(proj_dir) +- include_dirs = get_proj_incdirs(proj_dir) ++ include_dirs = get_proj_incdirs("@projdev@") + + # setup extension options + ext_options = { +diff -Nur a/test/conftest.py b/test/conftest.py +--- a/test/conftest.py 2020-03-24 12:53:39.417440608 +0100 ++++ b/test/conftest.py 2020-03-24 23:16:47.373972786 +0100 +@@ -1,6 +1,7 @@ + import os + import shutil + import tempfile ++import stat + + import pytest + +@@ -17,6 +18,15 @@ + with tempfile.TemporaryDirectory() as tmpdir: + tmp_data_dir = os.path.join(tmpdir, "proj") + shutil.copytree(data_dir, tmp_data_dir) ++ ++ # Data copied from the nix store is readonly (causes cleanup problem). ++ # Make it writable. ++ for r, d, files in os.walk(tmp_data_dir): ++ os.chmod(r, os.stat(r).st_mode | stat.S_IWUSR) ++ for f in files: ++ fpath = os.path.join(r, f) ++ os.chmod(fpath, os.stat(fpath).st_mode | stat.S_IWUSR) ++ + try: + os.remove(os.path.join(str(tmp_data_dir), "ntv2_0.gsb")) + except OSError: diff --git a/nixpkgs/pkgs/development/python-modules/pyproj/default.nix b/nixpkgs/pkgs/development/python-modules/pyproj/default.nix index 0f2763faf609..b23cb010f017 100644 --- a/nixpkgs/pkgs/development/python-modules/pyproj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyproj/default.nix @@ -1,20 +1,22 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, substituteAll +{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, isPy27, substituteAll , aenum , cython , pytest , mock , numpy +, shapely }: buildPythonPackage rec { pname = "pyproj"; - version = "2.2.2"; + version = "2.6.0"; + disabled = isPy27; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = "v${version}rel"; - sha256 = "0mb0jczgqh3sma69k7237i38h09gxgmvmddls9hpw4f3131f5ax7"; + sha256 = "0fyggkbr3kp8mlq4c0r8sl5ah58bdg2mj4kzql9p3qyrkcdlgixh"; }; # force pyproj to use ${pkgs.proj} @@ -22,13 +24,14 @@ buildPythonPackage rec { (substituteAll { src = ./001.proj.patch; proj = pkgs.proj; + projdev = pkgs.proj.dev; }) ]; buildInputs = [ cython pkgs.proj ]; propagatedBuildInputs = [ - numpy + numpy shapely ] ++ lib.optional (pythonOlder "3.6") aenum; checkInputs = [ pytest mock ]; @@ -38,6 +41,9 @@ buildPythonPackage rec { checkPhase = '' pytest . -k 'not alternative_grid_name \ and not transform_wgs84_to_alaska \ + and not transformer_group__unavailable \ + and not transform_group__missing_best \ + and not datum \ and not repr' \ --ignore=test/test_doctest_wrapper.py \ --ignore=test/test_datadir.py diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index e13472dafb4f..76007b83588e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.9"; + version = "0.5.10"; src = fetchPypi { inherit pname version; - sha256 = "1dymaa3rif05k42sh4c3g2m057v2dsc2f3f49hl2rw5yz8bd23i4"; + sha256 = "0akls1w67v17dmgr07n6rr5xy6yyj6p83ss05033gk1c3mfsbb1r"; }; # requires root priviledges @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Netlink library"; - homepage = https://github.com/svinota/pyroute2; + homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; maintainers = [maintainers.mic92]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix deleted file mode 100644 index b9ac354abfd7..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix new file mode 100644 index 000000000000..6847c5e05d4e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, pytest, pytest-metadata, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-html"; + version = "2.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "14cy5iixi6i8i5r5xvvkhwk48zgxnb1ypbp0g1343mwfdihshic6"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest pytest-metadata ]; + + meta = with stdenv.lib; { + description = "Plugin for generating HTML reports"; + homepage = "https://github.com/pytest-dev/pytest-html"; + license = licenses.mpl20; + maintainers = with maintainers; [ mpoquet ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix new file mode 100644 index 000000000000..369ddf2c4767 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-metadata"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fk6icip2x1nh4kzhbc8cnqrs77avpqvj7ny3xadfh6yhn9aaw90"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Plugin for accessing test session metadata"; + homepage = "https://github.com/pytest-dev/pytest-metadata"; + license = licenses.mpl20; + maintainers = with maintainers; [ mpoquet ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix new file mode 100644 index 000000000000..6bdf1089d5d5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, greenlet +, pytest +, decorator +}: + +buildPythonPackage rec { + pname = "pytest-twisted"; + version = "1.12"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "bb9af117c5c6063d9ef20ffdf2fa297caaf57de5a687e4d3607db7b0a6f74fea"; + }; + + propagatedBuildInputs = [ greenlet pytest decorator ]; + + meta = with lib; { + description = "A twisted plugin for py.test"; + homepage = "https://github.com/pytest-dev/pytest-twisted"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix index 74eadd9b2de3..c8bb1b5fa6f8 100644 --- a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.31.8"; + version = "0.31.9"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "sha256:1h0w7x7d9g3z7vmxn5w7qxdkjya3sl0xfnklfaaaj8dkb5mjldpi"; + sha256 = "06hd6a1hhd57hrq4vbwfs0saplkhsrz2krv8kq9kw4fz4hx7zj74"; }; # The tests require all the providers, disable otherwise. @@ -53,8 +53,7 @@ buildPythonPackage rec { "test_pandas_completions" "test_matplotlib_completions" "test_snippet_parsing" - - ]; + ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; # checkPhase = '' # HOME=$TEMPDIR pytest -k "not test_pyqt_completion and not # ''; diff --git a/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 8b46b105d69a..9f9818350bf2 100644 --- a/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix b/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix index 556be12872b5..39153f4a4daa 100644 --- a/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.12"; + version = "1.13"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "19fb5asv0ngnbpiz1bqzq2jhgn845kv9hjcjajsgzgfp2k24f4sc"; + sha256 = "0q4128rjdgavywhzlm2gz2n5ybc9b9sxs81g50dvxf5q7z9q63qj"; }; checkInputs = [ nose ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://arthurdejong.org/python-stdnum/; + homepage = "https://arthurdejong.org/python-stdnum/"; description = "Python module to handle standardized numbers and codes"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix new file mode 100644 index 000000000000..e4b4d87c11b2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -0,0 +1,99 @@ +{ 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 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix new file mode 100644 index 000000000000..2d6d02b5ad43 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -0,0 +1,65 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, arrow +, nest-asyncio +, qiskit-terra +, requests +, requests_ntlm +, websockets + # check inputs +, pytestCheckHook +, vcrpy +, pproxy +}: + +buildPythonPackage rec { + pname = "qiskit-ibmq-provider"; + version = "0.5.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + sha256 = "1jhgsfspmry0qk7jkcryn4225j2azys3rm99agk6mh0jzwrvx4am"; + }; + + propagatedBuildInputs = [ + arrow + nest-asyncio + qiskit-terra + requests + requests_ntlm + websockets + ]; + + # 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 vcrpy pproxy ]; + dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ "qiskit.providers.ibmq" ]; + disabledTests = [ "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" ]; # tests require internet connection + # skip tests that require IBMQ credentials, vs failing. + preCheck = '' + pushd /build/source # run pytest from /build vs $out + substituteInPlace test/decorators.py --replace "Exception('Could not locate valid credentials.')" "SkipTest('No IBMQ Credentials provided for tests')" + ''; + postCheck = '' + popd + ''; + + 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/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/nixpkgs/pkgs/development/python-modules/quandl/default.nix index bd73a0213310..2d78b626092d 100644 --- a/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix index 66340f917704..6bcc05fb34d6 100644 --- a/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -1,12 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: 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 ]; @@ -17,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/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 851a58584c66..613e7af7d3a1 100644 --- a/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -1,6 +1,7 @@ { lib , python , buildPythonPackage +, fetchpatch , fetchPypi , isPyPy , R @@ -24,13 +25,13 @@ }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.2.6"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "0pnk363klic4smb3jnkm4lnh984c2cpqzawrg2j52hgy8k1bgyrk"; + sha256 = "1p990cqx3p2pd1rc9wn66m56wahaq8dlr88frz49vb7nv4zw4a8q"; }; buildInputs = [ @@ -68,6 +69,14 @@ buildPythonPackage rec { # R_LIBS_SITE is used by the nix r package to point to the installed R libraries. # This patch sets R_LIBS_SITE when rpy2 is imported. ./rpy2-3.x-r-libs-site.patch + + # pandas 1.x compatibility, already merged upstream + # https://github.com/rpy2/rpy2/issues/636 + (fetchpatch { + name = "pandas-1.x.patch"; + url = "https://github.com/rpy2/rpy2/commit/fbd060e364b70012e8d26cc74df04ee53f769379.patch"; + sha256 = "19rdqydwjmqg25ibmsbx7lggrr9fsyjn283zgvz1wj4iyfjwp1za"; + }) ]; postPatch = '' substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE" diff --git a/nixpkgs/pkgs/development/python-modules/rq/default.nix b/nixpkgs/pkgs/development/python-modules/rq/default.nix index 0fe7a942245b..9f57fb486d91 100644 --- a/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rq"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0dk664lzjhj0rk4ffpv29mbcr7vh41ph1sx7ngszk3744gh1nshp"; + sha256 = "0xr38j35iqmhx0f2l8ix34vjs9flpqv2y17k33crh7rhm6gi9ja9"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix index 8d459e249848..745723a01bc7 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 8fee4b6631ab..05c0c43c15c7 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -1,13 +1,60 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore, - testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, - service-identity, parsel, pydispatcher, cssselect, lib }: +{ stdenv +, buildPythonPackage +, isPy27 +, fetchPypi +, glibcLocales +, pytest +, testfixtures +, pillow +, twisted +, cryptography +, w3lib +, lxml +, queuelib +, pyopenssl +, service-identity +, parsel +, pydispatcher +, cssselect +, zope_interface +, protego +, lib +, jmespath +, sybil +, pytest-twisted +, botocore +}: + buildPythonPackage rec { - version = "1.8.0"; + version = "2.0.1"; pname = "Scrapy"; - checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; + disabled = isPy27; + + checkInputs = [ + glibcLocales + jmespath + pytest + sybil + testfixtures + pillow + pytest-twisted + botocore + ]; + propagatedBuildInputs = [ - six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher + twisted + cryptography + cssselect + lxml + parsel + pydispatcher + pyopenssl + queuelib + service-identity + w3lib + zope_interface + protego ]; patches = [ @@ -18,20 +65,20 @@ buildPythonPackage rec { ./permissions-fix.patch ]; - LC_ALL="en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; # Disable doctest plugin—enabled in the shipped pytest.ini—because it causes pytest to hang # Ignore proxy tests because requires mitmproxy # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean" # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396 checkPhase = '' - substituteInPlace pytest.ini --replace "addopts = --doctest-modules" "addopts =" + substituteInPlace pytest.ini --replace "--doctest-modules" "" pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} ''; src = fetchPypi { inherit pname version; - sha256 = "fe06576f9a4971de9dc0175c60fd92561e8275f2bad585c1cb5d65c5181b2db0"; + sha256 = "85581a01f4160a103ca9906ffa4e44474f4ecd1685f0934728892c58ebf111f6"; }; postInstall = '' @@ -42,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = https://scrapy.org/; + homepage = "https://scrapy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ drewkett marsam ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/nixpkgs/pkgs/development/python-modules/shodan/default.nix index 0c88dcd0fe20..4db1172e0410 100644 --- a/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.21.3"; + version = "1.22.0"; src = fetchPypi { inherit pname version; - sha256 = "1mbqdk3jdga4r08dg66j7kawmb40rs0y3nnwb9vh3c1safgqjmiz"; + sha256 = "0pgkd0pngmygafld283zfx7whlv6yp3ldgd4sjv8bxjcsb19iw59"; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and command-line utility for Shodan"; - homepage = https://github.com/achillean/shodan-python; + homepage = "https://github.com/achillean/shodan-python"; license = licenses.mit; maintainers = with maintainers; [ lihop ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 84e92fa9f7c7..1d83edbc7229 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.0"; + version = "2.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1d3qxjqc79fi2l4sns5svbc6kfaihivsrpycflmh50h7x0k9sv7f"; + sha256 = "1qqlqypxj3j5qz8jjzil7250alf0w4bx8k8ndyj2ymp8kq2z1v0j"; }; propagatedBuildInputs = [ @@ -55,6 +55,11 @@ buildPythonPackage rec { urllib3 ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'cffi>=1.9,<1.14'," "'cffi~=1.9'," + ''; + # tests are not working # XXX: fix the tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/spacy/models.json b/nixpkgs/pkgs/development/python-modules/spacy/models.json index 4d7eff7fd025..1f1558b23c39 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/models.json +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 58b24f0dd73e..a60a36413ac1 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2a5883456c0caba0dad90f07968c75a50d5fc425a3aa06d1c538472ddf8c7e22"; + sha256 = "02pkzcmxikcfvkvcfsclnhymzl1lc84jz6vmdaslbgh4j5vlp5ym"; }; propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ikalnytskyi/sphinxcontrib-openapi; + homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi"; description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; license = licenses.bsd0; }; diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix new file mode 100644 index 000000000000..c4a61520333e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix @@ -0,0 +1,72 @@ +{ + lib + , buildPythonPackage + , fetchFromGitHub + , cloudpickle + , ipykernel + , wurlitzer + , jupyter_client + , pyzmq + , numpy + , pandas + , scipy + , matplotlib + , xarray + , pytest + , flaky + , isPy3k +}: + +buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = "spyder-kernels"; + rev = "v0.5.2"; + sha256 = "1yan589g0470y61bcyjy3wj13i94ndyffckqdyrg97vw2qhfrisb"; + }; + + # requirement xarray not available on Py2k + disabled = !isPy3k; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + jupyter_client + pyzmq + ]; + + checkInputs = [ + numpy + pandas + scipy + matplotlib + xarray + pytest + flaky + ]; + + # skipped tests: + # turtle requires graphics + # cython test fails, I don't think this can ever access cython? + # umr pathlist test assumes standard directories, not compatible with nix + checkPhase = '' + export JUPYTER_RUNTIME_DIR=$(mktemp -d) + pytest -x -vv -k '\ + not test_turtle_launch \ + and not test_umr_skip_cython \ + and not test_umr_pathlist' \ + -W 'ignore::DeprecationWarning' \ + spyder_kernels + ''; + + meta = with lib; { + description = "Jupyter kernels for Spyder's console"; + homepage = "https://github.com/spyder-ide/spyder-kernels"; + license = licenses.mit; + maintainers = with maintainers; [ gebner marcus7070 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/2.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/2.nix deleted file mode 100644 index 86daec23d954..000000000000 --- a/nixpkgs/pkgs/development/python-modules/spyder-kernels/2.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, - jupyter_client, pyzmq }: - -buildPythonPackage rec { - pname = "spyder-kernels"; - version = "0.5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7"; - }; - - propagatedBuildInputs = [ - cloudpickle - ipykernel - wurlitzer - jupyter_client - pyzmq - ]; - - # No tests - doCheck = false; - - meta = with stdenv.lib; { - description = "Jupyter kernels for Spyder's console"; - homepage = "https://github.com/spyder-ide/spyder-kernels"; - license = licenses.mit; - maintainers = with maintainers; [ gebner ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index f4d57ce579e7..1f9455c8087d 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a782fc5961a9dd48d520ddc1c868b960d54b8edb1116c21fc2e3c347fe5a4474"; + sha256 = "1sqjagabqccrc73a423smfjmiph7lfjzj26r6hn3j3vf3drm3rpj"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/2.nix b/nixpkgs/pkgs/development/python-modules/spyder/3.nix index b707d4a0abc1..7987775cee1d 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/2.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/3.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels, qtpy, pyzmq, chardet + spyder-kernels_0_5, qtpy, pyzmq, chardet , pyqtwebengine }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine ]; diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix index 65fabc6c7bc4..283c9b33f34e 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, intervaltree, jedi, pycodestyle, +{ stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server -, pyqtwebengine +, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch }: buildPythonPackage rec { pname = "spyder"; - version = "4.0.1"; + version = "4.1.1"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4b279c16487d224368dd2213e1517185fa59fc528f539601fffb34ea97accb7b"; + sha256 = "13ajjifyf7w895vpl0h9r59m73zisby81xjw2c5pk49fh5l6ycs9"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -20,6 +22,7 @@ buildPythonPackage rec { intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server + atomicwrites pyxdg diff-match-patch ]; # There is no test for spyder @@ -42,8 +45,12 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; - # Create desktop item postInstall = '' + # add Python libs to env so Spyder subprocesses + # created to run compute kernels don't fail with ImportErrors + wrapProgram $out/bin/spyder3 --prefix PYTHONPATH : "$PYTHONPATH" + + # Create desktop item mkdir -p $out/share/icons cp spyder/images/spyder.svg $out/share/icons cp -r $desktopItem/share/applications/ $out/share @@ -66,6 +73,5 @@ buildPythonPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/nixpkgs/pkgs/development/python-modules/sybil/default.nix index 8b1677a7b843..cf30b4546cdc 100644 --- a/nixpkgs/pkgs/development/python-modules/sybil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sybil/default.nix @@ -1,31 +1,28 @@ -{ stdenv, buildPythonApplication, fetchPypi, fetchpatch -, pytest, nose }: +{ lib +, buildPythonApplication +, fetchPypi +, pytest +, nose +}: buildPythonApplication rec { - pname = "sybil"; - version = "1.0.9"; + pname = "sybil"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "41d2f1dba8fd1d8ead5e9b1220b590fab8b0d1ca01d43da08555b1fb08d4d8e8"; + sha256 = "dd84e68facfcb778298ef50a4d7446d4d9092e9d8596012b12bcb82858fd10e1"; }; - patches = [ - (fetchpatch { - url = https://github.com/cjw296/sybil/commit/6461d8156cfb68bd073ec613a5a516916e97e549.patch; - sha256 = "0aqny0i7l6g6d7vr025b90zz8wzszqdbmi05mp67dxw5xqjqvxj2"; - }) - ]; - checkInputs = [ pytest nose ]; checkPhase = '' py.test tests ''; - meta = with stdenv.lib; { - description = "Automated testing for the examples in your documentation."; - homepage = https://github.com/cjw296/sybil/; - license = licenses.mit; + meta = with lib; { + description = "Automated testing for the examples in your documentation"; + homepage = "https://github.com/cjw296/sybil"; + license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index ed685bc0c485..7c80452b20fd 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin , addOpenGLRunpath # Python deps -, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python +, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python # Python libraries , numpy, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta @@ -348,6 +348,7 @@ let in buildPythonPackage { inherit version pname; + disabled = isPy27 || (pythonAtLeast "3.8"); src = bazel-build.python; diff --git a/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix b/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix index 2d4f9d10a8cc..df1b02283043 100644 --- a/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/thespian/default.nix b/nixpkgs/pkgs/development/python-modules/thespian/default.nix index 1c59b0cae6b1..add36ccf1b62 100644 --- a/nixpkgs/pkgs/development/python-modules/thespian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.11"; + version = "3.10.0"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "84887f0437ec144f7266ae22678bc5dc5d2a9e60a89f1f7c1707cbea5e03022a"; + sha256 = "0n85nhj5hr8kv33jk4by8hnxm3kni5f4z1jhiw27dlf6cbgsv892"; }; # Do not run the test suite: it takes a long time and uses @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Actor concurrency library"; - homepage = http://thespianpy.com/; + homepage = "http://thespianpy.com/"; license = licenses.mit; maintainers = [ maintainers.kquick ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix index 32c8c64c68c7..d77ca31687fd 100644 --- a/nixpkgs/pkgs/development/python-modules/trackpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "soft-matter"; repo = pname; rev = "v${version}"; - sha256 = "01fdv93f6z16gypmvqnlbjmcih7dmr7a63n5w9swmp11x3if4iyq"; + sha256 = "16mc22z3104fvygky4gy3gvifjijm42db48v2z1y0fmyf6whi9p6"; }; propagatedBuildInputs = [ @@ -54,5 +54,6 @@ buildPythonPackage rec { homepage = https://github.com/soft-matter/trackpy; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + broken = true; # not compatible with latest pandas }; } diff --git a/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/nixpkgs/pkgs/development/python-modules/twisted/default.nix index 5c4fea3f9b1b..2bea54818c24 100644 --- a/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "19.10.0"; + version = "20.3.0"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"; + sha256 = "040yzha6cyshnn6ljgk2birgh6mh2cnra48xp5ina5vfsnsmab6p"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix index d59a0bb8b8a4..db973dbffbed 100644 --- a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix @@ -1,22 +1,22 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi , twisted }: buildPythonPackage rec { - pname = "txamqp"; - version = "0.3"; + pname = "txAMQP"; + version = "0.8.2"; - src = fetchurl { - url = "https://launchpad.net/txamqp/trunk/${version}/+download/python-txamqp_${version}.orig.tar.gz"; - sha256 = "1r2ha0r7g14i4b5figv2spizjrmgfpspdbl1m031lw9px2hhm463"; + src = fetchPypi { + inherit pname version; + sha256 = "0jd9864k3csc06kipiwzjlk9mq4054s8kzk5q1cfnxj8572s4iv4"; }; - buildInputs = [ twisted ]; + propagatedBuildInputs = [ twisted ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/txamqp; + homepage = "https://github.com/txamqp/txamqp"; description = "Library for communicating with AMQP peers and brokers using Twisted"; license = licenses.asl20; maintainers = []; diff --git a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 8e74c6460fe7..e11088048c34 100644 --- a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "02d78242fcd0a58489aaf275964a6cf7581d7a2334ee240d2d547f8aca8607c6"; + sha256 = "1pzgj85c6g8vr3dq215cd1y2pn8pxc6wa7mjd9m0zrglr1qwwhdz"; }; buildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "An AMQP 1.0 client library for Python"; - homepage = https://github.com/Azure/azure-uamqp-python; + homepage = "https://github.com/Azure/azure-uamqp-python"; license = licenses.mit; maintainers = with maintainers; [ mwilsoninsight ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix b/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix index 6b3ca778ead1..e76d1f110296 100644 --- a/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix @@ -1,11 +1,11 @@ -{ buildPythonPackage, django_1_8, waitress }: +{ buildPythonPackage, django, waitress }: buildPythonPackage { pname = "waitress-django"; version = "0.0.0"; src = ./.; - pythonPath = [ django_1_8 waitress ]; + pythonPath = [ django waitress ]; doCheck = false; meta.description = "A waitress WSGI server serving django"; } diff --git a/nixpkgs/pkgs/development/python-modules/wsgitools/default.nix b/nixpkgs/pkgs/development/python-modules/wsgitools/default.nix new file mode 100644 index 000000000000..ab6f06abac65 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/wsgitools/default.nix @@ -0,0 +1,28 @@ +{lib +,buildPythonPackage +,fetchPypi +}: + +buildPythonPackage rec { + pname = "wsgitools"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0q6kmrkqf02fgww7z1g9cw8f70fimdzs1bvv9inb7fsk0c3pcf1i"; + }; + + meta = with lib; { + maintainers = with maintainers; [ clkamp ]; + description = "A set of tools working with WSGI"; + longDescription = '' + wsgitools is a set of tools working with WSGI (see PEP 333). It + includes classes for filtering content, middlewares for caching, + logging and tracebacks as well as two backends for SCGI. Goals + in writing it were portability and simplicity. + ''; + homepage = "https://subdivi.de/~helmut/wsgitools/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/xdg/default.nix b/nixpkgs/pkgs/development/python-modules/xdg/default.nix new file mode 100644 index 000000000000..8b2d73b00fb8 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/nixpkgs/pkgs/development/python-modules/xdis/default.nix index 831dd888fae8..03e91c0cff4f 100644 --- a/nixpkgs/pkgs/development/python-modules/xdis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.2.2"; + version = "4.2.3"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0d286myx6z6cbih77h8z5p9vscxvww3gy59lmi1w6y2nq6c8sqzb"; + sha256 = "0yjb07gk74qsag4ahjrbqgl7pgr2kvm43c7yrv10mwxk0ax51337"; }; checkInputs = [ pytest ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python cross-version byte-code disassembler and marshal routines"; - homepage = https://github.com/rocky/python-xdis/; + homepage = "https://github.com/rocky/python-xdis/"; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix index 8e3f084ca7f0..a1a5e2b4dadc 100644 --- a/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-jQuery"; - version = "3.3.1.1"; + version = "3.4.1.0"; src = fetchPypi { inherit version pname; - sha256 = "0xlgs4rlabzfcp8p2zspwpsljycb0djyrk7qy4qh76i7zkfhwn8j"; + sha256 = "0y2rhbasr7vdjbgi6x67cx97hwdnmv6m5difqqq59yb5n9zark1z"; }; # no tests implemented diff --git a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix index 41b7fb5c5206..cf4f6f7dd146 100644 --- a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zc_buildout ]; checkInputs = [ zope_testrunner ]; + doCheck = !python.pkgs.isPy27; checkPhase = '' ${python.interpreter} -m zope.testrunner --test-path=src [] ''; diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock index c2e4840eab06..70a3afb6e57b 100644 --- a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix index e1ea15fb4e16..a6ec78b74585 100644 --- a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index eba5a2b67149..743ebeef0a84 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -8,7 +8,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "1.7.4"; + version = "2.0.4"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { }; }; in { - ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0d2xjhxrly4cv5fpjv1i0a74ayij7c2x5sb6lsgzxpq7jj0bk1m6"; }; - ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "0hmdizzf8l8i07vdfik24iby39xg1vjfp1cwgjpbcmxv8klf50b0"; }; + ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "068lcdi1y3zcspr0qmppflad7a4kls9gi321rp8dc5qc6f9nnk04"; }; + ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "0fa0q9nk00crr2ws2mmw6pp4vf0xy53bqqhnws524ywwg6zwrl9s"; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index c977a9d20820..9e7b2d5096d0 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.120.1"; + version = "0.121.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0cqwwrml7yaqyd52rqcz64gbm1pc0yj5yhqqqj9vqyil8wif30v3"; + sha256 = "1lx3lfn0blnwpq6iph0x6xcr4nrdhyvfvx6x8qk6axwlmg2swdcy"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index fd5c58985cfb..e64f39a49609 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3"; + sha256 = "1icv56gxpzdjqn37pk3g99vgpljdc77i6k0x601iw2885s7s01n6"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index fc5244f96449..37dc9e51beab 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -110,7 +110,7 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "23963"; + version_commit = "24088"; gittap = "4.3.1"; gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; rev = "4.3.1"; @@ -120,12 +120,12 @@ in { cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "23963"; - gittap = "4.2.1"; - gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; - rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; - version = "2020-01-31"; - sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg"; + version_commit = "24088"; + gittap = "4.3.1"; + gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; + rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; + version = "2020-03-05"; + sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 8f370d2e0aa1..2cc9182cd68c 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -1,21 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "tflint"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1wwdnqb34l0ad6hlvs74acfh0744ir3ssm8wjwpxbsy0sxkrpxcf"; + sha256 = "1j56dadkyg483i2p4i76d4kdkm229yjiyariga96zxp3s4rl0fni"; }; - modSha256 = "1jbnsqa0ga372lhbgfnqvx8pdzrm0b2phzzwll4sgd0k1hzv2aqv"; + modSha256 = "14vgy5lavyp4w16g7wpi9xbni3js541rc3w9qn5ab3khqw5rdhgn"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; subPackages = [ "." ]; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 38fd32f38b65..94ca01faef2c 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -30,11 +30,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.43.0"; + version = "0.44.0"; src = fetchPypi { inherit pname version; - sha256 = "0v852636chil5n4cjqjvh29hhik881pkljs64jy5jiznbrph9ryr"; + sha256 = "0r3m41xjmg8m2jwsqwc9kdkcs3xbz8dsl240ybwbnr7rp29pnirf"; }; # Tests are not included in the PyPI package @@ -50,6 +50,7 @@ buildPythonApplication rec { docker flask idna + jmespath pathlib2 requests serverlessrepo @@ -65,11 +66,9 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ - --replace "requests==2.20.1" "requests==2.22.0" \ --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ - --replace "six~=1.11.0" "six~=1.12.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ - --replace "PyYAML~=3.12" "PyYAML~=5.1" + --replace "tomlkit==0.5.8" "tomlkit~=0.5.8" \ ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 328092feafc5..40741d96f562 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "azure-storage-azcopy"; @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb"; diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 5780cf4382a7..a737ddbb0fb6 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "bazelisk"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index ec1577c51079..9e2fb13b0e7a 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "bear"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ python ]; # just for shebang of bin/bear + buildInputs = [ python3 ]; # just for shebang of bin/bear doCheck = false; # all fail diff --git a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index 59b1b14ac5fa..5990208b645b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -1,5 +1,17 @@ { lib, python3, git, pkgconfig }: +# Note: +# Conan has specific dependency demanands; check +# https://github.com/conan-io/conan/blob/master/conans/requirements.txt +# https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt +# on the release branch/commit we're packaging. +# +# Two approaches are used here to deal with that: +# Pinning the specific versions it wants in `newPython`, +# and using `substituteInPlace conans/requirements.txt ...` +# in `postPatch` to allow newer versions when we know +# (e.g. from changelogs) that they are compatible. + let newPython = python3.override { packageOverrides = self: super: { distro = super.distro.overridePythonAttrs (oldAttrs: rec { @@ -16,20 +28,6 @@ let newPython = python3.override { sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; }; }); - future = super.future.overridePythonAttrs (oldAttrs: rec { - version = "0.16.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; - }; - }); - tqdm = super.tqdm.overridePythonAttrs (oldAttrs: rec { - version = "4.28.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav"; - }; - }); pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec { version = "0.7"; src = oldAttrs.src.override { @@ -41,18 +39,34 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.12.3"; + version = "1.23.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "1cnfy9b57apps4bfai6r67g0mrvgnqa154z9idv0kf93k1nvx53g"; + sha256 = "06jnmgvzdyxjpcmyj1804mlq6b842jvvbsngsamdy976sqws870g"; }; propagatedBuildInputs = with newPython.pkgs; [ - colorama deprecation distro fasteners bottle - future node-semver patch pygments pluginbase - pyjwt pylint pyyaml requests six tqdm + bottle + colorama + dateutil + deprecation + distro + fasteners + future + jinja2 + node-semver + patch-ng + pluginbase + pygments + pyjwt + pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152 + pyyaml + requests + six + tqdm + urllib3 ]; checkInputs = [ @@ -68,15 +82,13 @@ in newPython.pkgs.buildPythonApplication rec { webtest ]); - checkPhase = '' - export HOME=$TMPDIR - pytest conans/test/{utils,unittests} \ - -k 'not SVN and not ToolsNetTest' - ''; + # Conan 1.14.0 has removed all tests from the Pypi source dist: + # https://github.com/conan-io/conan/pull/4713 + # We have recommended they be added back: + # https://github.com/conan-io/conan/issues/4563#issuecomment-602225083 + doCheck = false; postPatch = '' - substituteInPlace conans/requirements_server.txt \ - --replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5" substituteInPlace conans/requirements.txt \ --replace "PyYAML>=3.11, <3.14.0" "PyYAML" ''; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix deleted file mode 100644 index 571df924e1f8..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pythonPackages, isPy3k, pkgs }: - -pythonPackages.buildPythonPackage rec { - name = "beautifulsoup-3.2.1"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; - sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://www.crummy.com/software/BeautifulSoup/; - license = "bsd"; - description = "Undemanding HTML/XML parser"; - }; -} diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index f08a2e563429..ab6f505bff37 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,27 +1,16 @@ -{ stdenv, lib, python27, fetchFromGitHub, mkdocs, which, findutils, coreutils +{ stdenv, lib, python3, fetchFromGitHub, mkdocs, which, findutils, coreutils , perl , doCheck ? true -}: let - - # copy from - # pkgs/applications/networking/pyload/beautifulsoup.nix - beautifulsoup = python27.pkgs.callPackage ./beautifulsoup.nix { - pythonPackages = python27.pkgs; - }; - - mkdocs-exclude = python27.pkgs.callPackage ./mkdocs-exclude.nix { - pythonPackages = python27.pkgs; - }; -in stdenv.mkDerivation rec { +}: stdenv.mkDerivation rec { pname = "redo-apenwarr"; - version = "0.42"; + version = "0.42a"; src = fetchFromGitHub rec { owner = "apenwarr"; repo = "redo"; rev = "${repo}-${version}"; - sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm"; + sha256 = "172z2idslhcqibd4lw82k6349nl5fdda2vj10dqcjz0lvv6n7php"; }; postPatch = '' @@ -60,10 +49,8 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - python27 - beautifulsoup - mkdocs - mkdocs-exclude + python3 + (with python3.pkgs; [ beautifulsoup4 markdown ]) which findutils ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix deleted file mode 100644 index d8c79e33dffb..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pythonPackages, isPy3k, pkgs }: - -pythonPackages.buildPythonPackage rec { - name = "mkdocs-exclude"; - disabled = isPy3k; - - src = pkgs.fetchFromGitHub { - owner = "apenwarr"; - repo = "mkdocs-exclude"; - rev = "fdd67d2685ff706de126e99daeaaaf3f6f7cf3ae"; - sha256 = "1phhl79xf4xq8w2sb2w5zm4bahcr33gsbxkz7dl1dws4qhcbxrfd"; - }; - - buildInputs = with pkgs; [ - mkdocs - ]; - - # error: invalid command 'test' - doCheck = false; -} diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 55e0dc790ed3..6e3335a3c07e 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.14.2"; + version = "1.14.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1475k8h1l8rbbs6hyq9gxksh9884l1674z77fmiyr5vzql5yf7ca"; + sha256 = "055xaczvqxp9qwiki2qw3576mj7qy0zzx90473wx4k7qri4csyrb"; }; outputs = [ "bin" "man" "out" ]; diff --git a/nixpkgs/pkgs/development/tools/conftest/default.nix b/nixpkgs/pkgs/development/tools/conftest/default.nix index ae35170cd193..76e53fd73b2a 100644 --- a/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -1,26 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "conftest"; - version = "0.15.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "0lb644fj80r4igxbslbd5pksirnyf6slz4yn0mznyx8i2bd1g4ic"; + sha256 = "189as930fksyqk3z636gyqdym1bqm522mya7msfnhzpnh46k5jvd"; }; - modSha256 = "1p7fjg1vcrcxb4f5hd00qxx4fqcl051klcjs6ljn4v46qcpn6dcn"; + modSha256 = "0gm08lrlaxc7504mapjdm3c4mwlzybnqxfwkkh6fawzvmd9sqddr"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildFlagsArray = '' -ldflags= -X main.version=${version} ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Write tests against structured configuration data"; - homepage = https://github.com/instrumenta/conftest; + homepage = "https://github.com/instrumenta/conftest"; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index a3df81d26053..c6e4878d52c4 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: -let version = "1.2.1"; -in buildGoModule rec { - inherit version; +buildGoModule rec { pname = "drone-cli"; - revision = "v${version}"; - goPackagePath = "github.com/drone/drone-cli"; + version = "1.2.1"; modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; @@ -16,10 +13,12 @@ in buildGoModule rec { src = fetchFromGitHub { owner = "drone"; repo = "drone-cli"; - rev = revision; + rev = "v${version}"; sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index 05257f65af52..e1f0a8de3b87 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { name = "drone.io-${version}"; @@ -14,6 +14,8 @@ 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/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index e5454796b7e4..4093e7e01728 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, writeText }: +{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }: buildGoModule rec { pname = "fly"; @@ -20,6 +20,8 @@ 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 @@ -28,7 +30,7 @@ buildGoModule rec { install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A command line interface to Concourse CI"; homepage = "https://concourse-ci.org"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 01c6ec0df29e..df1cef6f3f84 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.8.0"; + version = "12.9.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "02k9nzfqlsd78dan522qynbz2i2ggvf960968vmg0wdg6rjv19z2"; + sha256 = "0kd4zc9rgzsl6imk9vi2yqpaxrgy8ywcz2vvpsfzrhhmm2yx3qh0"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "098g6948w8skbz9z5212ndsxvf3k12aijy0v2a7c86r0zhlga52x"; + sha256 = "13xwcvw6m3p5ffas5mr55jkqks9s3f7qg1b928vcxkx57j06kb22"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "17cs7bs3dxkj6r7hip6kv7cj7g5lq9x1g3gcl2kjj8djxzkhfc4m"; + sha256 = "0p9i4z0xsq5rl6gkqjpwpz6hb57vi6wl969gncrsfskjjc1kcifq"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/nixpkgs/pkgs/development/tools/cue/default.nix b/nixpkgs/pkgs/development/tools/cue/default.nix index 98bf5249b626..4950e885e25c 100644 --- a/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/nixpkgs/pkgs/development/tools/cue/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchgit, stdenv }: +{ buildGoModule, fetchgit, stdenv, Security }: buildGoModule rec { pname = "cue"; @@ -12,6 +12,8 @@ buildGoModule rec { modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/cue" ]; buildFlagsArray = [ diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index efc20b6972be..57aa9c654d7f 100644 --- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "dbmate"; @@ -13,6 +13,8 @@ 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; diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix b/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix deleted file mode 100644 index 97bfc10b20af..000000000000 --- a/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; - sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; - sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; - sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "6c771bb9887719704b210e87e934f08be014bdb1"; - sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix index 5d4de99ffdbf..91889e80c044 100644 --- a/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/nixpkgs/pkgs/development/tools/dive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: +{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2, Security }: buildGoModule rec { pname = "dive"; @@ -15,7 +15,8 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index 1bb5c23645d6..e400051e2c66 100644 --- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -29,6 +29,7 @@ , gnumake , gnupg , gnutar +, p7zip , json-glib , libcap , libdwarf @@ -44,16 +45,15 @@ let installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder"; installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; - version = "1.0.9"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - inherit version; + version = "1.0.10"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "00qd770qjsiyd8qhhhyn7zg6jyi283ix5dhjzcfdn9yr3h53kvyn"; + sha256 = "1fn61cl1d33yd1jgqm8jpffjw3xlyyhkn032g14d9gnwkcaf4649"; }; nativeBuildInputs = [ @@ -99,6 +99,7 @@ in stdenv.mkDerivation rec { cpio = "${cpio}/bin/cpio"; git = "${gitMinimal}/bin/git"; rofilesfuse = "${ostree}/bin/rofiles-fuse"; + sevenz = "${p7zip}/bin/7z"; strip = "${binutils}/bin/strip"; eustrip = "${elfutils}/bin/eu-strip"; euelfcompress = "${elfutils}/bin/eu-elfcompress"; @@ -146,8 +147,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to build flatpaks from source"; - homepage = https://flatpak.org/; - license = licenses.lgpl21; + homepage = "https://github.com/flatpak/flatpak-builder"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch index 6b82e623a02c..cc7d9e82b0af 100644 --- a/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -1,6 +1,6 @@ --- a/src/builder-context.c +++ b/src/builder-context.c -@@ -763,7 +763,7 @@ +@@ -800,7 +800,7 @@ builder_context_enable_rofiles (BuilderContext *self, g_autoptr(GFile) rofiles_base = NULL; g_autoptr(GFile) rofiles_dir = NULL; g_autofree char *tmpdir_name = NULL; @@ -11,7 +11,7 @@ (char *)flatpak_file_get_path_cached (self->app_dir), --- a/src/builder-git.c +++ b/src/builder-git.c -@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@ git (GFile *dir, va_list ap; va_start (ap, error); @@ -20,7 +20,7 @@ va_end (ap); return res; -@@ -58,7 +58,7 @@ +@@ -58,7 +58,7 @@ cp (GError **error, va_list ap; va_start (ap, error); @@ -31,7 +31,7 @@ return res; --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c -@@ -430,7 +430,7 @@ +@@ -443,7 +443,7 @@ tar (GFile *dir, va_list ap; va_start (ap, error); @@ -40,7 +40,7 @@ va_end (ap); return res; -@@ -445,7 +445,7 @@ +@@ -458,7 +458,7 @@ unzip (GFile *dir, va_list ap; va_start (ap, error); @@ -49,7 +49,16 @@ va_end (ap); return res; -@@ -457,7 +457,7 @@ +@@ -470,7 +470,7 @@ un7z (GFile *dir, + GError **error) + { + gboolean res; +- const gchar *argv[] = { "7z", "x", sevenz_path, NULL }; ++ const gchar *argv[] = { "@sevenz@", "x", sevenz_path, NULL }; + + res = flatpak_spawnv (dir, NULL, 0, error, argv); + +@@ -483,7 +483,7 @@ unrpm (GFile *dir, GError **error) { gboolean res; @@ -58,7 +67,7 @@ "sh", /* shell's $0 */ rpm_path, /* shell's $1 */ NULL }; -@@ -604,7 +604,7 @@ +@@ -631,7 +631,7 @@ git (GFile *dir, va_list ap; va_start (ap, error); @@ -69,7 +78,7 @@ return res; --- a/src/builder-source-bzr.c +++ b/src/builder-source-bzr.c -@@ -124,7 +124,7 @@ +@@ -124,7 +124,7 @@ bzr (GFile *dir, va_list ap; va_start (ap, error); @@ -80,7 +89,7 @@ return res; --- a/src/builder-source-patch.c +++ b/src/builder-source-patch.c -@@ -215,15 +215,15 @@ +@@ -247,15 +247,15 @@ patch (GFile *dir, args = g_ptr_array_new (); if (use_git) { @@ -101,7 +110,7 @@ g_ptr_array_add (args, (gchar *) extra_options[i]); --- a/src/builder-utils.c +++ b/src/builder-utils.c -@@ -149,7 +149,7 @@ +@@ -149,7 +149,7 @@ strip (GError **error, va_list ap; va_start (ap, error); @@ -110,7 +119,7 @@ va_end (ap); return res; -@@ -163,7 +163,7 @@ +@@ -163,7 +163,7 @@ eu_strip (GError **error, va_list ap; va_start (ap, error); @@ -119,7 +128,7 @@ va_end (ap); return res; -@@ -177,7 +177,7 @@ +@@ -177,7 +177,7 @@ eu_elfcompress (GError **error, va_list ap; va_start (ap, error); diff --git a/nixpkgs/pkgs/development/tools/fmbt/default.nix b/nixpkgs/pkgs/development/tools/fmbt/default.nix index 3100daae389b..71365c01bfdd 100644 --- a/nixpkgs/pkgs/development/tools/fmbt/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/go-tools/default.nix b/nixpkgs/pkgs/development/tools/go-tools/default.nix index 1fd17060bd4f..b047689b81f9 100644 --- a/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -1,6 +1,7 @@ { buildGoModule -, lib +, stdenv , fetchFromGitHub +, Security }: buildGoModule rec { @@ -16,9 +17,11 @@ buildGoModule rec { sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; - meta = with lib; { + meta = with stdenv.lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; homepage = https://staticcheck.io; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/go2nix/default.nix b/nixpkgs/pkgs/development/tools/go2nix/default.nix index 26458a3ca2ef..adf0977c67d4 100644 --- a/nixpkgs/pkgs/development/tools/go2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/go2nix/default.nix @@ -19,7 +19,8 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; - buildInputs = [ go-bindata gotools makeWrapper ]; + nativeBuildInputs = [ go-bindata gotools makeWrapper ]; + preBuild = ''go generate ./...''; postInstall = '' diff --git a/nixpkgs/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix index 56b81f494e15..832d30ee8e87 100644 --- a/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/nixpkgs/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd"; + sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 14311b0c7a51..00858e94bc55 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "golangci-lint"; @@ -14,7 +14,9 @@ buildGoModule rec { modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk"; subPackages = [ "cmd/golangci-lint" ]; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = "https://golangci.com/"; license = licenses.agpl3; diff --git a/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 839c12c04af6..45629338d9ea 100644 --- a/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "0y71qr3ss3hgc8c7nmvpwk946xy1jc5d8whsv6y77wb24ncla7n0"; + sha256 = "1wllcmc2c8ch2ggknhxwgdm6g70ppmxr492kbxvlbwif9p6ms0ci"; }; - modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn"; + modSha256 = "08vil1jb7dpkld59b6qhsfh9cx450vbgfaji7777immzsd1azf4m"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with stdenv.lib; { homepage = "https://github.com/gotestyourself/gotestsum"; diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index 430f17bfb5b0..d46c9a9fb311 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, go, buildGoModule, fetchgit, Security }: buildGoModule rec { pname = "gotools-unstable"; @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish"; }; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # Build of golang.org/x/tools/gopls fails with: # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix index 477a476dfe78..c20f3b9dc124 100644 --- a/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "hcloud"; @@ -15,6 +15,8 @@ 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/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 4dd6c1efc900..b85ae307ee5a 100644 --- a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }: +{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "1.4.4"; + version = "2.0"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "04x4z1013nzjgz9nhs743sphjgg7d3yjn0phxfmxdjzqpff9l133"; + hash = "sha256-+T8U/GwMA46FHd0p6qpklHXb6+HPCbbIbo6s2Y/77RQ="; }; desktopItem = makeDesktopItem { @@ -26,16 +26,11 @@ stdenv.mkDerivation rec { substituteInPlace etc/visualvm.conf \ --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ --replace "/path/to/jdk" "${jdk.home}" \ - --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true ' substituteInPlace platform/lib/nbexec \ --replace /usr/bin/\''${awk} ${gawk}/bin/awk cp -r . $out - - # To get the native LAF, JVM needs to see GTK’s .so-s. - wrapProgram $out/bin/visualvm \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk2 ]}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/kcli/default.nix b/nixpkgs/pkgs/development/tools/kcli/default.nix index bbcb10a354cf..0d42df3b5e4d 100644 --- a/nixpkgs/pkgs/development/tools/kcli/default.nix +++ b/nixpkgs/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kcli"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix index 7c6f3f3396cf..0910c061ee50 100644 --- a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kubeprompt"; @@ -21,6 +21,8 @@ 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/nixpkgs/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix index e60181e9bc4c..ce173e89a2c5 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, tree }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kustomize"; @@ -25,7 +25,9 @@ buildGoModule rec { modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Customization of kubernetes YAML configurations"; longDescription = '' kustomize lets you customize raw, template-free YAML files for diff --git a/nixpkgs/pkgs/development/tools/lazygit/default.nix b/nixpkgs/pkgs/development/tools/lazygit/default.nix index 9a27c7d44e9c..4b99cfb10e0d 100644 --- a/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix index 8806b5a81cd1..11ff50016785 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix @@ -27,16 +27,19 @@ let noweb = stdenv.mkDerivation rec { "CC=clang" ]; + installFlags = [ - "BIN=$(out)/bin" - "ELISP=$(out)/share/emacs/site-lisp" - "LIB=$(out)/lib/noweb" - "MAN=$(out)/share/man" - "TEXINPUTS=$(tex)/tex/latex/noweb" ]; preInstall = '' mkdir -p "$tex/tex/latex/noweb" + installFlagsArray+=( \ + "BIN=${placeholder "out"}/bin" \ + "ELISP=${placeholder "out"}/share/emacs/site-lisp" \ + "LIB=${placeholder "out"}/lib/noweb" \ + "MAN=${placeholder "out"}/share/man" \ + "TEXINPUTS=${placeholder "tex"}/tex/latex/noweb" \ + ) ''; installTargets = [ "install-code" "install-tex" "install-elisp" ]; @@ -57,7 +60,7 @@ let noweb = stdenv.mkDerivation rec { # HACK: This is ugly, but functional. PATH=$out/bin:$PATH make -BC xdoc - make "''${installFlags[@]} install-man" + make "''${installFlagsArray[@]}" install-man ln -s "$tex" "$out/share/texmf" ''; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix index 41c4b25c8b1b..30eb28fc698c 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec{ pname = "nuweb"; - version = "1.58"; + version = "1.60"; src = fetchurl { url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz"; - sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y"; + sha256 = "08xmwq48biy2c1fr8wnyknyvqs9jfsj42cb7fw638xqv35f0xxvl"; }; buildInputs = [ tex ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec{ homepage = http://nuweb.sourceforge.net; license = licenses.free; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } # TODO: nuweb.el Emacs integration diff --git a/nixpkgs/pkgs/development/tools/metals/default.nix b/nixpkgs/pkgs/development/tools/metals/default.nix index 6ac2d4404eb9..85a27fd9150b 100644 --- a/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.1"; + version = "0.8.3"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0m1vly213cazylg1rmfh5qk3bq65aafa0rf1anfdb3ggymylwza0"; + outputHash = "1l196glr7rbsvrqmq6i7iw532jkz8d1w5m9nh0kh5z12visc7bkk"; }; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index de1cf939e6ae..17ff15265f25 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "act"; @@ -11,11 +11,13 @@ buildGoModule rec { sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Run your GitHub Actions locally"; homepage = "https://github.com/nektos/act"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index fde1c68d34d0..0ab126b63e73 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "circleci-cli"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/development/tools/misc/drush/default.nix b/nixpkgs/pkgs/development/tools/misc/drush/default.nix index f9a640d47038..e0f85c45f290 100644 --- a/nixpkgs/pkgs/development/tools/misc/drush/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/drush/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }: +{ stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }: stdenv.mkDerivation rec { name = "drush-6.1.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76"; }; - buildInputs = [ php which makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' # install libraries @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r . "$out/src" mkdir "$out/bin" - wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php bash coreutils ncurses ]}" + wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php73 bash coreutils ncurses ]}" ln -s "$out/src/drush" "$out/bin/drush" ''; } diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index 88c43a8c42a5..335cd2f25247 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "editorconfig-checker"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/development/tools/misc/gede/default.nix b/nixpkgs/pkgs/development/tools/misc/gede/default.nix index 00cc411dc403..0965f9fcddc3 100644 --- a/nixpkgs/pkgs/development/tools/misc/gede/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "gede"; - version = "2.15.4"; + version = "2.16.2"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "0bg7vyvznn1gn6w5yn14j59xph9psf2fyxr434pk62wmbzdpmkfg"; + sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj"; }; nativeBuildInputs = [ qmake makeWrapper python ]; diff --git a/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix b/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix index 6675f7ed3e25..7ab7ff8b742c 100644 --- a/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "go-license-detector"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Reliable project licenses detector"; homepage = "https://github.com/src-d/go-license-detector"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 5bf7e22bfbdf..19556aeafc01 100644 --- a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.24"; + version = "1.25"; src = fetchurl { url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz"; - sha256 = "1gr1m18w73hmh6n9w2f6gky21qc0pls14bgxkhy95z7azrr7qdap"; + sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0"; }; nativeBuildInputs = [ pkgconfig utilmacros ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://01.org/linuxgraphics/; + homepage = "https://01.org/linuxgraphics/"; description = "Tools for development and testing of the Intel DRM driver"; license = licenses.mit; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index ae0a4a6dfe21..6a114a8de8ba 100644 --- a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "mkcert"; @@ -19,7 +19,9 @@ buildGoModule rec { -X ${goPackagePath}/main.Version=${version} ''; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { homepage = https://github.com/FiloSottile/mkcert; description = "A simple tool for making locally-trusted development certificates"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index 9af294716ff3..aecd373f09e9 100644 --- a/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "reviewdog"; @@ -13,11 +13,13 @@ 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 lib; { + meta = with stdenv.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/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index 26aa50f7f7a1..67e8df9561ff 100644 --- a/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "terracognita"; @@ -13,11 +13,13 @@ buildGoModule rec { modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index aaf6efc03aee..a06bf4f248ac 100644 --- a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "10.1.2"; + version = "11.0.0"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1h9vk30wdcjkf6wdv1xdiv94ln5ivwhmfhx5kwdvrxx8cci2m3yx"; + sha256 = "0as3knld6vlni2s347wgh4g1fg531ky23pg7wx5fzzy6gxl4rgi1"; }; - cargoSha256 = "11xf2vkhar4y0rb4blq3hk9xlw0ixnig88zzc72hcnkv2yamgkhi"; + cargoSha256 = "1f385gjym3mm1vsjvss3yq21ixnbjkrx705hp3spyhghffxi00q1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/nixpkgs/pkgs/development/tools/mod/default.nix b/nixpkgs/pkgs/development/tools/mod/default.nix index 67b829877b04..cc94692c023a 100644 --- a/nixpkgs/pkgs/development/tools/mod/default.nix +++ b/nixpkgs/pkgs/development/tools/mod/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "mod"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/mod" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Automated Semantic Import Versioning Upgrades for Go"; longDescription = '' Command line tool to upgrade/downgrade Semantic Import Versioning in Go diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index c3fbb5863497..e0bd0e4ac676 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.10"; + name = "camlp5-7.11"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel710.tar.gz"; - sha256 = "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7"; + url = "https://github.com/camlp5/camlp5/archive/rel711.tar.gz"; + sha256 = "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4"; }; buildInputs = [ ocaml ]; diff --git a/nixpkgs/pkgs/development/tools/pet/default.nix b/nixpkgs/pkgs/development/tools/pet/default.nix index e7f4fce3c4d4..f1096e479a78 100644 --- a/nixpkgs/pkgs/development/tools/pet/default.nix +++ b/nixpkgs/pkgs/development/tools/pet/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "pet"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Simple command-line snippet manager, written in Go"; homepage = https://github.com/knqyf263/pet; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/pgloader/default.nix b/nixpkgs/pkgs/development/tools/pgloader/default.nix index 8aaae2b1c433..94ba95b2d92f 100644 --- a/nixpkgs/pkgs/development/tools/pgloader/default.nix +++ b/nixpkgs/pkgs/development/tools/pgloader/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz"; - sha256 = "1sm8xmq30d1biin5br0y3vrv4fydbrzfqglz1hnvrkdyxrg7d6f9"; + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.2/pgloader-bundle-3.6.2.tgz"; + sha256 = "1jqnw6pw11kwyy8zm2g7g85r8197fy0q4l70yybw9wr87wnqqnz3"; }; nativeBuildInputs = [ git makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pgloader.io/; + homepage = "https://pgloader.io/"; description = "pgloader loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; license = licenses.postgresql; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix index 95576b987f5c..355cebfd50c4 100755 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix index db85d4ddd3c0..fbcee749b7cd 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 7d3164fcec62..e7f718519a59 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index ec3fa0afa69d..12d2bc962065 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -3,7 +3,6 @@ , makeSetupHook , yj }: - let pythonInterpreter = python.pythonForBuild.interpreter; in diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index b816feb38e89..f4497afb8bc9 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 5ae35dfed49e..5e71190d28fe 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 9eb3f92bd12b..8301dcd49b83 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index b2e11205c36c..cda4e8c78d4d 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ae0c29f36838..67ffdddb4bd8 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index 784589a4ca48..07dcbbc5eacb 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/proto-contrib/default.nix b/nixpkgs/pkgs/development/tools/proto-contrib/default.nix index 836683895565..adb0df28ce16 100644 --- a/nixpkgs/pkgs/development/tools/proto-contrib/default.nix +++ b/nixpkgs/pkgs/development/tools/proto-contrib/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "proto-contrib"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Contributed tools and other packages on top of the Go proto package"; homepage = https://github.com/emicklei/proto-contrib; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix index 77c1df6f43e3..c25b2d56fe63 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule { pname = "protoc-gen-doc-unstable"; @@ -13,7 +13,9 @@ buildGoModule { modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Documentation generator plugin for Google Protocol Buffers"; longDescription = '' This is a documentation generator plugin for the Google Protocol Buffers diff --git a/nixpkgs/pkgs/development/tools/prototool/default.nix b/nixpkgs/pkgs/development/tools/prototool/default.nix index 37b0f1fdf8db..15a854e4d86c 100644 --- a/nixpkgs/pkgs/development/tools/prototool/default.nix +++ b/nixpkgs/pkgs/development/tools/prototool/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, protobuf, Security }: buildGoModule rec { pname = "prototool"; @@ -13,6 +13,8 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg"; postInstall = '' @@ -23,7 +25,7 @@ buildGoModule rec { subPackages = [ "cmd/prototool" ]; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/uber/prototool"; description = "Your Swiss Army Knife for Protocol Buffers"; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/tools/renderizer/default.nix b/nixpkgs/pkgs/development/tools/renderizer/default.nix index f33cad8da7a2..93634f935d1d 100644 --- a/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "renderizer"; - version = "2.0.5"; + version = "2.0.9"; src = fetchFromGitHub { owner = "gomatic"; repo = pname; rev = version; - sha256 = "186wcfzw60z6i59yl37rkppw8w88z5kikvsi65k4r9kwpll2z6z4"; + sha256 = "1bip12pcn8bqgph7vd7bzzadwbyqh80fx7gqciv9fchycwsj04rf"; }; - modSha256 = "1sxg9skd5hjpg2f4wyxh5hwjrplw3b3v32gn61a9yixfk3wvi05x"; + modSha256 = "0ss5l2n1sl1i2hvxsdzy6p61mnnxmm6h256jvv0p0ajynx8g538q"; meta = with stdenv.lib; { description = "CLI to render Go template text files"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index a799fc0bec27..7ffb77f741bf 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.17"; + version = "0.4.18"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "043adbvc1slswwygibgghfl2ryry3ja1x3zjz39qqv63f81pd5id"; + sha256 = "1dhrzfy1ii2vg8psvz9rrgk0blj5bl64ghr0z44vh5y0kxn9v62p"; }; - cargoSha256 = "0kwpc62nwjjhlh3rd5d27sjv0p53q5gj0gky9xx9khxy8xazbh91"; + cargoSha256 = "13ib0binyw1rzxjg59ly3ahyr53wdq3z7wfp11gd61kzwz34gs9d"; buildInputs = [ llvmPackages.libclang ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; - homepage = https://github.com/dtolnay/cargo-expand; + homepage = "https://github.com/dtolnay/cargo-expand"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock index dd5a492de6a9..86a539b33d71 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -33,7 +33,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "attohttpc" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -70,6 +70,11 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "base64" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -99,16 +104,16 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ci_info 0.9.1 (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.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscriptsdk 0.2.1 (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)", "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fern 0.5.9 (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)", "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -120,6 +125,7 @@ dependencies = [ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -135,16 +141,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "chrono" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "ci_info" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -235,7 +231,7 @@ dependencies = [ [[package]] name = "duckscript" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -243,20 +239,23 @@ dependencies = [ [[package]] name = "duckscriptsdk" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -326,10 +325,9 @@ dependencies = [ [[package]] name = "fern" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -523,23 +521,6 @@ version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "num-integer" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-traits" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "openssl" version = "0.10.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -702,6 +683,11 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "ryu" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -766,6 +752,16 @@ dependencies = [ ] [[package]] +name = "serde_json" +version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "shell2batch" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -823,21 +819,19 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.1.42" +name = "toml" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "toml" -version = "0.5.6" +name = "uname" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -911,7 +905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "whoami" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -947,18 +941,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -"checksum attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ac9fd7bdf8ff0a1b9d73b41f95cb189d77528110295c80e3c858bf343db24fa3" +"checksum attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de33d017f0add8b019c6d98c3132c82c8815ca96bbed8e8006e7402c840562b3" "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +"checksum base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" "checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" "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 chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" "checksum ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53a6853eb0aafd4be4d1c7c891982a91a58f84df98838992ce3eb774572bfd9" "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" @@ -969,8 +963,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" "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.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0f699115ffc264c2d6ed8eed098b48d7d08122ba8d59d44f93170c5d33972c7" -"checksum duckscriptsdk 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dad6bba01030a40c5c26a1393926220d046319c00352520b83e02bedf324c805" +"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 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" @@ -979,7 +973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" "checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352" -"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" +"checksum fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" "checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" @@ -1005,8 +999,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" -"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" -"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" "checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" @@ -1027,6 +1019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfbbb48b9c7ee71baadd968640f81ca4bc930c1a2029441eede96a6933275ac" "checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" "checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" +"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" "checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" "checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" @@ -1035,6 +1028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" +"checksum serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" "checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" "checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" @@ -1042,8 +1036,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +"checksum uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" "checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" @@ -1054,7 +1048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" "checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -"checksum whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "622a663c45e12b7ae198748afb532d0c53d2daea11037312221e26198ca4e8e9" +"checksum whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391" "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/cargo.patch b/nixpkgs/pkgs/development/tools/rust/cargo-make/cargo.patch deleted file mode 100644 index b75a5a298878..000000000000 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/cargo.patch +++ /dev/null @@ -1,1053 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..fe75e29 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1047 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "adler32" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "arrayref" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "attohttpc" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "autocfg" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "base64" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "blake2b_simd" -+version = "0.5.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "bytes" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cargo-make" -+version = "0.27.0" -+dependencies = [ -+ "ci_info 0.9.2 (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.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "chrono" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ci_info" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "clap" -+version = "2.33.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "colored" -+version = "1.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "core-foundation" -+version = "0.6.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "crc32fast" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "dirs" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "dirs-sys" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "duckscript" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "duckscriptsdk" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "encoding" -+version = "0.2.33" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "encoding-index-japanese" -+version = "1.20141219.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "encoding-index-korean" -+version = "1.20141219.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "encoding-index-simpchinese" -+version = "1.20141219.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "encoding-index-singlebyte" -+version = "1.20141219.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "encoding-index-tradchinese" -+version = "1.20141219.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "encoding_index_tests" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "envmnt" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "fern" -+version = "0.5.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "fs_extra" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "getrandom" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "git_info" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "home" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "http" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "idna" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "java-properties" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "libc" -+version = "0.2.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "memchr" -+version = "2.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "meval" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "native-tls" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "nom" -+version = "1.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "num-integer" -+version = "0.1.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "openssl" -+version = "0.10.28" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.54" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_users" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "regex" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "run_script" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rust-argon2" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rust_info" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "same-file" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "schannel" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "security-framework" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "shell2batch" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "syn" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "thread_local" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "url" -+version = "2.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "users" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "walkdir" -+version = "2.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "whoami" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+"checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+"checksum attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ac9fd7bdf8ff0a1b9d73b41f95cb189d77528110295c80e3c858bf343db24fa3" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -+"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" -+"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 chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" -+"checksum ci_info 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9c4ad4399f16ccee06f6a62acad539f42de4a80fa21cbe994df1bbb51bee3b9" -+"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" -+"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -+"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -+"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.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "747bb4e541a0830b4581bffc001045d3dc259683546fbf35a35f47af831634b5" -+"checksum duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c03843d05bb809ea1ee653c4f9ba9a5ee766c07490cc684cf6b259b68ba94" -+"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" -+"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -+"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -+"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -+"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" -+"checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352" -+"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" -+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" -+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" -+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -+"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b" -+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -+"checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" -+"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" -+"checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+"checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978" -+"checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" -+"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" -+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -+"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" -+"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" -+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -+"checksum openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)" = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52" -+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" -+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" -+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -+"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" -+"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80a217951e2afacc57d3129bd52aeddc550559f5a82f57529a31fc5675bd6621" -+"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -+"checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" -+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -+"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295" -+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" -+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -+"checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" -+"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -+"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -+"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" -+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+"checksum whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "622a663c45e12b7ae198748afb532d0c53d2daea11037312221e26198ca4e8e9" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 53849e4176fa..f3d6788e3ac1 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.28.0"; + version = "0.30.0"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1sf4hjsylk68d3wb7bs8gfkz5az41hjs7hvb8mbhyc7nryklkq4d"; + sha256 = "0zlj2jys97nphymxrzdjmnh9vv7rsq3fgidap96mh26q9af7ffbz"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx"; + cargoSha256 = "1pjdpnilbxn7vzxl15j5d3k07a80y1mr5cdmj96miyq89j5mmjq0"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index b97c9af088fd..34d744807463 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "13fb8cdg6r0g5jb3vaznvv5aaywrnsl2yp00h4k8028vl8jwwr79"; + cargoSha256 = "13fbahdih5whll09pfgyb1bjag1f0d0xfwgm2s342bs1krxsrbh3"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index 130aa87f7ce4..d297105ea91e 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -8,24 +8,26 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.02.04"; + version = "2020.03.25"; + # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-130-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-152-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "4e4b95c8e03583d48d76d1229f9c7825e2ee5be1"; - sha256 = "02kg48393bjiys56r62b4ks2xvfarw9phi5bips2xsnj9c99pmg0"; + rev = "c27bfc220a9f85f04173840d1ea081ba478adc9c"; + sha256 = "1fyl51246ns2njvij8g7k9a9axvhz8n8g09fny5dym9q7hcx08qh"; name = "trellis"; }) + (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis-db"; - rev = "717478b757a702bbc7e3e11a5fbecee2a64f7922"; - sha256 = "0q4j8qz3m2hissn2a82ck542cx62bp4f0wwzl3g22yv59i13yg83"; + rev = "c137076fdd8bfca3d2bf9cdacda9983dbbec599a"; + sha256 = "1br0vw8wwcn2qhs8kxkis5xqlr2nw7r3mf1qwjp8xckd6fa1wlcw"; name = "trellis-database"; }) ]; diff --git a/nixpkgs/pkgs/development/tools/unityhub/default.nix b/nixpkgs/pkgs/development/tools/unityhub/default.nix index f52d790c1063..2939df0ba20d 100644 --- a/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -17,11 +17,11 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage"; - sha256 = "1rx7ih94ig3pd1yx1d3fpx7zpixq3j5birkpnzkh778qqsdrg0nf"; + sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4"; }; 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/nixpkgs/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix index ee8100128620..677fddd0f60a 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -118,7 +118,7 @@ in buildRubyGem rec { description = "A tool for building complete development environments"; homepage = https://www.vagrantup.com/; license = licenses.mit; - maintainers = with maintainers; [ aneeshusa ma27 ]; + maintainers = with maintainers; [ ma27 ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/development/tools/wally-cli/default.nix b/nixpkgs/pkgs/development/tools/wally-cli/default.nix index b7333e456442..6020d6fe8765 100644 --- a/nixpkgs/pkgs/development/tools/wally-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/wally-cli/default.nix @@ -7,10 +7,9 @@ buildGoPackage rec { goPackagePath = "github.com/zsa/wally"; subPackages = [ "cli" ]; - nativeBuildInputs = [ - pkg-config - libusb1 - ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libusb1 ]; src = fetchFromGitHub { owner = "zsa"; diff --git a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index e30e9c3d7e5f..29886fccd5f1 100644 --- a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,19 +1,19 @@ -From 792dcf4aef3144222e3fab9498bda620879664ab Mon Sep 17 00:00:00 2001 +From 786cd8df9e9fa245c4dbab1bfd21b7949b8a5300 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 7 Mar 2020 22:56:36 +0100 +Date: Thu, 26 Mar 2020 01:54:11 +0100 Subject: [PATCH] Add cargo.lock --- - Cargo.lock | 2432 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2432 insertions(+) + Cargo.lock | 2527 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 2527 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..2cd91628 +index 00000000..976ea6d4 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2432 @@ +@@ -0,0 +1,2527 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] @@ -31,9 +31,9 @@ index 00000000..2cd91628 + +[[package]] +name = "aho-corasick" -+version = "0.7.9" ++version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +dependencies = [ + "memchr", +] @@ -49,9 +49,9 @@ index 00000000..2cd91628 + +[[package]] +name = "anyhow" -+version = "1.0.26" ++version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" ++checksum = "013a6e0a2cbe3d20f9c60b65458f7a7f7a5e636c5d0f45a5a6aee5d4b1f01785" + +[[package]] +name = "arrayref" @@ -192,9 +192,9 @@ index 00000000..2cd91628 + +[[package]] +name = "bumpalo" -+version = "3.2.0" ++version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742" ++checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" + +[[package]] +name = "byteorder" @@ -203,15 +203,6 @@ index 00000000..2cd91628 +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+dependencies = [ -+ "ppv-lite86", -+] -+ -+[[package]] +name = "canvas" +version = "0.1.0" +dependencies = [ @@ -368,9 +359,9 @@ index 00000000..2cd91628 + +[[package]] +name = "curl" -+version = "0.4.26" ++version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ecb534fed9060d04bccaa8b8e1e2d3d5a0d7a9ec6d9c667691c80a3c6b7d19ef" ++checksum = "eda1c0c03cacf3365d84818a40293f0e3f3953db8759c9c565a3b434edf0b52e" +dependencies = [ + "curl-sys", + "libc", @@ -383,9 +374,9 @@ index 00000000..2cd91628 + +[[package]] +name = "curl-sys" -+version = "0.4.28+curl-7.69.0" ++version = "0.4.30+curl-7.69.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2c6b7fa5d36aa192e410788b77af65f339af24c8786419e8b48173689a484bf" ++checksum = "923b38e423a8f47a4058e96f2a1fa2865a6231097ee860debd678d244277d50c" +dependencies = [ + "cc", + "libc", @@ -544,6 +535,31 @@ index 00000000..2cd91628 +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] ++name = "futures" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] +name = "futures-channel-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -553,12 +569,78 @@ index 00000000..2cd91628 +] + +[[package]] ++name = "futures-core" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a" ++ ++[[package]] +name = "futures-core-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" + +[[package]] ++name = "futures-executor" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6" ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.17", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -700,7 +782,7 @@ index 00000000..2cd91628 + +[[package]] +name = "js-sys" -+version = "0.3.36" ++version = "0.3.37" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -729,9 +811,9 @@ index 00000000..2cd91628 + +[[package]] +name = "libc" -+version = "0.2.67" ++version = "0.2.68" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" ++checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" + +[[package]] +name = "libz-sys" @@ -789,11 +871,11 @@ index 00000000..2cd91628 + +[[package]] +name = "memoffset" -+version = "0.5.3" ++version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" ++checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" +dependencies = [ -+ "rustc_version", ++ "autocfg 1.0.0", +] + +[[package]] @@ -949,9 +1031,9 @@ index 00000000..2cd91628 + +[[package]] +name = "openssl-src" -+version = "111.6.1+1.1.1d" ++version = "111.7.0+1.1.1e" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" ++checksum = "6fde5a8c01ef8aa31ff8d0aaf9bae248581ed8840fca0b66e51cc9f294a8cb2c" +dependencies = [ + "cc", +] @@ -1025,6 +1107,12 @@ index 00000000..2cd91628 +] + +[[package]] ++name = "pin-utils" ++version = "0.1.0-alpha.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" ++ ++[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1079,31 +1167,43 @@ index 00000000..2cd91628 + +[[package]] +name = "proc-macro-error" -+version = "0.4.11" ++version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7959c6467d962050d639361f7703b2051c43036d03493c36f01d440fdd3138a" ++checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-error-attr" -+version = "0.4.11" ++version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e4002d9f55991d5e019fb940a90e1a95eb80c24e77cb2462dd4dc869604d543a" ++checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "syn-mid", + "version_check 0.9.1", +] + +[[package]] ++name = "proc-macro-hack" ++version = "0.5.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcfdefadc3d57ca21cf17990a28ef4c0f7c61383a28cb7604cf4a18e6ede1420" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" ++ ++[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1198,7 +1298,7 @@ index 00000000..2cd91628 +dependencies = [ + "getrandom", + "libc", -+ "rand_chacha 0.2.1", ++ "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] @@ -1215,11 +1315,11 @@ index 00000000..2cd91628 + +[[package]] +name = "rand_chacha" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ -+ "c2-chacha", ++ "ppv-lite86", + "rand_core 0.5.1", +] + @@ -1395,9 +1495,9 @@ index 00000000..2cd91628 + +[[package]] +name = "regex" -+version = "1.3.4" ++version = "1.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" ++checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" +dependencies = [ + "aho-corasick", + "memchr", @@ -1407,9 +1507,9 @@ index 00000000..2cd91628 + +[[package]] +name = "regex-syntax" -+version = "0.6.16" ++version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" ++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" + +[[package]] +name = "remove_dir_all" @@ -1477,19 +1577,10 @@ index 00000000..2cd91628 +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] +name = "ryu" -+version = "1.0.2" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" ++checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" + +[[package]] +name = "safemem" @@ -1509,9 +1600,9 @@ index 00000000..2cd91628 + +[[package]] +name = "schannel" -+version = "0.1.17" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295" ++checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" +dependencies = [ + "lazy_static", + "winapi", @@ -1536,38 +1627,23 @@ index 00000000..2cd91628 +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+ -+[[package]] +name = "serde" -+version = "1.0.104" ++version = "1.0.105" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++checksum = "e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.104" ++version = "1.0.105" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++checksum = "ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1594,6 +1670,12 @@ index 00000000..2cd91628 +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] +name = "smallvec" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1631,9 +1713,9 @@ index 00000000..2cd91628 + +[[package]] +name = "structopt" -+version = "0.3.11" ++version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fe43617218c0805c6eb37160119dc3c548110a67786da7218d1c6555212f073" ++checksum = "c8faa2719539bbe9d77869bfb15d4ee769f99525e707931452c97b693b3f159d" +dependencies = [ + "clap", + "lazy_static", @@ -1642,15 +1724,15 @@ index 00000000..2cd91628 + +[[package]] +name = "structopt-derive" -+version = "0.4.4" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6e79c80e0f4efd86ca960218d4e056249be189ff1c42824dcd9a7f51a56f0bd" ++checksum = "3f88b8e18c69496aad6f9ddf4630dd7d585bcaf765786cb415b9aec2fe5a0430" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1666,9 +1748,9 @@ index 00000000..2cd91628 + +[[package]] +name = "syn" -+version = "1.0.16" ++version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" ++checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", @@ -1683,7 +1765,7 @@ index 00000000..2cd91628 +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1818,9 +1900,9 @@ index 00000000..2cd91628 + +[[package]] +name = "trybuild" -+version = "1.0.23" ++version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26ff1b18659a2218332848d76ad1c867ce4c6ee37b085e6bc8de9a6d11401220" ++checksum = "24b4e093c5ed1a60b22557090120aa14f90ca801549c0949d775ea07c1407720" +dependencies = [ + "glob", + "lazy_static", @@ -1958,7 +2040,7 @@ index 00000000..2cd91628 + "heck", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1969,7 +2051,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "cfg-if", + "js-sys", @@ -1985,7 +2067,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "rayon", @@ -1997,14 +2079,14 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "wasm-bindgen-shared", +] + @@ -2018,7 +2100,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2046,7 +2128,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2068,7 +2150,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.9" ++version = "0.4.10" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2080,7 +2162,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "quote 1.0.3", + "trybuild", @@ -2091,18 +2173,18 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "rayon", @@ -2123,11 +2205,11 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.59" ++version = "0.2.60" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.9" ++version = "0.3.10" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2153,7 +2235,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.9" ++version = "0.3.10" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", @@ -2161,7 +2243,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "walrus", @@ -2170,7 +2252,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "walrus", @@ -2178,7 +2260,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "log 0.4.8", @@ -2189,7 +2271,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "env_logger", @@ -2200,7 +2282,7 @@ index 00000000..2cd91628 + "quote 1.0.3", + "sourcefile", + "structopt", -+ "syn 1.0.16", ++ "syn 1.0.17", + "wasm-bindgen-backend", + "weedle", +] @@ -2254,25 +2336,25 @@ index 00000000..2cd91628 + +[[package]] +name = "wast" -+version = "9.0.0" ++version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a" ++checksum = "df4d67ba9266f4fcaf2e8a1afadc5e2a959e51aecc07b1ecbdf85a6ddaf08bde" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.10" ++version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6" ++checksum = "9a9400dc1c8512087b2d974b1b9b0a6c4e6e26e7e8acf629e3e351165a1ed301" +dependencies = [ -+ "wast 9.0.0", ++ "wast 11.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.36" ++version = "0.3.37" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2316,6 +2398,19 @@ index 00000000..2cd91628 +] + +[[package]] ++name = "webxr" ++version = "0.1.0" ++dependencies = [ ++ "futures", ++ "js-sys", ++ "serde", ++ "serde_derive", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++] ++ ++[[package]] +name = "weedle" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index e5afcb30a817..ee9a6ead7fa1 100644 --- a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.59"; + version = "0.2.60"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "1i0hdky5dlkrzcphddm122yxfhgcvnszh4q1as0r41vhfs5ss597"; + sha256 = "1jr4v5y9hbkyg8gjkr3qc2qxwhyagfs8q3y3z248mr1919mcas8h"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "1ylk9vrpajslx1zy4vqmlyqa5ygcmvir1gcn8hsr6liigf5kcz7p"; + cargoSha256 = "08g110qahipgm1qyyihgqwnkr23w0gk1gp63ici5dj2qsxnc4mxv"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; diff --git a/nixpkgs/pkgs/development/tools/yarn/default.nix b/nixpkgs/pkgs/development/tools/yarn/default.nix index 9db4472f6720..dfdd921fd03d 100644 --- a/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.2"; + version = "1.22.4"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1av52k5hl7xylxz5c0h64akz6ccd1vm64v0pzmny1661pbihiwp5"; + sha256 = "1s054c9cmlmzy6cfkawhaxvaxhqcq0a17n4sb12p0bp2lzkax9lm"; }; buildInputs = [ nodejs ]; diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index 85165d501d97..05f07fd02608 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "flyctl"; @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' go generate ./... ''; @@ -22,7 +24,7 @@ buildGoModule rec { modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd"; - meta = with lib; { + meta = with stdenv.lib; { description = "Command line tools for fly.io services"; homepage = "https://fly.io/"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix index d05fbff5e0c1..d877aa5331d5 100644 --- a/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1aqzg01dwgm1jidavwxichydxsz1c4ck8xhgvlgw24qddx5gwq1y"; + sha256 = "0lg3j5pr2bkjq5rq035fwh4mgpqsja3ndp11zpcz85ni3nvhn657"; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/development/web/minify/default.nix b/nixpkgs/pkgs/development/web/minify/default.nix index 3752519d0609..cd602317c70d 100644 --- a/nixpkgs/pkgs/development/web/minify/default.nix +++ b/nixpkgs/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "minify"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Minifiers for web formats"; license = licenses.mit; homepage = "https://go.tacodewolff.nl/minify"; diff --git a/nixpkgs/pkgs/development/web/nodejs/v13.nix b/nixpkgs/pkgs/development/web/nodejs/v13.nix index c5e3f7c4bdbf..8676214b50b2 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v13.nix +++ b/nixpkgs/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/nixpkgs/pkgs/games/empty-epsilon/default.nix b/nixpkgs/pkgs/games/empty-epsilon/default.nix index 29a789b4084b..fc71c288b987 100644 --- a/nixpkgs/pkgs/games/empty-epsilon/default.nix +++ b/nixpkgs/pkgs/games/empty-epsilon/default.nix @@ -3,8 +3,8 @@ let major = "2020"; - minor = "02"; - patch = "18"; + minor = "03"; + patch = "22"; version = "${major}.${minor}.${patch}"; @@ -16,7 +16,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version}"; - sha256 = "1cq32jm3p40h5mipb64i9b1kcid27bpc8g6j4k0v69cfqkjpha5c"; + sha256 = "15dk2aij571sdrmpp3p0z1njb60lz0d95x0jgqdxz2q3wqnp5p61"; }; nativeBuildInputs = [ cmake ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "1hl3mbg6pw2r7ri042vm86pb2xv77jvh6pag1z96bxvx791zcnwk"; + sha256 = "0idapy266mfrmi6dq3si5a8n12m1vvxr6ywbs0fs6sdkbabglc0c"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/games/ivan/default.nix b/nixpkgs/pkgs/games/ivan/default.nix index 8acab2eed0e8..4e8dc5bbbe9f 100644 --- a/nixpkgs/pkgs/games/ivan/default.nix +++ b/nixpkgs/pkgs/games/ivan/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ivan"; - version = "057"; + version = "058"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "0mavmwikfsyr5sp65sl8dqknl1yz7c7ds53y1qkma24vsikz3k64"; + sha256 = "04jzs8wad2b3g9hvnijr4r89iiw6b1i44zdzkg0dy447lrw6l6xc"; }; nativeBuildInputs = [ cmake pkgconfig graphicsmagick ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { This is a fan continuation of IVAN by members of Attnam.com ''; - homepage = https://attnam.com/; + homepage = "https://attnam.com/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [freepotion]; diff --git a/nixpkgs/pkgs/games/keeperrl/default.nix b/nixpkgs/pkgs/games/keeperrl/default.nix new file mode 100644 index 000000000000..68426a4aedfd --- /dev/null +++ b/nixpkgs/pkgs/games/keeperrl/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchFromGitHub, requireFile +, openal, curl, libogg, libvorbis +, SDL2, SDL2_image, zlib +, unfree_assets ? false }: + +stdenv.mkDerivation rec { + pname = "keeperrl"; + version = "alpha28"; + + free-src = fetchFromGitHub { + owner = "miki151"; + repo = "keeperrl"; + rev = version; + sha256 = "0isj8ijn5a89m2r5cxk4lcsq0cydx7c0h87vgr8v5cndm3rd27cy"; + }; + + assets = if unfree_assets then requireFile rec { + name = "keeperrl_data_${version}.tar.gz"; + message = '' + This nix expression requires that the KeeperRL art assets are already + part of the store. These can be obtained from a purchased copy of the game + and found in the "data" directory. Make a tar archive of this directory + with + + "tar czf ${name} data" + + Then add this archive to the nix store with + + "nix-prefetch-url file://\$PWD/${name}". + ''; + sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nk53"; + } else null; + + sourceRoot = "source"; + + srcs = [ free-src ] ++ stdenv.lib.optional unfree_assets assets; + + postUnpack = stdenv.lib.optionalString unfree_assets '' + mv data $sourceRoot + ''; + + buildInputs = [ + openal curl libogg libvorbis SDL2 SDL2_image zlib + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${SDL2.dev}/include/SDL2" + ]; + + enableParallelBuilding = true; + + makeFlags = [ "OPT=true" + "RELEASE=true" + "DATA_DIR=$(out)/share" + "ENABLE_LOCAL_USER_DIR=true" + ]; + + installPhase = '' + install -Dm755 keeper $out/bin/keeper + install -Dm755 appconfig.txt $out/share/appconfig.txt + + cp -r data_free $out/share + cp -r data_contrib $out/share + ${stdenv.lib.optionalString unfree_assets "cp -r data $out/share"} + ''; + + meta = with stdenv.lib; { + description = "A dungeon management rogue-like"; + homepage = "https://keeperrl.com/"; + license = licenses.gpl2; + maintainers = with maintainers; [ chattered ]; + # TODO: Add OS X + platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/games/nethack/default.nix b/nixpkgs/pkgs/games/nethack/default.nix index 9a60abdc1500..280ca090d60e 100644 --- a/nixpkgs/pkgs/games/nethack/default.nix +++ b/nixpkgs/pkgs/games/nethack/default.nix @@ -19,14 +19,14 @@ let binPath = lib.makeBinPath [ coreutils less ]; in stdenv.mkDerivation rec { - version = "3.6.5"; + version = "3.6.6"; name = if x11Mode then "nethack-x11-${version}" else if qtMode then "nethack-qt-${version}" else "nethack-${version}"; src = fetchurl { - url = "https://nethack.org/download/3.6.5/nethack-365-src.tgz"; - sha256 = "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv"; + url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; + sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"; }; buildInputs = [ ncurses ] diff --git a/nixpkgs/pkgs/games/performous/default.nix b/nixpkgs/pkgs/games/performous/default.nix index 28487a7f8e8a..96b07e9787e8 100644 --- a/nixpkgs/pkgs/games/performous/default.nix +++ b/nixpkgs/pkgs/games/performous/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "08j0qhr65l7qnd5vxl4l07523qpvdwi31h4vzl3lfiinx1zcgr4x"; }; + patches = [ ./performous-cmake.patch ]; + nativeBuildInputs = [ cmake pkgconfig gettext ]; buildInputs = [ diff --git a/nixpkgs/pkgs/games/performous/performous-cmake.patch b/nixpkgs/pkgs/games/performous/performous-cmake.patch new file mode 100644 index 000000000000..59d2cc9a927c --- /dev/null +++ b/nixpkgs/pkgs/games/performous/performous-cmake.patch @@ -0,0 +1,86 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.6) + project(Performous CXX C) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") +--- a/cmake/Modules/FindPango.cmake ++++ b/cmake/Modules/FindPango.cmake +@@ -2,31 +2,10 @@ + # Once done, this will define + # + # Pango_FOUND - system has Pango +-# Pango_INCLUDE_DIRS - the Pango include directories + # Pango_LIBRARIES - link these to use Pango + + include(LibFindMacros) + +-# Dependencies +-libfind_package(Pango Freetype) +-libfind_package(Pango Glib) +-libfind_package(Pango GObject) +- +-# Use pkg-config to get hints about paths +-libfind_pkg_check_modules(Pango_PKGCONF pango) +- +-# Include dir +-find_path(Pango_INCLUDE_DIR +- NAMES pango/pango.h +- HINTS ${Pango_PKGCONF_INCLUDE_DIRS} +- PATH_SUFFIXES pango-1.0 +-) +- +-# Finally the library itself +-find_library(Pango_LIBRARY +- NAMES pango-1.0 +- HINTS ${Pango_PKGCONF_LIBRARY_DIRS} +-) +- ++libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango) ++set(Pango_LIBRARY PkgConfig::Pango_PKGCONF) + libfind_process(Pango) +- +--- a/cmake/Modules/FindPangoCairo.cmake ++++ b/cmake/Modules/FindPangoCairo.cmake +@@ -1,35 +1,11 @@ + # - Try to find PangoCairo + # Once done, this will define + # +-# PangoCairo_FOUND - system has Pango +-# PangoCairo_INCLUDE_DIRS - the Pango include directories +-# PangoCairo_LIBRARIES - link these to use Pango ++# PangoCairo_FOUND - system has PangoCairo ++# PangoCairo_LIBRARIES - link these to use PangoCairo + + include(LibFindMacros) + +-# Dependencies +-libfind_package(PangoCairo Pango) +-libfind_package(PangoCairo Cairo) +- +-# Use pkg-config to get hints about paths +-libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo) +- +-# Include dir +-find_path(PangoCairo_INCLUDE_DIR +- NAMES pango/pangocairo.h +- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS} +- PATH_SUFFIXES pango-1.0 +-) +- +-# Finally the library itself +-find_library(PangoCairo_LIBRARY +- NAMES pangocairo-1.0 +- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS} +-) +- +-# Set the include dir variables and the libraries and let libfind_process do the rest. +-# NOTE: Singular variables for this library, plural for libraries this this lib depends on. +-set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR) +-set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY) ++libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo) ++set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF) + libfind_process(PangoCairo) +- diff --git a/nixpkgs/pkgs/games/spring/default.nix b/nixpkgs/pkgs/games/spring/default.nix index 8f43a6d84b1a..e0dd5f53449f 100644 --- a/nixpkgs/pkgs/games/spring/default.nix +++ b/nixpkgs/pkgs/games/spring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip +{ stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip @@ -6,13 +6,15 @@ }: stdenv.mkDerivation rec { - pname = "spring"; - version = "104.0"; - - src = fetchurl { - url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma"; - sha256 = "05pclcbw7v481pqz7bgirlk37494hy4hx4jghhnlzhdaz1cvzc6f"; + version = "104.0.1"; + + src = fetchFromGitHub { + owner = "spring"; + repo = "spring"; + rev = "9ee29da876f6d3d23e169185619b58df9c036703"; + sha256 = "0m94i85k8k5ls1ff9z8djslzhkgr7b7vsbpic2axxjvki6sn2xjv"; + fetchSubmodules = true; }; # The cmake included module correcly finds nix's glew, however @@ -21,8 +23,12 @@ stdenv.mkDerivation rec { substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \ --replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\ --replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages" + substituteInPlace ./rts/Rendering/GL/myGL.cpp \ + --replace "static constexpr const GLubyte* qcriProcName" "static const GLubyte* qcriProcName" patchShebangs . rm rts/build/cmake/FindGLEW.cmake + + echo "104.0.1-1466-g9ee29da maintenance" > VERSION ''; cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" @@ -50,6 +56,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; platforms = platforms.linux; - broken = true; }; } diff --git a/nixpkgs/pkgs/games/spring/springlobby.nix b/nixpkgs/pkgs/games/spring/springlobby.nix index dbcec10fdc65..f872d2172375 100644 --- a/nixpkgs/pkgs/games/spring/springlobby.nix +++ b/nixpkgs/pkgs/games/spring/springlobby.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "springlobby"; - version = "0.267"; + version = "0.269"; src = fetchurl { - url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "0yv7j9l763iqx7hdi2pcz5jkj0068yrffb8nrav7pwg0g3s0znak"; + url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2"; + sha256 = "1shgrfs4ssjj8m0c7805jisjzpc60796l0vja3yjfdksrz7yxvhg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/games/steam/chrootenv.nix b/nixpkgs/pkgs/games/steam/chrootenv.nix index cb85426c23b3..56e1a09f36e8 100644 --- a/nixpkgs/pkgs/games/steam/chrootenv.nix +++ b/nixpkgs/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/nixpkgs/pkgs/games/steam/runtime-generated.nix b/nixpkgs/pkgs/games/steam/runtime-generated.nix index bb4decfda4d2..3ed030c0094d 100644 --- a/nixpkgs/pkgs/games/steam/runtime-generated.nix +++ b/nixpkgs/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.1.73+dfsg-1+steamrt1.2+srt1_amd64"; + sha256 = "e70dbce3db8d74df853dd10265d37c8b4b4f7336043f79ae480be3d6922c206c"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+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,105 @@ }; } 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-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; + sha256 = "01420d08d0c99d4f70d350af91ac127635e6a75a88200350a4691b8440a7926c"; + url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-utils.deb"; + }; + } + rec { + name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; + sha256 = "ea9fbf565059fc5106a2a13bd56e5a37f2d641655304fd0d4b0d3989b69a8046"; + url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+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 +2310,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 +2364,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 +2544,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 +2733,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 +3102,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 +3228,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 +3363,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 +3480,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.1.73+dfsg-1+steamrt1.2+srt1_i386"; + sha256 = "4e06285406434cc1184884438a15e6dd11f1d9aa2e1d6c95d2138fbe0f61a172"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+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 +3948,105 @@ }; } 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-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; + sha256 = "2deda8ceeaef31ec4103e614282e554f360db2a7f51e2e868918845cb1187c75"; + url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-utils.deb"; + }; + } + rec { + name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; + sha256 = "13be3dd08ade9e67e7a3b870ee0787c2a96d6c2f99b3173c5439f643d52be220"; + url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+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/nixpkgs/pkgs/games/super-tux-kart/default.nix b/nixpkgs/pkgs/games/super-tux-kart/default.nix index 2db49165c5fb..96444897cc94 100644 --- a/nixpkgs/pkgs/games/super-tux-kart/default.nix +++ b/nixpkgs/pkgs/games/super-tux-kart/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig , openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype -, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet }: +, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }: let dir = "stk-code"; in stdenv.mkDerivation rec { pname = "supertuxkart"; - version = "1.0"; + version = "1.1"; srcs = [ (fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; rev = version; - sha256 = "03mrnzrvfdgjc687n718f5zsray6vbdlv4irzy2mfi78bz3bkjll"; + sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; name = dir; }) (fetchsvn { @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr openal freealut libGLU libGL libvorbis libogg zlib freetype - curl fribidi bluez libjpeg libpng enet + curl fribidi bluez libjpeg libpng enet harfbuzz ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/games/tintin/default.nix b/nixpkgs/pkgs/games/tintin/default.nix index 62fda890e84c..fbf4b1beecfd 100644 --- a/nixpkgs/pkgs/games/tintin/default.nix +++ b/nixpkgs/pkgs/games/tintin/default.nix @@ -6,11 +6,11 @@ assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { - name = "tintin-2.02.01"; + name = "tintin-2.02.02"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "15ajs6d0rb3xchd46gyziciz9vv0ks75schk1s4hs7pr30yr7k6y"; + sha256 = "11ylbp8ip7dwmh4gzb53z147pcfxkl3lwhyy8ngyn2zc634vdn65"; }; nativeBuildInputs = lib.optional tlsSupport gnutls.dev; diff --git a/nixpkgs/pkgs/games/xmage/default.nix b/nixpkgs/pkgs/games/xmage/default.nix new file mode 100644 index 000000000000..e8b8eb8a9419 --- /dev/null +++ b/nixpkgs/pkgs/games/xmage/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchurl +, jdk8 +, unzip +}: + +stdenv.mkDerivation rec { + name = "xmage"; + version = "1.4.42V6"; + + src = fetchurl { + url = "https://github.com/magefree/mage/releases/download/xmage_1.4.42V6/xmage_${version}.zip"; + sha256 = "14s4885ldi0rplqmab5m775plsqmmm0m89j402caiqm2q9mzvkhd"; + }; + + preferLocalBuild = true; + + unpackPhase = '' + ${unzip}/bin/unzip $src + ''; + + installPhase = '' + mkdir -p $out/bin + cp -rv ./* $out + + cat << EOS > $out/bin/xmage +exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.42.jar +EOS + + chmod +x $out/bin/xmage + ''; + + meta = with stdenv.lib; { + description = "Magic Another Game Engine"; + license = licenses.mit; + maintainers = with maintainers; [ matthiasbeyer ]; + homepage = "http://xmage.de/"; + }; + +} + diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index 13bb63ca7091..ecf79a953fe3 100644 --- a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -153,6 +153,39 @@ let plugins = { meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; }; + s650 = stdenv.mkDerivation rec { + name = "iscan-gt-s650-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1ffddf488c5fc1eb39452499951bd13a2dc1971980c0551176076c81af363038"; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" + $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" + ''; + hw = "GT-S650, Perfection V19, Perfection V39"; + }; + meta = common_meta // { description = "iscan GT-S650 for "+passthru.hw; }; + }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; # for the version, look for the driver of XP-750 in the search page @@ -244,6 +277,7 @@ stdenv.mkDerivation rec { sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd"; }) ./firmware_location.patch + ./sscanf.patch ]; patchFlags = [ "-p0" ]; @@ -277,6 +311,6 @@ stdenv.mkDerivation rec { Supported hardware: at least : '' + stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins); - maintainers = with stdenv.lib.maintainers; [ symphorien ]; + maintainers = with stdenv.lib.maintainers; [ symphorien dominikh ]; }; } diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/firmware_location.patch b/nixpkgs/pkgs/misc/drivers/epkowa/firmware_location.patch index 58ea849d8f9d..0f723a4ff9d7 100644 --- a/nixpkgs/pkgs/misc/drivers/epkowa/firmware_location.patch +++ b/nixpkgs/pkgs/misc/drivers/epkowa/firmware_location.patch @@ -8,12 +8,13 @@ set this environment variable. Instead, we patch iscan to set this variable before loading libesci-interpreter-gt-f720.so. --- backend/channel-usb.c.orig 2017-08-14 11:24:27.669582456 +0200 +++ backend/channel-usb.c 2017-08-14 11:31:40.509010897 +0200 -@@ -169,6 +169,9 @@ +@@ -169,6 +169,10 @@ { SANE_Status s; + setenv("ESCI_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1); + setenv("ISCAN_FW_DIR", NIX_ESCI_PREFIX, 1); ++ setenv("ISCAN_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1); + s = sanei_usb_open (self->name, &self->fd); diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/sscanf.patch b/nixpkgs/pkgs/misc/drivers/epkowa/sscanf.patch new file mode 100644 index 000000000000..7bee9cae5180 --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/epkowa/sscanf.patch @@ -0,0 +1,29 @@ +The "%as" verb requests sscanf to allocate a buffer for us. However, +this use of 'a' has been long deprecated, and gcc doesn't support it +in this manner when using -std=c99. The modern replacement is "%ms". + +Without this change, iscan couldn't read the interpreter file, in turn +breaking all scanners that require plugins. +--- backend/cfg-obj.c.orig 2020-03-19 01:27:17.254762077 +0100 ++++ backend/cfg-obj.c 2020-03-19 02:01:52.293329873 +0100 +@@ -1026,7 +1026,7 @@ + char *vendor = NULL; + char *model = NULL; + +- sscanf (string, "%*s %as %as", &vendor, &model); ++ sscanf (string, "%*s %ms %ms", &vendor, &model); + + if (list_append (_cfg->seen[CFG_KEY_SCSI], info)) + { +@@ -1108,10 +1112,10 @@ + char *library = NULL; + char *firmware = NULL; + +- sscanf (string, "%*s %*s %x %x %as %as", ++ sscanf (string, "%*s %*s %x %x %ms %ms", + &vendor, &product, &library, &firmware); + + if (library && _cfg_have_interpreter (library, firmware) + && list_append (_cfg->seen[CFG_KEY_INTERPRETER], info)) + { + diff --git a/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 1514e8def970..4678442abd99 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -12,16 +12,16 @@ let name = "hplip-${version}"; - version = "3.19.12"; + version = "3.20.3"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0mdj0sqgfxjqa550adiw1gn4z9n6wcvn55slivgf0ndn5x89iwxp"; + sha256 = "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1"; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; - sha256 = "1fn8h1a5znjqjh071ifjdywr0xswc14286gwy6h9vvlh8hzrz347"; + sha256 = "13xyv30jqjysfk7gh0gyn7qj0pb0qvk2rlbhm85a3lw7bjycal8g"; }; hplipState = substituteAll { diff --git a/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix index 9f092f91e2ef..38730ec752ba 100644 --- a/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix +++ b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "fs-uae"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "1awakxs3rlbm0bxpi37cbavi5fpb89wszksyw62as4nz3qsdrpjf"; + sha256 = "0v5c8ns00bam4myj7454hpkrnm9i81jwdzrp5nl7gaa18qb60hjq"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { create customized Amigas. ''; license = licenses.gpl2Plus; - homepage = https://fs-uae.net; + homepage = "https://fs-uae.net"; maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/misc/emulators/mame/default.nix b/nixpkgs/pkgs/misc/emulators/mame/default.nix index a0455b88bec2..995fd72a6e22 100644 --- a/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -4,7 +4,7 @@ let majorVersion = "0"; - minorVersion = "218"; + minorVersion = "219"; desktopItem = makeDesktopItem { name = "MAME"; @@ -23,7 +23,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "11qschyxhi45pbpf9q3k71kybqxmcfhjml8axqpi43sv4q2ack6q"; + sha256 = "048ar1j2vsrvqqc3spy9qcch2lbxn0ycd9lv4ig5wfnvjkdjdvgr"; }; hardeningDisable = [ "fortify" ]; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index 2176d53628fa..b1d01e12b626 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -1,28 +1,42 @@ { stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch -, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, libGL -, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis -, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost }: +, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL +, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump +, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl +, buildPackages }: let d2u = stdenv.lib.replaceChars ["-"] ["_"]; - mkLibRetroCore = ({ core, src, description, license, broken ? false, ... }@a: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { + mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a: + stdenv.lib.makeOverridable stdenv.mkDerivation ((rec { - name = "libretro-${core}-${version}"; - version = "2019-09-29"; - inherit src; + name = "libretro-${a.core}-${version}"; + version = "2020-03-06"; + inherit (a) src; - buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or []; + buildInputs = [ zlib ] ++ a.extraBuildInputs or []; + nativeBuildInputs = [ makeWrapper ] ++ a.extraNativeBuildInputs or []; makefile = "Makefile.libretro"; + makeFlags = [ + "platform=${{ + linux = "unix"; + darwin = "unix"; + windows = "win"; + }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}" + "ARCH=${{ + armv7l = "arm"; + armv6l = "arm"; + i686 = "x86"; + }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" + ] ++ (a.makeFlags or []); installPhase = '' COREDIR="$out/lib/retroarch/cores" mkdir -p $out/bin mkdir -p $COREDIR - mv ${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR/. + mv ${d2u a.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \ --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" ''; @@ -30,18 +44,18 @@ let enableParallelBuilding = true; passthru = { - core = core; + inherit (a) core; libretroCore = "/lib/retroarch/cores"; }; meta = with stdenv.lib; { - inherit description; + inherit (a) description license; + broken = a.broken or false; homepage = https://www.libretro.com/; - inherit license; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.unix; }; - } // a); + }) // builtins.removeAttrs a ["core" "src" "description" "license" "makeFlags"]); fetchRetro = { repo, rev, sha256 }: fetchgit { @@ -54,49 +68,32 @@ in with stdenv.lib.licenses; { - _4do = (mkLibRetroCore rec { - core = "4do"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "b6ad4bc8548f2f3792cd929ccf26d9078b73a1c0"; - sha256 = "0j2bd9cnnd5k99l9qr4wd5q9b4ciplia6ywp90xg6422s1im2iw0"; - }; - description = "Port of 4DO/libfreedo to libretro"; - license = "Non-commercial"; - }).override { - makefile = "Makefile"; - buildPhase = "make"; - }; - - atari800 = (mkLibRetroCore rec { + atari800 = mkLibRetroCore rec { core = "atari800"; src = fetchRetro { repo = "libretro-" + core; - rev = "efc0bc71e3cb8a4f957d07fe808cc002ed9c13b9"; - sha256 = "150hmazi4p5p18gpjmkrn1k9j719cd9gy7jn0jiy3jbk2cxxsjn6"; + rev = "f9bf53b864344b8bbe8d425ed2f3c628eb10519c"; + sha256 = "0sgk93zs423pwiqzvj0x1gfwcn9gacnlrrdq53ps395k64lig6lk"; }; description = "Port of Atari800 to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; + makeFlags = [ "GIT_VERSION=" ]; }; - beetle-snes = (mkLibRetroCore rec { + beetle-snes = mkLibRetroCore { core = "mednafen-snes"; src = fetchRetro { repo = "beetle-bsnes-libretro"; - rev = "6aee84d454570bb17dff5975df28febdbcb72938"; - sha256 = "0nk9xlypg3jhpbwd9z5bjbgzlkz842hy9rq14k1nwn0qz6d88kld"; + rev = "de22d8420ea606f1b2f72afd4dda34619cf2cc20"; + sha256 = "1nd4f8frmlhp1lyxz9zpxvwwz70x0i0rrp560cn9qlm1jzdv3xvf"; }; description = "Port of Mednafen's SNES core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - beetle-gba = (mkLibRetroCore rec { + beetle-gba = mkLibRetroCore { core = "mednafen-gba"; src = fetchRetro { repo = "beetle-gba-libretro"; @@ -105,155 +102,171 @@ in with stdenv.lib.licenses; }; description = "Port of Mednafen's GameBoy Advance core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - beetle-lynx = (mkLibRetroCore rec { + beetle-lynx = mkLibRetroCore { core = "mednafen-lynx"; src = fetchRetro { repo = "beetle-lynx-libretro"; - rev = "928f7cf5b39f0363e55667572ff455e37489998e"; - sha256 = "0f03wzdr6f0fpy889i9a2834jg5lvcriyl98pajp75m7whm9r9cc"; + rev = "74dde204c0ec6c4bc4cd7821c14548387fbd9ce8"; + sha256 = "05kwibjr30laalqzazswvmn9smm3mwqsz1i0z1s0pj7idfdhjfw0"; }; description = "Port of Mednafen's Lynx core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - beetle-ngp = (mkLibRetroCore rec { + beetle-ngp = mkLibRetroCore { core = "mednafen-ngp"; src = fetchRetro { repo = "beetle-ngp-libretro"; - rev = "6130e4057c3d8f9172f0c49bb9b6c61bd1a572d5"; - sha256 = "10k7spjrhggjgzb370bwv7fgk0nb6xri9ym6cm4qvnrkcwxm7i9p"; + rev = "6f15532b6ad17a2d5eb9dc8241d6af62416e796b"; + sha256 = "05r8mk9rc19nzs3gpfsjr6i7pm6xx3gn3b4xs8ab7v4vcmfg4cn2"; }; description = "Port of Mednafen's NeoGeo Pocket core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - beetle-pce-fast = let der = (mkLibRetroCore { + beetle-pce-fast = let der = mkLibRetroCore { core = "mednafen-pce-fast"; src = fetchRetro { repo = "beetle-pce-fast-libretro"; - rev = "7bbbdf111c1ce52ab4a97e911ebdaa6836ee881a"; - sha256 = "1p0kk5a2yi05yl0hspzv9q0n96yx9riaaacbmnq76li0i3ihkf6l"; + rev = "40a42b7f43f029760c92bf0b2097e7d4b90ed29c"; + sha256 = "1gr6wg4bd4chm4c39w0c1b5zfzr05zd7234vvlmr1imk0v6m0wj6"; }; description = "Port of Mednafen's PC Engine core to libretro"; license = gpl2; - }); in der.override { makefile = "Makefile"; - buildPhase = "make"; + }; in der.override { name = "beetle-pce-fast-${der.version}"; }; - beetle-pcfx = (mkLibRetroCore rec { + beetle-pcfx = mkLibRetroCore rec { core = "mednafen-pcfx"; src = fetchRetro { repo = "beetle-pcfx-libretro"; - rev = "e04f695202a7295e4b6f2122ae947279ac9df007"; - sha256 = "0pdlz05pjqxp19da13dr3wd20hgxw8z5swhflyf7ksjgvz5rxb4r"; + rev = "7bba6699d6f903bd701b0aa525d845de8427fee6"; + sha256 = "1lh7dh96fyi005fcg3xaf7r4ssgkq840p6anldlqy52vfwmglw3p"; }; description = "Port of Mednafen's PCFX core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; beetle-psx = let der = (mkLibRetroCore { core = "mednafen-psx"; src = fetchRetro { repo = "beetle-psx-libretro"; - rev = "f55db8655408104a6e20af667657423f08566c85"; - sha256 = "17iz8r2wy8zqh63j78ijwxasdnmg8dh9mmqn1qr4hvf4fj53ckk8"; + rev = "0f1e7e60827cad49ebba628abdc83ad97652ab89"; + sha256 = "1j92jgddyl970v775d6gyb50l8md6yfym2fpqhfxcr4gj1b4ivwq"; }; description = "Port of Mednafen's PSX Engine core to libretro"; license = gpl2; - }); in der.override { makefile = "Makefile"; - buildPhase = "make"; + makeFlags = [ "HAVE_HW=0" "HAVE_LIGHTREC=1" ]; + }); in der.override { name = "beetle-psx-${der.version}"; }; + beetle-psx-hw = let der = (mkLibRetroCore { + core = "mednafen-psx-hw"; + src = fetchRetro { + repo = "beetle-psx-libretro"; + rev = "0f1e7e60827cad49ebba628abdc83ad97652ab89"; + sha256 = "1j92jgddyl970v775d6gyb50l8md6yfym2fpqhfxcr4gj1b4ivwq"; + }; + description = "Port of Mednafen's PSX Engine (with HW accel) core to libretro"; + license = gpl2; + extraBuildInputs = [ libGL libGLU ]; + makefile = "Makefile"; + makeFlags = [ "HAVE_VULKAN=1" "HAVE_OPENGL=1" "HAVE_HW=1" "HAVE_LIGHTREC=1" ]; + }); in der.override { + name = "beetle-psx-hw-${der.version}"; + }; + beetle-saturn = let der = (mkLibRetroCore { core = "mednafen-saturn"; src = fetchRetro { repo = "beetle-saturn-libretro"; - rev = "3313cc6760c14cffa9226e0cfd41debc11df8bdd"; - sha256 = "1z2zfn5cpsr3x6bvr562vqvmp4pjjhv5a6jcp09gfsy2gkyispr2"; + rev = "8a65943bb7bbc3183eeb0d57c4ac3e663f1bcc11"; + sha256 = "1f0cd9wmvarsmf4jw0p6h3lbzs6515aja7krrwapja7i4xmgbrnh"; }; description = "Port of Mednafen's Saturn core to libretro"; license = gpl2; - }); in der.override { makefile = "Makefile"; - buildPhase = "make"; + makeFlags = [ "HAVE_HW=0" ]; + meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; + }); in der.override { name = "beetle-saturn-${der.version}"; + }; + + beetle-saturn-hw = let der = (mkLibRetroCore { + core = "mednafen-saturn-hw"; + src = fetchRetro { + repo = "beetle-saturn-libretro"; + rev = "8a65943bb7bbc3183eeb0d57c4ac3e663f1bcc11"; + sha256 = "1f0cd9wmvarsmf4jw0p6h3lbzs6515aja7krrwapja7i4xmgbrnh"; + }; + description = "Port of Mednafen's Saturn core to libretro"; + license = gpl2; + extraBuildInputs = [ libGL libGLU ]; + makefile = "Makefile"; + makeFlags = [ "HAVE_OPENGL=1" "HAVE_HW=1" ]; meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; + }); in der.override { + name = "beetle-saturn-${der.version}"; }; - beetle-supergrafx = (mkLibRetroCore rec { + beetle-supergrafx = mkLibRetroCore rec { core = "mednafen-supergrafx"; src = fetchRetro { repo = "beetle-supergrafx-libretro"; - rev = "857e41146e3b0a51def3baea49d2eec80f18102b"; - sha256 = "0r3v4qy4rx4mnr7w4s779f6f2bjyp69m42blimacl1l9f6hmcv5h"; + rev = "fadef23d59fa5ec17bc99e1e722cfd9e10535695"; + sha256 = "15rm7p5q38qy3xpyvamhphjnna8h91fsbcqnl9vhzx9cmjg0wf54"; }; description = "Port of Mednafen's SuperGrafx core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - beetle-wswan = (mkLibRetroCore rec { + beetle-wswan = mkLibRetroCore rec { core = "mednafen-wswan"; src = fetchRetro { repo = "beetle-wswan-libretro"; - rev = "925cb8c77af1678ceab24f04c2790cb95389def1"; - sha256 = "0kqsqn655z6nnr2s1xdbf37ds99gyhqfd7dx0wmx3sy1fshjg5wm"; + rev = "5b03d1b09f70dc208387d3c8b59e12e1f0d2692f"; + sha256 = "1sm6ww3y9m85lhp74dpxbs05yxdhhqqmj2022j9s0m235z29iygc"; }; description = "Port of Mednafen's WonderSwan core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - beetle-vb = (mkLibRetroCore rec { + beetle-vb = mkLibRetroCore rec { core = "mednafen-vb"; src = fetchRetro { repo = "beetle-vb-libretro"; - rev = "9066cdafa29ac054243a679baded49212661f47b"; - sha256 = "0gsniz5kk4xdiprcfyqjcss2vkrphi48wbr29gqvpf7l8gpnwx8p"; + rev = "9a4e604a7320a3c6ed30601989fe0bc417fa9ad3"; + sha256 = "1gallwbqxn5qbmwxr1vxb41nncksai4rxc739a7vqvp65k5kl0qp"; }; description = "Port of Mednafen's VirtualBoy core to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - bluemsx = (mkLibRetroCore rec { + bluemsx = mkLibRetroCore rec { core = "bluemsx"; src = fetchRetro { repo = core + "-libretro"; - rev = "ddd89ff1fa534816e48521bd930b721f2d39975a"; - sha256 = "0hiqhc1ckj3ydy0q1v8hwjkkyh2564f7wlqypmshjcc47n296xyf"; + rev = "7a1d40e750860580ab7cc21fbc244b5bc6db6586"; + sha256 = "05hnkyr47djccspr8v438zimdfsgym7v0jn1hwpkqc4i5zf70981"; }; description = "Port of BlueMSX to libretro"; license = gpl2; - }).override { - buildPhase = "make"; }; - bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore { + bsnes-mercury = let bname = "bsnes-mercury"; in mkLibRetroCore { core = bname + "-accuracy"; src = fetchRetro { repo = bname; @@ -262,12 +275,36 @@ in with stdenv.lib.licenses; }; description = "Fork of bsnes with HLE DSP emulation restored"; license = gpl3; - }).override { makefile = "Makefile"; - buildPhase = "make && cd out"; + postBuild = "cd out"; + }; + + citra = mkLibRetroCore rec { + core = "citra"; + src = fetchgit { + url = "https://github.com/libretro/citra.git"; + rev = "84f31e95160b029e6d614053705054ed6a34bb38"; + sha256 = "0gkgxpwrh0q098cpx56hprvmazi5qi448c23svwa8ar1myh8p248"; + fetchSubmodules = true; + deepClone = true; + }; + description = "Port of Citra to libretro"; + license = gpl2Plus; + extraNativeBuildInputs = [ cmake pkgconfig ]; + extraBuildInputs = [ libGLU libGL boost ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DENABLE_LIBRETRO=ON" + "-DENABLE_QT=OFF" + "-DENABLE_SDL2=OFF" + "-DENABLE_WEB_SERVICE=OFF" + "-DENABLE_DISCORD_PRESENCE=OFF" + ]; + preConfigure = "sed -e '77d' -i externals/cmake-modules/GetGitRevisionDescription.cmake"; + postBuild = "cd src/citra_libretro"; }; - desmume = (mkLibRetroCore rec { + desmume = mkLibRetroCore rec { core = "desmume"; src = fetchRetro { repo = core; @@ -277,45 +314,43 @@ in with stdenv.lib.licenses; description = "libretro wrapper for desmume NDS emulator"; license = gpl2; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - }).override { - makefile = "desmume/src/frontend/libretro/Makefile.libretro"; - configurePhase = "cd desmume/src/frontend/libretro"; - buildPhase = "make"; + preBuild = "cd desmume/src/frontend/libretro"; + makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; }; - desmume2015 = (mkLibRetroCore rec { + desmume2015 = mkLibRetroCore rec { core = "desmume2015"; src = fetchRetro { repo = core; - rev = "c27bb71aa28250f6da1576e069b4b8cc61986beb"; - sha256 = "1m7g1wwpnnprmki3rixknggjmxbp7d4hwxgkqr041shmrm0rhafd"; + rev = "93d5789d60f82436e20ccad05ce9cb43c6e3656e"; + sha256 = "12nii2pbnqgh7f7jkphbwjpr2hiy2mzbwpas3xyhpf9wpy3qiasg"; }; description = "libretro wrapper for desmume NDS emulator from 2015"; license = gpl2; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - }).override { - makefile = "desmume/Makefile.libretro"; - configurePhase = "cd desmume"; - buildPhase = "make"; + makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + preBuild = "cd desmume"; }; - dolphin = (mkLibRetroCore { + dolphin = mkLibRetroCore { core = "dolphin"; src = fetchRetro { repo = "dolphin"; - rev = "11a7ed402c7178da1d9d57c6e5e5a05a4dc6a2c8"; - sha256 = "11jrcczkbyns01rvxb5rd22fbkbfn2h81f6pfxbhi13fl4ljim9x"; + rev = "1fbd59911d1b718c142d6448dee3ede98152e395"; + sha256 = "1rymsvs034l1hbxc3w8zi9lhmgka2qaj3jynjy152dccd480nnd4"; }; description = "Port of Dolphin to libretro"; license = gpl2Plus; - broken = true; + extraNativeBuildInputs = [ cmake curl pkgconfig ]; extraBuildInputs = [ - cmake curl libGLU libGL pcre pkgconfig sfml + libGLU libGL pcre sfml gettext hidapi libevdev udev ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); - }).override { + makefile = "Makefile"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DLIBRETRO=ON" @@ -325,11 +360,10 @@ in with stdenv.lib.licenses; "-DUSE_UPNP=OFF" "-DUSE_DISCORD_PRESENCE=OFF" ]; - dontUseCmakeBuildDir = "yes"; - buildPhase = "make"; + dontUseCmakeBuildDir = true; }; - dosbox = (mkLibRetroCore rec { + dosbox = mkLibRetroCore rec { core = "dosbox"; src = fetchRetro { repo = core + "-libretro"; @@ -338,60 +372,105 @@ in with stdenv.lib.licenses; }; description = "Port of DOSBox to libretro"; license = gpl2; - }).override { - buildPhase = "make"; }; - fba = (mkLibRetroCore rec { - core = "fba"; + eightyone = mkLibRetroCore rec { + core = "81"; src = fetchRetro { repo = core + "-libretro"; - rev = "89245384c7d181e286d6f34995253419f946becb"; - sha256 = "1pg351qhbq5x8qmaq6c30v8ynic8jv3gbxy2kq5iknka80g1lkck"; + rev = "4352130bd2363954262a804b086f86b9d13d97f9"; + sha256 = "057ynnv85imjqhgixrx7p28wn42v88vsm3fc1lp3mpcfi2bk266h"; }; - description = "Port of Final Burn Alpha to libretro"; + description = "Port of EightyOne to libretro"; + license = gpl3; + }; + + fbalpha2012 = mkLibRetroCore rec { + core = "fbalpha2012"; + src = fetchRetro { + repo = core; + rev = "fa97cd2784a337f8ac774c2ce8a136aee69b5f43"; + sha256 = "1i75k0r6838hl77bjjmzvan33ka5qjrdpirmclzj20g5j97lmas7"; + }; + description = "Port of Final Burn Alpha ~2012 to libretro"; license = "Non-commercial"; - }).override { - makefile = "svn-current/trunk/makefile.libretro"; - buildPhase = '' - cd svn-current/trunk \ - && make -f makefile.libretro \ - && mv fbalpha2012_libretro${stdenv.hostPlatform.extensions.sharedLibrary} fba_libretro${stdenv.hostPlatform.extensions.sharedLibrary} + makefile = "makefile.libretro"; + preBuild = "cd svn-current/trunk"; + }; + + fbneo = mkLibRetroCore rec { + core = "fbneo"; + src = fetchRetro { + repo = core; + rev = "cf43fdb1755f9f5c886266e86ba40d339bc8f5d7"; + sha256 = "13g3c6mbwhcf0rp95ga4klszh8dab2d4ahh2vzzlmd57r69lf2lv"; + }; + description = "Port of FBNeo to libretro"; + license = "Non-commercial"; + makefile = "Makefile"; + postPatch = '' + sed -i -e 's:-Wall:-Wall -Wno-format-security:g' src/burner/libretro/Makefile ''; + preBuild = "cd src/burner/libretro"; + makeFlags = [ "USE_EXPERIMENTAL_FLAGS=1" ]; }; fceumm = mkLibRetroCore rec { core = "fceumm"; src = fetchRetro { repo = "libretro-" + core; - rev = "0e315e0ca0093ebda06a97835cec6ad4af81db7a"; - sha256 = "12bvvxmvafjvrvwxl5gzr583g48s0isx2fgvjgkrx175vk2amaf4"; + rev = "9ed22e5a9a1360a7f599a64283af9fe24b858e3d"; + sha256 = "0rz6iy281jpybmsz5rh06k5xvmd9id9w2q2gd0qdv9a2ylwv7s2j"; }; description = "FCEUmm libretro port"; license = gpl2; }; - flycast = (mkLibRetroCore rec { + flycast = mkLibRetroCore rec { core = "flycast"; src = fetchRetro { repo = core; - rev = "45a15205dfc05cfc4df2488cad7c2b4988c5aa0f"; - sha256 = "18glxd57kddq6p2bwq0qknyq6bv8dxklqks4w2jy2yccvwxdxy2i"; + rev = "b12f3726d9093acb4e441b1cdcf6cd11403c8644"; + sha256 = "0nczjhdqr7svq9aflczf7rwz64bih1wqy9q0gyglb55xlslf5jqc"; }; description = "Flycast libretro port"; license = gpl2; extraBuildInputs = [ libGL libGLU ]; - }).override { makefile = "Makefile"; - buildPhase = "make"; + makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + meta.platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; + + fmsx = mkLibRetroCore rec { + core = "fmsx"; + src = fetchRetro { + repo = core + "-libretro"; + rev = "3de916bbf15062de1ab322432d38a1fee29d5e68"; + sha256 = "1krr4lmdiv0d7bxk37fqz5y412znb5bmxapv9g7ci6fp87sr69jq"; + }; + description = "FMSX libretro port"; + license = "Non-commercial"; + makefile = "Makefile"; + }; + + freeintv = mkLibRetroCore rec { + core = "freeintv"; + src = fetchRetro { + repo = core; + rev = "45030e10cc1a50cf7a80c5d921aa8cba0aeaca91"; + sha256 = "10lngk3p012bgrg752426701hfzsiy359h8i0vzsa64pgyjbqlag"; + }; + description = "FreeIntv libretro port"; + license = gpl3; + makefile = "Makefile"; }; gambatte = mkLibRetroCore rec { core = "gambatte"; src = fetchRetro { repo = core + "-libretro"; - rev = "4d9ad7b29946ec0a914b2d6a735b6c2704ed1f23"; - sha256 = "156pvvlch5izbgbw4ddxhiwgzpp52irr3nqaz813i5f02fiq5wya"; + rev = "132f36e990dfc6effdafa6cf261373432464f9bf"; + sha256 = "19w5k9yc1cl99c5hiqbp6j54g6z06xcblpvd3x6nmhxij81yqxy7"; }; description = "Gambatte libretro port"; license = gpl2; @@ -401,42 +480,50 @@ in with stdenv.lib.licenses; core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; - rev = "0e4357bd64533d7fd93b5f01620b92595025fab5"; - sha256 = "1nryy00844h3ra97j40g38lj7036ibm2l8002qid7r5r9kggclqx"; + rev = "50551066f71f8a5ea782ea3747891fd6d24ebe67"; + sha256 = "150lgdrv7idcq7jbd1jj7902rcsyixd7kfjs2m5xdinjvl22kihr"; }; description = "Enhanced Genesis Plus libretro port"; license = "Non-commercial"; }; - gpsp = (mkLibRetroCore rec { + gpsp = mkLibRetroCore rec { core = "gpsp"; src = fetchRetro { repo = core; - rev = "24af89596e6484ff5a7a08efecfa8288cfbc02f3"; - sha256 = "1jc5i70cab5f23yc9sfv8iyvmwmc4sb33f413il2vlhsfdxklyk7"; + rev = "3f2f57c982ffead643957db5b26931df4913596f"; + sha256 = "09fa1c623rmy1w9zx85r75viv8q1vknhbs8fn6xbss9rhpxhivwg"; }; description = "Port of gpSP to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - handy = (mkLibRetroCore rec { + gw = mkLibRetroCore rec { + core = "gw"; + src = fetchRetro { + repo = core + "-libretro"; + rev = "819b1dde560013003eeac86c2069c5be7af25c6d"; + sha256 = "1jhgfys8hiipvbwq3gc48d7v6wq645d10rbr4w5m6px0fk6csshk"; + }; + description = "Port of Game and Watch to libretro"; + license = stdenv.lib.licenses.zlib; + makefile = "Makefile"; + }; + + handy = mkLibRetroCore rec { core = "handy"; src = fetchRetro { repo = "libretro-" + core; - rev = "6b19a4fad1b394f6a1351c88f60991d4878ff05b"; - sha256 = "0lhkrwh3rirdidxb8kfcg8wk9gjsc7g6qpkv74h6f09rb4y75w1y"; + rev = "c9fe65d1a2df454ee11404ac27bdc9be319dd9a2"; + sha256 = "1l1gi8z68mv2cpdy7a6wvhd86q55khj3mv3drf43ak4kj2ij8cvq"; }; description = "Port of Handy to libretro"; license = "Handy-License"; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - hatari = (mkLibRetroCore rec { + hatari = mkLibRetroCore rec { core = "hatari"; src = fetchRetro { repo = core; @@ -445,271 +532,280 @@ in with stdenv.lib.licenses; }; description = "Port of Hatari to libretro"; license = gpl2; - extraBuildInputs = [ cmake SDL ]; - }).override { - makefile = "Makefile.libretro"; - buildPhase = "make"; - }; - - higan-sfc = (mkLibRetroCore { - core = "higan-sfc"; - src = fetchFromGitLab { - owner = "higan"; - repo = "higan"; - rev = "d3f592013a27cb78f17d84f90a6be6cf6f6af1d1"; - sha256 = "19d4cbwg8d085xq5lmql4v5l4ckgwqzc59ha5yfgv3w4qfp4dmij"; - }; - description = "Accurate SNES / Super Famicom emulator"; - license = gpl3; - broken = true; - - }).override { - makefile = "GNUmakefile"; - buildPhase = "cd higan && make compiler=g++ target=libretro binary=library && cd out"; + extraBuildInputs = [ SDL zlib ]; + extraNativeBuildInputs = [ cmake which ]; + dontUseCmakeConfigure = true; + dontConfigure = true; + makeFlags = [ "EXTERNAL_ZLIB=1" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; }; - mame = (mkLibRetroCore { + mame = mkLibRetroCore { core = "mame"; src = fetchRetro { repo = "mame"; - rev = "f4aac49f3d56fbd653628ac456c23ac9a6b857ae"; - sha256 = "1pjpnwdj73319hgcjhganzrcz2zn4fnjydah989haqh3id5j3zam"; + rev = "ed987ad07964a938351ff3cc1ad42e02ffd2af6d"; + sha256 = "0qc66mvraffx6ws972skx3wgblich17q6z42798qn13q1a264p4j"; }; description = "Port of MAME to libretro"; license = gpl2Plus; extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ]; - }).override { postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src ''; - buildPhase = "make -f Makefile.libretro"; + makefile = "Makefile.libretro"; }; - mame2000 = (mkLibRetroCore rec { + mame2000 = mkLibRetroCore rec { core = "mame2000"; src = fetchRetro { repo = core + "-libretro"; - rev = "0a8a174f5e755cdd476895207003c5d07cfa6af2"; - sha256 = "03k0cfgd4wfl31dv5xb6xjd4h7sh0k0qw6wbspwi0lgswmhz97bb"; + rev = "e5d4a934c60adc6d42a3f87319312aad89595a15"; + sha256 = "1zn63yqyrsnsk196v5f3nm7cx41mvsm3icpis1yxbma2r3dk3f89"; }; description = "Port of MAME ~2000 to libretro"; license = gpl2Plus; - }).override { makefile = "Makefile"; - buildPhase = "make"; + makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; }; - mame2003 = (mkLibRetroCore rec { + mame2003 = mkLibRetroCore rec { core = "mame2003"; src = fetchRetro { repo = core + "-libretro"; - rev = "170d5b6490953d40edc39defe69945d005f8ec03"; - sha256 = "0slsf59sn5lijr1mrx5ffc9z81ra1wcw7810mb52djqyvm15r9zl"; + rev = "82596014905ad38c80c9eb322ab08c625d1d92cd"; + sha256 = "17dp2rz6p7q7nr0lajn3vhk9ghngxz16f7c6c87r6wgsy4y3xw0m"; }; description = "Port of MAME ~2003 to libretro"; license = gpl2Plus; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - mame2003-plus = (mkLibRetroCore rec { + mame2003-plus = mkLibRetroCore rec { core = "mame2003-plus"; src = fetchRetro { repo = core + "-libretro"; - rev = "d9a56a3af908ae9100b4c9feebff4b918363f241"; - sha256 = "1c16chfs4b2j1x1bmrklh8ssqki850k787qwq7b95dyxksj2bpx1"; + rev = "0134c428b75882aa474f78dbbf2c6ecde49b97b7"; + sha256 = "0jln2ys6v9hrsrkhqd87jfslwvkca425f40mf7866g6b4pz56mwc"; }; description = "Port of MAME ~2003+ to libretro"; license = gpl2Plus; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - mame2010 = (mkLibRetroCore rec { + mame2010 = mkLibRetroCore rec { core = "mame2010"; src = fetchRetro { repo = core + "-libretro"; - rev = "4ced2c31f1100eefc7f4483b474b8a680a3b3f2b"; - sha256 = "1a8ijj0sixr6xrqfgimna0ipfj2bb2kvj4mb45hb8a18mwn6y0mc"; + rev = "d3151837758eade73c85c28c20e7d2a8706f30c6"; + sha256 = "0hj0yhc8zs32fkzn8j341ybhvrsknv0k6x0z2fv3l9ic7swgb93i"; }; description = "Port of MAME ~2010 to libretro"; license = gpl2Plus; - }).override { makefile = "Makefile"; - buildPhase = "make"; + makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; }; - mame2015 = (mkLibRetroCore rec { + mame2015 = mkLibRetroCore rec { core = "mame2015"; src = fetchRetro { repo = core + "-libretro"; - rev = "e3a28398f54cd6b2c24b7165d215b046b79c10f5"; - sha256 = "1fgwi37zgp2s92bkz03gch3ivgyjgdi3xycrd8z7x87gi20a79x9"; + rev = "37333ed6fda4c798a1d6b055fe4708f9f0dcf5a7"; + sha256 = "1asldlj1ywgmhabbhaagagg5hn0359122al07802q3l57ns41l64"; }; description = "Port of MAME ~2015 to libretro"; license = gpl2Plus; - extraBuildInputs = [ python27 alsaLib ]; - }).override { + extraNativeBuildInputs = [ python27 ]; + extraBuildInputs = [ alsaLib ]; makefile = "Makefile"; - buildPhase = "make"; }; - mame2016 = (mkLibRetroCore rec { + mame2016 = mkLibRetroCore rec { core = "mame2016"; src = fetchRetro { repo = core + "-libretro"; - rev = "ea4c1ffa75eb3fb0096158b71706b8b84d86d12c"; - sha256 = "1qyvdymmjv5q0k3najgfdxzf1yr6bnysnsl19v753yj29xs4hwzp"; + rev = "02987af9b81a9c3294af8fb9d5a34f9826a2cf4d"; + sha256 = "0gl7irmn5d8lk7kf484vgw6kb325fq4ghwsni3il4nm5n2a8yglh"; }; description = "Port of MAME ~2016 to libretro"; license = gpl2Plus; - extraBuildInputs = [ python27 alsaLib ]; - }).override { + extraNativeBuildInputs = [ python27 ]; + extraBuildInputs = [ alsaLib ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src ''; - buildPhase = "make -f Makefile.libretro"; }; - mesen = (mkLibRetroCore rec { + mesen = mkLibRetroCore rec { core = "mesen"; src = fetchFromGitHub { owner = "SourMesen"; repo = core; - rev = "942633dd3dbb73cc3abd748f6d5440c78abbea09"; - sha256 = "0a95wd64vnblksacapxwxla9j2iw8a5hbdm111cldrni12q87iq2"; + rev = "cfc5bf6976f62ebd42ea30d5a803c138fc357509"; + sha256 = "0ihlgvzvni1yqcyi5yxdvg36q20fsqd6n67zavwfb2ph09cqv7kz"; }; description = "Port of Mesen to libretro"; license = gpl3; - }).override { - makefile = "Libretro/Makefile"; - buildPhase = "cd Libretro && make"; + makefile = "Makefile"; + preBuild = "cd Libretro"; + }; + + meteor = mkLibRetroCore rec { + core = "meteor"; + src = fetchRetro { + repo = core + "-libretro"; + rev = "3d21e3b5a7596918bee0fcaca5752ae76624c05e"; + sha256 = "0fghnxxbdrkdz6zswkd06w2r3dvr4ikvcp8jbr7nb9fc5yzn0avw"; + }; + description = "Port of Meteor to libretro"; + license = gpl3; + makefile = "Makefile"; + preBuild = "cd libretro"; }; mgba = mkLibRetroCore rec { core = "mgba"; src = fetchRetro { repo = core; - rev = "4865aaabc2a46c635f218f7b51f8fc5cc2c4c8ac"; - sha256 = "1mdzwcsl5bafmgqfh0a1bgfgilisffxsygcby0igsq2bgkal47mm"; + rev = "f87f9ef6cb38537e07dcaedeb82aecac6537d42e"; + sha256 = "0yixvnzgk7qvcfz12r5y8i85czqxbxx6bvl1c7yms8riqn9ssvb7"; }; description = "Port of mGBA to libretro"; license = mpl20; }; - mupen64plus = (mkLibRetroCore rec { + mupen64plus = mkLibRetroCore { core = "mupen64plus-next"; src = fetchRetro { - repo = "mupen64plus-libretro-nx"; # + "-libretro-nx"; - rev = "f77c16f9f1dd911fd2254becc8a28adcdafe8aa1"; - sha256 = "0j6vrkwch9lwmlhyz7fp1ha0bby54gvbwk91hwbv35f6dvs0aw0d"; + repo = "mupen64plus-libretro-nx"; + rev = "81a58df0263c90b10b7fc11b6deee04d47e3aa40"; + sha256 = "1brqyrsdzdq53a68q7ph01q2bx5y4m8b3ymvpp25229imm88lgkn"; }; description = "Libretro port of Mupen64 Plus, GL only"; license = gpl2; extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ]; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - nestopia = (mkLibRetroCore rec { + neocd = mkLibRetroCore rec { + core = "neocd"; + src = fetchRetro { + repo = core + "_libretro"; + rev = "3825848fe7dd7e0ef859729eefcb29e2ea2956b7"; + sha256 = "018vfmjsx62zk45yx3pwisp4j133yxjbm7fnwwr244gnyms57711"; + }; + description = "NeoCD libretro port"; + license = gpl3; + makefile = "Makefile"; + }; + + nestopia = mkLibRetroCore rec { core = "nestopia"; src = fetchRetro { repo = core; - rev = "7f48c211c281880d122981da119a4455a9bebbde"; - sha256 = "05p3a559633dzw222rs1fh48v657mdyirl1qfqzkhqiar9rxf31g"; + rev = "70c53f08c0cc92e90d095d6558ab737ce20431ac"; + sha256 = "1hlfqml66wy6fn40f1iiy892vq9y9fj20vv3ynd2s3b3qxhwfx73"; }; - description = "nestopia undead libretro port"; + description = "Nestopia libretro port"; license = gpl2; - }).override { - makefile = "libretro/Makefile"; - buildPhase = "cd libretro && make"; + makefile = "Makefile"; + preBuild = "cd libretro"; }; - o2em = (mkLibRetroCore rec { + o2em = mkLibRetroCore rec { core = "o2em"; src = fetchRetro { repo = "libretro-" + core; - rev = "d6731b9b2592654ce4f1b64c1b1da17b32e7c94c"; - sha256 = "0809qw16y7ablxfayf0lbzvq7wqdmjp0afdb0vcgv193vvhhp58q"; + rev = "b23a796dd3490e979ff43710317df6d43bd661e1"; + sha256 = "1pkbq7nig394zdjdic0mzdsvx8xhzamsh53xh2hzznipyj46b7z0"; }; description = "Port of O2EM to libretro"; license = artistic1; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - parallel-n64 = (mkLibRetroCore rec { + opera = mkLibRetroCore rec { + core = "opera"; + src = fetchRetro { + repo = core + "-libretro"; + rev = "27bc2653ed469072a6a95102a8212a35fbb1e590"; + sha256 = "10cxjpsd35rb4fjc5ycs1h00gvshpn2mxxvwb6xzrfrzva0kjw1l"; + }; + description = "Opera is a port of 4DO/libfreedo to libretro"; + license = "Non-commercial"; + makefile = "Makefile"; + makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ]; + }; + + parallel-n64 = mkLibRetroCore rec { core = "parallel-n64"; src = fetchRetro { repo = core; - rev = "30f4fd3c2456145763eb76aead7485a1b86ba6bd"; - sha256 = "0kbyzmscmfi6f842clzaff4k6xcb5410fwhv8n6vv42xk6ljfvgh"; + rev = "8fe07c62a364d0af1e22b7f75e839d42872dae7f"; + sha256 = "0p3fpldw6w4n4l60bv55c17vhqwq4q39fp36h8iqmnj7c32c61kf"; }; description = "Parallel Mupen64plus rewrite for libretro."; license = gpl2; - extraBuildInputs = [ libGLU libGL libpng ]; - }).override { makefile = "Makefile"; - buildPhase = "make"; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 '' + sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ + && sed -i -e 's,CPUFLAGS :=,,g' Makefile + ''; }; - pcsx_rearmed = (mkLibRetroCore rec { + pcsx_rearmed = mkLibRetroCore rec { core = "pcsx_rearmed"; src = fetchRetro { repo = core; - rev = "eb6943ee04b0f30a6f1cebfe399a94bacd1dfb45"; - sha256 = "0xikdirvjal4mdr5y9dl9gcxhdilqzq43f909b0z8vc069vj1wjz"; + rev = "8fda5dd0e28fe46621fb1ab57781c316143017da"; + sha256 = "0k371d0xqzqwy8ishvxssgasm36q83qj7ksn2av110n879n4knwb"; }; - description = "Port of PCSX ReARMed to libretro"; + description = "Port of PCSX ReARMed with GNU lightning to libretro"; license = gpl2; - }).override { - configurePhase = "rm configure"; - buildPhase = "make -f Makefile.libretro"; + dontConfigure = true; }; - picodrive = (mkLibRetroCore rec { + picodrive = mkLibRetroCore rec { core = "picodrive"; src = fetchRetro { repo = core; - rev = "28dcfd6f43434e6828ee647223a0576bfe858c24"; - sha256 = "19a1b6q8fhf7wxzyf690va1ixzlxlzyslv1zxm0ll5pfsqf2y3gx"; + rev = "600894ec6eb657586a972a9ecd268f50907a279c"; + sha256 = "1bxphwnq4b80ssmairy8sfc5cp4m6jyvrcjcj63q1vk7cs6qls7p"; }; description = "Fast MegaDrive/MegaCD/32X emulator"; license = "MAME"; extraBuildInputs = [ libpng SDL ]; - }).override { - patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL.dev}/bin/sdl-config\",' configure"; - configurePhase = "./configure"; + SDL_CONFIG = "${SDL.dev}/bin/sdl-config"; + dontAddPrefix = true; + configurePlatforms = []; + makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; }; - play = (mkLibRetroCore rec { + play = mkLibRetroCore { core = "play"; src = fetchRetro { repo = "play-"; - rev = "fedc1e1c2918a7490a881cdb4ec951a828c19671"; - sha256 = "0hwxx7h61gd29a2gagwjbvxk2hgwdk1wxg4nx90zrizb8nczwnl6"; + rev = "884ae3b96c631f235cd18b2643d1f318fa6951fb"; + sha256 = "0m9pk20jh4y02visgzfw64bpbw93bzs15x3a3bnd19yivm34dbfc"; }; description = "Port of Play! to libretro"; license = bsd2; - extraBuildInputs = [ cmake boost ]; - }).override { + extraBuildInputs = [ boost ]; + extraNativeBuildInputs = [ cmake openssl curl icu libGL libGLU xorg.libX11 ]; + makefile = "Makefile"; cmakeFlags = [ "-DBUILD_PLAY=OFF -DBUILD_LIBRETRO_CORE=ON" ]; - buildPhase = "make"; + postBuild = "mv Source/ui_libretro/play_libretro${stdenv.hostPlatform.extensions.sharedLibrary} play_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; }; - ppsspp = (mkLibRetroCore rec { + ppsspp = mkLibRetroCore { core = "ppsspp"; src = fetchgit { url = "https://github.com/hrydgard/ppsspp"; @@ -718,214 +814,261 @@ in with stdenv.lib.licenses; }; description = "ppsspp libretro port"; license = gpl2; - extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ]; - }).override { - cmakeFlags = [ "-DLIBRETRO=ON" ]; + extraNativeBuildInputs = [ cmake pkgconfig ]; + extraBuildInputs = [ libGLU libGL libzip ffmpeg python37 snappy xorg.libX11 ]; makefile = "Makefile"; - buildPhase = '' - make \ - && mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} - ''; + cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ]; + postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; }; - prboom = (mkLibRetroCore rec { + prboom = mkLibRetroCore rec { core = "prboom"; src = fetchRetro { repo = "libretro-" + core; - rev = "4c690eb6b569a276c5b2a87680718f715477eae2"; - sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja"; + rev = "991016b3c7a9c8b0e49b2bc9c72f68c60800fc7b"; + sha256 = "1abv9qgfvh3x84shgyl3y90bjz77mjj17vibag7bg6i8hgjikjgq"; }; description = "Prboom libretro port"; license = gpl2; - }).override { - buildPhase = "make"; + makefile = "Makefile"; }; - prosystem = (mkLibRetroCore rec { + prosystem = mkLibRetroCore rec { core = "prosystem"; src = fetchRetro { repo = core + "-libretro"; - rev = "cb4aa3ee72f98b0891a7bac5c9dac458cdba4d34"; - sha256 = "0yvzmks9zz1hf7mv6cd2qin1p3yx00dbrcxlm0yysy5q5jiigblg"; + rev = "6f7e34aea89db5ba2fbf674e5ff0ad6fc68a198e"; + sha256 = "0pqkb0f51s8ma0l4m9xk2y85z2kh3fgay9g4g8fingbgqq1klvzs"; }; description = "Port of ProSystem to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - quicknes = (mkLibRetroCore rec { + quicknes = mkLibRetroCore { core = "quicknes"; src = fetchRetro { repo = "QuickNES_Core"; - rev = "cd302d998d102c9461a924b81817e48b9ea1518f"; - sha256 = "1sczs1jqcbhpkb5xpcqqdcnxlz7bqmanm4gdnnc12c19snl7999b"; + rev = "31654810b9ebf8b07f9c4dc27197af7714364ea7"; + sha256 = "15fr5a9hv7wgndb0fpmr6ws969him41jidzir2ix9xkb0mmvcm86"; }; description = "QuickNES libretro port"; license = lgpl21Plus; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - scummvm = (mkLibRetroCore rec { + sameboy = mkLibRetroCore rec { + core = "sameboy"; + src = fetchRetro { + repo = "sameboy"; + rev = "c9e547c1063fd62c40a4b7a86e7db99dc9089051"; + sha256 = "0bff6gicm24d7h270aqvgd8il6mi7j689nj5zl9ij0wc77hrrpmq"; + }; + description = "SameBoy libretro port"; + license = mit; + extraNativeBuildInputs = [ which hexdump ]; + preBuild = "cd libretro"; + makefile = "Makefile"; + }; + + scummvm = mkLibRetroCore rec { core = "scummvm"; src = fetchRetro { repo = core; - rev = "e07a6ede61c364fb87630fa7507a4f8482d882e0"; - sha256 = "0i88z53q28lwzmadxincab4m66qbzcbmasgildybj8db0z2z8jm0"; + rev = "de91bf9bcbf4449f91e2f50fde173496a2b52ee0"; + sha256 = "06h9xaf2b1cjk85nbslpjj0fm9iy9b2lxr1wf3i09hgs4sh6x464"; }; description = "Libretro port of ScummVM"; license = gpl2; extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ]; - }).override { - makefile = "backends/platform/libretro/build/Makefile"; - buildPhase = "cd backends/platform/libretro/build && make"; + makefile = "Makefile"; + preConfigure = "cd backends/platform/libretro/build"; + }; + + smsplus-gx = mkLibRetroCore rec { + core = "smsplus"; + src = fetchRetro { + repo = core + "-gx"; + rev = "36c82768c03d889f1cf4b66369edac2297acba32"; + sha256 = "1f9waikyp7kp2abb76wlv9hmf2jpc76zjmfqyc7wk2pc70ljm3l4"; + }; + description = "SMS Plus GX libretro port"; + license = gpl2Plus; }; - snes9x = (mkLibRetroCore rec { + snes9x = mkLibRetroCore rec { core = "snes9x"; src = fetchFromGitHub { owner = "snes9xgit"; repo = core; - rev = "04692e1ee45cc647423774ee17c63208c2713638"; - sha256 = "09p9m85fxwrrrapjb08rcxknpgq5d6a87arrm1jn94r56glxlcfa"; + rev = "6db918cfe32b157239da44096091c212fdfb3b60"; + sha256 = "0y3jhy50qdhhfglybys9m0fgk9r24ksdcgv5iqpyxy5a4cjvhv8j"; }; description = "Port of SNES9x git to libretro"; license = "Non-commercial"; - }).override { - makefile = "libretro/Makefile"; - buildPhase = "cd libretro && make"; + makefile = "Makefile"; + preBuild = "cd libretro"; }; - snes9x2002 = (mkLibRetroCore rec { + snes9x2002 = mkLibRetroCore rec { core = "snes9x2002"; src = fetchRetro { repo = core; - rev = "354bcb5acea0aa45b56ae553e0b2b4f10792dfeb"; - sha256 = "05gvjjxy6ci5pax3frd9g8k9mkqskab5g6rvfjab7cc4zrxrg23f"; + rev = "a869da7f22c63ee1cb316f79c6dd7691a369da3e"; + sha256 = "11lcwscnxg6sk9as2xlr4nai051qhidbsymyis4nz3r4dmgzf8j8"; }; description = "Optimized port/rewrite of SNES9x 1.39 to Libretro"; license = "Non-commercial"; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - snes9x2005 = (mkLibRetroCore rec { + snes9x2005 = mkLibRetroCore rec { core = "snes9x2005"; src = fetchRetro { repo = core; - rev = "e5cadd2f21fb64e8c7194ad006b39e6f555c4a5b"; - sha256 = "1q0xrw3f8zm2k19sva8cz28yx815w8a6y1xsl0i6bb3cai3q1hyx"; + rev = "c216559b9e0dc3d7f059dcf31b813402ad47fea5"; + sha256 = "19b2rpj6i32c34ryvlna4yca84y5ypza78w4x9l17qlhp021h9pv"; }; description = "Optimized port/rewrite of SNES9x 1.43 to Libretro"; license = "Non-commercial"; - }).override { makefile = "Makefile"; - buildPhase = '' - make USE_BLARGG_APU=1 \ - && mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary} - ''; + makeFlags = [ "USE_BLARGG_APU=1" ]; + postBuild = "mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; }; - snes9x2010 = (mkLibRetroCore rec { + snes9x2010 = mkLibRetroCore rec { core = "snes9x2010"; src = fetchRetro { repo = core; - rev = "e945cbae0f8c472e1567a319817c9228b775dd71"; - sha256 = "1pj5p4a2hy7hk90bzy4vnkz3b6nc8n1niqibgwhyfsc22xlxqsfr"; + rev = "ba9f2240360f8db270fb6ba5465c79c317070560"; + sha256 = "00y53sjrsp8sccpp1qqw88iawsz30g6d370cbqcxs4ya1r6awn5x"; }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; license = "Non-commercial"; - }).override { - buildPhase = '' - make -f Makefile.libretro - ''; }; - stella = (mkLibRetroCore rec { + stella = mkLibRetroCore rec { core = "stella"; + src = fetchFromGitHub { + owner = "stella-emu"; + repo = core; + rev = "506bb0bd0618e676b1959931dcc00a9d0f5f0f3d"; + sha256 = "09nclx0ksixngnxkkjjcyhf3d0vl4ykm8fx7m307lvag8nxj7z03"; + }; + description = "Port of Stella to libretro"; + license = gpl2; + extraBuildInputs = [ libpng pkgconfig SDL ]; + makefile = "Makefile"; + preBuild = "cd src/libretro"; + dontConfigure = true; + }; + + stella2014 = mkLibRetroCore rec { + core = "stella2014"; src = fetchRetro { - repo = core + "2014-libretro"; - rev = "6d74ad9a0fd779145108cf1213229798d409ed37"; - sha256 = "0b1nsk92rr64xxj8jc9vpjqgrmm3554096zl031ymr94j5cc87q9"; + repo = core + "-libretro"; + rev = "fc87f2c78d3b177f4b9b19698557dce452ac3ce7"; + sha256 = "0yqzavk1w0d0ngpls32c4wlihii97fz2g6zsgadhm48apwjvn3xx"; }; description = "Port of Stella to libretro"; license = gpl2; - }).override { makefile = "Makefile"; - buildPhase = '' - make \ - && mv stella2014_libretro${stdenv.hostPlatform.extensions.sharedLibrary} stella_libretro${stdenv.hostPlatform.extensions.sharedLibrary} - ''; + }; + + tgbdual = mkLibRetroCore rec { + core = "tgbdual"; + src = fetchRetro { + repo = core + "-libretro"; + rev = "9be31d373224cbf288db404afc785df41e61b213"; + sha256 = "19m3f3hj3jyg711z1xq8qn1hgsr593krl6s6hi0r6vf8p5x0zbzw"; + }; + description = "Port of TGBDual to libretro"; + license = gpl2; + makefile = "Makefile"; + }; + + tic80 = mkLibRetroCore { + core = "tic80"; + src = fetchRetro { + repo = "tic-80"; + rev = "f43bad908d5f05f2a66d5cd1d6f21b234d4abd2c"; + sha256 = "0bp34r8qqyw52alws1z4ib9j7bs4d641q6nvqszd07snp9lpvwym"; + }; + description = "Port of TIC-80 to libretro"; + license = mit; + extraNativeBuildInputs = [ cmake pkgconfig ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DBUILD_LIBRETRO=ON" + "-DBUILD_DEMO_CARTS=OFF" + "-DBUILD_PRO=OFF" + "-DBUILD_PLAYER=OFF" + "-DBUILD_SDL=OFF" + "-DBUILD_SOKOL=OFF" + ]; + postBuild = "cd lib"; }; vba-next = mkLibRetroCore rec { core = "vba-next"; src = fetchRetro { repo = core; - rev = "3580ae6acb1a90c4e982e57597458da07eca4f41"; - sha256 = "0fz8z04kf9g1i5x5slyvx5kb07garzxvhcqnwmqn5j574xh1lc6d"; + rev = "019132daf41e33a9529036b8728891a221a8ce2e"; + sha256 = "0hab4rhvvcg30jifd9h9jq5q2vqk2hz5i1q456w6v2d10hl1lf15"; }; description = "VBA-M libretro port with modifications for speed"; license = gpl2; }; - vba-m = (mkLibRetroCore rec { + vba-m = mkLibRetroCore rec { core = "vbam"; src = fetchRetro { repo = core + "-libretro"; - rev = "9ccdeac3aa9db00720bb80eff5c9924362144efa"; - sha256 = "0rq89i9f483j93shhp2p3vqsnb2abpwz6wdnsycfwxgblczmi22y"; + rev = "7d88e045a2fe44e56b3f84846beec446b4c4b2d9"; + sha256 = "04f8adg99a36qkqhij54vkw5z18m5ld33p78lbmv8cxk7k7g7yhy"; }; description = "vanilla VBA-M libretro port"; license = gpl2; - }).override { - makefile = "src/libretro/Makefile"; - buildPhase = "cd src/libretro && make"; + makefile = "Makefile"; + preBuild = "cd src/libretro"; }; - vecx = (mkLibRetroCore rec { + vecx = mkLibRetroCore rec { core = "vecx"; src = fetchRetro { repo = "libretro-" + core; - rev = "26585ee701499550e484c11f005db18e926827d9"; - sha256 = "0vz2aksc8mqnw55f2bvvawj21mxf60fp93r0sr55hdccn9h7355k"; + rev = "321205271b1c6be5dbdb8d309097a5b5c2032dbd"; + sha256 = "1w54394yhf2yqmq1b8wi5y7lvixc5hpjxpyiancrdbjd0af7pdvd"; }; description = "Port of Vecx to libretro"; license = gpl3; - }).override { - buildPhase = "make"; }; - virtualjaguar = (mkLibRetroCore rec { + virtualjaguar = mkLibRetroCore rec { core = "virtualjaguar"; src = fetchRetro { repo = core + "-libretro"; - rev = "7bdd8658880b53bf2bcbae0741323fe18f9041f5"; - sha256 = "0zbrsfhvx293ijazy1w19qha19hprsi0zv8295sa0gq8kyh0xhyw"; + rev = "a162fb75926f5509f187e9bfc69958bced40b0a6"; + sha256 = "06k8xpn5y9rzmi2lwfw0v9v9pz4wvmpalycc608bw9cl39lmz10h"; }; description = "Port of VirtualJaguar to libretro"; license = gpl3; - }).override { makefile = "Makefile"; - buildPhase = "make"; }; - yabause = (mkLibRetroCore rec { + yabause = mkLibRetroCore rec { core = "yabause"; src = fetchRetro { repo = core; - rev = "08d09cb88a69ee4c2986693fb813e0eb58d71481"; - sha256 = "0z55yam1l7m21kbjwn44sp4md9g7p95b27vcxr7i0v08gnkwwvv1"; + rev = "9be109f9032afa793d2a79b837c4cc232cea5929"; + sha256 = "0aj862bs4dmnldy62wdssj5l63ibfkbzqvkxcqa3wyvdz4i367jc"; }; description = "Port of Yabause to libretro"; license = gpl2; - }).override { - makefile = "yabause/src/libretro/Makefile"; - buildPhase = "cd yabause/src/libretro && make"; + makefile = "Makefile"; + # Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64. + makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; + preBuild = "cd yabause/src/libretro"; }; } diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index 3f14258b0c01..02d098654321 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -19,22 +19,14 @@ with stdenv.lib; -let - - # ibtool is closed source so we have to download the blob - osx-MainMenu = fetchurl { - url = "https://github.com/matthewbauer/RetroArch/raw/b146a9ac6b2b516652a7bf05a9db5a804eab323d/pkg/apple/OSX/en.lproj/MainMenu.nib"; - sha256 = "13k1l628wy0rp6wxrpwr4g1m9c997d0q8ks50f8zhmh40l5j2sp8"; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.8.1"; + version = "1.8.5"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7"; + sha256 = "1pg8j9wvwgrzsv4xdai6i6jgdcc922v0m42rbqxvbghbksrc8la3"; rev = "v${version}"; }; @@ -50,33 +42,10 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else ""; + configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; postInstall = optionalString withVulkan '' wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib - '' + optionalString stdenv.targetPlatform.isDarwin '' - EXECUTABLE_NAME=RetroArch - PRODUCT_NAME=RetroArch - MACOSX_DEPLOYMENT_TARGET=10.5 - app=$out/Applications/$PRODUCT_NAME.app - - install -D pkg/apple/OSX/Info.plist $app/Contents/Info.plist - echo "APPL????" > $app/Contents/PkgInfo - mkdir -p $app/Contents/MacOS - ln -s $out/bin/retroarch $app/Contents/MacOS/$EXECUTABLE_NAME - - # Hack to fill in Info.plist template w/o using xcode - sed -i -e 's,''${EXECUTABLE_NAME}'",$EXECUTABLE_NAME," \ - -e 's,''${MACOSX_DEPLOYMENT_TARGET}'",$MACOSX_DEPLOYMENT_TARGET," \ - -e 's,''${PRODUCT_NAME}'",$PRODUCT_NAME," \ - -e 's,''${PRODUCT_NAME:rfc1034identifier}'",$PRODUCT_NAME," \ - $app/Contents/Info.plist - - install -D ${osx-MainMenu} \ - $app/Contents/Resources/en.lproj/MainMenu.nib - install -D pkg/apple/OSX/en.lproj/InfoPlist.strings \ - $app/Contents/Resources/en.lproj/InfoPlist.strings - install -D media/retroarch.icns $app/Contents/Resources/retroarch.icns ''; preFixup = "rm $out/bin/retroarch-cg2glsl"; @@ -86,6 +55,6 @@ in stdenv.mkDerivation rec { description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ MP2E edwtjo matthewbauer ]; + maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch ]; }; } diff --git a/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index 1937874a49cb..1dd09852d27c 100644 --- a/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/misc/solfege/default.nix b/nixpkgs/pkgs/misc/solfege/default.nix index 7ca9843e2e35..08397c8406f6 100644 --- a/nixpkgs/pkgs/misc/solfege/default.nix +++ b/nixpkgs/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,12 +26,9 @@ 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"; diff --git a/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix b/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix index d34619d5b52d..9e3be1101a63 100644 --- a/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix +++ b/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "sha256:06kpf730al50xv1q53ahycky3im23ysrqp40libls4k24zxs9ha2"; + sha256 = "0gqbbxh1y2vcznxw96xn1wpcvg613zzzrbbfrqbw3p7spbn65yfq"; }; patches = lib.singleton ( @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A PKCS#11 interface for TPM2 hardware"; - homepage = https://github.com/tpm2-software/tpm2-pkcs11; + homepage = "https://github.com/tpm2-software/tpm2-pkcs11"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ lschuermann ]; diff --git a/nixpkgs/pkgs/misc/vim-plugins/aliases.nix b/nixpkgs/pkgs/misc/vim-plugins/aliases.nix index cfdd629369c0..4cfb6ccd372f 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/aliases.nix +++ b/nixpkgs/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/nixpkgs/pkgs/misc/vim-plugins/default.nix b/nixpkgs/pkgs/misc/vim-plugins/default.nix index 20cbbf275c3a..e6bca9484a26 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/misc/vim-plugins/deprecated.json b/nixpkgs/pkgs/misc/vim-plugins/deprecated.json new file mode 100644 index 000000000000..2c02982f6c60 --- /dev/null +++ b/nixpkgs/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" + } +} \ No newline at end of file diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 1ce4cf0b7a33..0093bc78c418 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/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"; @@ -125,6 +125,17 @@ let }; }; + ats-vim = buildVimPluginFrom2Nix { + pname = "ats-vim"; + version = "2020-03-03"; + src = fetchFromGitHub { + owner = "vmchale"; + repo = "ats-vim"; + rev = "045fa53f1e0699e980c5c7cd85ecf237ae527ff0"; + sha256 = "1rpqy40kw0cn2h02ly71syvwz5j77xfmrs4mijkn7k0dxgamhy5s"; + }; + }; + auto-git-diff = buildVimPluginFrom2Nix { pname = "auto-git-diff"; version = "2019-09-23"; @@ -224,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"; @@ -283,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"; @@ -367,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"; @@ -446,12 +479,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-03-14"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "5b25ccfbb628d6645a20c27dd161b0eae30cf7c8"; - sha256 = "1l62lia82yzx9crlby71i84zp48xjfpkan14va72mg482fl7akfs"; + rev = "a4a82cd0ea5fb71399ca02c03456e9862a54eec8"; + sha256 = "1cj05rzzwacf0c2gk0zhb5ln6pywyc35p2walna80ncpyniyk6k2"; }; }; @@ -534,12 +567,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-03-13"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "725167224850eed7e792c8fad667b1fb780d8385"; - sha256 = "07crnlh71ycdp1p3xlkmgwq83k12kprain8yhvfzas068f8080hg"; + rev = "881de16a72440c2db7ecc0a68ae0d32a2e5e6864"; + sha256 = "12dwr6r30b78rhj2b19x2l48ri7qzvl2ggr9x6189fhbz4h25rs5"; }; }; @@ -556,12 +589,12 @@ let coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-02-19"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "c956e288a4d0ffff85e920970776d89dc9c65099"; - sha256 = "00xavbkdx019f6xm6bwf3xqgyvbp3sz7ddnjxfvgah97gwy0q7xs"; + rev = "4a8195f5f22d9d7b42998b7e3b846aa2aef7de52"; + sha256 = "1w8b9icwdam8ljprc8avs5pwdiwmx3j1jxsg03d1lvis9w5xm0cd"; }; }; @@ -611,23 +644,23 @@ 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"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-11-13"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "8c55c4b867cf2210810133fab6c9382a6f0a14e0"; - sha256 = "1da97d4s2qnysqk21qdm0sgxn03c2cg8vjsajccx538dwiq9f8lb"; + rev = "8072352a371261a922f30a89a6b5c6b07123da84"; + sha256 = "1nb33ndl0pzxw30ibs6p4qaa781cni93ffgypcc69wg4b2r4341a"; }; }; @@ -666,12 +699,12 @@ let coc-yank = buildVimPluginFrom2Nix { pname = "coc-yank"; - version = "2019-12-11"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yank"; - rev = "79c5a97c9b7122180b869f90f7f011934f3ae8f5"; - sha256 = "0dqz759aw0zlmgwrkv8ia45sdl27hb63ilawm9awzbl99w02psjf"; + rev = "6cb8bc7f2d41b9fb75c797c5805444badeff3dd9"; + sha256 = "0s28684531ihczg5nf2m3f8z1vx9fw4yllfq7jz8g7ifw922ddxb"; }; }; @@ -889,7 +922,7 @@ let pname = "denite-extra"; version = "2019-03-29"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-extra"; rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; @@ -900,7 +933,7 @@ let pname = "denite-git"; version = "2020-03-02"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-git"; rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; @@ -909,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-03-08"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "b6e2c7df9402f293bad1dc45f5d41b3dc5d8a9b1"; - sha256 = "1rnxaj1ah7k5l2bcc2x7pdlqjb9fki5r732yanp4r3c4mlx28rvp"; + rev = "c3206a06508a197650ee4e1d85da39ff24e3a56b"; + sha256 = "1yy6j5zpja8jr1j8sghwc1l0fkb47r8cvv36ckf75x9x5gpylb5m"; }; }; @@ -933,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"; @@ -989,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"; @@ -1121,12 +1154,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-03-11"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "494fcd8f311fb394d81921b63797e963c7d642a3"; - sha256 = "101y83y8gq81rijnsmx8z6aznxczjpm1k8iahix606jvsg7znxgf"; + rev = "1439c621dc94016c504e1732ce8270081a42768f"; + sha256 = "1c8qx839zmf52cfazlbbnlhxw6cvnsr3ds0rclawgycbl4s1qy8f"; }; }; @@ -1176,12 +1209,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-01-31"; + version = "2020-03-15"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "21fbc2afe8f30e98b890fb42fc6bc18fc0c0380e"; - sha256 = "1za9q891bxc355qn7v0wasnvf2j6pvhizbp6ycj411hjcw90jwns"; + rev = "c5804257c6b38c5537b71ac91ed051c70eaeb5e5"; + sha256 = "147cqfwzaxwc1fzvynwdvx1cvx6zziamcayrvacqxs7vzjnz8lx7"; fetchSubmodules = true; }; }; @@ -1344,12 +1377,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-03-15"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d16ddcf58dd5d99671474ab9a815c5599e377f4c"; - sha256 = "1ca0fpp55qa1gk6ljfm98042fyz9xpmk2dhqn0pd5iz93kfgn0gy"; + rev = "d4d36b412bdc53e8bdaf0e2714a2227f51781d68"; + sha256 = "0wbq8ckgzw867qqwjzm48jnbgp7yjl1vim7nsyk1wjm2d8z0xjm9"; }; }; @@ -1377,12 +1410,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-03-15"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "67a947821e3742eb1b4a2267d4d59adbf74ecb02"; - sha256 = "05ch1mxwhjd9ln49sp8xp5f6fgc19i2a9262lfi1kny7i1zrxmg1"; + rev = "63b7813cac0e67cba1ace94b42ef1af291e35e47"; + sha256 = "1p4blbngaxdlacmrqiyxw8y4d0jiws104np68d31mfnvqghylcdy"; }; }; @@ -1397,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"; @@ -1818,12 +1840,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-02-15"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "e8577f3654cac97ee18faae28c80a2200aaaad5a"; - sha256 = "15jw9qvj1dqqfnf52yqvs11r9hzw42aviz89q1gx6yqmvjd5py4v"; + rev = "893bd90787abfec52a2543074e444fc6a9e0cf78"; + sha256 = "0cgzkyhpr1p184yc9b3m259i5mnwdyj5zg80idywvv2gh8phw2y7"; }; }; @@ -2027,12 +2049,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"; }; }; @@ -2104,12 +2126,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-02-15"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "dacbae9d844e678c785db7c9d7988df7a405e572"; - sha256 = "03aah6lgygf7rj78kf4rh5hw593l4qi83ivh5amy9yw8lc630pjv"; + rev = "ee8bba435bed2ecadafb97ff00c2b7b07eedc1b4"; + sha256 = "190k2b0nzkkpakkfwbhmnh5q0b9vj882lvvnzw6dyiq5w5z59pxb"; }; }; @@ -2150,7 +2172,7 @@ let pname = "nerdcommenter"; version = "2020-02-19"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdcommenter"; rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; @@ -2161,7 +2183,7 @@ let pname = "nerdtree"; version = "2020-02-20"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdtree"; rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7"; sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k"; @@ -2236,12 +2258,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-03-12"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "2388fd4a673ac26608c5db570950f3e4edf71ad4"; - sha256 = "0a86l5yn120rn8kz6pfq4j9k9ix3cibysfp2d8rqjz6lndg56cmk"; + rev = "9ea1cd2cd110a8efa40dc893036596b39f979a7a"; + sha256 = "10qcs59r27fkzk0pg90gywbrz7y7b4hvavbws5kx6fjx3h2mbfsh"; }; }; @@ -2258,12 +2280,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-03-09"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "78b16eb3623c1c0d4433ca8e09c2cb661fa1a852"; - sha256 = "0fgj2yhfcdvpqs7012nwcinlndpfhzfzq9ac7kk0cib4m4vg1zxm"; + rev = "4fe58ec4e1fa3500c7ef98464174bf6c4cb8ce67"; + sha256 = "1xyqbr0f2pgvbbk0cpg92pswavff910hy8rjkm05grhqw43vkzcg"; }; }; @@ -2313,12 +2335,12 @@ let open-browser-github-vim = buildVimPluginFrom2Nix { pname = "open-browser-github-vim"; - version = "2020-02-08"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser-github.vim"; - rev = "cb1b3b957d391e15eac41a2c9695086472d6638f"; - sha256 = "0sd72arqqk6kpr3mxdvdcqsb0lcf80gbswxzd5piafwidkmk7m5n"; + rev = "db483ae17f02a8561e85b2071b90359a9a3bd18d"; + sha256 = "09x9lfyi9gfhy4m1vp6z1kxpvi31rr8dnlqhh6fgskkziiqch3jw"; }; }; @@ -2447,7 +2469,7 @@ let pname = "purescript-vim"; version = "2018-12-10"; src = fetchFromGitHub { - owner = "raichoo"; + owner = "purescript-contrib"; repo = "purescript-vim"; rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; @@ -2467,12 +2489,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-03-09"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "2a12d429144cf083382a87743c1cb658cd314309"; - sha256 = "16cf9jdjkf7igqvf40snq71n52kpszdi76ijhxk03dxgycj0hfkb"; + rev = "49b00ee08176636384c98690a4719565372f68b9"; + sha256 = "0lsmrmjrhyi1rm4sp3hs9lhs8v8ff50zc1gy4bg6gsxw4c1ghl3q"; }; }; @@ -2590,7 +2612,7 @@ let pname = "riv-vim"; version = "2020-02-17"; src = fetchFromGitHub { - owner = "Rykka"; + owner = "gu-fan"; repo = "riv.vim"; rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3"; sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5"; @@ -2821,7 +2843,7 @@ let pname = "sved"; version = "2019-01-25"; src = fetchFromGitHub { - owner = "peder2tm"; + owner = "peterbjorgensen"; repo = "sved"; rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; @@ -2843,7 +2865,7 @@ let pname = "syntastic"; version = "2020-01-29"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "vim-syntastic"; repo = "syntastic"; rev = "f3766538720116f099a8b1517f76ae2f094afd20"; sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65"; @@ -3051,12 +3073,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-03-02"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e910b4fb9e276d18ed140fc492f30967ef9ace59"; - sha256 = "0fbrwmk4plg1zyz5vyay7jsj240l9p2ksjlp7yjs1g3l7qf71xxz"; + rev = "ee31ea1c7d08ced8577120b4c1d55c5a05351a75"; + sha256 = "01nm3d95qjd2v3j9ln7w52i8bn2fgi5zms9078832w1x4iyb1mwn"; }; }; @@ -3073,12 +3095,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-02-27"; + version = "2020-03-18"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "582b715562c953ea9a1f043443f98793cfbc0d47"; - sha256 = "1wjmdjn129d8p6nrx69xdrrzg05l930a5lfbrvhyic3aiqn5x1mf"; + rev = "fc2e986f34dc6b21e80d54845a7b538003129feb"; + sha256 = "0h76726rnqrdvmm9bpgnrli66rg18b2snw077wz0zvcz7g0l9a24"; }; }; @@ -3370,12 +3392,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-03-02"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "4e2546a2098954b74cbc612f573826f13d6fb88e"; - sha256 = "1z1xnvkaz1yjjq87kdyplx0zh0il0qkmr5lzwfq33jcnwlafz6xw"; + rev = "119477060d55bb5de173b28f310d430af5593618"; + sha256 = "0hgq13iigpk8cy0lyamaz135019qbxc5nckgv0363ilhk4k5ilrd"; }; }; @@ -3436,12 +3458,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-03-02"; + version = "2020-03-18"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "b757f58c67908772a17300cf853ed0da653edeb2"; - sha256 = "0cl858hk7gaaxlj22d61mqiaypv76q85srskjay9s3px0mm5fanc"; + rev = "80bda05d0f5383af0a09b9ca4a2918a23d372f60"; + sha256 = "1dgqz73cprn2s3xpdfpyjq7bmwjpdrz8b3kf6mwkajgxjl89sv7m"; }; }; @@ -3568,12 +3590,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"; }; }; @@ -3700,12 +3722,12 @@ let vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2020-03-10"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "8e859e4c54fda0728e8f0b5cc4f61c7ff193083f"; - sha256 = "0nq7x957xwz6fibb4m4daq2xp74n922lm46117lfhvpa0ii2rz0i"; + rev = "b5f8a4b148b566626210d0c1f6b63036b62322bb"; + sha256 = "0a4gznfxmg7a62xwk4mmjcxykcgmm7mh5vv7n5hskxjczdrvl400"; }; }; @@ -3867,7 +3889,7 @@ let pname = "vim-elixir"; version = "2020-03-11"; src = fetchFromGitHub { - owner = "elixir-lang"; + owner = "elixir-editors"; repo = "vim-elixir"; rev = "088cfc407460dea7b81c10b29db23843f85e7919"; sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk"; @@ -4041,11 +4063,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"; }; }; @@ -4061,6 +4083,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"; @@ -4118,12 +4151,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-03-15"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "14382b346ea03615bfb03115679c8a48bbf03af2"; - sha256 = "0ni9kjqb78jf98v1xwmg6r7inm7qifpf21hnp1n2i65mvnrc4afm"; + rev = "50d52bafa00448ca8cde2b0e05b0fe71c9397762"; + sha256 = "1c8dwllscwxiqp409zy7ajwz84bn8g7p9gldqrhx8i9l7q382z0w"; }; }; @@ -4380,17 +4413,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"; @@ -4614,23 +4636,23 @@ 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"; }; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2019-08-14"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "ed4357d2caf1d04bd229a24191098759f94b2e25"; - sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v"; + rev = "b31525d7f6170c68f900abe24748ac9fbaf1ee4d"; + sha256 = "0d6qss18dq36hvxv1if1aaylljsnp2isxajb5xh4zr4cxarrzbfi"; }; }; @@ -4867,12 +4889,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-03-13"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "9c12affb112cf5bdbc74f6492f019dec539756ee"; - sha256 = "199mr1b740vd4rqjkpgwx539flyaqm7bi05fknzkyxizn8180xzw"; + rev = "c473c298d570622d520f455698a95356e55d6dcf"; + sha256 = "1j4plsm7md6yhis8bmgznwln12gnnm0lg9wvxgydqd6wxrc6hfnd"; }; }; @@ -5043,12 +5065,23 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-03-12"; + version = "2020-03-15"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "2008b24c1d740543041d1de9fa4036a35cd21e16"; - sha256 = "0q5njcfc4zlb2z5bzr5jsmqfqnp96c83pwwayfcms8sqczj2w13v"; + rev = "2decf51f19834434e34f1a8d79056b7014120ca3"; + sha256 = "1hph6w6mrlma96ys1nk9v46hscmplkpp2y7xq1ld2bnfs4wab3v8"; + }; + }; + + vim-pug = buildVimPluginFrom2Nix { + pname = "vim-pug"; + version = "2019-09-23"; + src = fetchFromGitHub { + owner = "digitaltoad"; + repo = "vim-pug"; + rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; + sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; }; }; @@ -5351,12 +5384,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-03-11"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "8eafafe246152c94b64149dd04d9e03b87527eac"; - sha256 = "1mfw69283w3xk9kawn2ms160sjzmxpfdh4drdis27fg27i58yadd"; + rev = "6e6b69fd5c12d4645225e7a3ba7d9f3414d83d25"; + sha256 = "0hc914c74dy22nm9bx2qd37py8f2xf3ylnfr3v4lvbxpnlpahjjc"; }; }; @@ -5527,12 +5560,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-03-14"; + version = "2020-03-21"; src = fetchFromGitHub { - owner = "janko-m"; + owner = "janko"; repo = "vim-test"; - rev = "2e3516833137ffcf6f291854551cfe70c17b1752"; - sha256 = "1hfksbai45c5ql9gvm1fqdfhakm2fvas59jyf71iddsfiha5vv2k"; + rev = "b302a325116d8708dc0721b7cd97ff59536f4e75"; + sha256 = "099dzadzhfkhf92lv5cmfk0iawbp40v1rz9xxp462hxxcn3p3c97"; }; }; @@ -5855,6 +5888,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"; @@ -5945,12 +5989,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-03-15"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "51797cde25904e595da62513b818ab3abc9acd9e"; - sha256 = "0dpcxqrv9jn7d0f2wnnqyj3069wfqg4h70qqqnlq07n4p8yj2rw1"; + rev = "8c59031d50feeec8b4f3549f70f82564975265f0"; + sha256 = "16a7qpp19gci8hq8h2999pwv0gd6x0mqgifv325mlb0jj5lxy7m1"; }; }; @@ -5989,21 +6033,21 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-03-15"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "a1e19503ce2f27a98fd6c03202d0651891aadecf"; - sha256 = "19xy5qxizhpnyaqvjayxpmc5hdfixdf84g4ilhagq7isd5l4a1cs"; + rev = "e7b362fffe3a5d1f21bd560d0455e19ff8192997"; + sha256 = "15nmls0m5hajh4k1kjibp299hdhyyjkcax44fmkjq51xlfb1nhc9"; }; }; - 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"; }; @@ -6099,24 +6143,24 @@ 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"; - version = "2020-03-14"; + YouCompleteMe = buildVimPluginFrom2Nix { + pname = "YouCompleteMe"; + version = "2020-03-18"; src = fetchFromGitHub { - owner = "valloric"; - repo = "youcompleteme"; - rev = "3108b9bd4408b2af891eea179108bc9704e7263d"; - sha256 = "0913d0mixhm24mhqgf3cca3p4hglsj23f85m4n4npksiqw91swla"; + owner = "ycm-core"; + repo = "YouCompleteMe"; + rev = "cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3"; + sha256 = "0si9by2ag2f7xgxidp5215d6wkg1mdhq9j5c4icdpsly9gv3w5s8"; fetchSubmodules = true; }; }; @@ -6158,7 +6202,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/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index e4710e27193c..86a65e1ad8ce 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -393,7 +393,7 @@ 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 ]; }); @@ -460,6 +460,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 ]; @@ -640,7 +655,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', '''" \ diff --git a/nixpkgs/pkgs/misc/vim-plugins/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py index 0ef93ac569ab..bbeef0889f42 100755 --- a/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/nixpkgs/pkgs/misc/vim-plugins/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 @@ -32,6 +34,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 +74,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: 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 +101,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 +118,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 +217,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: str, cache: "Cache" +) -> 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] 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 +235,10 @@ 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 print_download_error(plugin: str, ex: Exception): @@ -227,20 +252,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 +355,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 +413,49 @@ in lib.fix' (lib.extends overrides packages) print(f"updated {outfile}") +def rewrite_input(input_file: Path, output_file: Path, redirects: dict): + with open(input_file, "r") as f: + lines = f.readlines() + + 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_name = old.split("/")[1].split(" ")[0].strip("\n") + new_name = new.split("/")[1].split(" ")[0].strip("\n") + if old_name != new_name: + deprecations[old_name] = { + "new": new_name, + "date": cur_date_iso, + } + with open(DEPRECATED, "w") as f: + json.dump(deprecations, f, indent=4, sort_keys=True) + + print( + f"""\ +Redirects have been detected and {input_file} has been updated. Please take the +following steps: + 1. Go ahead and commit just the updated expressions as you intended to do: + git add {output_file} + git commit -m "vimPlugins: Update" + 2. Run this script again so these changes will be reflected in the + generated expressions: + ./update.py + 3. Commit {input_file} along with deprecations and generated expressions: + git add {output_file} {input_file} {DEPRECATED} + git commit -m "vimPlugins: Update redirects" + """ + ) + + lines = sorted(lines, key=str.casefold) + + with open(input_file, "w") as f: + f.writelines(lines) + + def parse_args(): parser = argparse.ArgumentParser( description=( @@ -428,10 +498,12 @@ def main() -> None: finally: cache.store() - plugins = check_results(results) + plugins, redirects = check_results(results) generate_nix(plugins, args.outfile) + rewrite_input(args.input_file, args.outfile, redirects) + if __name__ == "__main__": main() diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 874b2471d5c4..62333ae15e31 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -9,10 +9,12 @@ alvan/vim-closetag alx741/vim-hindent alx741/vim-stylishask amiorin/ctrlp-z +andrep/vimacs andreshazard/vim-logreview 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 +22,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 +37,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 +57,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 +88,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 +111,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 +119,7 @@ google/vim-maktaba gorkunov/smartpairs.vim gotcha/vimelette gregsexton/gitv +gu-fan/riv.vim guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp @@ -147,7 +150,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 @@ -259,7 +262,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 @@ -314,8 +317,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 +332,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 +360,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 +368,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,7 +380,6 @@ 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 @@ -381,7 +388,6 @@ 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 +397,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 @@ -501,22 +503,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,11 +537,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 @@ -550,11 +554,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/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index 81cd77f3edb5..d745198e6a40 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -250,13 +250,14 @@ let # plugins with dependencies plugins = findDependenciesRecursively specifiedPlugins; - # Vim almost reads JSON, so eventually JSON support should be added to Nix - # TODO: proper quoting - toNix = x: - if (builtins.isString x) then "'${x}'" - else if builtins.isAttrs x && builtins ? out then toNix x # a derivation - else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" - else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" + # Convert scalars, lists, and attrs, to VimL equivalents + toVimL = x: + if builtins.isString x then "'${lib.replaceStrings [ "\n" "'" ] [ "\n\\ " "''" ] x}'" + else if builtins.isAttrs x && builtins ? out then toVimL x # a derivation + else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toVimL n}: ${toVimL v}") x)}}" + else if builtins.isList x then "[${lib.concatMapStringsSep ", " toVimL x}]" + else if builtins.isInt x || builtins.isFloat x then builtins.toString x + else if builtins.isBool x then (if x then "1" else "0") else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; in assert builtins.hasAttr "vim-addon-manager" knownPlugins; @@ -293,9 +294,9 @@ let endif endif - " tell vam about which plugins to load when: + " tell vam which plugins to load, and when: let l = [] - ${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins} + ${lib.concatMapStrings (p: "call add(l, ${toVimL p})\n") vam.pluginDictionaries} call vam#Scripts(l, {}) ''); diff --git a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index dec6bbbba10a..604d0fa3ad9d 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchurl, vscode-utils, extractNuGet , icu, curl, openssl, lttng-ust, autoPatchelfHook -, pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. - # Use version from `PATH` for default setting otherwise. - # Defaults to `false` as we expect it to be project specific most of the time. -, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified. - # Use version from `PATH` for default setting otherwise. - # Defaults to `true` as usually not defined on a per projet basis. +, python3 +, pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. + # Use version from `PATH` for default setting otherwise. + # Defaults to `false` as we expect it to be project specific most of the time. +, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified. + # Use version from `PATH` for default setting otherwise. + # Defaults to `true` as usually not defined on a per projet basis. }: -assert pythonUseFixed -> null != python; assert ctagsUseFixed -> null != ctags; let - pythonDefaultsTo = if pythonUseFixed then "${python}/bin/python" else "python"; + pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python"; ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; # The arch tag comes from 'PlatformName' defined here: @@ -23,14 +23,14 @@ let else throw "Only x86_64 Linux and Darwin are supported."; languageServerSha256 = { - linux-x64 = "10qwi8lih5i6216d1vqsmviab73ha0d3zdvircrgrydkf0d4ancd"; - osx-x64 = "08gjxs0bjhz5a9l35vvgwnvzshsyyqiqvb5hxv6w0k2ajgv5z7av"; + linux-x64 = "1pmj5pb4xylx4gdx4zgmisn0si59qx51n2m1bh7clv29q6biw05n"; + osx-x64 = "0ishiy1z9dghj4ryh95vy8rw0v7q4birdga2zdb4a8am31wmp94b"; }.${arch}; # version is languageServerVersion in the package.json languageServer = extractNuGet rec { name = "Python-Language-Server"; - version = "0.4.127"; + version = "0.5.30"; src = fetchurl { url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg"; @@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.2.64397"; - sha256 = "1kwyc5ycz1276i2zbw93mpq59y2py6kj71gvhzya8xvm184jk07a"; + version = "2020.3.69010"; + sha256 = "1dg8wfc3yl0msg6c9ccbvwc78f559109slsagi0lgnbc40v6v24b"; }; buildInputs = [ @@ -54,6 +54,11 @@ in vscode-utils.buildVscodeMarketplaceExtension { nativeBuildInputs = [ autoPatchelfHook + python3.pkgs.wrapPython + ]; + + pythonPath = with python3.pkgs; [ + setuptools ]; postPatch = '' @@ -70,6 +75,8 @@ in vscode-utils.buildVscodeMarketplaceExtension { mkdir -p "$out/$installPrefix/languageServer.${languageServer.version}" cp -R --no-preserve=ownership ${languageServer}/* "$out/$installPrefix/languageServer.${languageServer.version}" chmod -R +wx "$out/$installPrefix/languageServer.${languageServer.version}" + + patchPythonScript "$out/$installPrefix/pythonFiles/lib/python/isort/main.py" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix b/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix index 9efa230d3b72..6e799f1caaaa 100644 --- a/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, libobjc, Security }: buildGoModule rec { pname = "smimesign"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ]; + buildFlagsArray = "-ldflags=-X main.versionString=${version}"; - meta = with lib; { + meta = with stdenv.lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git."; homepage = https://github.com/github/smimesign; diff --git a/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix b/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix index 9725ea66dd43..96283af40d05 100644 --- a/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "earlyoom-${VERSION}"; # This environment variable is read by make to set the build version. - VERSION = "1.3"; + VERSION = "1.5"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${VERSION}"; - sha256 = "0fwbx0y80nqgkxrc9kf9j3iwa0wbps2jmqir3pgqbc2cj0wjh0lr"; + sha256 = "1wcw2lfd9ajachbrjqywkzj9x6zv32gij2r6yap26x1wdd5x7i93"; }; installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/nixpkgs/pkgs/os-specific/linux/ell/default.nix index e811dc1bc386..b1a3a4f08915 100644 --- a/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/nixpkgs/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 = [ diff --git a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index bb04efaf1ca2..9f734a47c29b 100644 --- a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,19 +4,18 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "15pwhz4267kwhkv532k6wgjqfzawawdrrk6vnl017ys5s9ln51a8"; + sha256 = "0h1ssw9x37hvks8rcnsjq4nsl6djmhx53iiwrw8fw4lf3nlmdzpx"; }; postPatch = '' substituteInPlace Makefile \ --replace 'TAG_VERSION := $(shell git describe --tags)' "" \ - --replace '$(shell date)' '$(shell date --date="@0")' \ --replace "/usr/local" "$out" ''; @@ -46,6 +45,7 @@ buildGoModule rec { directories. ''; inherit (src.meta) homepage; + changelog = "https://github.com/google/fscrypt/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix index 35c91c5ec071..b0f684e6242a 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix @@ -84,8 +84,17 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { + description = "Library that allows filesystems to be implemented in user space"; + longDescription = '' + FUSE (Filesystem in Userspace) is an interface for userspace programs to + export a filesystem to the Linux kernel. The FUSE project consists of two + components: The fuse kernel module (maintained in the regular kernel + repositories) and the libfuse userspace library (this package). libfuse + provides the reference implementation for communicating with the FUSE + kernel module. + ''; inherit (src.meta) homepage; - description = "Kernel module and library that allows filesystems to be implemented in user space"; + changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}"; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl21 ]; maintainers = [ maintainers.primeos ]; diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index 6792e05829d1..415226509b7b 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.9.0"; - sha256Hash = "00yppzmv15jqjy3wq5ki9d49jl6bfxrlwr5sfz50ihr40d6dgx9p"; + version = "3.9.1"; + sha256Hash = "1i3f4h3vnjxls8hdi6w2n2ksrgbs7brbzj65rvxginyxicykh857"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch index 1d41a26b0a4d..903f30325df2 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch +++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch @@ -1,12 +1,12 @@ --- a/lib/meson.build +++ b/lib/meson.build -@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), +@@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), soversion: '3', include_directories: include_dirs, dependencies: deps, install: true, link_depends: 'fuse_versionscript', -- c_args: [ '-DFUSE_USE_VERSION=34', +- c_args: [ '-DFUSE_USE_VERSION=35', - '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ], -+ c_args: [ '-DFUSE_USE_VERSION=34' ], ++ c_args: [ '-DFUSE_USE_VERSION=35' ], link_args: ['-Wl,--version-script,' + meson.current_source_dir() + '/fuse_versionscript' ]) diff --git a/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index f6e98b047df6..d93b11bc9577 100644 --- a/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/nixpkgs/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; rev = version; - sha256 = "09viyfv5j2rl6ly52b2xlc2zbmb6i22dv89jc6823bzdjjimkrg6"; + sha256 = "0c38c7a234cwdd5y1brq4w56xszs8zlp57rr3nvgp8z8djcy1qvx"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 363f8eb91746..aa75c125da41 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.173"; + version = "4.14.174"; # 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 = "0kxp3mgiags8hdax15masab9zr89xraqvl9ri7zwgksx8ixav0m2"; + sha256 = "12ai2lc2ny38s93d0m5ngrv030vwv1h2hhzp0fs6fhjxasikq8jc"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index ae5da9fe92f5..65f93a0f9243 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.109"; + version = "4.19.113"; # 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 = "0kwnlv5336vqdf38dzn077ic17zkb4rl5khxmc47syzd9zm4fhnh"; + sha256 = "1rf0jz7r1f4rb4k0g3glssfa1hm2ka6vlbwjlkmsx1bybxnmg85m"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 27fcb5020d72..69156f577f62 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.216"; + version = "4.4.217"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hjgh9brvxzi6ypgfnk07l3j28xsxgz88sdshnz19vj96bn1w70q"; + sha256 = "0vsjchywznmjn01flgvm9vsja5zqni319rfwgy997afcbz0c9spx"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4d12bec7617d..98d203e481ff 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.216"; + version = "4.9.217"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0lgv5k8v5xz9z2z4k42566bh0akyk1gr0dx6s1m1rjrzsf9k86l6"; + sha256 = "06b8av9f9pk2yp95nzv4322k0d5wsg40sxd9kfim1xzb093abckg"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 5773b171f744..2471962404e3 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.25"; + version = "5.4.28"; # 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 = "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0"; + sha256 = "197p7rjmbs229ncj1y8s80f7n4bm8g9w0jrv1109m3rl8q9wqqy8"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix index bcd67b0af425..aa15a42d2c4d 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.9"; + version = "5.5.13"; # 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 = "0y58gkzadjwfqfry5568g4w4p2mpx2sw50sk95i07s5va1ly2dd4"; + sha256 = "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3cfqz"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index e9872cf0761f..c6e850c99072 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/nixpkgs/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 = "17322"; - sha256 = "1hhi1gsfr08zj9d8mglbfk5wicfy1gqrh68vg90hxglp61dsx97x"; + rev = "17387"; + sha256 = "1a62n326xsbb8r8y610d4k698n3la22rnhlxa56c2zki2q5697h3"; } , ... }: diff --git a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix index fff66fe328a5..741d4ab14820 100644 --- a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "3.2.1"; + version = "4.0.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1m633j5k700nsc3smca7fxqfhxhypxbamh18x9z60zdilj33k42z"; + sha256 = "1x63nbfsicqxckq62ga3k0g8fm4qgcpn45ianj6m7rvw4lnaxwxk"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index b3f7a41d32bc..8672aeb22fd3 100644 --- a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/nixpkgs/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.20200215"; + version = "0.0.20200318"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1hd9hm876ixr8jvzp5s1n9r6xal08sh2pxgj10pw4pk7mm15z2ib"; + sha256 = "1syl3p37fvfxvp4apvfnlp632pg3xwslj9r3s54mpxbxc6d8s3v6"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix new file mode 100644 index 000000000000..49da843e3ad9 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -0,0 +1,23 @@ +{ stdenv }: + +stdenv.mkDerivation rec { + pname = "wooting-udev-rules"; + version = "20190601"; + + # Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules + src = [ ./wooting.rules ]; + + unpackPhase = ":"; + + installPhase = '' + install -Dpm644 $src $out/lib/udev/rules.d/70-wooting.rules + ''; + + meta = with stdenv.lib; { + 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"; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules new file mode 100644 index 000000000000..d906df3d4c6a --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules @@ -0,0 +1,9 @@ +# Wooting One +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input" +# Wooting One update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0660", GROUP="input" + +# Wooting Two +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input" +# Wooting Two update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input" diff --git a/nixpkgs/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix index bcd4b7065b58..8b51e584e3ec 100644 --- a/nixpkgs/pkgs/servers/caddy/default.nix +++ b/nixpkgs/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "caddy"; @@ -16,6 +16,8 @@ buildGoModule rec { }; modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' cat << EOF > caddy/main.go package main diff --git a/nixpkgs/pkgs/servers/caddy/v2.nix b/nixpkgs/pkgs/servers/caddy/v2.nix index c0b2134abded..7330388a7859 100644 --- a/nixpkgs/pkgs/servers/caddy/v2.nix +++ b/nixpkgs/pkgs/servers/caddy/v2.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: +{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "caddy"; @@ -16,6 +16,8 @@ buildGoModule rec { }; modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; diff --git a/nixpkgs/pkgs/servers/clickhouse/default.nix b/nixpkgs/pkgs/servers/clickhouse/default.nix index 40760093462a..9521d470a0f1 100644 --- a/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dns/coredns/default.nix b/nixpkgs/pkgs/servers/dns/coredns/default.nix index 2c8506ac9d28..8388968298ef 100644 --- a/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/nixpkgs/pkgs/servers/dns/coredns/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "coredns"; - version = "1.6.6"; + version = "1.6.7"; goPackagePath = "github.com/coredns/coredns"; @@ -10,10 +10,12 @@ buildGoModule rec { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "1x8sgchp0kkk5xdharjrq29qxgv1mdzrw3f12s2kchgqf1m6r0sx"; + sha256 = "05r0dm8h23s5dafxisya48izc2ywpn5ywvhf9q6m20qkpwr8gd10"; }; - modSha256 = "10ljggg1g5x00gpgzc5m29n1k5akf0s0g3hkdh8adcbrcz0pgr5c"; + modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { homepage = "https://coredns.io"; diff --git a/nixpkgs/pkgs/servers/dns/nsd/default.nix b/nixpkgs/pkgs/servers/dns/nsd/default.nix index 130a25511d70..d815771c66cb 100644 --- a/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0z7j3vwqqj0hh8n5irb2yqwzl45k4sn2wczbq1b1lqv5cxv6vgcy"; + sha256 = "15qy25210j9nq2i3pm8rwphnc6b5gq83js10078fvw9hbmjps03s"; }; prePatch = '' @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nlnetlabs.nl; + homepage = "http://www.nlnetlabs.nl"; description = "Authoritative only, high performance, simple and open source name server"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/servers/documize-community/default.nix b/nixpkgs/pkgs/servers/documize-community/default.nix index 0607902295a8..a6477d61e984 100644 --- a/nixpkgs/pkgs/servers/documize-community/default.nix +++ b/nixpkgs/pkgs/servers/documize-community/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }: +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, Security }: buildGoModule rec { pname = "documize-community"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0"; - buildInputs = [ go-bindata-assetfs go-bindata ]; + nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; subPackages = [ "edition/community.go" ]; @@ -23,7 +25,7 @@ buildGoModule rec { mv $out/bin/community $out/bin/documize ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; license = licenses.agpl3; maintainers = with maintainers; [ ma27 elseym ]; diff --git a/nixpkgs/pkgs/servers/echoip/default.nix b/nixpkgs/pkgs/servers/echoip/default.nix index b3402933f9fe..ae6057c34697 100644 --- a/nixpkgs/pkgs/servers/echoip/default.nix +++ b/nixpkgs/pkgs/servers/echoip/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule { pname = "echoip"; @@ -13,6 +13,8 @@ buildGoModule { modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + outputs = [ "out" "index" ]; postInstall = '' @@ -20,7 +22,7 @@ buildGoModule { cp $src/index.html $index/index.html ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://github.com/mpolden/echoip; license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/nixpkgs/pkgs/servers/gobetween/default.nix b/nixpkgs/pkgs/servers/gobetween/default.nix index ff59ad53ed1c..e66d5581b3c8 100644 --- a/nixpkgs/pkgs/servers/gobetween/default.nix +++ b/nixpkgs/pkgs/servers/gobetween/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: +{ buildGoModule, fetchFromGitHub, stdenv, Security, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; @@ -14,8 +14,10 @@ buildGoModule rec { modSha256 = "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildPhase = '' - make build${lib.optionalString enableStatic "-static"} + make build${stdenv.lib.optionalString enableStatic "-static"} ''; installPhase = '' @@ -25,7 +27,7 @@ buildGoModule rec { cp -r config $out/share ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Modern & minimalistic load balancer for the Сloud era"; homepage = "http://gobetween.io"; license = licenses.mit; diff --git a/nixpkgs/pkgs/servers/gortr/default.nix b/nixpkgs/pkgs/servers/gortr/default.nix index 35c6e1452437..3e5dfc87f0ee 100644 --- a/nixpkgs/pkgs/servers/gortr/default.nix +++ b/nixpkgs/pkgs/servers/gortr/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "gortr"; @@ -12,7 +12,9 @@ buildGoModule rec { }; modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "The RPKI-to-Router server used at Cloudflare"; homepage = "https://github.com/cloudflare/gortr/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/servers/gotify/default.nix b/nixpkgs/pkgs/servers/gotify/default.nix index f2014aac9fdc..275aaa5d68bc 100644 --- a/nixpkgs/pkgs/servers/gotify/default.nix +++ b/nixpkgs/pkgs/servers/gotify/default.nix @@ -1,11 +1,11 @@ { stdenv , buildGoPackage -, lib , fetchFromGitHub , buildGoModule , packr , sqlite , callPackage +, Security }: buildGoModule rec { @@ -28,7 +28,8 @@ buildGoModule rec { --replace 'Version = "unknown"' 'Version = "${version}"' ''; - buildInputs = [ sqlite ]; + buildInputs = [ sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ packr ]; diff --git a/nixpkgs/pkgs/servers/http/openresty/default.nix b/nixpkgs/pkgs/servers/http/openresty/default.nix index 55e813a2ce72..4b5b4259ca43 100644 --- a/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/nixpkgs/pkgs/servers/http/openresty/default.nix @@ -9,11 +9,11 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; nginxVersion = "1.15.8"; - version = "${nginxVersion}.2"; + version = "${nginxVersion}.3"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "05jxrb8hv758nm38jil8n63q1nhrz3d249bsrwc7maa7sn24wss3"; + sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n"; }; fixPatch = patch: diff --git a/nixpkgs/pkgs/servers/http/tomcat/default.nix b/nixpkgs/pkgs/servers/http/tomcat/default.nix index 38b4974e1554..3908db5ea71c 100644 --- a/nixpkgs/pkgs/servers/http/tomcat/default.nix +++ b/nixpkgs/pkgs/servers/http/tomcat/default.nix @@ -32,25 +32,19 @@ let in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.92"; - sha256 = "0j015mf15drl92kvgyi1ppzjziw0k1rwvfnih8r20h92ylk8mznk"; + versionMinor = "0.100"; + sha256 = "0wjjnvxjz0xbnsfgyp0xc7nlij4z093v54hg59vww2nmkz5mg01v"; }; tomcat8 = common { versionMajor = "8"; - versionMinor = "0.53"; - sha256 = "1ymp5n6xjqzpqjjlwql195v8r5fsmry7nfax46bafkjw8b24g80r"; - }; - - tomcat85 = common { - versionMajor = "8"; - versionMinor = "5.42"; - sha256 = "1d90abwwvl0ghr0g0drk48j37wr2zgw74vws9z2rshyzrwgbvgp3"; + versionMinor = "5.51"; + sha256 = "1zmg0hi4nw4y5sknd0jgq9lb3bncjjscay5fdiiq3qh5cs0wsvl3"; }; tomcat9 = common { versionMajor = "9"; - versionMinor = "0.21"; - sha256 = "0nsylbqvky4pf3wpsx3a29b85lvwk91ay37mljk9636qffjj1vjh"; + versionMinor = "0.31"; + sha256 = "0hybcy280qhhp9if58xw0rmyyqz1m1bzby7qnwz3y2wc1y4is48v"; }; } diff --git a/nixpkgs/pkgs/servers/hydron/default.nix b/nixpkgs/pkgs/servers/hydron/default.nix index 6ac37a98deea..145d341bb516 100644 --- a/nixpkgs/pkgs/servers/hydron/default.nix +++ b/nixpkgs/pkgs/servers/hydron/default.nix @@ -15,8 +15,10 @@ buildGoPackage { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ]; + + nativeBuildInputs = [ pkgconfig go-bindata ]; + + buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ]; meta = with stdenv.lib; { homepage = "https://github.com/bakape/hydron"; diff --git a/nixpkgs/pkgs/servers/imgproxy/default.nix b/nixpkgs/pkgs/servers/imgproxy/default.nix index be78e1aa8316..c7d0d910ac1e 100644 --- a/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }: +{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection, Security }: buildGoModule rec { pname = "imgproxy"; @@ -13,17 +13,16 @@ buildGoModule rec { modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w"; - buildInputs = [ - gobject-introspection - pkg-config - vips - ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gobject-introspection vips ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; preBuild = '' export CGO_LDFLAGS_ALLOW='-(s|w)' ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Fast and secure on-the-fly image processing server written in Go"; homepage = "https://imgproxy.net"; license = licenses.mit; diff --git a/nixpkgs/pkgs/servers/livepeer/default.nix b/nixpkgs/pkgs/servers/livepeer/default.nix index 64edcb2ef4fa..547a106a3987 100644 --- a/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/nixpkgs/pkgs/servers/livepeer/default.nix @@ -16,7 +16,9 @@ buildGoPackage rec { sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; }; - buildInputs = [ pkgconfig ffmpeg ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ ffmpeg ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 71a5c20dea3d..6b51aea6512e 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.9"; + version = "0.5.10"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "01dxidrnmrr2gqggfsgkfxa6ynvyjyw13xw32gi86yqmwnm6inin"; + sha256 = "0pk0579ifl3ymfzn505396bsjlg29ykwr7ag8prcbafayg4rrj28"; }; buildInputs = [ dovecot openssl ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://pigeonhole.dovecot.org/; + homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; maintainers = with maintainers; [ rickynils globin ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 8da5d4676d68..f0c8a0d4f819 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.11.1"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0xd4bxsmk67r6pfj5lh0hn36r8z51mxsl39fjfrfdidvl1qqbxnk"; + sha256 = "18wavnb47w4hfh8dc7g77bfhz03zh1xzl58mxlfi0000qsbkz680"; }; patches = [ diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index bf93cae5bc2e..fc89486cfbc0 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,9 +1,9 @@ +#!/usr/bin/env bash -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix +ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)" -node2nix \ - --nodejs-10 \ +$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ + --nodejs-12 \ --node-env ../../../development/node-packages/node-env.nix \ --development \ --input package.json \ diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix index e306e49c8498..36da6132423c 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index cc14fb2852f3..9af470f8310f 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g=="; }; }; - "@slack/types-1.4.0" = { + "@slack/types-1.5.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.4.0.tgz"; - sha512 = "G5u2gCl7oci0k4E9KIX33nmA4YPp1pXYwS/It7ct9dOglCcj63Ee5GRCgtplzOBS+2++DMdp6l3ZCq+VeAMrfw=="; + url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz"; + sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA=="; }; }; "@slack/web-api-5.8.0" = { @@ -1922,6 +1922,15 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; + "mkdirp-0.5.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; + sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; + }; + }; "mocha-6.2.2" = { name = "mocha"; packageName = "mocha"; @@ -3221,14 +3230,14 @@ let }; in { - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.0.2" = nodeEnv.buildNodePackage { + "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" = nodeEnv.buildNodePackage { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.0.2"; + version = "1.1.0"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "8202c97c1fee0f8215f86b0fda1845ca17db3612"; - sha256 = "b419d34771f4f4be56fe66ba4cbf690fb5a337e317a927e70e65be3f1ddd55ef"; + rev = "62b2a05c99bbefb0b268adc8b0fedfe91a4f76bd"; + sha256 = "64e930cecb11de9df3cb03367a22ff7dc78d44b7f992d9379fae8b692bf35157"; }; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -3239,7 +3248,7 @@ in sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.4.0" + sources."@slack/types-1.5.0" (sources."@slack/web-api-5.8.0" // { dependencies = [ sources."p-queue-2.4.2" @@ -3464,15 +3473,13 @@ in sources."mime-types-2.1.26" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.3" (sources."mocha-6.2.2" // { dependencies = [ sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" sources."ms-2.1.1" sources."supports-color-6.0.0" sources."yargs-13.3.0" diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index 87dada8f027b..8fb44891dd42 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,3 +1,3 @@ [ - {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.0.2" } + {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" } ] diff --git a/nixpkgs/pkgs/servers/matterbridge/default.nix b/nixpkgs/pkgs/servers/matterbridge/default.nix index 556625016f25..2eec5d52bb9c 100644 --- a/nixpkgs/pkgs/servers/matterbridge/default.nix +++ b/nixpkgs/pkgs/servers/matterbridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchurl }: +{ stdenv, buildGoModule, fetchurl, Security }: buildGoModule rec { pname = "matterbridge"; @@ -12,6 +12,8 @@ buildGoModule rec { sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d"; }; + 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/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index 578f125ee2b5..648b4830661d 100644 --- a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-02-09"; + version = "2020-03-26"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "260555b69ccd20f247405e4d8cab3d49fabda070"; - sha256 = "1ykhwrp8bvhzzw4lg4m1w430ybgzd0zqgrs4jrvfd1m0als2iff7"; + rev = "3a9642386cdff8293657c8409da4bffd674184bf"; + sha256 = "183ghrm83vlnalmlxq69xinvkylnxwmz41wwm5s4035arizkjh1b"; }; - modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9"; + modSha256 = "01xwq0h3i8ai0294v8jdagksas48866lxcnkn4slwp3rnzv6cmbp"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { homepage = https://github.com/tulir/mautrix-whatsapp; diff --git a/nixpkgs/pkgs/servers/meguca/default.nix b/nixpkgs/pkgs/servers/meguca/default.nix index 47530ba9db60..3088ee190e77 100644 --- a/nixpkgs/pkgs/servers/meguca/default.nix +++ b/nixpkgs/pkgs/servers/meguca/default.nix @@ -17,10 +17,10 @@ buildGoPackage { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkgconfig cmake go-bindata ]; buildInputs = [ - ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata + ffmpeg-full graphicsmagick ghostscript quicktemplate easyjson emscripten opencv statik ]; diff --git a/nixpkgs/pkgs/servers/memcached/default.nix b/nixpkgs/pkgs/servers/memcached/default.nix index 98bd92c75318..0449144b07a2 100644 --- a/nixpkgs/pkgs/servers/memcached/default.nix +++ b/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,24 +1,14 @@ -{stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent}: +{stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.22"; + version = "1.6.2"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "14qzbxgz40j4yhi3lzrsdjd6kyy3zwv9c8kw11kj6njp42fpxd62"; + sha256 = "12qn8m0jdvdckz53m2akrvixbrn64g5kv6r4hl5vx286qhc02wh6"; }; - patches = [ - # Fixes compilation error on Darwin due to redeclaration of - # htonll. The fix should appear in 1.5.23. - # https://github.com/memcached/memcached/issues/598 - (fetchpatch { - url = "https://github.com/memcached/memcached/commit/95c67710aaf5cfe188d94b510faef8c66d6f5604.diff"; - sha256 = "0ab5l24p4n4fpx78ilmg7jvs9nl84pdza90jbpbx3ns5n23pqbfs"; - }) - ]; - configureFlags = [ "ac_cv_c_endian=${if stdenv.hostPlatform.isBigEndian then "big" else "little"}" ]; @@ -32,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A distributed memory object caching system"; repositories.git = https://github.com/memcached/memcached.git; - homepage = http://memcached.org/; + homepage = "http://memcached.org/"; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/servers/meteor/default.nix b/nixpkgs/pkgs/servers/meteor/default.nix index c2f0ffa59b97..b6abec241a5e 100644 --- a/nixpkgs/pkgs/servers/meteor/default.nix +++ b/nixpkgs/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.8.2"; + version = "1.9.3"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1pydmwx1yjbw54qfq7ndw2l3i3v302bvasvf71x4y9572r2p99mp"; + sha256 = "1njp2db939w3ah5k943bkgm62k969fj47qwmlzvhmmg87xwnq3fb"; }; #dontStrip = true; @@ -82,7 +82,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Complete open source platform for building web and mobile apps in pure JavaScript"; - homepage = http://www.meteor.com; + homepage = "http://www.meteor.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix index 858f8899501d..1fae973066aa 100644 --- a/nixpkgs/pkgs/servers/minio/default.nix +++ b/nixpkgs/pkgs/servers/minio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "minio"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + subPackages = [ "." ]; buildFlagsArray = [''-ldflags= diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index a4a4796a8cdf..ff283396e223 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.6.2"; + version = "6.7.1"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0zbc9jcr3w7rwsv96csqaifn5d0b435wyrrajr5wzsmhljygvrcy"; + sha256 = "0isidfnny4rds9mq7gfm3qmsjsg9higiqliri5zy5bc68lz1gnbz"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1plijm7cy92k79ypcnxjmdf2vhlxa4dzwjyl9lkf2npm7kswswsl"; + sha256 = "0pa5g9pgifdi49vklcxnip2a156f5x64i9r2pshdg4gxfdqbxkxy"; }; postPatch = '' @@ -39,7 +39,7 @@ buildGoPackage rec { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; homepage = "https://grafana.com"; - maintainers = with maintainers; [ offline fpletz willibutz globin ma27 ]; + maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/nixpkgs/pkgs/servers/monitoring/mtail/default.nix index 31a6501ea3a5..75b58b65a9cc 100644 --- a/nixpkgs/pkgs/servers/monitoring/mtail/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/mtail/default.nix @@ -1,24 +1,30 @@ -{ lib, fetchFromGitHub, gotools, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: -buildGoPackage rec { +buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc4"; - goPackagePath = "github.com/google/mtail"; + version = "3.0.0-rc35"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - sha256 = "1n7pqvid48ayn15qfpgpbsx0iqg24x08wphzpc08mlfw47gq7jg3"; + sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; }; - buildInputs = [ gotools ]; - goDeps = ./deps.nix; - patches = [ ./fix-gopath.patch ]; - preBuild = "go generate -x ./go/src/github.com/google/mtail/vm/"; + modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi"; + subPackages = [ "cmd/mtail" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with lib; { + preBuild = '' + go generate -x ./internal/vm/ + ''; + + buildFlagsArray = [ + "-ldflags=-X main.Version=${version}" + ]; + + meta = with stdenv.lib; { license = licenses.asl20; homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; diff --git a/nixpkgs/pkgs/servers/monitoring/mtail/deps.nix b/nixpkgs/pkgs/servers/monitoring/mtail/deps.nix deleted file mode 100644 index 6de3c8b6e139..000000000000 --- a/nixpkgs/pkgs/servers/monitoring/mtail/deps.nix +++ /dev/null @@ -1,56 +0,0 @@ -[ - rec { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://${goPackagePath}.git"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - rec { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://${goPackagePath}.git"; - rev = "5660eeed305fe5f69c8fc6cf899132a459a97064"; - sha256 = "0rpwvjp9xfmy2yvbmy810qamjhimr56zydvx7hb1gjn3b7jp4rhd"; - }; - } - rec { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://${goPackagePath}.git"; - rev = "v1.4.2"; - sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; - }; - } - rec { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://${goPackagePath}.git"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "95c6576299259db960f6c5b9b69ea52422860fce"; - sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "3ba1a4dc141f5236b19ccbf2f67cb63d1a688d46"; - sha256 = "07sbakmman41p5hmdbf4y2wak0gh7k1z88m0zb72acsypp4179h1"; - }; - } -] diff --git a/nixpkgs/pkgs/servers/monitoring/mtail/fix-gopath.patch b/nixpkgs/pkgs/servers/monitoring/mtail/fix-gopath.patch deleted file mode 100644 index 9421d194a9e5..000000000000 --- a/nixpkgs/pkgs/servers/monitoring/mtail/fix-gopath.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vm/compiler.go b/vm/compiler.go -index c55266b..a46417c 100644 ---- a/vm/compiler.go -+++ b/vm/compiler.go -@@ -2,7 +2,7 @@ - // This file is available under the Apache license. - - // Build the parser: --//go:generate $GOPATH/bin/goyacc -v y.output -o parser.go -p mtail parser.y -+//go:generate goyacc -v y.output -o parser.go -p mtail parser.y - - package vm - diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index c8013e6bc15c..773fddd311bb 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "dnsmasq_exporter"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 12341eee911e..96526d246a6d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d77675671950..a0e3c6b1783c 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }: buildGoModule rec { pname = "prometheus_varnish_exporter"; @@ -15,6 +15,8 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' wrapProgram $out/bin/prometheus_varnish_exporter \ --prefix PATH : "${varnish}/bin" @@ -22,10 +24,10 @@ buildGoModule rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; + license = licenses.mit; + maintainers = with maintainers; [ MostAwesomeDude willibutz ]; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 1a7a2ebdf211..b4626b9e8f82 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,25 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc"; + sha256 = "15his6mv3vmzfg972fb8m01h2m3jxmaqz3zw2krfr136mvg2rvjw"; }; - cargoSha256 = "0m7xa610k260gxn2xg6bc2y6fww0p72mvvik7278j2d15044c4yl"; + cargoSha256 = "0ajkpshjv0im6falgjrsc2jdbvm2rhibl4v8rcmb2fg3kx7xc8vf"; buildInputs = lib.optional stdenv.isDarwin Security; - # Commonly used hack in nixpkgs to allow unstable features on a stable rustc. This is needed - # since `prometheus_exporter_base` uses `#!feature[]` to enable async which - # is actually not needed as `async` is part of rustc 1.39.0-stable. This can be removed - # as soon as https://github.com/MindFlavor/prometheus_exporter_base/pull/15 is merged. - RUSTC_BOOTSTRAP = 1; - meta = with lib; { description = "A Prometheus exporter for WireGuard, written in Rust."; homepage = "https://github.com/MindFlavor/prometheus_wireguard_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index a4e2b1eb313c..adba0277bf77 100644 --- a/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -1,10 +1,10 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.14.1"; + version = "5.18.1"; shortRev = "1f6d16b"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,12 +13,14 @@ let owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1fhvw2hrn2zqpz3ypsx6i1zrn83pdifvsyzpbhzxmff6l9a290bq"; + sha256 = "1iwlkm7ac7brap45r6ly0blywgq6f28r1nws3yf0ybydv30brfj4"; }; inherit subPackages postInstall; - modSha256 = "0c0cj0ylhifyb7l9kjmgdlfzcz8528fzw8kr3c5y7j5h6pih06sy"; + modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; @@ -28,11 +30,11 @@ let -X ${versionPkg}.BuildSHA=${shortRev} ''; - meta = { - homepage = https://sensu.io; + meta = with stdenv.lib; { + homepage = "https://sensu.io"; description = "Open source monitoring tool for ephemeral infrastructure & distributed applications"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ thefloweringash ]; + license = licenses.mit; + maintainers = with maintainers; [ thefloweringash ]; }; }; in diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index c6189e124715..4785d78ab185 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/telegraf/deps.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/deps.nix deleted file mode 100644 index 4292d9aa7914..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index f307032f4141..a246249d7d71 100644 --- a/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "thanos"; version = "0.11.0"; @@ -12,6 +12,8 @@ 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/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix index 9b23e9ac501f..008d6bbde398 100644 --- a/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -1,24 +1,37 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = "nextcloud"; - version = "18.0.2"; +let + generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec { + pname = "nextcloud"; + inherit version; - src = fetchurl { - url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh"; - }; + src = fetchurl { + url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; + inherit sha256; + }; + + installPhase = '' + mkdir -p $out/ + cp -R . $out/ + ''; - installPhase = '' - mkdir -p $out/ - cp -R . $out/ - ''; + meta = with stdenv.lib; { + description = "Sharing solution for files, calendars, contacts and more"; + homepage = https://nextcloud.com; + maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ]; + license = licenses.agpl3Plus; + platforms = with platforms; unix; + knownVulnerabilities = optional insecure "Nextcloud version ${version} is EOL"; + }; + }; +in { + nextcloud17 = generic { + version = "17.0.4"; + sha256 = "0cj5mng0nmj3hz30pyz3g19kj3mkm5ca8si3sw3arv61dmw6c5g6"; + }; - meta = { - description = "Sharing solution for files, calendars, contacts and more"; - homepage = https://nextcloud.com; - maintainers = with stdenv.lib.maintainers; [ schneefux bachp globin fpletz ]; - license = stdenv.lib.licenses.agpl3Plus; - platforms = with stdenv.lib.platforms; unix; + nextcloud18 = generic { + version = "18.0.2"; + sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh"; }; } diff --git a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index 90dd16417465..d1f4938197ca 100644 --- a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "EventStore"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0jlyyqs1z2xrw0dkai2k2zr3dsdbdsvmhx81qa92k7ga9hv04sqj"; + sha256 = "0yvprql73g4lc88b6kp1kk8h64az2hn4am5hc4gyiaxfavaww3ci"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch b/nixpkgs/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch new file mode 100644 index 000000000000..eb5db1818fe0 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch @@ -0,0 +1,20 @@ +diff --git a/src/third_party/asio-master/asio/include/asio/detail/config.hpp b/src/third_party/asio-master/asio/include/asio/detail/config.hpp +index 7fe6a95a..ff4cc56b 100644 +--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp ++++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp +@@ -786,7 +786,6 @@ + # if (__cplusplus >= 201402) + # if __has_include(<experimental/string_view>) + # define ASIO_HAS_STD_STRING_VIEW 1 +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 + # endif // __has_include(<experimental/string_view>) + # endif // (__cplusplus >= 201402) + # endif // defined(__clang__) +@@ -794,7 +793,6 @@ + # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) + # if (__cplusplus >= 201402) + # define ASIO_HAS_STD_STRING_VIEW 1 +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 + # endif // (__cplusplus >= 201402) + # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) + # endif // defined(__GNUC__) diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch b/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch new file mode 100644 index 000000000000..ca2c043deb2d --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch @@ -0,0 +1,17 @@ +--- a/site_scons/mongo_scons_utils.py ++++ b/site_scons/mongo_scons_utils.py +@@ -84,14 +84,11 @@ + def default_buildinfo_environment_data(): + return ( + ('distmod', '$MONGO_DISTMOD', True, True,), + ('distarch', '$MONGO_DISTARCH', True, True,), + ('cc', '$CC_VERSION', True, False,), +- ('ccflags', '$CCFLAGS', True, False,), + ('cxx', '$CXX_VERSION', True, False,), +- ('cxxflags', '$CXXFLAGS', True, False,), +- ('linkflags', '$LINKFLAGS', True, False,), + ('target_arch', '$TARGET_ARCH', True, True,), + ('target_os', '$TARGET_OS', True, False,), + ) + + # If you want buildInfo and --version to be relatively empty, set diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch b/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch index ca2c043deb2d..897618cceb12 100644 --- a/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch +++ b/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch @@ -1,8 +1,6 @@ ---- a/site_scons/mongo_scons_utils.py -+++ b/site_scons/mongo_scons_utils.py -@@ -84,14 +84,11 @@ - def default_buildinfo_environment_data(): - return ( +--- a/site_scons/mongo/generators.py ++++ b/site_scons/mongo/generators.py +@@ -18,10 +18,7 @@ def default_buildinfo_environment_data(): ('distmod', '$MONGO_DISTMOD', True, True,), ('distarch', '$MONGO_DISTARCH', True, True,), ('cc', '$CC_VERSION', True, False,), @@ -13,5 +11,3 @@ ('target_arch', '$TARGET_ARCH', True, True,), ('target_os', '$TARGET_OS', True, False,), ) - - # If you want buildInfo and --version to be relatively empty, set diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix b/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix index c2ae83f3e8af..b4b6334c13f5 100644 --- a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,58 +1,63 @@ -{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy -, zlib, libyamlcpp, sasl, openssl, libpcap, Security -}: +{ stdenv, fetchurl, scons, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp +, sasl, openssl, libpcap, python27, curl, Security, CoreFoundation, cctools }: # Note: # The command line tools are written in Go as part of a different package (mongodb-tools) with stdenv.lib; -let version = "3.4.10"; - system-libraries = [ - "pcre" - #"asio" -- XXX use package? - #"wiredtiger" - "boost" - "snappy" - "zlib" - #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. - #"stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs). - "yaml" - ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; - -in stdenv.mkDerivation { - pname = "mongodb"; +{ version, sha256, patches ? [] }@args: + +let + python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); + system-libraries = [ + "boost" + "pcre" + "snappy" + "yaml" + "zlib" + #"asio" -- XXX use package? + #"stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs). + #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. + #"wiredtiger" + ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; + inherit (stdenv.lib) systems subtractLists; + +in stdenv.mkDerivation rec { inherit version; + name = "mongodb-${version}"; src = fetchurl { url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "1wz2mhl9z0b1bdkg6m8v8mvw9k60mdv5ybq554xn3yjj9z500f24"; + inherit sha256; }; nativeBuildInputs = [ scons ]; buildInputs = [ - sasl boost gperftools pcre-cpp snappy - zlib libyamlcpp sasl openssl.dev openssl.out libpcap - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - patches = - [ - # MongoDB keeps track of its build parameters, which tricks nix into - # keeping dependencies to build inputs in the final output. - # We remove the build flags from buildInfo data. - ./forget-build-dependencies.patch - (fetchpatch { - url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb; - name = "boost160.patch"; - sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8"; - }) - ]; + boost + curl + gperftools + libpcap + libyamlcpp + openssl + pcre-cpp + python + sasl + snappy + zlib + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ]; + + # MongoDB keeps track of its build parameters, which tricks nix into + # keeping dependencies to build inputs in the final output. + # We remove the build flags from buildInfo data. + inherit patches; postPatch = '' # fix environment variable reading substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0 substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder @@ -66,13 +71,14 @@ in stdenv.mkDerivation { --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + "-Wno-unused-command-line-argument"; sconsFlags = [ "--release" "--ssl" #"--rocksdb" # Don't have this packaged yet - "--wiredtiger=${if stdenv.is64bit then "on" else "off"}" + "--wiredtiger=on" "--js-engine=mozjs" "--use-sasl-client" "--disable-warnings-as-errors" @@ -87,8 +93,13 @@ in stdenv.mkDerivation { ''; preInstall = '' - mkdir -p $out/lib + mkdir -p "$out/lib" ''; + + postInstall = '' + rm -f "$out/bin/install_compass" || true + ''; + prefixKey = "--prefix="; enableParallelBuilding = true; @@ -97,10 +108,10 @@ in stdenv.mkDerivation { meta = { description = "A scalable, high-performance, open source NoSQL database"; - homepage = http://www.mongodb.org; - license = licenses.agpl3; + homepage = "http://www.mongodb.org"; + license = licenses.sspl; maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; - platforms = platforms.unix; + platforms = subtractLists systems.doubles.i686 systems.doubles.unix; }; } diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch b/nixpkgs/pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch new file mode 100644 index 000000000000..8c60cdd1e688 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Dan Gohman <sunfish@mozilla.com> +# Parent d9b405d82cffb07343a5f2fd941e029298c7f6c4 +# Bug 1390214 - IonMonkey: Don't test for a 3-byte opcode in a 2-byte opcode predicate. +# https://bug1390214.bmoattachments.org/attachment.cgi?id=8902972 + +diff --git a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h +--- a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h ++++ b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h +@@ -310,17 +310,16 @@ enum ThreeByteOpcodeID { + + // Test whether the given opcode should be printed with its operands reversed. + inline bool IsXMMReversedOperands(TwoByteOpcodeID opcode) + { + switch (opcode) { + case OP2_MOVSD_WsdVsd: // also OP2_MOVPS_WpsVps + case OP2_MOVAPS_WsdVsd: + case OP2_MOVDQ_WdqVdq: +- case OP3_PEXTRD_EdVdqIb: + return true; + default: + break; + } + return false; + } + + enum ThreeByteEscape { diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/v3_4.nix b/nixpkgs/pkgs/servers/nosql/mongodb/v3_4.nix new file mode 100644 index 000000000000..2f02ae7f72ad --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/mongodb/v3_4.nix @@ -0,0 +1,15 @@ +{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: + +let + buildMongoDB = callPackage ./mongodb.nix { + inherit sasl; + inherit boost; + inherit Security; + inherit CoreFoundation; + inherit cctools; + }; +in buildMongoDB { + version = "3.4.24"; + sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr"; + patches = [ ./forget-build-dependencies-3-4.patch ]; +} diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/v3_6.nix b/nixpkgs/pkgs/servers/nosql/mongodb/v3_6.nix new file mode 100644 index 000000000000..68f83631c801 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/mongodb/v3_6.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: + +let + buildMongoDB = callPackage ./mongodb.nix { + inherit sasl; + inherit boost; + inherit Security; + inherit CoreFoundation; + inherit cctools; + }; +in buildMongoDB { + version = "3.6.13"; + sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4"; + patches = [ ./forget-build-dependencies.patch ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; +} diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/v4_0.nix b/nixpkgs/pkgs/servers/nosql/mongodb/v4_0.nix new file mode 100644 index 000000000000..51ce1e25062d --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/mongodb/v4_0.nix @@ -0,0 +1,17 @@ +{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: + +let + buildMongoDB = callPackage ./mongodb.nix { + inherit sasl; + inherit boost; + inherit Security; + inherit CoreFoundation; + inherit cctools; + }; +in buildMongoDB { + version = "4.0.12"; + sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1"; + patches = + [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; +} diff --git a/nixpkgs/pkgs/servers/nosql/redis/default.nix b/nixpkgs/pkgs/servers/nosql/redis/default.nix index 278ba8d13c57..8e75ee4fbde2 100644 --- a/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "5.0.7"; + version = "5.0.8"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "0ax8sf3vw0yadr41kzc04917scrg5wir1d94zmbz00b8pzm79nv1"; + sha256 = "1msfxr97aflk5zdgq8xvdbsgmzb906x0vdc1v6l2ccs35z2fmizk"; }; # Cross-compiling fixes @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { passthru.tests.redis = nixosTests.redis; meta = with stdenv.lib; { - homepage = https://redis.io; + homepage = "https://redis.io"; description = "An open source, advanced key-value store"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index 45d3d3cc5595..f85c4aebd512 100644 --- a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,18 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.32.5"; + version = "1.33.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1i3l8bkii3x8wnq9a8yn48cchni5h0gy3rrpvg0jgm4kmm5dlq4y"; + sha256 = "1irc3zahp72631ai9rafc8n7vayr4hzlh8qla05chlsb2fwzqrrd"; }; - modSha256 = "0696p1hv5z3dvawizvw0yi4xzl41bsmszkdqayzb37nm5cfk8riq"; - meta = with lib; { + modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix index 666da1363517..d4dd993b3296 100644 --- a/nixpkgs/pkgs/servers/plex/raw.nix +++ b/nixpkgs/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.7.2457-77cb9455c"; + version = "1.18.8.2527-740d4c206"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "1lhsf4qrq77vqj63a6r0gm90nnlqg50b6v24lrpld1aia9akm9f1"; + sha256 = "05543nkhmp6wq88vz5cnv3cfd5hbd8rqs1rylfy7njgvb0pxl107"; }; outputs = [ "out" "basedb" ]; diff --git a/nixpkgs/pkgs/servers/radicale/1.x.nix b/nixpkgs/pkgs/servers/radicale/1.x.nix index bfc681c921b9..83fa2506800f 100644 --- a/nixpkgs/pkgs/servers/radicale/1.x.nix +++ b/nixpkgs/pkgs/servers/radicale/1.x.nix @@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec { ''; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ edwtjo pSub aneeshusa ]; + maintainers = with maintainers; [ edwtjo pSub ]; }; } diff --git a/nixpkgs/pkgs/servers/rainloop/default.nix b/nixpkgs/pkgs/servers/rainloop/default.nix index ff6cb8c98ebf..6d5016961e98 100644 --- a/nixpkgs/pkgs/servers/rainloop/default.nix +++ b/nixpkgs/pkgs/servers/rainloop/default.nix @@ -2,7 +2,7 @@ common = { edition, sha256 }: stdenv.mkDerivation (rec { pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}"; - version = "1.13.0"; + version = "1.14.0"; buildInputs = [ unzip ]; @@ -35,10 +35,10 @@ in { rainloop-community = common { edition = "community"; - sha256 = "1skwq6bn98142xf8r77b818fy00nb4x0s1ii3mw5849ih94spx40"; + sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; }; rainloop-standard = common { edition = ""; - sha256 = "e3ec8209cb3b9f092938a89094e645ef27659763432bedbe7fad4fa650554222"; + sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; }; } diff --git a/nixpkgs/pkgs/servers/rt/default.nix b/nixpkgs/pkgs/servers/rt/default.nix index b4400215dd01..94fd1661c3f5 100644 --- a/nixpkgs/pkgs/servers/rt/default.nix +++ b/nixpkgs/pkgs/servers/rt/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { perl (buildEnv { name = "rt-perl-deps"; - paths = (with perlPackages; [ + paths = with perlPackages; (requiredPerlModules [ ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index 27139ed846c1..d24a9b9748aa 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/pkgs/servers/samba/4.x.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen +{ lib, stdenv, fetchurl, python, pkgconfig, 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, fam, libceph, glusterfs +, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, liburing, fam, libceph, glusterfs , gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid , enableLDAP ? false @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.11.5"; + version = "4.12.0"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "0gyr773dl0krcra6pvyp8i9adj3r16ihrrm2b71c0974cbzrkqpk"; + sha256 = "1zk5jqnkifkfi6ssn02bh2ih7vyw2nsr0angsd6kyg3xaq5bgh3f"; }; outputs = [ "out" "dev" "man" ]; @@ -34,20 +34,15 @@ stdenv.mkDerivation rec { ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch ./4.x-fix-makeflags-parsing.patch - (fetchpatch { - name = "test-oLschema2ldif-fmemopen.patch"; - url = "https://gitlab.com/samba-team/samba/commit/5e517e57c9d4d35e1042a49d3592652b05f0c45b.patch"; - sha256 = "1bbldf794svsdvcbp649imghmj0jck7545d3k9xs953qkkgwkbxi"; - }) ]; - nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; + nativeBuildInputs = [ pkgconfig perl perl.pkgs.ParseYapp libxslt docbook_xsl docbook_xml_dtd_42 ] + ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; buildInputs = [ - python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* - docbook_xml_dtd_45 */ readline popt iniparser jansson + python readline popt iniparser jansson libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls - ] ++ optionals stdenv.isLinux [ libaio systemd ] + ] ++ optionals stdenv.isLinux [ libaio liburing systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi diff --git a/nixpkgs/pkgs/servers/sonarr/default.nix b/nixpkgs/pkgs/servers/sonarr/default.nix index 7a546d5813cf..d18e9fb7f586 100644 --- a/nixpkgs/pkgs/servers/sonarr/default.nix +++ b/nixpkgs/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "2.0.0.5338"; + version = "2.0.0.5344"; src = fetchurl { url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "05l7l4d1765m01c14iz8lcr61dnm4xd5p09sns4w8wmanks9jg3x"; + sha256 = "0bsxf7m2dir7gi0cfn8vdasr11q224b9mp6cixak9ss5zafwn59a"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Smart PVR for newsgroup and bittorrent users"; - homepage = https://sonarr.tv/; + homepage = "https://sonarr.tv/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.fadenb ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/servers/sql/dolt/default.nix b/nixpkgs/pkgs/servers/sql/dolt/default.nix index dbface601f54..27ab7d444bf1 100644 --- a/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "dolt"; @@ -15,7 +15,9 @@ buildGoModule rec { subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index c872e8bf95d2..257af21cec97 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.0.6"; + version = "1.2"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "0fli8wxi5f3vyn9cjjqi0a2z4i9npx4nqndx2lqzzx95khqqknp1"; + sha256 = "128bfxy7aabyvlcrzdi20f51k9xxgynd76f01v6w1314wrjg2r8f"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 6f0ec04cd752..42a8d9de49ee 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.6.0"; + version = "1.6.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0b42rhkycr4pwwa4fxnmppd3bl0xz7azvlm145rd7warlsr5h0lb"; + sha256 = "0k03aqpc1faqlpw46wazv0dy0xja57cv1sr1zwmizw3j3p3s0zdq"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; diff --git a/nixpkgs/pkgs/servers/tailscale/default.nix b/nixpkgs/pkgs/servers/tailscale/default.nix new file mode 100644 index 000000000000..e4cc0889c31f --- /dev/null +++ b/nixpkgs/pkgs/servers/tailscale/default.nix @@ -0,0 +1,35 @@ +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute }: + +buildGoModule rec { + pname = "tailscale"; + version = "0.97"; + + src = fetchFromGitHub { + owner = "tailscale"; + repo = "tailscale"; + rev = "v${version}"; + sha256 = "0ckjqhj99c25h8xgyfkrd19nw5w4a7972nvba9r5faw5micjs02n"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + CGO_ENABLED = 0; + + goPackagePath = "tailscale.com"; + modSha256 = "0anpakcqz4irwxnm0iwm7wqzh84kv3yxxdvyr38154pbd0ys5pa2"; + subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; + + postInstall = '' + wrapProgram $out/bin/tailscaled --prefix PATH : ${ + lib.makeBinPath [ iproute iptables ] + } + ''; + + meta = with lib; { + homepage = "https://tailscale.com"; + description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ danderson mbaillie ]; + }; +} diff --git a/nixpkgs/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix index dc92a10fe24d..1e1c0f938dbe 100644 --- a/nixpkgs/pkgs/servers/teleport/default.nix +++ b/nixpkgs/pkgs/servers/teleport/default.nix @@ -14,8 +14,11 @@ buildGoPackage rec { }; goPackagePath = "github.com/gravitational/teleport"; + subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; - buildInputs = [ zip ]; + + nativeBuildInputs = [ zip ]; + postBuild = '' pushd . cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport @@ -27,7 +30,7 @@ buildGoPackage rec { cd $NIX_BUILD_TOP/go/bin zip -q -A teleport popd - ''; + ''; dontStrip = true; diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index 1707eb403b70..f3c97e8adcc1 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/pkgs/servers/traefik/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v"; }; - buildInputs = [ go-bindata bash ]; + nativeBuildInputs = [ go-bindata bash ]; buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/servers/web-apps/shiori/default.nix b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix index dd4cdc08287b..bd17f2f267c6 100644 --- a/nixpkgs/pkgs/servers/web-apps/shiori/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "shiori"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/shells/elvish/default.nix b/nixpkgs/pkgs/shells/elvish/default.nix index ad2e845f9bc8..228692efe852 100644 --- a/nixpkgs/pkgs/shells/elvish/default.nix +++ b/nixpkgs/pkgs/shells/elvish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "elvish"; @@ -20,6 +20,8 @@ buildGoModule rec { modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "A friendly and expressive command shell"; longDescription = '' diff --git a/nixpkgs/pkgs/shells/ion/default.nix b/nixpkgs/pkgs/shells/ion/default.nix index c58302df2102..ca2f7a6d515a 100644 --- a/nixpkgs/pkgs/shells/ion/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/nixpkgs/pkgs/shells/zsh/antibody/default.nix index c0ae5e03e6c3..cc4726a3cb41 100644 --- a/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix index ece3c87cb664..382b76916d31 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests }: +{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests, Security }: buildGoModule rec { pname = "zsh-history"; @@ -13,6 +13,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; goPackagePath = "github.com/b4b4r07/history"; @@ -22,7 +24,7 @@ buildGoModule rec { installShellCompletion --zsh --name _history $out/share/zsh/completions/_history ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A CLI to provide enhanced history for your ZSH shell"; license = licenses.mit; homepage = https://github.com/b4b4r07/history; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 35355bf29759..7fac0fb8ab8a 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1w2iy9anc3cxb5kffrdz8knml8nsl6v3lcrdsigfzfp0zignb4cw"; + sha256 = "0r8vccgfy85ryswaigzgwmvhvrhlap7nrg7bi66w63877znqlksj"; }; patches = [ diff --git a/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix index c5426431b3ce..0ac818b9f223 100644 --- a/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix +++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix @@ -1,12 +1,18 @@ { + # Note: do not use Hydra as a source URL. Ask a member of the + # infrastructure team to mirror the job. busybox = import <nix/fetchurl.nix> { - url = https://hydra.nixos.org/build/112609163/download/2/busybox; - sha256 = "0dc5471dc6a5f69ad98eb7445f51a61e88aa5792d7a677025bf012bdb513b763"; + # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest + # from build: https://hydra.nixos.org/build/114203025 + url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; + # note: the following hash is different than the above hash, due to executable = true + sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d"; executable = true; }; - bootstrapTools = import <nix/fetchurl.nix> { - url = https://hydra.nixos.org/build/112609163/download/1/bootstrap-tools.tar.xz; - sha256 = "ca0564eca4eb944649ce10ec70859640427bf2241243af62812b163176487e02"; + # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest + # from build: https://hydra.nixos.org/build/114203025 + url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; + sha256 = "28327343db5ecc7f7811449ec69280d5867fa5d1d377cab0426beb9d4e059ed6"; }; } diff --git a/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l.nix index caf7df66cef6..8bc99c64c681 100644 --- a/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l.nix +++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l.nix @@ -1,12 +1,18 @@ { + # Note: do not use Hydra as a source URL. Ask a member of the + # infrastructure team to mirror the job. busybox = import <nix/fetchurl.nix> { - url = https://hydra.nixos.org/build/112609441/download/2/busybox; - sha256 = "e6f6aecb675e924a96516f4379445dd2c0ba8b9c438fbfbaa2dc14ccce2802e0"; + # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest + # from build: https://hydra.nixos.org/build/114202834 + url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; + # note: the following hash is different than the above hash, due to executable = true + sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6"; executable = true; }; - bootstrapTools = import <nix/fetchurl.nix> { - url = https://hydra.nixos.org/build/112609441/download/1/bootstrap-tools.tar.xz; - sha256 = "7a3f20def1a17ebf0edb5a92c403558429bcc2ac3d931b5e1bd88606cb217778"; + # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest + # from build: https://hydra.nixos.org/build/114202834 + url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; + sha256 = "0810fe74f8cd09831f177d075bd451a66b71278d3cc8db55b07c5e38ef3fbf3f"; }; } diff --git a/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv7l.nix index 67bca39eaf68..74d158452231 100644 --- a/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv7l.nix +++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv7l.nix @@ -1,12 +1,18 @@ { + # Note: do not use Hydra as a source URL. Ask a member of the + # infrastructure team to mirror the job. busybox = import <nix/fetchurl.nix> { - url = https://hydra.nixos.org/build/112609103/download/2/busybox; - sha256 = "566a469dac214b31e4abdb0a91d32550bab1be5858d329e1b6074eef05370ca3"; + # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest + # from build: https://hydra.nixos.org/build/114203060 + url = "http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; + # note: the following hash is different than the above hash, due to executable = true + sha256 = "18qc6w2yykh7nvhjklsqb2zb3fjh4p9r22nvmgj32jr1mjflcsjn"; executable = true; }; - bootstrapTools = import <nix/fetchurl.nix> { - url = https://hydra.nixos.org/build/112609103/download/1/bootstrap-tools.tar.xz; - sha256 = "79fa2d7722aeb856c7c9b62a3fd64b6d261fd6f6bcbac486f0a2a7d823210550"; + # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest + # from build: https://hydra.nixos.org/build/114203060 + url = "http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; + sha256 = "cf2968e8085cd3e6b3e9359624060ad24d253800ede48c5338179f6e0082c443"; }; } diff --git a/nixpkgs/pkgs/tools/X11/xpra/default.nix b/nixpkgs/pkgs/tools/X11/xpra/default.nix index ea4e84889f9f..cef8bd491637 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0msm53iphb6zr1phb2knkrn94hjcg3a9n1vvbis5sipdvlx50m08"; + sha256 = "0i4c5cdr5prbz54jinsinhvb60s5s5yskjzjg47zbw0if17sp26w"; }; patches = [ @@ -88,7 +88,7 @@ in buildPythonApplication rec { passthru = { inherit xf86videodummy; }; meta = { - homepage = http://xpra.org/; + homepage = "http://xpra.org/"; downloadPage = "https://xpra.org/src/"; downloadURLRegexp = "xpra-.*[.]tar[.]xz$"; description = "Persistent remote applications for X"; diff --git a/nixpkgs/pkgs/tools/admin/ansible/default.nix b/nixpkgs/pkgs/tools/admin/ansible/default.nix index 7dde0e4764c6..4af031118693 100644 --- a/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -5,7 +5,7 @@ rec { ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; - ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec { + ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; version = "2.8.7"; @@ -15,7 +15,7 @@ rec { }; })); - ansible_2_7 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec { + ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; version = "2.7.15"; @@ -25,7 +25,7 @@ rec { }; })); - ansible_2_6 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec { + ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; version = "2.6.20"; diff --git a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 48a1de61cd80..3e145f732362 100644 --- a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "aws-vault"; version = "5.3.2"; @@ -13,13 +13,15 @@ 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 lib; { + meta = with stdenv.lib; { description = "A vault for securely storing and accessing AWS credentials in development environments"; homepage = "https://github.com/99designs/aws-vault"; diff --git a/nixpkgs/pkgs/tools/admin/awsweeper/default.nix b/nixpkgs/pkgs/tools/admin/awsweeper/default.nix index 661747c2fd0d..1ea54953701d 100644 --- a/nixpkgs/pkgs/tools/admin/awsweeper/default.nix +++ b/nixpkgs/pkgs/tools/admin/awsweeper/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "awsweeper"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "A tool to clean out your AWS account"; homepage = "https://github.com/cloudetc/awsweeper/"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 69e0a2afe6e2..13fdf6dcd0d0 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "0f4wrqp9f4n4mk73ybx08ybvmxx88r6g5cvx8ld6ybhl2w8bbn9v"; + sha256 = "0bqkvx1gp4bhpjn5nrjc08lq8wldl1icrz6q1llaxgvqqmc8hcgp"; }; # put packages that needs to be overriden in the py package scope diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 7b43ba209c2a..cbec7e86a63f 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -119,8 +119,8 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "1.9.0" "zip" - "0v91hl936wp9sl3bc31svf6kdxwa57qh6ih9rrv43dnb2000km6r"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.0.0" "zip" + "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb"; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; @@ -131,8 +131,11 @@ let azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip" - "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip" + "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; + + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "11.0.0" "zip" + "1dnlql4z9wawf8gc1v4rr386pifwcnx3ycr4gdccqwkgimgpsdg4"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -140,8 +143,8 @@ let azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.1.0" "zip" "07vpzhvi2946v5dn9cb2hkd1b9vj5c6zl32958bg2bxsjg9vvyi1"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.11.0" "zip" - "05j0s2ng6ck35lw85cbjf5cm6canc71c41aagr68cmiqj1li6v1z"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.12.0" "zip" + "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -188,8 +191,8 @@ let azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip" "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx"; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.15.0" "zip" - "0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.17.0" "zip" + "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0"; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; @@ -206,11 +209,11 @@ let azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip" "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9"; - azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.0.0" "zip" - "0aphqh4mvrc1yiyis8zvks0d19d1m3lqylr9jc8fj73iw84rwgm5"; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip" + "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc8" "zip" - "1j2xyfid0qg95lywwsz8520r7gd8m0a487n03jxnckr91vd890v1"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc9" "zip" + "060m4hqi1h5h53imj0vmpbzhqkwis7h91nwinpcvjs422figcv0i"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip" "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2"; @@ -224,8 +227,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.2.0" "zip" - "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "8.0.0" "zip" + "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; diff --git a/nixpkgs/pkgs/tools/admin/berglas/default.nix b/nixpkgs/pkgs/tools/admin/berglas/default.nix index aaca67baa165..d088184f7a17 100644 --- a/nixpkgs/pkgs/tools/admin/berglas/default.nix +++ b/nixpkgs/pkgs/tools/admin/berglas/default.nix @@ -1,22 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { - - name = "berglas-${version}"; - version = "0.5.0"; + pname = "berglas"; + version = "0.5.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; - repo = "berglas"; - rev = "v0.5.0"; - sha256 = "1y5w2czipwj069w4zxnyb9xqv5mx0yjjramykf3vm3q478bk3rm7"; + repo = pname; + rev = "v${version}"; + sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n"; }; - modSha256 = "0y4ajii3pv25s4gjazf6fl0b9wax17cmwhbmiybqhp61annca7kr"; + 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; + homepage = "https://github.com/GoogleCloudPlatform/berglas"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/admin/certigo/default.nix b/nixpkgs/pkgs/tools/admin/certigo/default.nix index 5474cb254298..89c6b8996fa3 100644 --- a/nixpkgs/pkgs/tools/admin/certigo/default.nix +++ b/nixpkgs/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "certigo"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/tools/admin/clair/default.nix b/nixpkgs/pkgs/tools/admin/clair/default.nix index 3f4d00736ad9..a12b8abe1206 100644 --- a/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }: buildGoModule rec { pname = "clair"; @@ -13,14 +13,16 @@ buildGoModule rec { modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/clair \ - --prefix PATH : "${lib.makeBinPath [ rpm xz ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Vulnerability Static Analysis for Containers"; homepage = "https://github.com/quay/clair"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 4c01383f8986..c700e4f397c7 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "eksctl"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; @@ -25,7 +27,7 @@ buildGoModule rec { $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 95878ef09ab6..fb7870eac956 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/admin/iamy/default.nix b/nixpkgs/pkgs/tools/admin/iamy/default.nix index e09cd2f52853..6a1ec948d907 100644 --- a/nixpkgs/pkgs/tools/admin/iamy/default.nix +++ b/nixpkgs/pkgs/tools/admin/iamy/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "iamy"; version = "2.3.2"; - goPackagePath = "github.com/99designs/iamy"; - src = fetchFromGitHub { owner = "99designs"; repo = "iamy"; @@ -15,6 +13,8 @@ buildGoModule rec { modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w '']; diff --git a/nixpkgs/pkgs/tools/admin/lego/default.nix b/nixpkgs/pkgs/tools/admin/lego/default.nix index 3a0d9491d157..0cb614c12d1f 100644 --- a/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -1,24 +1,26 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "lego"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "198nc0rpkxyjms2lvv7g0rzy8cczzs662ncywzmcqsd1qs67zvif"; + sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw"; }; - modSha256 = "09w2lsn1zbn750m77084x886k4lx264dgl80d9g7kxjnsqgsmzig"; + modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; subPackages = [ "cmd/lego" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index c7c2881a567a..efd6db395f20 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "lxd"; - version = "3.22"; + version = "3.23"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1j60xajcycqnnkasbghcvx3dvb5iadvvq2l3hh9i0sw3dk1wx4hn"; + sha256 = "1zbm736m9g4c40r55s6rg3xrgw9bysslr992sa80vlrxfmwfiqg4"; }; preBuild = '' diff --git a/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix b/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix new file mode 100644 index 000000000000..77d30e56d5fc --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, stdenv +, fetchgit +, requests +, makeWrapper +, extraHandlers ? [] +}: + +buildPythonPackage rec { + pname = "ssh-import-id"; + version = "5.8"; + + src = fetchgit { + url = "https://git.launchpad.net/ssh-import-id"; + rev = version; + sha256 = "0l9gya1hyf2qfidlmvg2cgfils1fp9rn5r8sihwvx4qfsfp5yaak"; + }; + + propagatedBuildInputs = [ + requests + ] ++ extraHandlers; + + nativeBuildInputs = [ + makeWrapper + ]; + + # handlers require main bin, main bin requires handlers + makeWrapperArgs = [ "--prefix" ":" "$out/bin" ]; + + meta = with stdenv.lib; { + description = "Retrieves an SSH public key and installs it locally"; + license = licenses.gpl3; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/audio/volctl/default.nix b/nixpkgs/pkgs/tools/audio/volctl/default.nix index 7b4cdd6b5315..dd58671824db 100644 --- a/nixpkgs/pkgs/tools/audio/volctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/volctl/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "volctl"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "buzz"; repo = pname; rev = version; - sha256 = "1bqq5mrpi7qxzl37z6fj67pqappjmwhi8d8db95j3lmf16svm2xk"; + sha256 = "0rppqc5wiqxd83z2mgvhi6gdx7yhy9wnav1dbbi1wvm7lzw6fnil"; }; nativeBuildInputs = [ @@ -28,14 +28,6 @@ pythonPackages.buildPythonApplication rec { strictDeps = false; - postPatch = '' - # The user can set a mixer application in the preferences. The - # default is pavucontrol. Do not hard code its path and hope it - # can be found in $PATH. - - substituteInPlace volctl/app.py --replace /usr/bin/pavucontrol pavucontrol - ''; - preBuild = '' export LD_LIBRARY_PATH=${libpulseaudio}/lib ''; @@ -50,7 +42,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "PulseAudio enabled volume control featuring per-app sliders"; - homepage = https://buzz.github.io/volctl/; + homepage = "https://buzz.github.io/volctl/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/tools/backup/dar/default.nix b/nixpkgs/pkgs/tools/backup/dar/default.nix index c105c8086c49..a439bbf41b13 100644 --- a/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.8"; + version = "2.6.9"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "05mw6m054jklnxkxgf9fh4hx8ik1d8c18rfg3i55bnddk0vr8ra3"; + sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://dar.linux.free.fr; + homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/backup/pyznap/default.nix b/nixpkgs/pkgs/tools/backup/pyznap/default.nix index 42df651e1a8f..b04aab345320 100644 --- a/nixpkgs/pkgs/tools/backup/pyznap/default.nix +++ b/nixpkgs/pkgs/tools/backup/pyznap/default.nix @@ -6,11 +6,11 @@ buildPythonApplication rec { pname = "pyznap"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "00xpw6rmkq5cfjfw23mv0917wfzvb5zxj420p6yh0rnl3swh7gi8"; + sha256 = "0s8glb6kbwwha6zgzfrf195r1qkrv1a9wagyhhm3kryv7c88mqnp"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/backup/restic/default.nix b/nixpkgs/pkgs/tools/backup/restic/default.nix index 1eb02e9a4834..345d14fd10b9 100644 --- a/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, nixosTests}: buildGoPackage rec { pname = "restic"; @@ -13,20 +13,19 @@ buildGoPackage rec { sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7"; }; - buildPhase = '' - cd go/src/${goPackagePath} - go run build.go - ''; - passthru.tests.restic = nixosTests.restic; + # Use a custom install phase here as by default the + # build-release-binaries and prepare-releases binaries are + # installed. installPhase = '' + mkdir -p "$bin/bin" + cp go/bin/restic "$bin/bin" + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p \ - $bin/bin \ $bin/etc/bash_completion.d \ $bin/share/zsh/vendor-completions \ $bin/share/man/man1 - cp restic $bin/bin/ $bin/bin/restic generate \ --bash-completion $bin/etc/bash_completion.d/restic.sh \ --zsh-completion $bin/share/zsh/vendor-completions/_restic \ diff --git a/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/nixpkgs/pkgs/tools/backup/wal-g/default.nix index 90ce2d188d6e..e5ed04bb4a1c 100644 --- a/nixpkgs/pkgs/tools/backup/wal-g/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-g/default.nix @@ -1,30 +1,28 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, brotli }: +{ stdenv, buildGoModule, fetchFromGitHub, brotli, Security }: -buildGoPackage rec { +buildGoModule rec { pname = "wal-g"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { - owner = "wal-g"; - repo = "wal-g"; - rev = "v${version}"; - sha256 = "0rrn9kzcg3nw9qvzy58m4qacghv0pj7iyjh4yspc71n5nkamkfgm"; + owner = "wal-g"; + repo = "wal-g"; + rev = "v${version}"; + sha256 = "1hslhs9i4wib6c74gdq9yail958ff1y11pymjww2xr84wkwd9v7i"; }; - buildInputs = [ brotli ]; + modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; - doCheck = true; - - goPackagePath = "github.com/wal-g/wal-g"; + buildInputs = [ brotli ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - goDeps = ./deps.nix; + doCheck = true; subPackages = [ "main/pg" ]; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/pg.WalgVersion=${version} -X ${goPackagePath}/cmd/pg.GitRevision=${src.rev}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ]; postInstall = '' - mv $bin/bin/pg $bin/bin/wal-g + mv $out/bin/pg $out/bin/wal-g ''; meta = { diff --git a/nixpkgs/pkgs/tools/backup/wal-g/deps.nix b/nixpkgs/pkgs/tools/backup/wal-g/deps.nix deleted file mode 100644 index 13daf375c31a..000000000000 --- a/nixpkgs/pkgs/tools/backup/wal-g/deps.nix +++ /dev/null @@ -1,588 +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 = "0ebda48a7f143b1cce9eb37a8c1106ac762a3430"; - sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; - }; - } - { - goPackagePath = "github.com/Azure/azure-pipeline-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-pipeline-go"; - rev = "232aee85e8e3a6223a11c0943f7df2ae0fac00e4"; - sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6"; - }; - } - { - goPackagePath = "github.com/Azure/azure-storage-blob-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-storage-blob-go"; - rev = "fc700035fe4a7020f50d49f420b3c088aed57e03"; - sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/DataDog/zstd"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/zstd"; - rev = "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab"; - sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; - }; - } - { - goPackagePath = "github.com/RoaringBitmap/roaring"; - fetch = { - type = "git"; - url = "https://github.com/RoaringBitmap/roaring"; - rev = "3d677d3262197ee558b85029301eb69b8239f91a"; - sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "02973e4916ed10f78aff1257f45f01d23907a05d"; - sha256 = "0w5c06l0f8h77p74gmsp2wzl21pcn92yzsycd36746qqav83yyld"; - }; - } - { - goPackagePath = "github.com/cyberdelia/lzo"; - fetch = { - type = "git"; - url = "https://github.com/cyberdelia/lzo"; - rev = "feb520148d8940294afb1e242dc1d2a7c9c34432"; - sha256 = "0mk93b7vr9hp1xcvzaw5r01zs2blhk24m22pacf6sx5zwx8fd2ld"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/glycerine/go-unsnap-stream"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/go-unsnap-stream"; - rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126"; - sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "75795aa4236dc7341eefac3bbe945e68c99ef9df"; - sha256 = "1qf7zl5slnc4bcz0z0vn4fq1pwkphdrmqmjg3wv5q6pv2x29drli"; - }; - } - { - 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/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "51421b967af1f557f93a59e0057aaf15ca02e29c"; - sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/google/brotli"; - fetch = { - type = "git"; - url = "https://github.com/google/brotli"; - rev = "d6d98957ca8ccb1ef45922e978bb10efca0ea541"; - sha256 = "0n0ia2sxsj3fnnzhjbigbadpsqxivjs3v78b1xzqvgd1nwalglaj"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d"; - sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jackc/pgx"; - fetch = { - type = "git"; - url = "https://github.com/jackc/pgx"; - rev = "c73e7d75061bb42b0282945710f344cfe1113d10"; - sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f"; - }; - } - { - goPackagePath = "github.com/jedib0t/go-pretty"; - fetch = { - type = "git"; - url = "https://github.com/jedib0t/go-pretty"; - rev = "a37e1e030434d93557ca8a6a77b4cf9d31cc21ff"; - sha256 = "057xwrrqq0cvyq9f0wnfzjpx10807520vl92qq7l7a7s0r56jyrx"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-ieproxy"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-ieproxy"; - rev = "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13"; - sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz"; - }; - } - { - goPackagePath = "github.com/minio/sio"; - fetch = { - type = "git"; - url = "https://github.com/minio/sio"; - rev = "035b4ef8c449ba2ba21ec143c91964e76a1fb68c"; - sha256 = "007mh7a61qzgf8ga4pix6qhm6jbph3h71a8iif7l45mvqphabh0z"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/mschoch/smat"; - fetch = { - type = "git"; - url = "https://github.com/mschoch/smat"; - rev = "90eadee771aeab36e8bf796039b8c261bebebe4f"; - sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3"; - }; - } - { - goPackagePath = "github.com/ncw/swift"; - fetch = { - type = "git"; - url = "https://github.com/ncw/swift"; - rev = "f737f4e00462f79ff2e0ddbcfb09331ce7ec4fa9"; - sha256 = "0c6vcn3dmhh339wilh71fmjb535kgfkf9dh2dh8ln43whq6mbjbs"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "5a3d2245f97fc249850e7802e3c01fad02a1c316"; - sha256 = "1my03x0m72vc2xyy9h0naa1qrzcf0g531gh4cakcwpxrq0z39vmr"; - }; - } - { - goPackagePath = "github.com/pierrec/xxHash"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/xxHash"; - rev = "d17cb990ad2d219d5901415ceaeb50d17df59527"; - sha256 = "07rbr0apyq9m8m2knf1j7g9299r2v2ihvig1b7bq2srszcd9r221"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "f4711e4db9e9a1d3887343acb72b2bbfc2f686f5"; - sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1"; - sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "6d33b5a963d922d182c91e8a1c88d81fd150cfd4"; - sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "221dbe5ed46703ee255b1da0dec05086f5035f62"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/tinsane/tracelog"; - fetch = { - type = "git"; - url = "https://github.com/tinsane/tracelog"; - rev = "05cb843fbac1d7693bbbbed8aa8f7b401438ee7f"; - sha256 = "1fry633qi4iih9za91m90c26p3qpd79d716dggk10cbc0bpvql51"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1"; - sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d"; - sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy"; - }; - } - { - goPackagePath = "github.com/wal-g/storages"; - fetch = { - type = "git"; - url = "https://github.com/wal-g/storages"; - rev = "ecd376af8972cd9c3e355831c126a7862de6b2b9"; - sha256 = "1jmvin93811xxh9sqf6xrrys55dm12zszqf2l3arf92h0bysvniy"; - }; - } - { - goPackagePath = "github.com/willf/bitset"; - fetch = { - type = "git"; - url = "https://github.com/willf/bitset"; - rev = "e553b05586428962bf7058d1044519d87ca72d74"; - sha256 = "0davmxzv79qqg7lkj89diqinqx3xkr94d67yfnazqn3h1f7sjkd1"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "9c377598961b706d1542bd2d84d538b5094d596e"; - sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "e657309f52e71501f9934566ac06dc5c2f7f11a1"; - sha256 = "17jwkjrfj7kz25z8z492xlz88nmb42kpjcxl9dsv5jl28zvzq1bj"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "ec7cb31e5a562f5e9e31b300128d2f530f55d127"; - sha256 = "19b4kdwfahq9f809v4lmn9h47sq1y67nkl7csnracn5qd334hp06"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "959b441ac422379a43da2230f62be024250818b0"; - sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "74dc4d7220e7acc4e100824340f3e66577424772"; - sha256 = "0563yswwqknxx2gsvl0qikn0lmwalilbng8i12iw4d3v40n23s0l"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; - sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0fa942474b76e1b46a6060d720ae6e"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "4d1cda033e0619309c606fc686de3adcf599539e"; - sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd"; - sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "fc82fb2afd64396b05ea9aa0bccd6e8f2257b154"; - sha256 = "1rnpbhhcnv28k63m7biv2rxrmdxhz9q3p35qi0phcq2qhcf78032"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "feb0267beb8644f5088a03be4d5ec3f8c7020152"; - sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "4a4468ece617fc8205e99368fa2200e9d1fad421"; - sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "24fa4b261c55da65468f2abfdae2b024eef27dfb"; - sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "6eaf6f47437a6b4e2153a190160ef39a92c7eceb"; - sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "72554cb117ad340748b3093e7108983fd984c9f2"; - sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd"; - }; - } -] \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix b/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix new file mode 100644 index 000000000000..a3ce3d361824 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 6debd333c41c..00f893139427 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, fuse3 }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0fifqa4f79lhklajsf1aiipc4cyykscqlns9pzbcq5hdphi9fbsb"; + sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse3 ]; diff --git a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index dad032073c04..5cc6e5c156b2 100644 --- a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.3"; + version = "7.4"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "08g8394vk88cb71z4k5sknld1nsd20f4mk2yyjvdp1hwm97z12pq"; + sha256 = "1f7z1dacnx7pd3ri4nka6851fzhdfandbf94blds8bqfqc1263h6"; }; buildInputs = [ @@ -186,7 +186,7 @@ stdenv.mkDerivation meta = with stdenv.lib; { inherit (s) version; description = "Distributed storage system"; - homepage = https://www.gluster.org; + homepage = "https://www.gluster.org"; license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2 maintainers = [ maintainers.raskin ]; platforms = with platforms; linux ++ freebsd; diff --git a/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix b/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix index 78f80ecfa87a..6782987c027f 100644 --- a/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simg2img"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "anestisb"; repo = "android-simg2img"; rev = version; - sha256 = "119gl9i61g2wr07hzv6mi1ihql6yd6pwq94ki2pgcpfbamv8f6si"; + sha256 = "1xm9kaqs2w8c7a4psv78gv66gild88mpgjn5lj087d7jh1jxy7bf"; }; buildInputs = [ zlib ]; diff --git a/nixpkgs/pkgs/tools/misc/bat/default.nix b/nixpkgs/pkgs/tools/misc/bat/default.nix index d8ac90abf87c..bf84502af2bc 100644 --- a/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1cpa8dal4c27pnbmmrar4vqzcl4h0zf8x1zx1dlf0riavdg9n56y"; + sha256 = "1kaa6ps6v1wk9qs63h116k4pbz7y9mfbfxfbq7g89yjhzkjmh6xc"; fetchSubmodules = true; }; - cargoSha256 = "17xyb84axkn341nd5rm7jza1lrn8wcnl6jirhyv63r5k6mswy39i"; + cargoSha256 = "01l1y124gjh6gf9z1jkbpfzh0w92hrgwvsmqkqdw3a9pa4w5f6yg"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; @@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; postInstall = '' - installManPage doc/bat.1 - installShellCompletion assets/completions/bat.fish + installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 + installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish ''; # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; - homepage = https://github.com/sharkdp/bat; + homepage = "https://github.com/sharkdp/bat"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir lilyball ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/bibutils/default.nix b/nixpkgs/pkgs/tools/misc/bibutils/default.nix index d099a8aba9b0..bd744bcfb6fb 100644 --- a/nixpkgs/pkgs/tools/misc/bibutils/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/misc/blsd/default.nix b/nixpkgs/pkgs/tools/misc/blsd/default.nix index 23bd7ed172c4..1b860fc1b4d5 100644 --- a/nixpkgs/pkgs/tools/misc/blsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/blsd/default.nix @@ -24,5 +24,6 @@ buildGoPackage { license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; + broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead. }; } diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index b2fb6925abac..979a658ac022 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: buildGoModule rec { pname = "chezmoi"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/docui/default.nix b/nixpkgs/pkgs/tools/misc/docui/default.nix index 0329c1bc4a69..c8f3dbf8009c 100644 --- a/nixpkgs/pkgs/tools/misc/docui/default.nix +++ b/nixpkgs/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "docui"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 0b56b03b9de6..765c7777f0f3 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.3.1"; + version = "2.3.8"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "15pmmjnzjbjlf7np5zf2yahccqx8iw1jlzl3nkhqbs673ns0gjml"; + sha256 = "0ql74z24qp68m3ivzmxdijafrhpwjgs462chrxd021n9nl7mqhss"; # 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 = "0xqjbhqb08bk40i0rfzfkcl9kp67b8a285ksil4f663nidycmgw3"; + cargoSha256 = "0c0d9qi7v3s7vf1rzd467w56i9zdh8fqqrmkkk6xxyh5xhkqx0kd"; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/edid-generator/default.nix b/nixpkgs/pkgs/tools/misc/edid-generator/default.nix new file mode 100644 index 000000000000..49b6277faef5 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/edid-generator/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, dos2unix +, edid-decode +, hexdump +, zsh +, modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync +}: +let + version = "unstable-2018-03-15"; +in stdenv.mkDerivation { + pname = "edid-generator"; + inherit version; + + src = fetchFromGitHub { + owner = "akatrevorjay"; + repo = "edid-generator"; + rev = "31a6f80784d289d2faa8c4ca4788409c83b3ea14"; + sha256 = "0j6wqzx5frca8b5i6812vvr5iwk7440fka70bmqn00k0vfhsc2x3"; + }; + + nativeBuildInputs = [ dos2unix edid-decode hexdump zsh ]; + + postPatch = '' + patchShebangs modeline2edid + ''; + + configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); + + installPhase = '' + install -Dm 444 *.bin -t "$out/lib/firmware/edid" + ''; + + meta = { + description = "Hackerswork to generate an EDID blob from given Xorg Modelines"; + homepage = "https://github.com/akatrevorjay/edid-generator"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.flokli ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/fd/default.nix b/nixpkgs/pkgs/tools/misc/fd/default.nix index 3136381dd8eb..060e1c3fcdf6 100644 --- a/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fd"; - version = "7.4.0"; + version = "7.5.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr"; + sha256 = "029xr7l751dy167hfzrd030llkaiy8j585h1d4l6391fgrsvnav7"; }; - cargoSha256 = "1nhlarrl0m6as3j2547yf1xxjm88qy3v8jgvhd47z3f5s63bb6w5"; + cargoSha256 = "0lq6da2f6xywyhzyyrpph96d8b9vpdzakzipci167g6hhh232b5b"; + + nativeBuildInputs = [ installShellFiles ]; preFixup = '' - install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1" - - install -Dm644 target/release/build/fd-find-*/out/fd.bash \ - "$out/share/bash-completion/completions/fd.bash" - install -Dm644 target/release/build/fd-find-*/out/fd.fish \ - "$out/share/fish/vendor_completions.d/fd.fish" - install -Dm644 target/release/build/fd-find-*/out/_fd \ - "$out/share/zsh/site-functions/_fd" + installManPage "$src/doc/fd.1" + + (cd target/release/build/fd-find-*/out + installShellCompletion fd.{bash,fish} + installShellCompletion --zsh _fd) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' `fd` is a simple, fast and user-friendly alternative to `find`. diff --git a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index a593805b651e..57909debf79a 100644 --- a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1ly6afq4badmvs1rsqcai5kyka66n0rzi8857893wjcscppja55a"; + sha256 = "07p0cy4y2x45kgimg7rjjk9zknmnnsfxdy2vlz6dzaxrslv6c3x6"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index a4b9af09712e..56462aa3d303 100644 --- a/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "gotify-cli"; @@ -17,7 +17,9 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { license = licenses.mit; homepage = https://github.com/gotify/cli; description = "A command line interface for pushing messages to gotify/server."; diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index a998ccb3f63c..615eea5a7831 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.12.2) - html-proofer (3.15.1) + html-proofer (3.15.2) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -16,7 +16,7 @@ GEM yell (~> 2.0) mercenary (0.4.0) mini_portile2 (2.4.0) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index 5ddb6accb940..2e3b3a10b3b8 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krd80ga7qcms469l55jbm711a7ph2lmyn88l929nhbxc7sgm81g"; + sha256 = "1b7wx2hnwnml3y10x6yxybl3hy973n2ifq3hbqh0jd72bqs615wp"; type = "gem"; }; - version = "3.15.1"; + version = "3.15.2"; }; mercenary = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; diff --git a/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/nixpkgs/pkgs/tools/misc/kepubify/default.nix index 207492a89449..a7b7da451fb7 100644 --- a/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "kepubify"; @@ -15,9 +15,11 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." "covergen" "seriesmeta" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "EPUB to KEPUB converter"; homepage = "https://pgaskin.net/kepubify"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/nixpkgs/pkgs/tools/misc/mutagen/default.nix index 8940fef2a0dd..c029f38acb2c 100644 --- a/nixpkgs/pkgs/tools/misc/mutagen/default.nix +++ b/nixpkgs/pkgs/tools/misc/mutagen/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "mutagen"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 6c334db1ede8..77fdbcf8ac34 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,13 +1,15 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200222"; + name = "parallel-20200322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "077b72h2d191bmsb78fmzcynxj5mi5v3axmwwxz1d1q8xhv756r6"; + sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10"; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl procps ]; diff --git a/nixpkgs/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch b/nixpkgs/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch new file mode 100644 index 000000000000..f444d72c4648 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch @@ -0,0 +1,570 @@ +From 153e9acd6fb50c50db5ebdd03303a42f56ec05e0 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Tue, 17 Mar 2020 23:14:36 +0100 +Subject: [PATCH] Add Cargo.lock by running `cargo vendor` + +--- + Cargo.lock | 551 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 551 insertions(+) + create mode 100644 Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..91f9100 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,551 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++dependencies = [ ++ "byteorder", ++ "iovec", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "ctrlc" ++version = "3.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7" ++dependencies = [ ++ "nix 0.17.0", ++ "winapi 0.3.8", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futures" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" ++dependencies = [ ++ "bitflags", ++ "futures", ++ "inotify-sys", ++ "libc", ++ "mio", ++ "tokio-io", ++ "tokio-reactor", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.68" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" ++ ++[[package]] ++name = "lock_api" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" ++dependencies = [ ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "mio" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" ++dependencies = [ ++ "cfg-if", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "winapi 0.3.8", ++] ++ ++[[package]] ++name = "nix" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "becb657d662f1cd2ef38c7ad480ec6b8cf9e96b27adb543e594f9cf0f2e6065c" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", ++] ++ ++[[package]] ++name = "nix" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" ++ ++[[package]] ++name = "parking_lot" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" ++dependencies = [ ++ "lock_api", ++ "parking_lot_core", ++ "rustc_version", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" ++dependencies = [ ++ "cfg-if", ++ "cloudabi", ++ "libc", ++ "redox_syscall", ++ "rustc_version", ++ "smallvec", ++ "winapi 0.3.8", ++] ++ ++[[package]] ++name = "peep" ++version = "0.1.4" ++dependencies = [ ++ "ctrlc", ++ "getopts", ++ "inotify", ++ "libc", ++ "mio", ++ "nix 0.11.1", ++ "regex", ++ "termion", ++ "termios", ++ "unicode-width", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++dependencies = [ ++ "redox_syscall", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8900ebc1363efa7ea1c399ccc32daed870b4002651e0bed86e72d501ebbe0048" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++dependencies = [ ++ "maybe-uninit", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" ++dependencies = [ ++ "libc", ++ "numtoa", ++ "redox_syscall", ++ "redox_termios", ++] ++ ++[[package]] ++name = "termios" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "tokio-executor" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" ++dependencies = [ ++ "crossbeam-utils", ++ "futures", ++] ++ ++[[package]] ++name = "tokio-io" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" ++dependencies = [ ++ "bytes", ++ "futures", ++ "log", ++] ++ ++[[package]] ++name = "tokio-reactor" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" ++dependencies = [ ++ "crossbeam-utils", ++ "futures", ++ "lazy_static", ++ "log", ++ "mio", ++ "num_cpus", ++ "parking_lot", ++ "slab", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-sync", ++] ++ ++[[package]] ++name = "tokio-sync" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" ++dependencies = [ ++ "fnv", ++ "futures", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] +-- +2.25.0 + diff --git a/nixpkgs/pkgs/tools/misc/peep/default.nix b/nixpkgs/pkgs/tools/misc/peep/default.nix new file mode 100644 index 000000000000..161ea3f75e63 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/peep/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "peep"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "ryochack"; + repo = "peep"; + rev = "v${version}"; + sha256 = "0c0fphnhq9vg9jjnkl35k56jbcnyz2ballsnkbm2xrh8vbyvk1av"; + }; + + cargoPatches = [ ./0001-Add-Cargo.lock-by-running-cargo-vendor.patch ]; + cargoSha256 = "15qc9a4zpnq7lbcaji1mkik93qkx366misczbi1mipiq5w7sgn0l"; + + meta = with lib; { + description = "The CLI text viewer tool that works like less command on small pane within the terminal window"; + license = licenses.mit; + homepage = "https://github.com/ryochack/peep"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index 7cb810b2fe2d..9eed1aaffd8e 100644 --- a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "pgcenter"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = https://pgcenter.org/; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; diff --git a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index b702ffc1703d..04e106ca5522 100644 --- a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "pgmetrics"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/tools/misc/rmtrash/default.nix b/nixpkgs/pkgs/tools/misc/rmtrash/default.nix new file mode 100644 index 000000000000..073871b0f438 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/rmtrash/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper +, trash-cli, coreutils, which, getopt }: + +stdenv.mkDerivation rec { + pname = "rmtrash"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "PhrozenByte"; + repo = pname; + rev = "v${version}"; + sha256 = "04a9c65wnkq1fj8qhdsdbps88xjbp7rn6p27y25v47kaysvrw01j"; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + for f in rm{,dir}trash; do + install -D ./$f $out/bin/$f + wrapProgram $out/bin/$f \ + --prefix PATH : ${lib.makeBinPath [ trash-cli coreutils which getopt ]} + done + ''; + + meta = with lib; { + homepage = "https://github.com/PhrozenByte/rmtrash"; + description = "trash-put made compatible with GNUs rm and rmdir"; + longDescription = '' + Put files (and directories) in trash using the `trash-put` command in a + way that is, otherwise as `trash-put` itself, compatible to GNUs `rm` + and `rmdir`. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peelz ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 9d1fcb897891..152db99660c8 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "17jgb8fp6zarsnl1hm2y24h0xb0w2w6m61k8g3ww3r4fm8yj649v"; + sha256 = "0qp3y2wcpj1r07v1r2y42zrzkl13j0vlinjx05gfmrmapcls41gi"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postPatch = '' substituteInPlace src/utils.rs \ --replace "/bin/echo" "echo" ''; - cargoSha256 = "01qzwk3q1f6pmyqsq5gnczdjm3157ja2zlrahw5bd5vmy929l5gq"; + cargoSha256 = "11492fv2isw2prfcgxq0wrbln1n6xdi9209cifjf25nnw2aq2csn"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/nixpkgs/pkgs/tools/misc/thefuck/default.nix index 4ac9b32b3556..d67da78a3004 100644 --- a/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.29"; + version = "3.30"; src = fetchFromGitHub { owner = "nvbn"; repo = pname; rev = version; - sha256 = "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs"; + sha256 = "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; diff --git a/nixpkgs/pkgs/tools/misc/timidity/default.nix b/nixpkgs/pkgs/tools/misc/timidity/default.nix index c307c96199f2..88c3c7cb4252 100644 --- a/nixpkgs/pkgs/tools/misc/timidity/default.nix +++ b/nixpkgs/pkgs/tools/misc/timidity/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; + patches = [ ./timidity-iA-Oj.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ alsaLib libjack2 ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/timidity/timidity-iA-Oj.patch b/nixpkgs/pkgs/tools/misc/timidity/timidity-iA-Oj.patch new file mode 100644 index 000000000000..9bb964134283 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/timidity/timidity-iA-Oj.patch @@ -0,0 +1,14 @@ +Without this timidity -iA -Oj prints "Couldn't start JACK device (`j')" +and does not play MIDI. + +--- a/timidity/jack_a.c ++++ b/timidity/jack_a.c +@@ -513,6 +513,8 @@ static int actl_jack(int request, void *arg) + ringbuf_clear(&ctx->rbuf); + return 0; + ++ case PM_REQ_PLAY_START: ++ return 0; + } + return -1; + } diff --git a/nixpkgs/pkgs/tools/misc/wev/default.nix b/nixpkgs/pkgs/tools/misc/wev/default.nix index fa69cc4445ee..0f033d1c7e22 100644 --- a/nixpkgs/pkgs/tools/misc/wev/default.nix +++ b/nixpkgs/pkgs/tools/misc/wev/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl -, pkg-config, scdoc -, wayland, wayland-protocols, libxkbcommon +, pkg-config, scdoc, wayland +, wayland-protocols, libxkbcommon }: -let - version = "2019-08-11"; - commit = "47d17393473be152cf601272faf5704fff1c3f92"; -in stdenv.mkDerivation { - pname = "wev-unstable"; - inherit version; +stdenv.mkDerivation rec { + pname = "wev"; + version = "1.0.0"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/wev/archive/${commit}.tar.gz"; - sha256 = "0a5kvrviz77bf7357gqs2iy7a1bvb3izgkmiv1rdxzzmihd563ga"; + url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz"; + sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g"; }; - nativeBuildInputs = [ pkg-config scdoc ]; - buildInputs = [ wayland wayland-protocols libxkbcommon ]; + nativeBuildInputs = [ pkg-config scdoc wayland ]; + buildInputs = [ wayland-protocols libxkbcommon ]; installFlags = [ "PREFIX=$(out)" ]; @@ -26,7 +23,7 @@ in stdenv.mkDerivation { This is a tool for debugging events on a Wayland window, analagous to the X11 tool xev. ''; - homepage = https://git.sr.ht/~sircmpwn/wev; + homepage = "https://git.sr.ht/~sircmpwn/wev"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/misc/wootility/default.nix b/nixpkgs/pkgs/tools/misc/wootility/default.nix new file mode 100644 index 000000000000..e88322f7f756 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, udev, wooting-udev-rules }: + +let + pname = "wootility"; + version = "3.3.3"; +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"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + ''; + + multiPkgs = extraPkgs; + extraPkgs = + pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules ]); + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + homepage = https://wooting.io/wootility; + description = "Wootility is customization and management software for Wooting keyboards."; + platforms = [ "x86_64-linux" ]; + license = "unknown"; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/x11idle/default.nix b/nixpkgs/pkgs/tools/misc/x11idle/default.nix index 270b39f8110b..ac13f41ef9f5 100644 --- a/nixpkgs/pkgs/tools/misc/x11idle/default.nix +++ b/nixpkgs/pkgs/tools/misc/x11idle/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, libXScrnSaver, libX11 }: +{ stdenv, fetchurl, libXScrnSaver, libX11 }: -stdenv.mkDerivation { - name = "x11idle-unstable-2017-07-01"; +stdenv.mkDerivation rec { - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "fbd865941f3105f689f78bf053bb3b353b9b8a23"; - sha256 = "0ma3m48f4s38xln0gl1ww9i5x28ij0ipxc94kx5h2931zy7lqzvz"; + version = "9.2.4"; + name = "x11idle-org-${version}"; + + src = fetchurl { + url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c"; + sha256 = "0fc5g57xd6bmghyl214gcff0ni3idv33i3gkr339kgn1mdjljv5g"; }; buildInputs = [ libXScrnSaver libX11 ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - gcc -lXss -lX11 $src/contrib/scripts/x11idle.c -o $out/bin/x11idle + gcc -lXss -lX11 $src -o $out/bin/x11idle ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 2f875e01f3f8..7b58ccfa8531 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -10,7 +10,7 @@ , rtmpSupport ? true , phantomjsSupport ? false , hlsEncryptedSupport ? true -, makeWrapper }: +, installShellFiles, makeWrapper }: buildPythonPackage rec { @@ -18,14 +18,14 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.03.08"; + version = "2020.03.24"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn"; + sha256 = "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; @@ -46,8 +46,7 @@ buildPythonPackage rec { ]; postInstall = '' - mkdir -p $out/share/zsh/site-functions - cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl + installShellCompletion youtube-dl.zsh ''; # Requires network diff --git a/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 171c86e805b5..7d8e760a8d93 100644 --- a/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.7.4"; + version = "1.8.4"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; - rev = "v${version}"; - sha256 = "0cn38sadcn65pgw6dgr59bnx9hf97011hydmpmfi3kzdqjmarwci"; + rev = version; + sha256 = "1whh2gzxhx4c24mwh5yifnpah56bzb6v7barp727pjw4whpflg1s"; }; dontBuild = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/skywind3000/z.lua; + homepage = "https://github.com/skywind3000/z.lua"; description = "A new cd command that helps you navigate faster by learning your habits"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix b/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix index d21573885123..74e7e7223d14 100644 --- a/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix @@ -4,7 +4,7 @@ let in pythonPackages.buildPythonApplication rec { pname = "zabbix-cli"; - version = "2.1.1"; + version = "2.2.1"; propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; @@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec { owner = "usit-gd"; repo = "zabbix-cli"; rev = version; - sha256 = "10a1cvjqwlqqfz52ajv9i53h6v95w8y7xmgqr79q2c4v1nz5bfks"; + sha256 = "0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/nixpkgs/pkgs/tools/misc/zoxide/default.nix index 4ce1be83b557..9502af65201e 100644 --- a/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -2,26 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "0ldqhzkpbqjc1in0d0f7b06b8gim4sbh292qcbwhf5abyrhbm3m8"; + sha256 = "0s6aax6bln9jmmv7kw630mj0l6qpvdx8mdk3a5d9akr9d23zxmr5"; }; buildInputs = [ fzf ]; - cargoSha256 = "1grrqbdy37p3r857gz956h0ls922ma5fz6f8fb3vx7wc98rap621"; + cargoSha256 = "1gzpkf7phl5xd666l7pc25917x4qq0kkxk4i9dkz3lvxz3v8ylrz"; meta = with stdenv.lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ysndr ]; + maintainers = with maintainers; [ ysndr cole-h ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/networking/amass/default.nix b/nixpkgs/pkgs/tools/networking/amass/default.nix index a79540eaeca9..348104e95913 100644 --- a/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -1,30 +1,33 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { pname = "amass"; - version = "3.4.4"; + version = "3.5.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1qr9cd22m6w5r32bsvg08bmvyvzz7agaklrghf8n1d23ijj1563p"; + sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9"; }; - modSha256 = "00pd0xi0m3w4xqdqq7ldqcpirq9plln45nhpjrsp5r9bz7yc5wn9"; + modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl"; outputs = [ "out" "wordlists" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' mkdir -p $wordlists cp -R $src/examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; - meta = with lib; { + meta = with stdenv.lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' The OWASP Amass tool suite obtains subdomain names by scraping data diff --git a/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/nixpkgs/pkgs/tools/networking/cassowary/default.nix index 6156f43b04b8..5b9ba71f8c9b 100644 --- a/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "cassowary"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/rogerwelin/cassowary"; description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/networking/clash/default.nix b/nixpkgs/pkgs/tools/networking/clash/default.nix index 234fd0b31afa..8e7499caa479 100644 --- a/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "clash"; @@ -14,6 +14,8 @@ buildGoModule rec { goPackagePath = "github.com/Dreamacro/clash"; modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/constant.Version=${version}" diff --git a/nixpkgs/pkgs/tools/networking/corerad/default.nix b/nixpkgs/pkgs/tools/networking/corerad/default.nix index 96798c1c17e9..0cfaddcf06ae 100644 --- a/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "corerad"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/tools/networking/croc/default.nix b/nixpkgs/pkgs/tools/networking/croc/default.nix index 52f9ef9fade8..d7ab830479ea 100644 --- a/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -1,19 +1,20 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "croc"; - version = "8.0.3"; - - goPackagePath = "github.com/schollz/croc"; + version = "8.0.4"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0jx6yxyxdnv4xzxsyfa7y1gm079rcsjqa1gmkh6bwkmhk6w5h1k9"; + sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43"; }; - modSha256 = "0d4mm840fjsbcyl98zg6d3i7qp1lmjkx07mh91d56jyf9j082g99"; + modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 8296600cf3d3..89173e7b4277 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "dnsproxy"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; homepage = "https://github.com/AdguardTeam/dnsproxy"; diff --git a/nixpkgs/pkgs/tools/networking/frp/default.nix b/nixpkgs/pkgs/tools/networking/frp/default.nix index 2ed70c9ef202..7323c914bfa1 100644 --- a/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -1,21 +1,23 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "frp"; - version = "0.31.2"; + version = "0.32.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "0947psq6qcr175xsgwr5k6idphs3s4vdv130ms738bcqf0h9snky"; + sha256 = "1hj3xy7ihwl66hyxc1m8k3fwgz5jyx1bd32f80d7266klhjqf6nw"; }; - modSha256 = "1zbl0gfc99pbzdacxhfa1k3y6i7v13sb441wpbp9aygxhvwqrms9"; + modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; subPackages = [ "cmd/frpc" "cmd/frps" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Fast reverse proxy"; longDescription = '' frp is a fast reverse proxy to help you expose a local server behind a diff --git a/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/nixpkgs/pkgs/tools/networking/grpcui/default.nix index 58e698ed7081..de2b3f787986 100644 --- a/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "grpcui"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/tools/networking/hey/default.nix b/nixpkgs/pkgs/tools/networking/hey/default.nix index d65d5c9e3235..69cfa4526029 100644 --- a/nixpkgs/pkgs/tools/networking/hey/default.nix +++ b/nixpkgs/pkgs/tools/networking/hey/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "hey"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/networking/http2tcp/default.nix b/nixpkgs/pkgs/tools/networking/http2tcp/default.nix new file mode 100644 index 000000000000..b1f3c704b1fa --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/http2tcp/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3 +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "http2tcp"; + version = "0.5"; + + src = fetchurl { + url = "https://www.linta.de/~aehlig/http2tcp/${pname}-${version}.tar.gz"; + sha256 = "34fb83c091689dee398ca80db76487e0c39abb17cef390d845ffd888009a5caa"; + }; + + buildInputs = [ + (python3.withPackages (ps: [ + ps.wsgitools + ])) + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/{bin,share/${pname}} + cp http2tcp* $out/bin + cp Protocol $out/share/${pname}/ + ''; + + meta = with lib; { + maintainers = with maintainers; [ clkamp ]; + description = "A tool for tunneling TCP connections via HTTP GET requests"; + longDescription = '' + The http2tcp tools allow to tunnel tcp connections (presumably + ssh) via syntactically correct http requests. It is designed to + work in the presence of so-called "transparent" + store-and-forward proxies disallowing POST requests. + + It also turned out to be useful to stabilise connections where + the client's internet connection is unreliable (frequent long + network outages, rapidly changing IP address, etc). + ''; + homepage = "https://www.linta.de/~aehlig/http2tcp/"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 20169121cd9a..9f7d79bdd88c 100644 --- a/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "0izhynqfj4xafsrc653wym8arwps0qim203w8l0g5z9vzfxfnvqw"; + sha256 = "013kxlglxliajv3lrsix4w88w40g709rvycajb6ad6gbh8giqv47"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://troglobit.com/project/inadyn/; + homepage = "http://troglobit.com/project/inadyn/"; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/networking/iodine/default.nix b/nixpkgs/pkgs/tools/networking/iodine/default.nix index 44bf52c9933f..c978a330ceeb 100644 --- a/nixpkgs/pkgs/tools/networking/iodine/default.nix +++ b/nixpkgs/pkgs/tools/networking/iodine/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, zlib, nettools }: +{ stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: stdenv.mkDerivation rec { - name = "iodine-0.7.0"; + pname = "iodine"; + version = "unstable-2019-09-27"; - src = fetchurl { - url = "https://code.kryo.se/iodine/${name}.tar.gz"; - sha256 = "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd"; + src = fetchFromGitHub { + owner = "yarrick"; + repo = "iodine"; + rev = "8e14f18"; + sha256 = "0k8m99qfjd5n6n56jnq85y7q8h2i2b8yw6ba0kxsz4jyx97lavg3"; }; buildInputs = [ zlib ]; @@ -16,6 +19,10 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=\${out}" ]; + passthru.tests = { + inherit (nixosTests) iodine; + }; + meta = { homepage = http://code.kryo.se/iodine/; description = "Tool to tunnel IPv4 data through a DNS server"; diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 885ffbe91579..b8cf93bc2d3f 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "minio-client"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + subPackages = [ "." ]; preBuild = '' diff --git a/nixpkgs/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix index 3411aca55519..f78d7129c34a 100644 --- a/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "nebula"; @@ -13,11 +13,13 @@ buildGoModule rec { modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; - meta = with lib; { + meta = with stdenv.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/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix index 69b454ea72ee..109c4c8cce15 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix @@ -1,46 +1,74 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 -, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 -, libappindicator-gtk3, withGnome ? true, gcr, glib }: +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, networkmanager +, gnome3 +, libnotify +, libsecret +, polkit +, modemmanager +, libnma +, mobile-broadband-provider-info +, glib-networking +, gsettings-desktop-schemas +, libgudev +, jansson +, wrapGAppsHook +, gobject-introspection +, python3 +, gtk3 +, libappindicator-gtk3 +, glib +}: -let +stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.8.24"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.16.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1gzvz4wfqfsfclqg56y954al8x6fmz71cnxlx1i4nqr7a25bp2qi"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"; }; mesonFlags = [ - "-Dlibnm_gtk=false" # It is deprecated "-Dselinux=false" "-Dappindicator=yes" - "-Dgcr=${if withGnome then "true" else "false"}" ]; - outputs = [ "out" "lib" "dev" "devdoc" "man" ]; + outputs = [ "out" "man" ]; buildInputs = [ - gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes mobile-broadband-provider-info libgudev - modemmanager jansson glib-networking - libappindicator-gtk3 gnome3.adwaita-icon-theme - ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser - - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; + libnma + gtk3 + networkmanager + libnotify + libsecret + gsettings-desktop-schemas + polkit + libgudev + modemmanager + jansson + glib-networking + libappindicator-gtk3 + gnome3.adwaita-icon-theme + ]; - # Needed for wingpanel-indicator-network and switchboard-plug-network - patches = [ ./hardcode-gsettings.patch ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + wrapGAppsHook + gobject-introspection + python3 + ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - - substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name} ''; passthru = { @@ -51,7 +79,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/"; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ]; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 94a4c4b362ae..0ce50a3b2d4b 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, -networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: +networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, libnma }: let pname = "NetworkManager-fortisslvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix index 29c0d550fe2f..47e5a2f41813 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: +{ stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 +, withGnome ? true, gnome3, fetchpatch, libnma }: let pname = "NetworkManager-iodine"; - version = "1.2.0"; + version = "unstable-2019-11-05"; 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 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "network-manager-iodine"; + rev = "2ef0abf089b00a0546f214dde0d45e63f2990b79"; + sha256 = "1ps26fr9b1yyafj7lrzf2kmaxb0ipl0mhagch5kzrjdsc5xkajz7"; }; patches = [ @@ -25,13 +28,14 @@ in stdenv.mkDerivation { ]; buildInputs = [ iodine networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + preConfigure = "intltoolize"; configureFlags = [ "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" diff --git a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix index e4ab74f08e35..09fb0c5977b5 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, networkmanagerapplet }: +, withGnome ? true, libnma }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix new file mode 100644 index 000000000000..727c18e92c10 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, gtk-doc +, pkg-config +, vala +, networkmanager +, gnome3 +, isocodes +, libxml2 +, docbook_xsl +, docbook_xml_dtd_43 +, mobile-broadband-provider-info +, gobject-introspection +, gtk3 +, withGnome ? true +, gcr +, glib +, substituteAll +}: + +stdenv.mkDerivation rec { + pname = "libnma"; + version = "1.8.28"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"; + }; + + patches = [ + # Needed for wingpanel-indicator-network and switchboard-plug-network + ./hardcode-gsettings.patch + ]; + + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + libxml2 + vala + ]; + + buildInputs = [ + gtk3 + networkmanager + isocodes + mobile-broadband-provider-info + ] ++ stdenv.lib.optionals withGnome [ + # advanced certificate chooser + gcr + ]; + + mesonFlags = [ + "-Dgcr=${if withGnome then "true" else "false"}" + ]; + + postPatch = '' + substituteInPlace src/nma-ws/nma-eap.c --subst-var-by \ + NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/libnma"; + description = "NetworkManager UI utilities (libnm version)"; + license = licenses.gpl2Plus; # Mix of GPL and LPGL 2+ + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch b/nixpkgs/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch index a480fd6d91e7..9b2f5366950c 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch +++ b/nixpkgs/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch @@ -1,32 +1,26 @@ -diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c -index 2e9daa23..6663b3ce 100644 ---- a/src/wireless-security/eap-method.c -+++ b/src/wireless-security/eap-method.c -@@ -265,8 +265,11 @@ eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection) +--- a/src/nma-ws/nma-eap.c ++++ b/src/nma-ws/nma-eap.c +@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection) static GSettings * _get_ca_ignore_settings (NMConnection *connection) { -+ GSettingsSchemaSource *schema_source; ++ g_autoptr (GSettingsSchemaSource) *schema_source; + g_autoptr (GSettingsSchema) *schema; GSettings *settings; -- char *path = NULL; -+ -+ g_autofree char *path = NULL; + char *path = NULL; const char *uuid; - + g_return_val_if_fail (connection, NULL); -@@ -274,9 +277,12 @@ _get_ca_ignore_settings (NMConnection *connection) - uuid = nm_connection_get_uuid (connection); - g_return_val_if_fail (uuid && *uuid, NULL); - + + schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL); + schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE); -+ g_settings_schema_source_unref (schema_source); + + uuid = nm_connection_get_uuid (connection); + g_return_val_if_fail (uuid && *uuid, NULL); + path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); - settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); -- g_free (path); + settings = g_settings_new_full (schema, NULL, path); - + g_free (path); + return settings; - } diff --git a/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix index 2762b12a364a..13f7eab5cc78 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, networkmanagerapplet }: +, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, libnma }: let pname = "NetworkManager-openvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix index 843985bfa3e4..4f0a516b4201 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM -, gtk3, gnome3, libsecret, networkmanagerapplet }: +, gtk3, gnome3, libsecret, libnma }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; }; - buildInputs = [ networkmanager strongswanNM libsecret gtk3 networkmanagerapplet ]; + buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix index 663923255745..9c1d046e4fb6 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, networkmanagerapplet }: +, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix index 19ae72aaac0d..6e6d543c4391 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata ]; preConfigure = '' sed -e '/jteeuwen\/go-bindata/d' \ diff --git a/nixpkgs/pkgs/tools/networking/obfs4/default.nix b/nixpkgs/pkgs/tools/networking/obfs4/default.nix index 005abb0968b6..93ebdeb0720c 100644 --- a/nixpkgs/pkgs/tools/networking/obfs4/default.nix +++ b/nixpkgs/pkgs/tools/networking/obfs4/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, buildGoModule }: +{ stdenv, fetchgit, buildGoModule, Security }: buildGoModule rec { pname = "obfs4"; @@ -12,7 +12,9 @@ buildGoModule rec { modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "A pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix new file mode 100644 index 000000000000..01a0ef2242ed --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + version = "5.0.0-2020-02-04"; + pname = "openapi-generator-cli"; + + jarfilename = "${pname}-${version}.jar"; + + nativeBuildInputs = [ + makeWrapper + ]; + + src = fetchurl { + url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/openapi-generator-cli-5.0.0-20200204.091421-37.jar"; + sha256 = "0swv976fcr2z8g53avr0r706c31xacb2dlnl8b4c8mzmi49byy7k"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${jarfilename}" + ''; + + 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; + license = licenses.asl20; + maintainers = [ maintainers.shou ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/networking/opensm/default.nix b/nixpkgs/pkgs/tools/networking/opensm/default.nix index e0a0dcd56cbe..3fe9f87d6585 100644 --- a/nixpkgs/pkgs/tools/networking/opensm/default.nix +++ b/nixpkgs/pkgs/tools/networking/opensm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opensm"; - version = "3.3.22"; + version = "3.3.23"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "opensm"; rev = version; - sha256 = "1nb6zl93ffbgb8z8728j0dxrmvk3pm0i6a1sn7mpn8ki1vkf2y0j"; + sha256 = "0r0nw7b2711ca6mrj19ymg97x862hdxv54fhhm4kiqvdh6n75y0s"; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infiniband subnet manager"; - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; # dual licensed as 2-clause BSD maintainers = [ maintainers.aij ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/networking/passh/default.nix b/nixpkgs/pkgs/tools/networking/passh/default.nix new file mode 100644 index 000000000000..6534d3a1d517 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/passh/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, stdenv }: +stdenv.mkDerivation rec { + pname = "passh"; + version = "2020-03-18"; + + src = fetchFromGitHub { + owner = "clarkwang"; + repo = pname; + rev = "7112e667fc9e65f41c384f89ff6938d23e86826c"; + sha256 = "1g0rx94vqg36kp46f8v4x6jcmvdk85ds6bkrpayq772hbdm1b5z5"; + }; + + installPhase = '' + mkdir -p $out/bin + cp passh $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/clarkwang/passh"; + description = "An sshpass alternative for non-interactive ssh auth"; + license = licenses.gpl3; + maintainers = [ maintainers.lovesegfault ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/pixiecore/default.nix b/nixpkgs/pkgs/tools/networking/pixiecore/default.nix new file mode 100644 index 000000000000..bc8ec7da1698 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/pixiecore/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pixiecore"; + version = "2020-03-25"; + rev = "68743c67a60c18c06cd21fd75143e3e069ca3cfc"; + + src = fetchFromGitHub { + owner = "danderson"; + repo = "netboot"; + inherit rev; + sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; + }; + + modSha256 = "1waqaglm6f9zy5296z309ppkck2vmydhk9gjnxrgzmhqld5lcq4f"; + subPackages = [ "cmd/pixiecore" ]; + + meta = { + description = "A tool to manage network booting of machines"; + homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index f2ae143e1b9e..37d5edaec452 100644 --- a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "shadowfox"; @@ -11,10 +11,10 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlags = [ "--tags" "release" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index f9add47dd3fd..b70bf2952f7a 100644 --- a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, libcap, libseccomp }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "0g7apfw33wkxxj7qwvlnnhv7qy13s1gkbmvns8612c0yfv9jrsvq"; + sha256 = "1932q80s6187k4fsvgia5iwc9lqsdkxzqqwpw1ksy0mx8wzmwbih"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcap libseccomp glib ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/rootless-containers/slirp4netns; + homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2; maintainers = with maintainers; [ orivej saschagrunert ]; diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 0b9c254deeb4..91378757af1d 100644 --- a/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "tendermint"; @@ -13,6 +13,8 @@ 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/; diff --git a/nixpkgs/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix index 35b92e0f653b..a24ff25ef2ba 100644 --- a/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: +{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }: buildGoModule rec { pname = "termshark"; @@ -12,7 +12,8 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wireshark-cli ]; + buildInputs = [ wireshark-cli ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; diff --git a/nixpkgs/pkgs/tools/networking/ubridge/default.nix b/nixpkgs/pkgs/tools/networking/ubridge/default.nix index 42839a8ba2f2..c628a2c8a8cc 100644 --- a/nixpkgs/pkgs/tools/networking/ubridge/default.nix +++ b/nixpkgs/pkgs/tools/networking/ubridge/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ubridge"; - version = "0.9.16"; + version = "0.9.18"; src = fetchFromGitHub { owner = "GNS3"; repo = "ubridge"; rev = "v${version}"; - sha256 = "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h"; + sha256 = "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn"; }; postPatch = '' @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { and TAP interfaces is supported. Packet capture is also supported. ''; inherit (src.meta) homepage; + changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/networking/uget/default.nix b/nixpkgs/pkgs/tools/networking/uget/default.nix index b2da1384557d..f8c585c3b252 100644 --- a/nixpkgs/pkgs/tools/networking/uget/default.nix +++ b/nixpkgs/pkgs/tools/networking/uget/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "uget"; - version = "2.2.2"; + version = "2.2.3-1"; src = fetchurl { url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz"; - sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw"; + sha256 = "0jchvgkkphhwp2z7vd4axxr9ns8b6vqc22b2z8a906qm8916wd8i"; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { thinking that it "might be too powerful" because remember power is good and lightweight power is uGet! ''; - homepage = http://www.ugetdm.com; + homepage = "http://www.ugetdm.com"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; diff --git a/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 5d1cd4540d7f..762d68acdb1f 100644 --- a/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -3,20 +3,20 @@ , ... } @ args: callPackage ./generic.nix (rec { - version = "4.22.1"; + version = "4.23.0"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "0l4rg9galjcm6dzv7sapnim9a02z7pv354mk5mwqndznii6nkr73"; + sha256 = "0if53d1blj1wf572z21dsywx6czbmhs5dpccx5z1knjhh2xgg9lm"; }; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202001210102"; - geoipSha256 = "1wxhrhrigjqzpy5w8yj7yd9ib245xwhqys2pf9prdknq71piyziz"; + geoipRev = "202003180002"; + geoipSha256 = "08d383phc5qk7glq25nkf1g8za38415x2952phy525ail88afpwl"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -24,8 +24,8 @@ callPackage ./generic.nix (rec { # MIT licensed "geosite.dat" = let - geositeRev = "202001211332"; - geositeSha256 = "06qlbjxk21lhyh5l3pd8l4m9rdl7sjh2jriz51zihaqx4417f0m7"; + geositeRev = "202003221514"; + geositeSha256 = "1d4gv6714m97i57srrzybnmc4322qv5lypkqbmhcxb8bi4ljpf1m"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 4d2e9db33c5e..0a86d7dec8f9 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,13 +13,15 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200206"; + version = "1.0.20200319"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7"; + sha256 = "0g9vlngg9dnh7qqfhaycw35fq8ij5hfz6p1cykh4ncjgr93i7rbx"; }; + outputs = [ "out" "man" ]; + sourceRoot = "source/src"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index 3bf3b97c2355..605801b6ab73 100644 --- a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Foundation }: buildGoModule rec { pname = "yggdrasil"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ]; + # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to # be granted write permission to /run. @@ -27,7 +29,7 @@ buildGoModule rec { -s -w ''; - meta = with lib; { + meta = with stdenv.lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; diff --git a/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 4675dac5f47f..f5086e15436e 100644 --- a/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "0a4gxdan3aivbpkxw9cv1bgl7rfrwdii12d096dx06zlymb27gqs"; + sha256 = "0993vqbsqcnxgv5l3il432i4sqzp8ns69rnsgww872vpb4bp3cg8"; }; nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index da5b8837523d..2a3987f490ff 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ + + substituteInPlace ./make-linux.mk \ + --replace 'armv5' 'armv6' ''; @@ -29,6 +32,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + buildFlags = [ "all" "selftest" ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkPhase = '' + ./zerotier-selftest + ''; + installPhase = '' install -Dt "$out/bin/" zerotier-one ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool @@ -47,6 +57,6 @@ stdenv.mkDerivation rec { homepage = https://www.zerotier.com; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = with platforms; x86_64 ++ aarch64 ++ arm; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix index b15400e576ef..2fdf8a999561 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix @@ -4,25 +4,27 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr"; + sha256 = "19jnvsbddn52ibjv48jyfss25gg9mmvxzfhbr7s7bqyf3bq68jbm"; }; - cargoSha256 = "1zwkar914zyghky09lgk0s374m5d6yccn0m15bqlgxxyymg4b59y"; + cargoSha256 = "0b06jsilj87rnr1qlarn29hnz0i9p455fdxg6nf6r2fli2xpv1f0"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + doCheck = false; # integration tests depend on changing cargo config + meta = with lib; { description = "A utility for managing cargo dependencies from the command line"; homepage = https://github.com/killercup/cargo-edit; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ gerschtli jb55 filalex77 ]; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch b/nixpkgs/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch deleted file mode 100644 index 4b8bc874e676..000000000000 --- a/nixpkgs/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fd0ccac1b3d4f78faa4c642dc2a413dfb54200fd Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Wed, 11 Mar 2020 22:27:23 +0100 -Subject: [PATCH] Fix outdated Cargo.lock - ---- - Cargo.lock | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 8458954..8083e81 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -171,7 +171,7 @@ dependencies = [ - - [[package]] - name = "cargo-outdated" --version = "0.9.6" -+version = "0.9.7" - dependencies = [ - "cargo", - "docopt", --- -2.25.0 - diff --git a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix index 6f8a415c5cbc..a87387b3831f 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libiconv, curl, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "0g91cfja4h9qhpxgnimczjna528ml645iz7hgpwl6yp0742qcal4"; + sha256 = "112yk46yq484zvr8mbj678qsirmyn2ij2h0z359qrhhl7r19icab"; }; - # Can be removed when updating to the next release. - cargoPatches = [ ./0001-Fix-outdated-Cargo.lock.patch ]; + cargoSha256 = "1bjs7lkbamy9za619z31ycqqgrfhvxbgfgpc79ykh4mfwphxzg3n"; - cargoSha256 = "0pr57g41lnn8srcbc11sb15qchf01zwqcb1802xdayj6wlc3g3dy"; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -26,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A cargo subcommand for displaying when Rust dependencies are out of date"; - homepage = https://github.com/kbknapp/cargo-outdated; + homepage = "https://github.com/kbknapp/cargo-outdated"; license = with licenses; [ asl20 /* or */ mit ]; platforms = platforms.all; maintainers = with maintainers; [ sondr3 ivan ]; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix index c85bcf5b66c3..145d8aaacc00 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.13.1"; + version = "0.13.3"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "0w4p1v9ya6kai2sy4ic45s1m01ya3hlysxlc8ha698jfvzs8nnld"; + sha256 = "0d9fgmy87xjl9kcmx9crmmg83iyybisg0gfwmnlxz5529slqng5r"; }; - cargoSha256 = "02x268xbxd2nin9y1dm35mkk90vyx16zzp18fi4fwc8kpsdbjpai"; + cargoSha256 = "1a6ac4x51i1rg0bgrxbbdd54gmwldsiv7nn8vi81y20llnshgjk7"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index 21b2fad1caa4..793c7cfae32d 100644 --- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2020-01-04"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "1b7b1bc294e99ab1795fe7dad183c1d2ae58a099"; - sha256 = "02kwym8n41d5ba9lccnl5q3y10sw35p1da5b66mxldfr6d930pbj"; + rev = "5c1e7349bbd9b51fe41ea96b67c380feef996b90"; + sha256 = "03lw5pq878zbkkwm5abr01p77radn2zgfyvwlra7fhywbl76l83x"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,12 +28,15 @@ stdenv.mkDerivation rec { --subst-var-by gnused "${gnused}" \ --subst-var-by less "${less}" \ --subst-var-by HOME_MANAGER_PATH '${src}' + + install -D -m755 home-manager/completion.bash \ + "$out/share/bash-completion/completions/home-manager" ''; meta = with stdenv.lib; { description = "A user environment configurator"; maintainers = with maintainers; [ rycee ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/tools/package-management/morph/default.nix b/nixpkgs/pkgs/tools/package-management/morph/default.nix index d0cd7127c50c..a1d2f15ad134 100644 --- a/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -14,8 +14,7 @@ buildGoPackage rec { goPackagePath = "github.com/dbcdk/morph"; goDeps = ./deps.nix; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ go-bindata ]; + nativeBuildInputs = [ makeWrapper go-bindata ]; buildFlagsArray = '' -ldflags= diff --git a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix index b40257d42f4b..6afba001e08d 100644 --- a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: buildGoModule rec { pname = "mynewt-newt"; @@ -24,6 +24,8 @@ buildGoModule rec { modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = https://mynewt.apache.org/; description = "Build and package management tool for embedded development."; diff --git a/nixpkgs/pkgs/tools/security/age/default.nix b/nixpkgs/pkgs/tools/security/age/default.nix index bde597ba9f30..0448faf53b76 100644 --- a/nixpkgs/pkgs/tools/security/age/default.nix +++ b/nixpkgs/pkgs/tools/security/age/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "age"; @@ -18,7 +18,9 @@ buildGoModule rec { sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; }; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix index ac8091a91045..cd71ea99fecb 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.13.1"; + version = "1.14"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "0af8cnpx86a096m59wmszcfyrfgf7adlqr39phbg647mgjfzwcrk"; + sha256 = "1ck0l0167kw1i5fjn507g4d18x2krbpk2ks0lnw9vzg0bwnzzwwd"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "1zzf71d2pr4mkc3xpm58z1apgskw2z8rklly7q23qxkzg5h4qasx"; + cargoSha256 = "0cgk61dmc057p82g0apd4sx6a8vhvcipxikrdb0hds4frhqsr6i8"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/nixpkgs/pkgs/tools/security/gobuster/default.nix b/nixpkgs/pkgs/tools/security/gobuster/default.nix index c3426bee965b..c9348b2f23aa 100644 --- a/nixpkgs/pkgs/tools/security/gobuster/default.nix +++ b/nixpkgs/pkgs/tools/security/gobuster/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { @@ -16,7 +17,9 @@ buildGoModule rec { modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.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/nixpkgs/pkgs/tools/security/hashdeep/default.nix b/nixpkgs/pkgs/tools/security/hashdeep/default.nix new file mode 100644 index 000000000000..8c8ab5b01a5d --- /dev/null +++ b/nixpkgs/pkgs/tools/security/hashdeep/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +let version = "4.4"; +in stdenv.mkDerivation { + name = "hashdeep-${version}"; + + src = fetchFromGitHub { + owner = "jessek"; + repo = "hashdeep"; + rev = "release-${version}"; + sha256 = "0m2b042ndikavmplv3qjdhfj44hl1h8car83c192xi9nv5ahi7mf"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A set of cross-platform tools to compute hashes."; + homepage = "https://github.com/jessek/hashdeep"; + license = licenses.gpl2; + platforms = with platforms; linux ++ freebsd ++ openbsd; + maintainers = [ stdenv.lib.maintainers.karantan ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/ipscan/default.nix b/nixpkgs/pkgs/tools/security/ipscan/default.nix index 40546b6f1c33..642b7d80305a 100644 --- a/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/nixpkgs/pkgs/tools/security/ipscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.6.2"; + version = "3.7.0"; src = fetchurl { - url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb"; - sha256 = "0wnnnabpj0dsxdijvss5sl9kd4i6rmcq55zbas33xs3c5g305ssk"; + url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; + sha256 = "1dbralnbi5q5v6a5nbs64ihvs20fkm3cddsbakck5fbqdm5by7k7"; }; sourceRoot = "."; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share - cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar + cp usr/lib/ipscan/ipscan-any-${version}.jar $out/share/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/ipscan \ --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt xorg.libXtst ]}" \ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast and friendly network scanner"; - homepage = https://angryip.org; + homepage = "https://angryip.org"; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kylesferrazza ]; diff --git a/nixpkgs/pkgs/tools/security/jwt-cli/default.nix b/nixpkgs/pkgs/tools/security/jwt-cli/default.nix index fc40129f6caa..f2314d7a0e87 100644 --- a/nixpkgs/pkgs/tools/security/jwt-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "2.5.2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "1q6dqh8z6mhiksjrhi602cvq31jgc18pfbwf6mlm9gi1grpgm5dl"; + sha256 = "108pwk0h6zcbfmp0k8rhjxaa9yk8rhb78aaql22x48n11fnjl27i"; }; - cargoSha256 = "1krsr4a1f5rdba4l0i90yr5s8k8hg1np9n85ingx37gar9ahr1y3"; + cargoSha256 = "1xh2ylx5fqblhlrs8yhl3zf8kvgrqnwdwmix6yzch9bi5mv5c11w"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix index 9a8a283d799d..6f2eaf577011 100644 --- a/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.2.1"; + version = "5.3.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1gq5s202zlf6z6fd4qwbgzmddrzj50js3kzyln63xh0svc3sgfvl"; + sha256 = "1a1h2c8jr4r20w4gyvyrpsslmh69bl8syl3jbr0fcr2kka7vqnzg"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix index e46da9ca9b6a..0a5855b20605 100644 --- a/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20200225210944.9845113a89"; + versionSuffix = "20200320154633.3e235215b3"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.2.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "183vkwm12frdy50z6gyb1mffn3w8jvxxj472868af813r0n1akl5"; + sha256 = "00k1xg27arbqpa836c55fhkxjvjbhjgkf6jqzprjzz76zksfdcx4"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/rage/default.nix b/nixpkgs/pkgs/tools/security/rage/default.nix index 2bb4e4aeea3e..cdba2f2beb01 100644 --- a/nixpkgs/pkgs/tools/security/rage/default.nix +++ b/nixpkgs/pkgs/tools/security/rage/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "1lfp9vyrk8880j7p5i73zja9dglvl1lvvh7286rwd1a9gbcj6grb"; + sha256 = "1wwndzy4xxbar9r67z8g7pp0s1xsxk5xaarh4h6hc0kh411zglrq"; }; - cargoSha256 = "0jjzxzdlflzvy39zi8vwx53xiv66v90idllsfvhj9p9lhc5ssi24"; + cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 011747890818..811b95d25245 100644 --- a/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, libobjc, Foundation, IOKit }: buildGoModule rec { pname = "saml2aws"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Foundation IOKit ]; + subPackages = [ "." "cmd/saml2aws" ]; buildFlagsArray = '' diff --git a/nixpkgs/pkgs/tools/security/sops/default.nix b/nixpkgs/pkgs/tools/security/sops/default.nix index 8aa2e219e7df..d028b9787dba 100644 --- a/nixpkgs/pkgs/tools/security/sops/default.nix +++ b/nixpkgs/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "sops"; @@ -13,6 +13,8 @@ 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/nixpkgs/pkgs/tools/security/tor/default.nix b/nixpkgs/pkgs/tools/security/tor/default.nix index 78d5b4441d53..0ef45bd5337e 100644 --- a/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/nixpkgs/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.2.6"; + version = "0.4.2.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1i766s211nrbjvwvkd2375mjsbbc28yrg46564rbx6w46cj10005"; + sha256 = "0v82ngwwmmcb7i9563bgsmrjy6xp83xyhqhaljygd0pkvlsxi886"; }; outputs = [ "out" "geoip" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.torproject.org/; + homepage = "https://www.torproject.org/"; repositories.git = https://git.torproject.org/git/tor; description = "Anonymizing overlay network"; diff --git a/nixpkgs/pkgs/tools/system/ctop/default.nix b/nixpkgs/pkgs/tools/system/ctop/default.nix index 4f492def1624..b9ea0c04aa85 100644 --- a/nixpkgs/pkgs/tools/system/ctop/default.nix +++ b/nixpkgs/pkgs/tools/system/ctop/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ctop"; @@ -13,9 +13,11 @@ 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 lib; { + meta = with stdenv.lib; { description = "Top-like interface for container metrics"; homepage = "https://ctop.sh/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/system/inxi/default.nix b/nixpkgs/pkgs/tools/system/inxi/default.nix index 7866bece0661..f5b5d4ef7a2a 100644 --- a/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inxi"; - version = "3.0.37-1"; + version = "3.0.38-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "15wvj9w601ci3bavd1hk5qlm8dfm7a7cjglczk29yir5yw2jww3f"; + sha256 = "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm"; }; buildInputs = [ perl makeWrapper ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full featured CLI system information tool"; - homepage = https://smxi.org/docs/inxi.htm; + homepage = "https://smxi.org/docs/inxi.htm"; + changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/system/ioping/default.nix b/nixpkgs/pkgs/tools/system/ioping/default.nix index 6ffaf23280f4..6acd41046ceb 100644 --- a/nixpkgs/pkgs/tools/system/ioping/default.nix +++ b/nixpkgs/pkgs/tools/system/ioping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "ioping"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "10bv36bqga8sdifxzywzzpjil7vmy62psirz7jbvlsq1bw71aiid"; }; + patches = [ + # add netdata support: https://github.com/koct9i/ioping/pull/41 + (fetchpatch { + url = "https://github.com/koct9i/ioping/commit/e7b818457ddb952cbcc13ae732ba0328f6eb73b3.patch"; + sha256 = "122ivp4rqsnjszjfn33z8li6glcjhy7689bgipi8cgs5q55j99gf"; + }) + ]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/system/ipmiutil/default.nix b/nixpkgs/pkgs/tools/system/ipmiutil/default.nix index 0d2a78efba12..17c28b3cd420 100644 --- a/nixpkgs/pkgs/tools/system/ipmiutil/default.nix +++ b/nixpkgs/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.1.5"; + version = "3.1.6"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "18q1nc2caaixy3dr2axdvwq37iz916piarvmg0jdfzaxfpaxpk2q"; + sha256 = "0jlfb4firph3hc0854n7cw7yjwlax3wdxn37r2jl0l94dj684548"; }; buildInputs = [ openssl ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An easy-to-use IPMI server management utility"; - homepage = http://ipmiutil.sourceforge.net/; + homepage = "http://ipmiutil.sourceforge.net/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix index 39e1bc7b6e7d..a12d70315d91 100644 --- a/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -9,13 +9,14 @@ buildGoPackage rec { rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce"; sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; }; + goPackagePath = "github.com/Stebalien/localtime"; - buildInputs = [ m4 ]; + nativeBuildInputs = [ m4 ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" - "BINDIR=${placeholder "bin"}/bin" + makeFlags = [ + "PREFIX=${placeholder "out"}" + "BINDIR=${placeholder "bin"}/bin" ]; buildPhase = '' diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index 482e6253a52a..c4001e8c50b3 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -47,18 +47,22 @@ in stdenv.mkDerivation rec { postInstall = '' ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d - ln -s ${go-d-plugin.bin}/bin/godplugind $out/libexec/netdata/plugins.d/go.d.plugin + ln -s ${go-d-plugin.bin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin '' + optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org + mv $out/libexec/netdata/plugins.d/perf.plugin \ + $out/libexec/netdata/plugins.d/perf.plugin.org + mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ + $out/libexec/netdata/plugins.d/slabinfo.plugin.org ${optionalString withIpmi '' mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ $out/libexec/netdata/plugins.d/freeipmi.plugin.org ''} ''; - preConfigure = optionalString (!stdenv.isDarwin) '' + preConfigure = optionalString (!stdenv.isDarwin) '' substituteInPlace collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ --replace 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; diff --git a/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 0dcde2b1e330..a5ced1e325d0 100644 --- a/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2001.0"; + version = "8.2002.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "1nm83s9abknli46sknjs50cmdhhqzkznbsjspjbdg96likshdgsq"; + sha256 = "1y414g61j93dgm5xg0ni985a99cyag0flvv1fqn2188dhr6w31py"; }; #patches = [ ./fix-gnutls-detection.patch ]; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://www.rsyslog.com/; + homepage = "https://www.rsyslog.com/"; description = "Enhanced syslog implementation"; changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${version}/ChangeLog"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/text/languagetool/default.nix b/nixpkgs/pkgs/tools/text/languagetool/default.nix index 8d9e44f1b860..154e099d3dd2 100644 --- a/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/text/mdbook/default.nix b/nixpkgs/pkgs/tools/text/mdbook/default.nix index 2aad1755cff0..09e0b24ab7ff 100644 --- a/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0gcrv54iswphzxxkmak1c7pmmpakiri6jk50j4bxrsplwjr76f7n"; + sha256 = "07rpak233mi6ssqbpqsccn66a32jcgl90a5iyl2l5yyxw95rcya0"; }; - cargoSha256 = "12i9w9dgji36yvvdks0vkjjkh32nbnhz76sgrl2827pj49h9vnn0"; + cargoSha256 = "0aanngwx7k86fb11zjx4wx954md446nn8667f2plr6bkqmlpxlkr"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with stdenv.lib; { description = "Create books from MarkDown"; - homepage = https://github.com/rust-lang-nursery/mdbook; + homepage = "https://github.com/rust-lang-nursery/mdbook"; license = [ licenses.mpl20 ]; maintainers = [ maintainers.havvy ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/miller/default.nix b/nixpkgs/pkgs/tools/text/miller/default.nix index 1fc462bad8b0..3b8fbdb64298 100644 --- a/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/nixpkgs/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.6.2"; + version = "5.7.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "1xajaab02y9bysanfn4i5c77q1zfmjzdswyvw2mzbidsxnjsgn6l"; + sha256 = "1lmin69rf9lp3b64ga7li4sz7mm0gqapsbk1nb29l4fqjxk16ddh"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index f2d447f66f6e..c355d7b6d986 100644 --- a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -1,16 +1,7 @@ { stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages -, ipaexfont, junicode +, ipaexfont, junicode, lmodern, lmmath }: let - lm = fetchzip { - url = "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip"; - sha256 = "1mc88fbhfd2wki2vr700pgv96smya6d1z783xs3mfy138yb6ga2p"; - stripRoot = false; - }; - lm-math = fetchzip { - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; - sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs"; - }; camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; @@ -63,8 +54,8 @@ in installPhase = '' cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/ cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/ - cp -r ${lm}/* lib-satysfi/dist/fonts/ - cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/ + cp -r ${lmodern}/share/fonts/opentype/public/lm/* lib-satysfi/dist/fonts/ + cp -r ${lmmath}/share/fonts/opentype/latinmodern-math.otf lib-satysfi/dist/fonts/ make install PREFIX=$out LIBDIR=$out/share/satysfi mkdir -p $out/share/satysfi/ cp -r lib-satysfi/dist/ $out/share/satysfi/ diff --git a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index a27e006053ff..ada948735d0f 100644 --- a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/nixpkgs/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"; diff --git a/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 6e38942cb253..dc05c974bd03 100755 --- a/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -9,6 +9,7 @@ use Getopt::Long qw(:config gnu_getopt); use Cwd 'abs_path'; use Time::HiRes; +my $nsenter = "@utillinux@/bin/nsenter"; my $su = "@su@"; # Ensure a consistent umask. @@ -319,10 +320,9 @@ sub restartContainer { # Run a command in the container. sub runInContainer { my @args = @_; - - exec("systemd-run", "--machine", $containerName, "--pty", "--quiet", "--", @args); - - die "cannot run ‘systemd-run’: $!\n"; + my $leader = getLeader; + exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args); + die "cannot run ‘nsenter’: $!\n"; } # Remove a directory while recursively unmounting all mounted filesystems within diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index edb05f176119..fe234143e70b 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -212,6 +212,7 @@ mapAliases ({ krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 + latinmodern-math = lmmath; letsencrypt = certbot; # added 2016-05-16 libaudit = audit; # added 2018-04-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 @@ -234,7 +235,9 @@ mapAliases ({ libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = liblapack; # added 2018-11-05 + liblrdf = lrdf; # added 2018-04-25 libqrencode = qrencode; # added 2019-01-01 + librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 @@ -478,6 +481,7 @@ mapAliases ({ telnet = inetutils; # added 2018-05-15 terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 + terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 tesseract_4 = tesseract4; # added 2018-12-19 testdisk-photorec = throw "This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13 @@ -486,6 +490,7 @@ mapAliases ({ tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 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."; trang = jing-trang; # added 2018-04-25 @@ -502,6 +507,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/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 440166c9dfb9..a5e24bc2efb6 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -161,7 +161,9 @@ in cm256cc = callPackage ../development/libraries/cm256cc { }; - conftest = callPackage ../development/tools/conftest { }; + conftest = callPackage ../development/tools/conftest { + inherit (darwin.apple_sdk.frameworks) Security; + }; corgi = callPackage ../development/tools/corgi { }; @@ -175,9 +177,13 @@ 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 {}; + proto-contrib = callPackage ../development/tools/proto-contrib { + inherit (darwin.apple_sdk.frameworks) Security; + }; - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { + inherit (darwin.apple_sdk.frameworks) Security; + }; demoit = callPackage ../servers/demoit { }; @@ -191,7 +197,9 @@ in dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - archiver = callPackage ../applications/misc/archiver { }; + archiver = callPackage ../applications/misc/archiver { + inherit (darwin.apple_sdk.frameworks) Security; + }; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; @@ -211,7 +219,9 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; - docui = callPackage ../tools/misc/docui { }; + docui = callPackage ../tools/misc/docui { + inherit (darwin.apple_sdk.frameworks) Security; + }; dotfiles = callPackage ../applications/misc/dotfiles { }; @@ -288,13 +298,18 @@ 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 { }; + pet = callPackage ../development/tools/pet { + inherit (darwin.apple_sdk.frameworks) Security; + }; run = callPackage ../development/tools/run { }; - mod = callPackage ../development/tools/mod { }; + mod = callPackage ../development/tools/mod { + inherit (darwin.apple_sdk.frameworks) Security; + }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; @@ -528,7 +543,9 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act {}; + act = callPackage ../development/tools/misc/act { + inherit (darwin.apple_sdk.frameworks) Security; + }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -553,7 +570,9 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; + aerc = callPackage ../applications/networking/mailreaders/aerc { + inherit (darwin.apple_sdk.frameworks) Security; + }; aerospike = callPackage ../servers/nosql/aerospike { }; @@ -563,7 +582,9 @@ in acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; - amass = callPackage ../tools/networking/amass { }; + amass = callPackage ../tools/networking/amass { + inherit (darwin.apple_sdk.frameworks) Security; + }; afew = callPackage ../applications/networking/mailreaders/afew { }; @@ -687,8 +708,6 @@ in artyFX = callPackage ../applications/audio/artyFX {}; - as31 = callPackage ../development/compilers/as31 {}; - owl-lisp = callPackage ../development/compilers/owl-lisp {}; ascii = callPackage ../tools/text/ascii { }; @@ -740,19 +759,27 @@ in aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; - aws-vault = callPackage ../tools/admin/aws-vault { }; + aws-vault = callPackage ../tools/admin/aws-vault { + inherit (darwin.apple_sdk.frameworks) Security; + }; - iamy = callPackage ../tools/admin/iamy { }; + iamy = callPackage ../tools/admin/iamy { + inherit (darwin.apple_sdk.frameworks) Security; + }; azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; - azure-storage-azcopy = callPackage ../development/tools/azcopy { }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { + inherit (darwin.apple_sdk.frameworks) Security; + }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { }; + berglas = callPackage ../tools/admin/berglas/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; brakeman = callPackage ../development/tools/analysis/brakeman { }; @@ -824,16 +851,22 @@ in calls = callPackage ../applications/networking/calls { }; - certigo = callPackage ../tools/admin/certigo { }; + certigo = callPackage ../tools/admin/certigo { + inherit (darwin.apple_sdk.frameworks) Security; + }; - chezmoi = callPackage ../tools/misc/chezmoi { }; + chezmoi = callPackage ../tools/misc/chezmoi { + inherit (darwin.apple_sdk.frameworks) Security; + }; chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; }; - clair = callPackage ../tools/admin/clair { }; + clair = callPackage ../tools/admin/clair { + inherit (darwin.apple_sdk.frameworks) Security; + }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; @@ -865,7 +898,9 @@ in crc32c = callPackage ../development/libraries/crc32c { }; - cue = callPackage ../development/tools/cue { }; + cue = callPackage ../development/tools/cue { + inherit (darwin.apple_sdk.frameworks) Security; + }; deltachat-electron = callPackage ../applications/networking/instant-messengers/deltachat-electron { }; @@ -890,7 +925,9 @@ in sedutil = callPackage ../tools/security/sedutil { }; - elvish = callPackage ../shells/elvish { }; + elvish = callPackage ../shells/elvish { + inherit (darwin.apple_sdk.frameworks) Security; + }; emplace = callPackage ../tools/package-management/emplace { }; @@ -960,6 +997,8 @@ in hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; + http2tcp = callPackage ../tools/networking/http2tcp { }; + httperf = callPackage ../tools/networking/httperf { }; ili2c = callPackage ../tools/misc/ili2c { }; @@ -1032,6 +1071,8 @@ in ssh-agents = callPackage ../tools/networking/ssh-agents { }; + ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -1102,7 +1143,9 @@ in awstats = callPackage ../tools/system/awstats { }; - awsweeper = callPackage ../tools/admin/awsweeper { }; + awsweeper = callPackage ../tools/admin/awsweeper { + inherit (darwin.apple_sdk.frameworks) Security; + }; axel = callPackage ../tools/networking/axel { libssl = openssl; @@ -1367,8 +1410,12 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; - caddy2 = callPackage ../servers/caddy/v2.nix { }; + caddy = callPackage ../servers/caddy { + inherit (darwin.apple_sdk.frameworks) Security; + }; + caddy2 = callPackage ../servers/caddy/v2.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1420,9 +1467,13 @@ in ccnet = callPackage ../tools/networking/ccnet { }; - cassowary = callPackage ../tools/networking/cassowary { }; + cassowary = callPackage ../tools/networking/cassowary { + inherit (darwin.apple_sdk.frameworks) Security; + }; - croc = callPackage ../tools/networking/croc { }; + croc = callPackage ../tools/networking/croc { + inherit (darwin.apple_sdk.frameworks) Security; + }; cddl = callPackage ../development/tools/cddl { }; @@ -1442,7 +1493,9 @@ in clac = callPackage ../tools/misc/clac {}; - clash = callPackage ../tools/networking/clash { }; + clash = callPackage ../tools/networking/clash { + inherit (darwin.apple_sdk.frameworks) Security; + }; clasp = callPackage ../tools/misc/clasp { }; @@ -1707,7 +1760,9 @@ in eggdrop = callPackage ../tools/networking/eggdrop { }; - eksctl = callPackage ../tools/admin/eksctl { }; + eksctl = callPackage ../tools/admin/eksctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; @@ -1861,7 +1916,9 @@ in gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { }; + gotify-cli = callPackage ../tools/misc/gotify-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; gping = callPackage ../tools/networking/gping { }; @@ -2093,6 +2150,8 @@ in pueue = callPackage ../applications/misc/pueue { }; + pixiecore = callPackage ../tools/networking/pixiecore {}; + pyCA = python3Packages.callPackage ../applications/video/pyca {}; pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; @@ -2165,6 +2224,7 @@ in rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken + libksi = null; # Currently Broken }; rsyslog-light = rsyslog.override { @@ -2438,7 +2498,9 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; circus = callPackage ../tools/networking/circus { }; @@ -2472,6 +2534,8 @@ in cmst = libsForQt5.callPackage ../tools/networking/cmst { }; + cmt = callPackage ../applications/audio/cmt {}; + codimd = callPackage ../servers/web-apps/codimd { nodejs = nodejs-10_x; }; @@ -2607,7 +2671,9 @@ in caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; }; - age = callPackage ../tools/security/age { }; + age = callPackage ../tools/security/age { + inherit (darwin.apple_sdk.frameworks) Security; + }; brotli = callPackage ../tools/compression/brotli { }; @@ -2832,7 +2898,9 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { + inherit (darwin.apple_sdk.frameworks) Security; + }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -2935,9 +3003,13 @@ in driftnet = callPackage ../tools/networking/driftnet {}; - drone = callPackage ../development/tools/continuous-integration/drone { }; + drone = callPackage ../development/tools/continuous-integration/drone { + inherit (darwin.apple_sdk.frameworks) Security; + }; - drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; + drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; dropbear = callPackage ../tools/networking/dropbear { }; @@ -3003,6 +3075,8 @@ in edid-decode = callPackage ../tools/misc/edid-decode { }; + edid-generator = callPackage ../tools/misc/edid-generator { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -3862,6 +3936,7 @@ in grpcui = callPackage ../tools/networking/grpcui { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ @@ -4088,7 +4163,9 @@ in hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; - hey = callPackage ../tools/networking/hey { }; + hey = callPackage ../tools/networking/hey { + inherit (darwin.apple_sdk.frameworks) Security; + }; hhpc = callPackage ../tools/misc/hhpc { }; @@ -4170,6 +4247,8 @@ in icecast = callPackage ../servers/icecast { }; + icepeak = haskell.lib.justStaticExecutables haskellPackages.icepeak; + iceshelf = callPackage ../tools/backup/iceshelf { }; darkice = callPackage ../tools/audio/darkice { }; @@ -4284,9 +4363,12 @@ 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 { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + inherit (darwin.apple_sdk.frameworks) Security; + }; ipget = callPackage ../applications/networking/ipget { }; @@ -4446,6 +4528,8 @@ in keepalived = callPackage ../tools/networking/keepalived { }; + keeperrl = callPackage ../games/keeperrl { }; + kexectools = callPackage ../os-specific/linux/kexectools { }; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; @@ -4528,7 +4612,9 @@ in lefthook = gitAndTools.lefthook; - lego = callPackage ../tools/admin/lego { }; + lego = callPackage ../tools/admin/lego { + inherit (darwin.apple_sdk.frameworks) Security; + }; leocad = callPackage ../applications/graphics/leocad { }; @@ -4621,7 +4707,9 @@ in mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); - mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; + mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { + inherit (darwin.apple_sdk.frameworks) Security; + }; mcfly = callPackage ../tools/misc/mcfly { inherit (darwin.apple_sdk.frameworks) Security; @@ -4658,7 +4746,9 @@ in motion = callPackage ../applications/video/motion { }; - mtail = callPackage ../servers/monitoring/mtail { }; + mtail = callPackage ../servers/monitoring/mtail { + inherit (darwin.apple_sdk.frameworks) Security; + }; multitail = callPackage ../tools/misc/multitail { }; @@ -5105,7 +5195,9 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { }; + minio-client = callPackage ../tools/networking/minio-client { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -5224,7 +5316,9 @@ in munt = libsForQt5.callPackage ../applications/audio/munt { }; - mutagen = callPackage ../tools/misc/mutagen { }; + mutagen = callPackage ../tools/misc/mutagen { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; mycli = callPackage ../tools/admin/mycli { }; @@ -5262,7 +5356,9 @@ in ndppd = callPackage ../applications/networking/ndppd { }; - nebula = callPackage ../tools/networking/nebula { }; + nebula = callPackage ../tools/networking/nebula { + inherit (darwin.apple_sdk.frameworks) Security; + }; nemiver = callPackage ../development/tools/nemiver { }; @@ -5339,6 +5435,8 @@ in networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { }; + libnma = callPackage ../tools/networking/network-manager/libnma { }; + networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; @@ -5349,7 +5447,8 @@ in grocy = callPackage ../servers/grocy { }; - nextcloud = callPackage ../servers/nextcloud { }; + inherit (callPackage ../servers/nextcloud {}) + nextcloud17 nextcloud18; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -5487,7 +5586,9 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + inherit (darwin.apple_sdk.frameworks) Security; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -5537,6 +5638,7 @@ in onioncircuits = callPackage ../tools/security/onioncircuits { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; + openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; opencc = callPackage ../tools/text/opencc { }; @@ -5560,6 +5662,8 @@ in openjade = callPackage ../tools/text/sgml/openjade { }; + openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; + openmvg = callPackage ../applications/science/misc/openmvg { }; openmvs = callPackage ../applications/science/misc/openmvs { }; @@ -5714,10 +5818,14 @@ in parted = callPackage ../tools/misc/parted { }; + passh = callPackage ../tools/networking/passh { }; + paulstretch = callPackage ../applications/audio/paulstretch { }; pazi = callPackage ../tools/misc/pazi { }; + peep = callPackage ../tools/misc/peep { }; + pell = callPackage ../applications/misc/pell { }; pepper = callPackage ../tools/admin/salt/pepper { }; @@ -5820,9 +5928,13 @@ in pg_top = callPackage ../tools/misc/pg_top { }; - pgcenter = callPackage ../tools/misc/pgcenter { }; + pgcenter = callPackage ../tools/misc/pgcenter { + inherit (darwin.apple_sdk.frameworks) Security; + }; - pgmetrics = callPackage ../tools/misc/pgmetrics { }; + pgmetrics = callPackage ../tools/misc/pgmetrics { + inherit (darwin.apple_sdk.frameworks) Security; + }; pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation @@ -6264,6 +6376,8 @@ in rlwrap = callPackage ../tools/misc/rlwrap { }; + rmtrash = callPackage ../tools/misc/rmtrash { }; + rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; @@ -6342,6 +6456,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 { }; @@ -6358,7 +6474,10 @@ in samim-fonts = callPackage ../data/fonts/samim-fonts {}; - saml2aws = callPackage ../tools/security/saml2aws {}; + saml2aws = callPackage ../tools/security/saml2aws { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation IOKit; + }; samplicator = callPackage ../tools/networking/samplicator { }; @@ -6852,7 +6971,7 @@ in textadept = callPackage ../applications/editors/textadept { }; - texworks = callPackage ../applications/editors/texworks { }; + texworks = libsForQt5.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -7287,6 +7406,8 @@ in woof = callPackage ../tools/misc/woof { }; + wootility = callPackage ../tools/misc/wootility { }; + wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; @@ -7574,6 +7695,8 @@ in xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; libxfs = xfsprogs.dev; + xmage = callPackage ../games/xmage { }; + xml2 = callPackage ../tools/text/xml/xml2 { }; xmlformat = callPackage ../tools/text/xml/xmlformat { }; @@ -7657,7 +7780,9 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - yggdrasil = callPackage ../tools/networking/yggdrasil { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; @@ -7668,6 +7793,8 @@ in you-get = python3Packages.callPackage ../tools/misc/you-get { }; + zasm = callPackage ../development/compilers/zasm {}; + zbackup = callPackage ../tools/backup/zbackup {}; zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; @@ -7708,7 +7835,9 @@ in zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { }; + zsh-history = callPackage ../shells/zsh/zsh-history { + inherit (darwin.apple_sdk.frameworks) Security; + }; zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; @@ -7818,6 +7947,24 @@ in abcl = callPackage ../development/compilers/abcl {}; + adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; + adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; + + adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; @@ -8008,7 +8155,9 @@ in scry = callPackage ../development/tools/scry {}; - dbmate = callPackage ../development/tools/database/dbmate { }; + dbmate = callPackage ../development/tools/database/dbmate { + inherit (darwin.apple_sdk.frameworks) Security; + }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -8036,7 +8185,9 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; - flyctl = callPackage ../development/web/flyctl { }; + flyctl = callPackage ../development/web/flyctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; fpc = callPackage ../development/compilers/fpc { }; @@ -8474,7 +8625,7 @@ in openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { }; + openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -8519,21 +8670,33 @@ in else openjdk11.override { headless = true; }; + openjdk13-bootstrap = + if adoptopenjdk-hotspot-bin-13.meta.available then + adoptopenjdk-hotspot-bin-13 + else + /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */ + callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; + /* current JDK */ - openjdk12 = + openjdk13 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx12; + openjfx = openjfx13; inherit (gnome2) GConf gnome_vfs; }; - openjdk12_headless = + openjdk13_headless = if stdenv.isDarwin then - openjdk12 + openjdk13 else - openjdk12.override { headless = true; }; + openjdk13.override { headless = true; }; openjdk = openjdk8; openjdk_headless = openjdk8_headless; @@ -8545,8 +8708,8 @@ in jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - jdk12 = openjdk12; - jdk12_headless = openjdk12_headless; + jdk13 = openjdk13; + jdk13_headless = openjdk13_headless; jdk = jdk8; jre = jre8; @@ -8785,6 +8948,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 { }; @@ -8998,7 +9163,6 @@ in swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { - openssl = openssl_1_0_2; inherit (darwin.apple_sdk.frameworks) Security; }; swiPrologWithGui = swiProlog.override { withGui = true; }; @@ -9196,7 +9360,9 @@ in jmeter = callPackage ../applications/networking/jmeter {}; - joker = callPackage ../development/interpreters/joker {}; + joker = callPackage ../development/interpreters/joker { + inherit (darwin.apple_sdk.frameworks) Security; + }; davmail = callPackage ../applications/networking/davmail {}; @@ -9424,7 +9590,7 @@ in python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; python38Full = python38.override{x11Support=true;}; - python39Full = python38.override{x11Support=true;}; + python39Full = python39.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -9863,7 +10029,9 @@ in go = go_1_12; }; - bazelisk = callPackage ../development/tools/bazelisk { }; + bazelisk = callPackage ../development/tools/bazelisk { + inherit (darwin.apple_sdk.frameworks) Security; + }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; @@ -10131,7 +10299,9 @@ in binutils = binutils; }; - dive = callPackage ../development/tools/dive { }; + dive = callPackage ../development/tools/dive { + inherit (darwin.apple_sdk.frameworks) Security; + }; doclifter = callPackage ../development/tools/misc/doclifter { }; @@ -10141,7 +10311,9 @@ in doit = callPackage ../development/tools/build-managers/doit { }; - dolt = callPackage ../servers/sql/dolt { }; + dolt = callPackage ../servers/sql/dolt { + inherit (darwin.apple_sdk.frameworks) Security; + }; dot2tex = pythonPackages.dot2tex; @@ -10160,7 +10332,9 @@ in drush = callPackage ../development/tools/misc/drush { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { + inherit (darwin.apple_sdk.frameworks) Security; + }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -10201,7 +10375,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fly = callPackage ../development/tools/continuous-integration/fly { }; + fly = callPackage ../development/tools/continuous-integration/fly { + inherit (darwin.apple_sdk.frameworks) Security; + }; foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; @@ -10210,7 +10386,9 @@ in frame = callPackage ../development/libraries/frame { }; - frp = callPackage ../tools/networking/frp { }; + frp = callPackage ../tools/networking/frp { + inherit (darwin.apple_sdk.frameworks) Security; + }; fsatrace = callPackage ../development/tools/misc/fsatrace { }; @@ -10279,7 +10457,9 @@ in gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; - gotify-server = callPackage ../servers/gotify { }; + gotify-server = callPackage ../servers/gotify { + inherit (darwin.apple_sdk.frameworks) Security; + }; gotty = callPackage ../servers/gotty { }; @@ -10323,7 +10503,9 @@ in halfempty = callPackage ../development/tools/halfempty {}; - hcloud = callPackage ../development/tools/hcloud { }; + hcloud = callPackage ../development/tools/hcloud { + inherit (darwin.apple_sdk.frameworks) Security; + }; help2man = callPackage ../development/tools/misc/help2man { }; @@ -10405,13 +10587,17 @@ in kube-prompt = callPackage ../development/tools/kube-prompt { }; - kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubeprompt = callPackage ../development/tools/kubeprompt { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubicorn = callPackage ../development/tools/kubicorn { }; kubie = callPackage ../development/tools/kubie { }; - kustomize = callPackage ../development/tools/kustomize { }; + kustomize = callPackage ../development/tools/kustomize { + inherit (darwin.apple_sdk.frameworks) Security; + }; ktlint = callPackage ../development/tools/ktlint { }; @@ -10468,14 +10654,18 @@ in mdl = callPackage ../development/tools/misc/mdl { }; - minify = callPackage ../development/web/minify { }; + minify = callPackage ../development/web/minify { + inherit (darwin.apple_sdk.frameworks) Security; + }; 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 { }; + mkcert = callPackage ../development/tools/misc/mkcert { + inherit (darwin.apple_sdk.frameworks) Security; + }; mkdocs = callPackage ../development/tools/documentation/mkdocs { }; @@ -10527,7 +10717,7 @@ in # NOTE: Override and set icon-lang = null to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; - nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; nrfutil = callPackage ../development/tools/misc/nrfutil { }; @@ -10657,7 +10847,9 @@ in withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { }; + reviewdog = callPackage ../development/tools/misc/reviewdog { + inherit (darwin.apple_sdk.frameworks) Security; + }; rman = callPackage ../development/tools/misc/rman { }; @@ -10799,7 +10991,9 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; - terracognita = callPackage ../development/tools/misc/terracognita { }; + terracognita = callPackage ../development/tools/misc/terracognita { + inherit (darwin.apple_sdk.frameworks) Security; + }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; @@ -10820,11 +11014,15 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - tflint = callPackage ../development/tools/analysis/tflint { }; + tflint = callPackage ../development/tools/analysis/tflint { + inherit (darwin.apple_sdk.frameworks) Security; + }; tfsec = callPackage ../development/tools/analysis/tfsec { }; - todoist = callPackage ../applications/misc/todoist { }; + todoist = callPackage ../applications/misc/todoist { + inherit (darwin.apple_sdk.frameworks) Security; + }; todoist-electron = callPackage ../applications/misc/todoist-electron { }; @@ -12917,6 +13115,8 @@ in libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures {}; + libinstpatch = callPackage ../development/libraries/audio/libinstpatch { }; + libisofs = callPackage ../development/libraries/libisofs { }; libisoburn = callPackage ../development/libraries/libisoburn { }; @@ -12936,6 +13136,8 @@ in libkate = callPackage ../development/libraries/libkate { }; + libkml = callPackage ../development/libraries/libkml { }; + libksba = callPackage ../development/libraries/libksba { }; libksi = callPackage ../development/libraries/libksi { }; @@ -13130,6 +13332,8 @@ in libsigsegv = callPackage ../development/libraries/libsigsegv { }; + libslirp = callPackage ../development/libraries/libslirp { }; + libsndfile = callPackage ../development/libraries/libsndfile { inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; @@ -13422,6 +13626,8 @@ in loudmouth = callPackage ../development/libraries/loudmouth { }; + lrdf = callPackage ../development/libraries/lrdf { }; + luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; luabind_luajit = luabind.override { lua = luajit; }; @@ -13643,6 +13849,8 @@ in nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; + nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; + nvtop = callPackage ../tools/system/nvtop { nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; @@ -14181,9 +14389,6 @@ in librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; redland = librdf_redland; # added 2018-04-25 - librdf = callPackage ../development/libraries/librdf { }; - liblrdf = librdf; # added 2018-04-25 - libsmf = callPackage ../development/libraries/audio/libsmf { }; lilv = callPackage ../development/libraries/audio/lilv { }; @@ -14223,9 +14428,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 { }; @@ -14725,7 +14928,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 { }; @@ -15444,6 +15647,7 @@ in gobetween = callPackage ../servers/gobetween { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; h2o = callPackage ../servers/http/h2o { }; @@ -15473,7 +15677,9 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; - imgproxy = callPackage ../servers/imgproxy { }; + imgproxy = callPackage ../servers/imgproxy { + inherit (darwin.apple_sdk.frameworks) Security; + }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; @@ -15512,7 +15718,9 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { }; + matterbridge = callPackage ../servers/matterbridge { + inherit (darwin.apple_sdk.frameworks) Security; + }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; @@ -15526,7 +15734,9 @@ in micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { }; + minio = callPackage ../servers/minio { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; @@ -15717,11 +15927,27 @@ in }; mysql = mariadb; # TODO: move to aliases.nix - mongodb = callPackage ../servers/nosql/mongodb { + mongodb = hiPrio mongodb-3_4; + + mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix { sasl = cyrus_sasl; boost = boost160; - openssl = openssl_1_0_2; - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + + mongodb-3_6 = callPackage ../servers/nosql/mongodb/v3_6.nix { + sasl = cyrus_sasl; + boost = boost160; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + + mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix { + sasl = cyrus_sasl; + boost = boost169; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; nginx-sso = callPackage ../servers/nginx-sso { }; @@ -15860,7 +16086,9 @@ 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 { }; + prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; 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 { }; @@ -15868,7 +16096,9 @@ 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 { }; + prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; 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 { }; @@ -15890,6 +16120,7 @@ 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 { @@ -16006,7 +16237,9 @@ in sensu = callPackage ../servers/monitoring/sensu { }; - inherit (callPackages ../servers/monitoring/sensu-go { }) + inherit (callPackages ../servers/monitoring/sensu-go { + inherit (darwin.apple_sdk.frameworks) Security; + }) sensu-go-agent sensu-go-backend sensu-go-cli; @@ -16052,12 +16285,15 @@ in syncserver = callPackage ../servers/syncserver { }; - thanos = callPackage ../servers/monitoring/thanos { }; + tailscale = callPackage ../servers/tailscale { }; + + thanos = callPackage ../servers/monitoring/thanos { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 - tomcat85 tomcat9; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; @@ -16078,7 +16314,9 @@ in shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - shiori = callPackage ../servers/web-apps/shiori { }; + shiori = callPackage ../servers/web-apps/shiori { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackages ../servers/web-apps/matomo {}) matomo @@ -16091,7 +16329,9 @@ in unifiStable; unifi = unifiStable; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { + inherit (darwin.apple_sdk.frameworks) Security; + }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; @@ -16292,9 +16532,13 @@ in conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { }; - coredns = callPackage ../servers/dns/coredns { }; + coredns = callPackage ../servers/dns/coredns { + inherit (darwin.apple_sdk.frameworks) Security; + }; - corerad = callPackage ../tools/networking/corerad { }; + corerad = callPackage ../tools/networking/corerad { + inherit (darwin.apple_sdk.frameworks) Security; + }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -17102,7 +17346,9 @@ in golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { }; + golangci-lint = callPackage ../development/tools/golangci-lint { + inherit (darwin.apple_sdk.frameworks) Security; + }; gocyclo = callPackage ../development/tools/gocyclo { }; @@ -17116,9 +17362,13 @@ in govendor = callPackage ../development/tools/govendor { }; - go-tools = callPackage ../development/tools/go-tools { }; + go-tools = callPackage ../development/tools/go-tools { + inherit (darwin.apple_sdk.frameworks) Security; + }; - gotools = callPackage ../development/tools/gotools { }; + gotools = callPackage ../development/tools/gotools { + inherit (darwin.apple_sdk.frameworks) Security; + }; gotop = callPackage ../tools/system/gotop { }; @@ -17225,7 +17475,9 @@ in procdump = callPackage ../os-specific/linux/procdump { }; - prototool = callPackage ../development/tools/prototool { }; + prototool = callPackage ../development/tools/prototool { + inherit (darwin.apple_sdk.frameworks) Security; + }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); @@ -17302,7 +17554,10 @@ in smem = callPackage ../os-specific/linux/smem { }; - smimesign = callPackage ../os-specific/darwin/smimesign { }; + smimesign = callPackage ../os-specific/darwin/smimesign { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Security; + }; speedometer = callPackage ../os-specific/linux/speedometer { }; @@ -17452,6 +17707,8 @@ in wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; + wooting-udev-rules = callPackage ../os-specific/linux/wooting-udev-rules { }; + wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; @@ -17509,7 +17766,13 @@ in anonymousPro = callPackage ../data/fonts/anonymous-pro { }; - ant-theme = callPackage ../data/themes/ant-theme { }; + ant-theme = callPackage ../data/themes/ant-theme/ant.nix { }; + + ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { }; + + ant-dracula-theme = callPackage ../data/themes/ant-theme/ant-dracula.nix { }; + + ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { }; arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; @@ -17630,7 +17893,9 @@ in documentation-highlighter = callPackage ../misc/documentation-highlighter { }; - documize-community = callPackage ../servers/documize-community { }; + documize-community = callPackage ../servers/documize-community { + inherit (darwin.apple_sdk.frameworks) Security; + }; doge = callPackage ../misc/doge { }; @@ -17733,7 +17998,9 @@ in helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { + inherit (darwin.apple_sdk.frameworks) Security; + }; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; @@ -17750,8 +18017,11 @@ in 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 {}; + input-fonts = callPackage ../data/fonts/input-fonts { }; inriafonts = callPackage ../data/fonts/inriafonts { }; @@ -17785,8 +18055,6 @@ in kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; - latinmodern-math = callPackage ../data/fonts/lm-math {}; - lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -17821,7 +18089,7 @@ in libre-franklin = callPackage ../data/fonts/libre-franklin { }; - lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; + lmmath = callPackage ../data/fonts/lmmath {}; lmodern = callPackage ../data/fonts/lmodern { }; @@ -18156,6 +18424,8 @@ in terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; + terminus-nerdfont = callPackage ../data/fonts/terminus-nerdfont { }; + termtekst = callPackage ../misc/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -18352,14 +18622,17 @@ in ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; - inherit (vamp) vampSDK; }; arelle = with python3Packages; toPythonApplication arelle; - argo = callPackage ../applications/networking/cluster/argo { }; + argo = callPackage ../applications/networking/cluster/argo { + inherit (darwin.apple_sdk.frameworks) Security; + }; - argocd = callPackage ../applications/networking/cluster/argocd { }; + argocd = callPackage ../applications/networking/cluster/argocd { + inherit (darwin.apple_sdk.frameworks) Security; + }; ario = callPackage ../applications/audio/ario { }; @@ -18384,6 +18657,8 @@ in astroid = callPackage ../applications/networking/mailreaders/astroid { }; + aucatctl = callPackage ../applications/audio/aucatctl { }; + audacious = callPackage ../applications/audio/audacious { }; audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { }; @@ -18401,6 +18676,8 @@ in cadence = qt5.callPackage ../applications/audio/cadence { }; + cheesecutter = callPackage ../applications/audio/cheesecutter { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -18753,7 +19030,9 @@ in csdp = callPackage ../applications/science/math/csdp { }; - ctop = callPackage ../tools/system/ctop { }; + ctop = callPackage ../tools/system/ctop { + inherit (darwin.apple_sdk.frameworks) Security; + }; cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; @@ -18864,6 +19143,7 @@ in docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; + docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { @@ -18944,7 +19224,9 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; - echoip = callPackage ../servers/echoip { }; + echoip = callPackage ../servers/echoip { + inherit (darwin.apple_sdk.frameworks) Security; + }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { jdk = jdk11; @@ -19096,7 +19378,9 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - exercism = callPackage ../applications/misc/exercism { }; + exercism = callPackage ../applications/misc/exercism { + inherit (darwin.apple_sdk.frameworks) Security; + }; go-motion = callPackage ../development/tools/go-motion { }; @@ -19208,7 +19492,9 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -19231,6 +19517,8 @@ in ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; }; + grandorgue = callPackage ../applications/audio/grandorgue { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; @@ -19247,7 +19535,9 @@ in inherit (darwin) libiconv; }; - gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; + gomuks = callPackage ../applications/networking/instant-messengers/gomuks { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -19337,7 +19627,9 @@ in sngrep = callPackage ../applications/networking/sniffers/sngrep {}; - termshark = callPackage ../tools/networking/termshark { }; + termshark = callPackage ../tools/networking/termshark { + inherit (darwin.apple_sdk.frameworks) Security; + }; fbida = callPackage ../applications/graphics/fbida { }; @@ -19570,7 +19862,9 @@ in inherit (darwin) IOKit; }; - glow = callPackage ../applications/editors/glow { }; + glow = callPackage ../applications/editors/glow { + inherit (darwin.apple_sdk.frameworks) Security; + }; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; @@ -19708,6 +20002,8 @@ in herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hercules = callPackage ../applications/virtualization/hercules { }; + hexchat = callPackage ../applications/networking/irc/hexchat { }; hexcurse = callPackage ../applications/editors/hexcurse { }; @@ -19748,11 +20044,15 @@ in wxGTK = wxGTK30; }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { + inherit (darwin.apple_sdk.frameworks) Security; + }; hydrogen = callPackage ../applications/audio/hydrogen { }; - hydroxide = callPackage ../applications/networking/hydroxide { }; + hydroxide = callPackage ../applications/networking/hydroxide { + inherit (darwin.apple_sdk.frameworks) Security; + }; hyper = callPackage ../applications/misc/hyper { }; @@ -20035,8 +20335,6 @@ in josm = callPackage ../applications/misc/josm { }; - jbrout = callPackage ../applications/graphics/jbrout { }; - jwm = callPackage ../applications/window-managers/jwm { }; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; @@ -20096,7 +20394,9 @@ in kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; - kepubify = callPackage ../tools/misc/kepubify { }; + kepubify = callPackage ../tools/misc/kepubify { + inherit (darwin.apple_sdk.frameworks) Security; + }; kermit = callPackage ../tools/misc/kermit { }; @@ -20157,25 +20457,39 @@ in kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; - kubeval = callPackage ../applications/networking/cluster/kubeval { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { go = buildPackages.go_1_13; }; - kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; - k9s = callPackage ../applications/networking/cluster/k9s { }; + k9s = callPackage ../applications/networking/cluster/k9s { + inherit (darwin.apple_sdk.frameworks) Security; + }; - fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; + linkerd = callPackage ../applications/networking/cluster/linkerd { + inherit (darwin.apple_sdk.frameworks) Security; + }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; @@ -20472,7 +20786,9 @@ in minidjvu = callPackage ../applications/graphics/minidjvu { }; minikube = callPackage ../applications/networking/cluster/minikube { - inherit (darwin.apple_sdk.frameworks) vmnet; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) vmnet Foundation IOKit; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -20485,9 +20801,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 { }; @@ -20564,6 +20878,8 @@ in mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { }; + mopidy-mpd = callPackage ../applications/audio/mopidy/mpd.nix { }; + motif = callPackage ../development/libraries/motif { }; mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; @@ -20669,6 +20985,8 @@ in else null; }; + mup = callPackage ../applications/audio/mup { }; + # TODO: we should probably merge these 2 musescore = if stdenv.isDarwin then @@ -20702,6 +21020,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 { @@ -20759,7 +21080,9 @@ in ptex = callPackage ../development/libraries/ptex {}; - qbec = callPackage ../applications/networking/cluster/qbec { }; + qbec = callPackage ../applications/networking/cluster/qbec { + inherit (darwin.apple_sdk.frameworks) Security; + }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; @@ -20981,10 +21304,7 @@ in opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentx = callPackage ../applications/misc/opentx { - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; + opentx = libsForQt5.callPackage ../applications/misc/opentx { }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -21303,6 +21623,8 @@ in qmetro = callPackage ../applications/misc/qmetro { }; + qmidiarp = callPackage ../applications/audio/qmidiarp {}; + qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; @@ -21550,7 +21872,9 @@ in sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { }; + shadowfox = callPackage ../tools/networking/shadowfox { + inherit (darwin.apple_sdk.frameworks) Security; + }; shfmt = callPackage ../tools/text/shfmt { }; @@ -21582,7 +21906,9 @@ in sooperlooper = callPackage ../applications/audio/sooperlooper { }; - sops = callPackage ../tools/security/sops { }; + sops = callPackage ../tools/security/sops { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; sorcer = callPackage ../applications/audio/sorcer { }; @@ -21731,13 +22057,9 @@ in skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { - inherit (pkgs.vamp) vampSDK; - }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; - sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { - inherit (pkgs.vamp) vampSDK; - }; + sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; @@ -21784,7 +22106,8 @@ in stp = callPackage ../applications/science/logic/stp { }; stretchly = callPackage ../applications/misc/stretchly { - inherit (gnome2) GConf; + # Error on launch w/electron_8 + electron = electron_7; }; stumpish = callPackage ../applications/window-managers/stumpish {}; @@ -21840,7 +22163,10 @@ in syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + }) syncthing syncthing-cli syncthing-discovery @@ -21927,6 +22253,7 @@ in tendermint = callPackage ../tools/networking/tendermint { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -22033,6 +22360,8 @@ in tortoisehg = callPackage ../applications/version-management/tortoisehg { }; + tony = libsForQt5.callPackage ../applications/audio/tony { }; + toot = callPackage ../applications/misc/toot { }; tootle = callPackage ../applications/misc/tootle { }; @@ -22103,7 +22432,6 @@ in unison = callPackage ../applications/networking/sync/unison { enableX11 = config.unison.enableX11 or true; - ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; unpaper = callPackage ../tools/graphics/unpaper { }; @@ -22159,6 +22487,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 { @@ -22437,7 +22767,6 @@ in inherit (lib) optional; in with libretro; ([ ] - ++ optional (cfg.enable4do or false) _4do ++ optional (cfg.enableAtari800 or false) atari800 ++ optional (cfg.enableBeetleGBA or false) beetle-gba ++ optional (cfg.enableBeetleLynx or false) beetle-lynx @@ -22445,26 +22774,33 @@ in ++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast ++ optional (cfg.enableBeetlePCFX or false) beetle-pcfx ++ optional (cfg.enableBeetlePSX or false) beetle-psx + ++ optional (cfg.enableBeetlePSXHW or false) beetle-psx-hw ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn + ++ optional (cfg.enableBeetleSaturnHW or false) beetle-saturn-hw ++ optional (cfg.enableBeetleSNES or false) beetle-snes ++ optional (cfg.enableBeetleSuperGrafx or false) beetle-supergrafx ++ optional (cfg.enableBeetleWswan or false) beetle-wswan ++ optional (cfg.enableBeetleVB or false) beetle-vb ++ optional (cfg.enableBlueMSX or false) bluemsx ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury - ++ optional (cfg.enableDOSBox or false) dosbox + ++ optional (cfg.enableCitra or false) citra ++ optional (cfg.enableDesmume or false) desmume ++ optional (cfg.enableDesmume2015 or false) desmume2015 ++ optional (cfg.enableDolphin or false) dolphin - ++ optional (cfg.enableFBA or false) fba + ++ optional (cfg.enableDOSBox or false) dosbox + ++ optional (cfg.enableEightyOne or false) eightyone + ++ optional (cfg.enableFBAlpha2012 or false) fbalpha2012 + ++ optional (cfg.enableFBNeo or false) fbneo ++ optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableFlycast or false) flycast + ++ optional (cfg.enableFMSX or false) fmsx + ++ optional (cfg.enableFreeIntv or false) freeintv ++ optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx ++ optional (cfg.enableGpsp or false) gpsp + ++ optional (cfg.enableGW or false) gw ++ optional (cfg.enableHandy or false) handy ++ optional (cfg.enableHatari or false) hatari - ++ optional (cfg.enableHiganSFC or false) higan-sfc ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMAME2000 or false) mame2000 ++ optional (cfg.enableMAME2003 or false) mame2003 @@ -22473,10 +22809,13 @@ in ++ optional (cfg.enableMAME2015 or false) mame2015 ++ optional (cfg.enableMAME2016 or false) mame2016 ++ optional (cfg.enableMesen or false) mesen + ++ optional (cfg.enableMeteor or false) meteor ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus + ++ optional (cfg.enableNeoCD or false) neocd ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enableO2EM or false) o2em + ++ optional (cfg.enableOpera or false) opera ++ optional (cfg.enableParallelN64 or false) parallel-n64 ++ optional (cfg.enablePCSXRearmed or false) pcsx_rearmed ++ optional (cfg.enablePicodrive or false) picodrive @@ -22485,24 +22824,22 @@ in ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enableProSystem or false) prosystem ++ optional (cfg.enableQuickNES or false) quicknes + ++ optional (cfg.enableSameBoy or false) sameboy ++ optional (cfg.enableScummVM or false) scummvm + ++ optional (cfg.enableSMSPlusGX or false) smsplus-gx ++ optional (cfg.enableSnes9x or false) snes9x ++ optional (cfg.enableSnes9x2002 or false) snes9x2002 ++ optional (cfg.enableSnes9x2005 or false) snes9x2005 ++ optional (cfg.enableSnes9x2010 or false) snes9x2010 ++ optional (cfg.enableStella or false) stella + ++ optional (cfg.enableStella2014 or false) stella2014 + ++ optional (cfg.enableTGBDual or false) tgbdual + ++ optional (cfg.enableTIC80 or false) tic80 ++ optional (cfg.enableVbaNext or false) vba-next ++ optional (cfg.enableVbaM or false) vba-m ++ optional (cfg.enableVecx or false) vecx ++ optional (cfg.enableVirtualJaguar or false) virtualjaguar ++ optional (cfg.enableYabause or false) yabause - # added on 2017-02-25 due #23163 - ++ optional (cfg.enableMednafenPCEFast or false) - (throw "nix config option enableMednafenPCEFast has been renamed to enableBeetlePCEFast") - ++ optional (cfg.enableMednafenPSX or false) - (throw "nix config option enableMednafenPSX has been renamed to enableBeetlePSX") - ++ optional (cfg.enableMednafenSaturn or false) - (throw "nix config option enableMednafenSaturn has been renamed to enableBeetleSaturn") ); wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { @@ -22563,6 +22900,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 {}; @@ -22861,6 +23202,8 @@ in zim = callPackage ../applications/office/zim { }; + zita-at1 = callPackage ../applications/audio/zita-at1 { }; + zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; zola = callPackage ../applications/misc/zola { @@ -22931,7 +23274,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) IOKit; + inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; }; ledger_agent = with python3Packages; toPythonApplication ledger_agent; @@ -22945,14 +23288,17 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; }; }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost16x; + protobuf = protobuf3_10; }; masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; @@ -22973,6 +23319,8 @@ in sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + tessera = callPackage ../applications/blockchains/tessera.nix { }; + vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; @@ -22990,6 +23338,8 @@ in particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + quorum = callPackage ../applications/blockchains/quorum.nix { }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; @@ -23654,7 +24004,6 @@ in spring = callPackage ../games/spring { boost = boost155; - cmake = cmake_2_8; }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -23936,6 +24285,7 @@ in clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; @@ -24332,13 +24682,6 @@ in rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; - fenics = callPackage ../development/libraries/science/math/fenics { - inherit (python3Packages) numpy ply pytest python six sympy; - pythonPackages = python3Packages; - pythonBindings = true; - docs = true; - }; - lcalc = callPackage ../development/libraries/science/math/lcalc { }; lrcalc = callPackage ../applications/science/math/lrcalc { }; @@ -24381,6 +24724,8 @@ in suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {}; suitesparse = suitesparse_5_3; + suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas {}; + superlu = callPackage ../development/libraries/science/math/superlu {}; symmetrica = callPackage ../applications/science/math/symmetrica {}; @@ -24886,7 +25231,9 @@ in hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; - hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; + hepmc3 = callPackage ../development/libraries/physics/hepmc3 { + python = null; + }; herwig = callPackage ../development/libraries/physics/herwig { }; @@ -24933,7 +25280,9 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { }; + atlantis = callPackage ../applications/networking/cluster/atlantis { + inherit (darwin.apple_sdk.frameworks) Security; + }; auctex = callPackage ../tools/typesetting/tex/auctex { }; @@ -25121,7 +25470,9 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gobuster = callPackage ../tools/security/gobuster { }; + gobuster = callPackage ../tools/security/gobuster { + inherit (darwin.apple_sdk.frameworks) Security; + }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -25135,7 +25486,9 @@ in stdenv = gcc8Stdenv; }; - helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmfile = callPackage ../applications/networking/cluster/helmfile { + inherit (darwin.apple_sdk.frameworks) Security; + }; heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; @@ -25200,8 +25553,9 @@ in kops_1_13 kops_1_14 kops_1_15 + kops_1_16 ; - kops = kops_1_15; + kops = kops_1_16; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -25229,6 +25583,8 @@ in mongoc = callPackage ../development/libraries/mongoc { }; + mongoose = callPackage ../development/libraries/science/math/mongoose {}; + morph = callPackage ../tools/package-management/morph { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { }; @@ -25237,7 +25593,9 @@ in musly = callPackage ../applications/audio/musly { }; - mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; @@ -25704,12 +26062,15 @@ in sqsh = callPackage ../development/tools/sqsh { }; - jx = callPackage ../applications/networking/cluster/jx {}; + jx = callPackage ../applications/networking/cluster/jx { + inherit (darwin.apple_sdk.frameworks) Security; + }; 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; }; inherit (callPackage ../applications/networking/cluster/terraform { @@ -25728,7 +26089,7 @@ in terraform-providers = recurseIntoAttrs ( callPackage ../applications/networking/cluster/terraform-providers { - inherit buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; } ); @@ -25849,7 +26210,9 @@ in webfs = callPackage ../servers/http/webfs { }; - websocketd = callPackage ../applications/networking/websocketd { }; + websocketd = callPackage ../applications/networking/websocketd { + inherit (darwin.apple_sdk.frameworks) Security; + }; wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; @@ -26069,7 +26432,9 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { }; + wtf = callPackage ../applications/misc/wtf { + inherit (darwin.apple_sdk.frameworks) Security; + }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -26130,7 +26495,9 @@ in dsniff = callPackage ../tools/networking/dsniff {}; - wal-g = callPackage ../tools/backup/wal-g {}; + wal-g = callPackage ../tools/backup/wal-g { + inherit (darwin.apple_sdk.frameworks) Security; + }; tlwg = callPackage ../data/fonts/tlwg { }; @@ -26233,19 +26600,28 @@ in sieveshell = with python3.pkgs; toPythonApplication managesieve; - gortr = callPackage ../servers/gortr {}; + gortr = callPackage ../servers/gortr { + inherit (darwin.apple_sdk.frameworks) Security; + }; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { + inherit (darwin.apple_sdk.frameworks) Security; + }; unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + hashdeep = callPackage ../tools/security/hashdeep { }; fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; btcdeb = callPackage ../applications/blockchains/btcdeb {}; + } diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 2d03b3ed8f44..052b84f269e6 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/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/nixpkgs/pkgs/top-level/make-tarball.nix b/nixpkgs/pkgs/top-level/make-tarball.nix index ff0b0568819c..23542e4afe0a 100644 --- a/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/nixpkgs/pkgs/top-level/make-tarball.nix @@ -22,7 +22,7 @@ releaseTools.sourceTarball { then builtins.substring 0 8 nixpkgs.lastModified else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; - buildInputs = [ nix.out jq lib-tests ]; + buildInputs = [ nix.out jq lib-tests pkgs.brotli ]; configurePhase = '' eval "$preConfigure" @@ -38,6 +38,8 @@ releaseTools.sourceTarball { doCheck = true; checkPhase = '' + set -o pipefail + export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR export NIX_PATH=nixpkgs=$TMPDIR/barf.nix @@ -83,12 +85,10 @@ releaseTools.sourceTarball { --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system --meta --xml \ "''${opts[@]}" > /dev/null - stopNest done header "checking eval-release.nix" nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null - stopNest header "checking find-tarballs.nix" nix-instantiate --readonly-mode --eval --strict --show-trace --json \ @@ -100,7 +100,16 @@ releaseTools.sourceTarball { echo "suspiciously low number of URLs" exit 1 fi - stopNest + + header "generating packages.json" + mkdir -p $out/nix-support + echo -n '{"version":2,"packages":' > tmp + 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 + + echo "file json-br $packages" >> $out/nix-support/hydra-build-products ''; distPhase = '' diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index e8a6bc21035b..7e12a3db3f78 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -16,8 +16,6 @@ let buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; - buildDune2Package = buildDunePackage.override { dune = dune_2; }; - alcotest = callPackage ../development/ocaml-modules/alcotest {}; alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; @@ -232,9 +230,9 @@ let dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; - dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { buildDunePackage = buildDune2Package; }; + dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; - dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { buildDunePackage = buildDune2Package; }; + dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; earley = callPackage ../development/ocaml-modules/earley { }; @@ -349,6 +347,11 @@ let gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + graphics = + if lib.versionOlder "4.09" ocaml.version + then callPackage ../development/ocaml-modules/graphics { } + else null; + graphql = callPackage ../development/ocaml-modules/graphql { }; graphql-cohttp = callPackage ../development/ocaml-modules/graphql/cohttp.nix { }; diff --git a/nixpkgs/pkgs/top-level/packages-config.nix b/nixpkgs/pkgs/top-level/packages-config.nix new file mode 100644 index 000000000000..8ce855780cf9 --- /dev/null +++ b/nixpkgs/pkgs/top-level/packages-config.nix @@ -0,0 +1,13 @@ +# Used in the generation of package search database. +{ + # Ensures no aliases are in the results. + allowAliases = false; + + # Enable recursion into attribute sets that nix-env normally doesn't look into + # so that we can get a more complete picture of the available packages for the + # purposes of the index. + packageOverrides = super: { + haskellPackages = super.recurseIntoAttrs super.haskellPackages; + rPackages = super.recurseIntoAttrs super.rPackages; + }; +} diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index f617bdd27e36..99bbdf1af1a4 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -1243,6 +1243,21 @@ let }; }; + BytesRandomSecure = buildPerlPackage { + pname = "Bytes-Random-Secure"; + version = "0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-0.29.tar.gz"; + sha256 = "53bbd339e6a11efca07c619a615c7c188a68bb2be849a1cb7efc3dd4d9ae85ae"; + }; + propagatedBuildInputs = [ CryptRandomSeed MathRandomISAAC ]; + meta = { + description = "Perl extension to generate cryptographically-secure random bytes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CacheCache = buildPerlPackage { pname = "Cache-Cache"; version = "1.08"; @@ -3329,9 +3344,9 @@ let }; 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 ]; @@ -3605,6 +3620,22 @@ let }; }; + CryptRandomSeed = buildPerlPackage { + pname = "Crypt-Random-Seed"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-Seed-0.03.tar.gz"; + sha256 = "593da54b522c09cc26bbcc0e4e49c1c8e688a6fd33b0726af801d722a5c8d0f1"; + }; + propagatedBuildInputs = [ CryptRandomTESHA2 ]; + meta = { + homepage = "https://github.com/danaj/Crypt-Random-Seed"; + description = "Provide strong randomness for seeding"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptRandomSource = buildPerlModule { pname = "Crypt-Random-Source"; version = "0.14"; @@ -3620,6 +3651,20 @@ let }; }; + CryptRandomTESHA2 = buildPerlPackage { + pname = "Crypt-Random-TESHA2"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-TESHA2-0.01.tar.gz"; + sha256 = "a0912b42c52be173da528d5527e40d967324bc04ac78d9fc2ddc91ff16fe9633"; + }; + meta = { + homepage = "https://github.com/danaj/Crypt-Random-TESHA2"; + description = "Random numbers using timer/schedule entropy, aka userspace voodoo entropy"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptRC4 = buildPerlPackage { pname = "Crypt-RC4"; version = "2.02"; @@ -3826,14 +3871,15 @@ let CryptSSLeay = buildPerlPackage { pname = "Crypt-SSLeay"; - version = "0.72"; + version = "0.73_06"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz; - sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; + url = "mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.73_06.tar.gz"; + sha256 = "0b159lw3ia5r87qsgff3qhdnz3l09xcz04rbk4ji7fbyr12wmv7q"; }; + makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; buildInputs = [ PathClass ]; - propagatedBuildInputs = [ LWPProtocolHttps ]; + propagatedBuildInputs = [ LWPProtocolHttps BytesRandomSecure ]; }; CSSDOM = buildPerlPackage { @@ -12225,6 +12271,23 @@ let }; }; + MojoPg = buildPerlPackage { + pname = "Mojo-Pg"; + version = "4.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.18.tar.gz"; + sha256 = "31baacc0d6693886b3580e4b3ec6f2d053be8578809c9c1750753576bd1bda3c"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; + meta = { + homepage = "https://github.com/mojolicious/mojo-pg"; + description = "Mojolicious <3 PostgreSQL"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -14541,6 +14604,19 @@ let }; }; + ParseYapp = buildPerlPackage { + pname = "Parser-Yapp"; + version = "1.21"; + src = fetchurl { + url = mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz; + sha256 = "1r8kbyk0qd4ficmabj753kjpq0ib0csk01169w7jxflg62cfj41q"; + }; + meta = { + description = "Perl extension for generating and using LALR parsers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PathClass = buildPerlModule { pname = "Path-Class"; version = "0.37"; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 0773a1984ab5..aba67f63a828 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -477,6 +477,8 @@ in { backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; + bacpypes = callPackage ../development/python-modules/bacpypes {}; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; }; @@ -617,6 +619,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 { }; @@ -878,6 +882,8 @@ in { markerlib = callPackage ../development/python-modules/markerlib { }; + mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; + matchpy = callPackage ../development/python-modules/matchpy { }; maxminddb = callPackage ../development/python-modules/maxminddb { }; @@ -1288,6 +1294,8 @@ in { pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; @@ -1504,11 +1512,11 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; - spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {} - else callPackage ../development/python-modules/spyder-kernels/2.nix {}; + spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {}; - spyder = if isPy3k then callPackage ../development/python-modules/spyder {} - else callPackage ../development/python-modules/spyder/2.nix {}; + spyder = callPackage ../development/python-modules/spyder {}; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; tenacity = callPackage ../development/python-modules/tenacity { }; @@ -2242,6 +2250,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 { }; @@ -2254,6 +2267,10 @@ in { jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + hepmc3 = toPythonModule (pkgs.hepmc3.override { + inherit python; + }); + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -2345,8 +2362,6 @@ in { pyhcl = callPackage ../development/python-modules/pyhcl { }; - pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = if isPy3k then self.pytest_5 else self.pytest_4; pytest_5 = callPackage ../development/python-modules/pytest { @@ -2391,12 +2406,14 @@ 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 { }; + pytest-html = callPackage ../development/python-modules/pytest-html { }; + + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; @@ -2509,6 +2526,7 @@ in { libfdt = toPythonModule (pkgs.dtc.override { inherit python; + pythonSupport = true; }); libtmux = callPackage ../development/python-modules/libtmux { }; @@ -2702,6 +2720,12 @@ in { ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; + fenics = callPackage ../development/libraries/science/math/fenics { + inherit (pkgs) pkg-config; + mpi = pkgs.openmpi; + pytest = self.pytest_4; + }; + filetype = callPackage ../development/python-modules/filetype { }; flammkuchen = callPackage ../development/python-modules/flammkuchen { }; @@ -3333,8 +3357,6 @@ in { django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; - django_1_8 = callPackage ../development/python-modules/django/1_8.nix { }; - django-allauth = callPackage ../development/python-modules/django-allauth { }; django-anymail = callPackage ../development/python-modules/django-anymail {}; @@ -3415,20 +3437,6 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_tagging_0_4_3 = if - self.django.version != "1.8.19" - then throw "django_tagging_0_4_3 should be build with django_1_8" - else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { - pname = "django-tagging"; - version = "0.4.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; - }; - propagatedBuildInputs = with self; [ django ]; - }); - django_classytags = callPackage ../development/python-modules/django_classytags { }; # This package may need an older version of Django. @@ -3941,6 +3949,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 { }; @@ -4149,6 +4159,11 @@ in { inherit (pkgs.linuxPackages) nvidia_x11; }; + libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + enablePython = true; + python3 = python; + })); + libkeepass = callPackage ../development/python-modules/libkeepass { }; librepo = pipe pkgs.librepo [ @@ -4619,7 +4634,7 @@ in { offtrac = callPackage ../development/python-modules/offtrac { }; - openpyxl = if isPy3k then + openpyxl = if pythonAtLeast "3.6" then callPackage ../development/python-modules/openpyxl { } else callPackage ../development/python-modules/openpyxl/2.nix { }; @@ -4632,6 +4647,8 @@ in { omegaconf = callPackage ../development/python-modules/omegaconf { }; + opuslib = callPackage ../development/python-modules/opuslib { }; + orderedset = callPackage ../development/python-modules/orderedset { }; python-multipart = callPackage ../development/python-modules/python-multipart { }; @@ -4751,6 +4768,8 @@ in { patch = callPackage ../development/python-modules/patch { }; + patch-ng = callPackage ../development/python-modules/patch-ng { }; + pathos = callPackage ../development/python-modules/pathos { }; patsy = callPackage ../development/python-modules/patsy { }; @@ -4901,6 +4920,8 @@ in { ppft = callPackage ../development/python-modules/ppft { }; + pproxy = callPackage ../development/python-modules/pproxy { }; + praw = if isPy3k then callPackage ../development/python-modules/praw { } else callPackage ../development/python-modules/praw/6.3.nix { }; @@ -5059,6 +5080,8 @@ in { pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; + pymumble = callPackage ../development/python-modules/pymumble { }; + pyomo = callPackage ../development/python-modules/pyomo { }; pyopencl = callPackage ../development/python-modules/pyopencl { }; @@ -5187,6 +5210,8 @@ in { progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + protego = callPackage ../development/python-modules/protego {}; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; @@ -6245,6 +6270,8 @@ in { wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + wsgitools = callPackage ../development/python-modules/wsgitools { }; + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; xcaplib = callPackage ../development/python-modules/xcaplib { }; @@ -6394,8 +6421,6 @@ in { influxgraph = callPackage ../development/python-modules/influxgraph { }; - graphitepager = callPackage ../development/python-modules/graphitepager { }; - pyspotify = callPackage ../development/python-modules/pyspotify { }; pykka = callPackage ../development/python-modules/pykka { }; @@ -7035,6 +7060,10 @@ in { qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; + + qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; qasm2image = callPackage ../development/python-modules/qasm2image { }; @@ -7094,6 +7123,8 @@ in { pybotvac = callPackage ../development/python-modules/pybotvac { }; + pymetno = callPackage ../development/python-modules/pymetno { }; + pytado = callPackage ../development/python-modules/pytado { }; casttube = callPackage ../development/python-modules/casttube { }; |