swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 21:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging into staging-next

Browse source
This commit is contained in:
Frederik Rietdijk 2020-02-09 16:38:32 +01:00
parent 531a48ebdb 3b17e6559b
commit cffec212dc
60 changed files with 1394 additions and 1411 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/kde/default.nix
View file

@ -91,11 +91,9 @@ let
kate = callPackage ./kate.nix {}; kate = callPackage ./kate.nix {};
kcachegrind = callPackage ./kcachegrind.nix {}; kcachegrind = callPackage ./kcachegrind.nix {};
kcalc = callPackage ./kcalc.nix {}; kcalc = callPackage ./kcalc.nix {};
kcalcore = callPackage ./kcalcore.nix {};
kcalutils = callPackage ./kcalutils.nix {}; kcalutils = callPackage ./kcalutils.nix {};
kcharselect = callPackage ./kcharselect.nix {}; kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kdav = callPackage ./kdav.nix {}; kdav = callPackage ./kdav.nix {};
kdebugsettings = callPackage ./kdebugsettings.nix {}; kdebugsettings = callPackage ./kdebugsettings.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.3/ ) WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.1/src )

16
pkgs/applications/kde/kcalcore.nix
View file

@ -1,16 +0,0 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kdelibs4support, libical
}:
mkDerivation {
name = "kcalcore";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support libical ];
outputs = [ "out" "dev" ];
}

1747
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

6
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -145,6 +145,12 @@ stdenv.mkDerivation {
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
mkdir -p $out/etc/bash_completion.d mkdir -p $out/etc/bash_completion.d
ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
mkdir -p $out/share/zsh/site-functions
ln -s $out/share/git/contrib/completion/git-completion.zsh $out/share/zsh/site-functions/_git
# Patch the zsh completion script so it can find the Bash completion script.
sed -i -e "/locations=(/a \${"\t\t"}'$out/share/git/contrib/completion/git-completion.bash'" \
$out/share/git/contrib/completion/git-completion.zsh
# grep is a runtime dependency, need to patch so that it's found # grep is a runtime dependency, need to patch so that it's found
substituteInPlace $out/libexec/git-core/git-sh-setup \ substituteInPlace $out/libexec/git-core/git-sh-setup \

29
pkgs/development/compilers/rust/1_40_0.nix
View file

@ -1,29 +0,0 @@
# New rust versions should first go to staging.
# Things to check after updating:
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
# This testing can be also done by other volunteers as part of the pull
# request review, in case platforms cannot be covered.
# 2. The LLVM version used for building should match with rust upstream.
# 3. Firefox and Thunderbird should still build on x86_64-linux.
import ./default.nix {
rustcVersion = "1.40.0";
rustcSha256 = "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx";
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.39.0";
# fetch hashes by running `print-hashes.sh 1.39.0`
bootstrapHashes = {
i686-unknown-linux-gnu = "36e31b3069c5be4b1fe3c8f7588ca787f13f91ab7170d2b24c6b07285816d0e5";
x86_64-unknown-linux-gnu = "b10a73e5ba90034fe51f0f02cb78f297ed3880deb7d3738aa09dc5a4d9704a25";
arm-unknown-linux-gnueabihf = "ea08d78a718cd34e67733526c70f3be460605dec8284bdeda36e0c6dd6222eca";
armv7-unknown-linux-gnueabihf = "41186745a97e6b76fb7a3a049882fb4869b526e98a66c05a133518515037f0d7";
aarch64-unknown-linux-gnu = "e27dc8112fe577012bd88f30e7c92dffd8c796478ce386c49465c03b6db8209f";
i686-apple-darwin = "0ada2ed87cc449ed470dce3b57b15bfd5c8c52b01d6116e6b1edc9a3e97836aa";
x86_64-apple-darwin = "3736d49c5e9592844e1a5d5452883aeaf8f1e25d671c1bc8f01e81c1766603b5";
};
selectRustPackage = pkgs: pkgs.rust_1_40_0;
}

29
pkgs/development/compilers/rust/1_41_0.nix Normal file
View file

@ -0,0 +1,29 @@
# New rust versions should first go to staging.
# Things to check after updating:
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
# This testing can be also done by other volunteers as part of the pull
# request review, in case platforms cannot be covered.
# 2. The LLVM version used for building should match with rust upstream.
# 3. Firefox and Thunderbird should still build on x86_64-linux.
import ./default.nix {
rustcVersion = "1.41.0";
rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm";
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.40.0";
# fetch hashes by running `print-hashes.sh 1.40.0`
bootstrapHashes = {
i686-unknown-linux-gnu = "d050d3a1c7c45ba9c50817d45bf6d7dd06e1a4d934f633c8096b7db6ae27adc1";
x86_64-unknown-linux-gnu = "fc91f8b4bd18314e83a617f2389189fc7959146b7177b773370d62592d4b07d0";
arm-unknown-linux-gnueabihf = "4be9949c4d3c572b69b1df61c3506a3a3ac044851f025d38599612e7caa933c5";
armv7-unknown-linux-gnueabihf = "ebfe3978e12ffe34276272ee6d0703786249a9be80ca50617709cbfdab557306";
aarch64-unknown-linux-gnu = "639271f59766d291ebdade6050e7d05d61cb5c822a3ef9a1e2ab185fed68d729";
i686-apple-darwin = "ea189b1fb0bfda367cde6d43c18863ab4c64ffca04265e5746bf412a186fe1a2";
x86_64-apple-darwin = "749ca5e0b94550369cc998416b8854c13157f5d11d35e9b3276064b6766bcb83";
};
selectRustPackage = pkgs: pkgs.rust_1_41_0;
}

4
pkgs/development/libraries/check/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "check"; pname = "check";
version = "0.13.0"; version = "0.14.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz";
sha256 = "02crar51gniijrrl9p8f9maibnwc33n76kw5cqr7xk3s8hqnncy4"; sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx";
}; };
# Test can randomly fail: http://hydra.nixos.org/build/7243912 # Test can randomly fail: http://hydra.nixos.org/build/7243912

4
pkgs/development/libraries/ffmpeg/generic.nix
View file

@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
(ifMinVer "2.1" "--enable-libssh") (ifMinVer "2.1" "--enable-libssh")
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
(ifMinVer "3.4" (enableFeature vaapiSupport "libdrm")) (ifMinVer "3.4" (enableFeature vaapiSupport "libdrm"))
"--enable-vdpau" (enableFeature vdpauSupport "vdpau")
"--enable-libvorbis" "--enable-libvorbis"
(ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) (ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
(ifMinVer "2.4" "--enable-lzma") (ifMinVer "2.4" "--enable-lzma")
@ -171,7 +171,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
] ++ optionals openglSupport [ libGL libGLU ] ] ++ optionals openglSupport [ libGL libGLU ]
++ optional libmfxSupport intel-media-sdk ++ optional libmfxSupport intel-media-sdk
++ optional vpxSupport libaom ++ optional vpxSupport libaom

4
pkgs/development/libraries/gmp/6.x.nix
View file

@ -6,11 +6,11 @@
let inherit (stdenv.lib) optional; in let inherit (stdenv.lib) optional; in
let self = stdenv.mkDerivation rec { let self = stdenv.mkDerivation rec {
name = "gmp-6.1.2"; name = "gmp-6.2.0";
src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
sha256 = "1clg7pbpk6qwxj5b2mw0pghzawp2qlm3jf9gdd8i6fl6yh2bnxaj"; sha256 = "1sji8i9yjzfv5l2fsadpgjfyn452q6ab9zvm02k23ssd275rj77m";
}; };
#outputs TODO: split $cxx due to libstdc++ dependency #outputs TODO: split $cxx due to libstdc++ dependency

4
pkgs/development/libraries/gnutls/default.nix
View file

@ -8,7 +8,7 @@
assert guileBindings -> guile != null; assert guileBindings -> guile != null;
let let
version = "3.6.11.1"; version = "3.6.12";
# XXX: Gnulib's `test-select' fails on FreeBSD: # XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw . # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "1y1wadpsrj5ai603xv5bgssl9v0pb1si2hg14zqdnmcsvgri5fpv"; sha256 = "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z";
}; };
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];

1
pkgs/development/libraries/kde-frameworks/default.nix
View file

@ -100,6 +100,7 @@ let
kcalendarcore = callPackage ./kcalendarcore.nix {}; kcalendarcore = callPackage ./kcalendarcore.nix {};
kcodecs = callPackage ./kcodecs.nix {}; kcodecs = callPackage ./kcodecs.nix {};
kconfig = callPackage ./kconfig.nix {}; kconfig = callPackage ./kconfig.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kcoreaddons = callPackage ./kcoreaddons.nix {}; kcoreaddons = callPackage ./kcoreaddons.nix {};
kdbusaddons = callPackage ./kdbusaddons.nix {}; kdbusaddons = callPackage ./kdbusaddons.nix {};
kdnssd = callPackage ./kdnssd.nix {}; kdnssd = callPackage ./kdnssd.nix {};

3
pkgs/applications/kde/kcontacts.nix → pkgs/development/libraries/kde-frameworks/kcontacts.nix
View file

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib,
extra-cmake-modules, extra-cmake-modules,
kcoreaddons, kconfig, kcodecs, ki18n, qtbase, kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
}: }:
@ -8,7 +8,6 @@ mkDerivation {
name = "kcontacts"; name = "kcontacts";
meta = { meta = {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ]; buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];

4
pkgs/development/libraries/libheif/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libheif"; pname = "libheif";
version = "1.6.1"; version = "1.6.2";
outputs = [ "bin" "out" "dev" "man" ]; outputs = [ "bin" "out" "dev" "man" ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "strukturag"; owner = "strukturag";
repo = "libheif"; repo = "libheif";
rev = "v${version}"; rev = "v${version}";
sha256 = "0l3mj11lp4974kaym3aidm4wriqzls13gz22s67l6341yhsc42n6"; sha256 = "0ngbzban585hsgs6fb6fkhccc91kxn1n59qvqjp8bw41l24i3nr2";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/development/libraries/libtasn1/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, texinfo }: { stdenv, fetchurl, perl, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libtasn1-4.14"; name = "libtasn1-4.16.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/libtasn1/${name}.tar.gz"; url = "mirror://gnu/libtasn1/${name}.tar.gz";
sha256 = "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y"; sha256 = "179jskl7dmfp1rd2khkzmlibzgki4wi6hvmmwfv7q49r728b03qf";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];

8
pkgs/development/libraries/libuv/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.34.1"; version = "1.34.2";
pname = "libuv"; pname = "libuv";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0vkn76wr2nivhmgjnkni2yih642mrlzkxbivdmlvcf3hg4h7gipp"; sha256 = "14ax49daz7j86lybi242jiry49jrnnvlyc39k6va700n03py4h9n";
}; };
postPatch = let postPatch = let
@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
"tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot"
"multiple_listen" "delayed_accept" "multiple_listen" "delayed_accept"
"shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
"tty_pty" "condvar_5" "tty_pty" "condvar_5" "hrtime"
# Tests that fail when sandboxing is enabled. # Tests that fail when sandboxing is enabled.
"fs_event_close_in_callback" "fs_event_watch_dir" "fs_event_close_in_callback" "fs_event_watch_dir" "fs_event_error_reporting"
"fs_event_watch_dir_recursive" "fs_event_watch_file" "fs_event_watch_dir_recursive" "fs_event_watch_file"
"fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path"
"process_priority" "udp_create_early_bad_bind" "process_priority" "udp_create_early_bad_bind"

4
pkgs/development/libraries/nspr/default.nix
View file

@ -2,7 +2,7 @@
, CoreServices ? null , CoreServices ? null
, buildPackages }: , buildPackages }:
let version = "4.24"; in let version = "4.25"; in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "nspr"; pname = "nspr";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch"; sha256 = "0mjjk2b7ika3v4y99cnaqz3z1iq1a50r1psn9i3s87gr46z0khqb";
}; };
patches = [ patches = [

4
pkgs/development/libraries/p11-kit/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "p11-kit"; pname = "p11-kit";
version = "0.23.18.1"; version = "0.23.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "p11-glue"; owner = "p11-glue";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0l4ndipcbikblfjz729zkscvni5lzdzvbvsar2538pylw556rx73"; sha256 = "0hsg06mqsd90a0nxj5484b40cbfq7vna4w0sv6y5ihbj5l2hz06b";
}; };
outputs = [ "out" "dev"]; outputs = [ "out" "dev"];

2
pkgs/development/libraries/qt-5/5.12/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.6/submodules/ ) WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/ )

320
pkgs/development/libraries/qt-5/5.12/srcs.nix
View file

@ -3,323 +3,323 @@
{ {
qt3d = { qt3d = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qt3d-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qt3d-everywhere-src-5.12.7.tar.xz";
sha256 = "cf34ce99a2592270abbf32a13fa824d99c76412fc493a3f1c37e37892b198baf"; sha256 = "2030de3dc93fd4062f677f61938229af9cd7aa4c3d2932cdda2ccb663d681126";
name = "qt3d-everywhere-src-5.12.6.tar.xz"; name = "qt3d-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtactiveqt = { qtactiveqt = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtactiveqt-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtactiveqt-everywhere-src-5.12.7.tar.xz";
sha256 = "c50f082588bf7dad2091a5b67c426791bf36d7d1503c56dc79b9e26444931f09"; sha256 = "302ce1e74dae8ead602ac663e208e6c9b98bdf9a2b7795de4198a28eba2d895d";
name = "qtactiveqt-everywhere-src-5.12.6.tar.xz"; name = "qtactiveqt-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtandroidextras = { qtandroidextras = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtandroidextras-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtandroidextras-everywhere-src-5.12.7.tar.xz";
sha256 = "a0f15a4ba29abe90de2b2c221efd22ecfb6793590ff9610f85e6e6b6562784fe"; sha256 = "a5acc927bd46ed87627e2ae0f0bfc199189d383a3e17c2f34b8c34ea57b2aea1";
name = "qtandroidextras-everywhere-src-5.12.6.tar.xz"; name = "qtandroidextras-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtbase = { qtbase = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtbase-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz";
sha256 = "6ab52649d74d7c1728cf4a6cf335d1142b3bf617d476e2857eb7961ef43f9f27"; sha256 = "b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d";
name = "qtbase-everywhere-src-5.12.6.tar.xz"; name = "qtbase-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtcanvas3d = { qtcanvas3d = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtcanvas3d-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz";
sha256 = "2d33e6c944e5a2eed7528fdfe9deadfb1b7a0fcf17bab1f8b83988b1327d9d08"; sha256 = "b63a513a2ee11548b122e0fd640b1fa22d3eb83cdc51ddfdf3b97c2ecd0d0c50";
name = "qtcanvas3d-everywhere-src-5.12.6.tar.xz"; name = "qtcanvas3d-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtcharts = { qtcharts = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtcharts-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtcharts-everywhere-src-5.12.7.tar.xz";
sha256 = "14dbdb5bb18d774e3b7ac3042a3f349080ab42c2588527ff04123df1c9ccaa3d"; sha256 = "434065526d0b1d8921e96cc1827b1a3579e073b930fe536455c4c1da2f15cf5f";
name = "qtcharts-everywhere-src-5.12.6.tar.xz"; name = "qtcharts-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtconnectivity = { qtconnectivity = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtconnectivity-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz";
sha256 = "10f1c6727aedc375a1bfab4bb33fd2111bf2c1dfc19049e361c0f58608ea22da"; sha256 = "647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a";
name = "qtconnectivity-everywhere-src-5.12.6.tar.xz"; name = "qtconnectivity-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtdatavis3d = { qtdatavis3d = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdatavis3d-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtdatavis3d-everywhere-src-5.12.7.tar.xz";
sha256 = "414d91aae5e7d3404a0b526f944961871b1abf1fda51f0861d19cb28a2eba4fe"; sha256 = "07ff5713cfcdf073681d905912e8d871e4451508494c789df805eb241ed98b27";
name = "qtdatavis3d-everywhere-src-5.12.6.tar.xz"; name = "qtdatavis3d-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtdeclarative = { qtdeclarative = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdeclarative-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtdeclarative-everywhere-src-5.12.7.tar.xz";
sha256 = "34b1d1ae5562f1d433e22c255ac1a37a2fb030ef05bf6123d4b9496644b686d3"; sha256 = "5cdc05a035f240ab73b6b37dd3831c1350cd80e5799da47929974085f6eae9bd";
name = "qtdeclarative-everywhere-src-5.12.6.tar.xz"; name = "qtdeclarative-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtdoc = { qtdoc = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdoc-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtdoc-everywhere-src-5.12.7.tar.xz";
sha256 = "82549278120236ece0e02f9bab351319e4469c242ce97b05f269964aee924aac"; sha256 = "6c07918cec8494ea05a42234d8f281a2958de7380458f3fb5a189949ce1233e9";
name = "qtdoc-everywhere-src-5.12.6.tar.xz"; name = "qtdoc-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtgamepad = { qtgamepad = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtgamepad-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtgamepad-everywhere-src-5.12.7.tar.xz";
sha256 = "e1ebc5f3593c5234724663106790fbf1831d4ac8ea50a9d9805d2dd0a1c5b3b3"; sha256 = "07638c42be94be1e5e622b020c6192341b5bb87be34d7b38f2899672d83a1e94";
name = "qtgamepad-everywhere-src-5.12.6.tar.xz"; name = "qtgamepad-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtgraphicaleffects = { qtgraphicaleffects = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtgraphicaleffects-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtgraphicaleffects-everywhere-src-5.12.7.tar.xz";
sha256 = "ded0327624a13bf7fab07e5fe762473194ed898b0442ef9325498e41c8c077ef"; sha256 = "02f0328420c623da8f9ae949fec01e99ba84213dd2ad559cb00c204502bbcace";
name = "qtgraphicaleffects-everywhere-src-5.12.6.tar.xz"; name = "qtgraphicaleffects-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtimageformats = { qtimageformats = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtimageformats-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz";
sha256 = "330d1c29a135c44bb36b5ffc2ba4f8915dbc446d5d75563523ebcfd373617858"; sha256 = "9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b";
name = "qtimageformats-everywhere-src-5.12.6.tar.xz"; name = "qtimageformats-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtlocation = { qtlocation = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtlocation-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtlocation-everywhere-src-5.12.7.tar.xz";
sha256 = "7ae231ca4de3c0915e92bb95440b0ddc7113790b1acb536c9394472e8dde2278"; sha256 = "d1e905b80befda3c9aaad92ea984e6dbf722568b5c91e8d15b027bc5bc22781f";
name = "qtlocation-everywhere-src-5.12.6.tar.xz"; name = "qtlocation-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtmacextras = { qtmacextras = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtmacextras-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtmacextras-everywhere-src-5.12.7.tar.xz";
sha256 = "eae25b8858fef348667b938f5c88a014ee78945c419e4e6d856d4a6adc5e43a3"; sha256 = "265b5607664927e1c92af3abc4b034244f37abd83db1f0a8f22f6952f7d6abb8";
name = "qtmacextras-everywhere-src-5.12.6.tar.xz"; name = "qtmacextras-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtmultimedia = { qtmultimedia = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtmultimedia-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz";
sha256 = "9f580e8962ca6a09608570e77b38d7c3f71d344ff6de1c39bc6905226b679570"; sha256 = "28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d";
name = "qtmultimedia-everywhere-src-5.12.6.tar.xz"; name = "qtmultimedia-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtnetworkauth = { qtnetworkauth = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtnetworkauth-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtnetworkauth-everywhere-src-5.12.7.tar.xz";
sha256 = "ea122d86a960863bbe0e0f4b5a12f0a376455beed3c26f1b61926e065b366abd"; sha256 = "cbfb7c71a25e74b92b927a5aeae2d099e4142968424a0fcebc1a52fa4fb4576b";
name = "qtnetworkauth-everywhere-src-5.12.6.tar.xz"; name = "qtnetworkauth-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtpurchasing = { qtpurchasing = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtpurchasing-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtpurchasing-everywhere-src-5.12.7.tar.xz";
sha256 = "1fa0b7e3da4755b64559177f507718320c1aa9e66ec49e17595e04c3f3af70cd"; sha256 = "6f7ecb1e6b6d290b268344ddb031bb7114cd36139c76323732d12661eeb15a76";
name = "qtpurchasing-everywhere-src-5.12.6.tar.xz"; name = "qtpurchasing-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtquickcontrols = { qtquickcontrols = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtquickcontrols-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz";
sha256 = "c48d96a187ff924f1ae4b4abe9cc073adeb06a6c2b07c4191aa595ad22df2c99"; sha256 = "1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5";
name = "qtquickcontrols-everywhere-src-5.12.6.tar.xz"; name = "qtquickcontrols-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtquickcontrols2 = { qtquickcontrols2 = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtquickcontrols2-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz";
sha256 = "5cab0712f946405db269851b96cca02ef8ba98f3ee2c4fa9c0877dba3808a970"; sha256 = "3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237";
name = "qtquickcontrols2-everywhere-src-5.12.6.tar.xz"; name = "qtquickcontrols2-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtremoteobjects = { qtremoteobjects = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtremoteobjects-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtremoteobjects-everywhere-src-5.12.7.tar.xz";
sha256 = "49b5353d020fb6ab9bdf90c941a4b3acc6b036266f6c68a42fc44a7ac151d699"; sha256 = "6d6aaec4e9c140c027b0badaabc6322ea3c16cf649495a27fec1f261e891120f";
name = "qtremoteobjects-everywhere-src-5.12.6.tar.xz"; name = "qtremoteobjects-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtscript = { qtscript = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtscript-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtscript-everywhere-src-5.12.7.tar.xz";
sha256 = "a18082ad338e2378cccab932045804ad3077ec924fed2efc59d4b726d622777c"; sha256 = "ca1dbc66d4125a678638dd0c9c030b72fdfc4ec2c229b9316a8bc80a86104019";
name = "qtscript-everywhere-src-5.12.6.tar.xz"; name = "qtscript-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtscxml = { qtscxml = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtscxml-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtscxml-everywhere-src-5.12.7.tar.xz";
sha256 = "53d7837c8b5b1f9beb26cb64ea4334211218533e0126167e4e7e75238f7ac68b"; sha256 = "afa950bc95f881c90eea564511f3e9918d53fddf0823afb641d20dc6f794fbb6";
name = "qtscxml-everywhere-src-5.12.6.tar.xz"; name = "qtscxml-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtsensors = { qtsensors = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtsensors-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtsensors-everywhere-src-5.12.7.tar.xz";
sha256 = "59dba4c0bc72846d938e0862f14d8064fb664d893f270a41d3abf4e871290ef5"; sha256 = "2b9aea9f4e2f681b4067f2b9d97c5073c135e41d26601c71f18f199bc980e740";
name = "qtsensors-everywhere-src-5.12.6.tar.xz"; name = "qtsensors-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtserialbus = { qtserialbus = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtserialbus-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz";
sha256 = "071b421282118c507a996e3cee4070f2c545335dfd891a44bf54100935cff5de"; sha256 = "82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae";
name = "qtserialbus-everywhere-src-5.12.6.tar.xz"; name = "qtserialbus-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtserialport = { qtserialport = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtserialport-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz";
sha256 = "77d0def93078fb5d9de6faa9ccff05cce5b934899e856b04bcf7f721a4e190be"; sha256 = "224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f";
name = "qtserialport-everywhere-src-5.12.6.tar.xz"; name = "qtserialport-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtspeech = { qtspeech = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtspeech-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtspeech-everywhere-src-5.12.7.tar.xz";
sha256 = "27ae7b2c7073377a617f32b0f4adfc1807774f02d13469ed4bcd282799cf878a"; sha256 = "0cc4f14aa21172b84c8ebca442037cd94927dad4921f6f6bfb4d7f2468aa6060";
name = "qtspeech-everywhere-src-5.12.6.tar.xz"; name = "qtspeech-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtsvg = { qtsvg = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtsvg-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtsvg-everywhere-src-5.12.7.tar.xz";
sha256 = "46243e6c425827ab4e91fbe31567f683ff14cb01d12f9f7543a83a571228ef8f"; sha256 = "4bf60916d4e398d9609f1b3a17fc7345a0e13c7c1cc407298df20da4c7c67bb8";
name = "qtsvg-everywhere-src-5.12.6.tar.xz"; name = "qtsvg-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qttools = { qttools = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qttools-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qttools-everywhere-src-5.12.7.tar.xz";
sha256 = "e94991c7885c2650cefd71189873e45b1d64d6042e439a0a0d9652c191d3c777"; sha256 = "860a97114d518f83c0a9ab3742071da16bb018e6eb387179d5764a8dcca03948";
name = "qttools-everywhere-src-5.12.6.tar.xz"; name = "qttools-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qttranslations = { qttranslations = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qttranslations-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qttranslations-everywhere-src-5.12.7.tar.xz";
sha256 = "798ac44414206898d0192653118de3f115c59016e2bf82ad0c659f9f8c864768"; sha256 = "2c8d1169f1f20ba32639181f1853b4159940cbaaac41adaa018b6f43ca31323f";
name = "qttranslations-everywhere-src-5.12.6.tar.xz"; name = "qttranslations-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtvirtualkeyboard = { qtvirtualkeyboard = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz";
sha256 = "04699888d6e1e8e04db8043a37212fa3b1fcb1b23aef41c2f3ae7a4278e34d2c"; sha256 = "aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa";
name = "qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz"; name = "qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtwayland = { qtwayland = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwayland-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwayland-everywhere-src-5.12.7.tar.xz";
sha256 = "fa9c6aa84ddc0334b44f0f47d69569e496e5d9f3a1ed67aab42214854d2351c4"; sha256 = "fc1ab8e25461580e37090e4f82422411dee71a3de48a54be1f4b6569e00f66c5";
name = "qtwayland-everywhere-src-5.12.6.tar.xz"; name = "qtwayland-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtwebchannel = { qtwebchannel = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebchannel-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz";
sha256 = "2745d1703de1a749405727a74786184c950ba7465dc5d02e2f39f51635dbc8d7"; sha256 = "b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75";
name = "qtwebchannel-everywhere-src-5.12.6.tar.xz"; name = "qtwebchannel-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtwebengine = { qtwebengine = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebengine-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebengine-everywhere-src-5.12.7.tar.xz";
sha256 = "caa5f257c3bc33c1d2fcb9b7cd414fd5c46e8eee8a103231ab28d592a0058621"; sha256 = "83b754dca3dafeb21be6c7cb5ea99f11f5dbe9055bc1680f5bd7159224bb46fa";
name = "qtwebengine-everywhere-src-5.12.6.tar.xz"; name = "qtwebengine-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtwebglplugin = { qtwebglplugin = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebglplugin-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebglplugin-everywhere-src-5.12.7.tar.xz";
sha256 = "21d88852f69f0f06c5899e61fe76b2cefc2b65be4ed3c334ec01431ba16f50dd"; sha256 = "e049ed855bc772a56808844a803aac653d2d64f092a1fd1fe6a73ab460b55c3b";
name = "qtwebglplugin-everywhere-src-5.12.6.tar.xz"; name = "qtwebglplugin-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtwebsockets = { qtwebsockets = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebsockets-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz";
sha256 = "f00bfbaa73e60a4c3371e729167d7acb465cbb2db32535d745982cab21fed61e"; sha256 = "6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17";
name = "qtwebsockets-everywhere-src-5.12.6.tar.xz"; name = "qtwebsockets-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtwebview = { qtwebview = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebview-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebview-everywhere-src-5.12.7.tar.xz";
sha256 = "42c0623c1c066620ab1afc3736a4a5f42115f9c190dafdf643e16ccec6e7727a"; sha256 = "d3f82d2ceab59dc4dee3b6f54f4b70869c199d63f4534b299d900cdacc9b7be7";
name = "qtwebview-everywhere-src-5.12.6.tar.xz"; name = "qtwebview-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtwinextras = { qtwinextras = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwinextras-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwinextras-everywhere-src-5.12.7.tar.xz";
sha256 = "02c2b2393073a22498a5645faed34040428ace9cf09f18e2f12e75e31be54bea"; sha256 = "cfeec81ee1f75b9786ed28382deecc5e38fd142c0b48476beccadb587f93118c";
name = "qtwinextras-everywhere-src-5.12.6.tar.xz"; name = "qtwinextras-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtx11extras = { qtx11extras = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtx11extras-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtx11extras-everywhere-src-5.12.7.tar.xz";
sha256 = "5f3991f557116034731ed059895e73b5d34e1b22e85536a8eb6e92350b3a1d6b"; sha256 = "23895f4b1e84f3783526b9e17680df38c587601d4dfa6ff1b81ace432c480b96";
name = "qtx11extras-everywhere-src-5.12.6.tar.xz"; name = "qtx11extras-everywhere-src-5.12.7.tar.xz";
}; };
}; };
qtxmlpatterns = { qtxmlpatterns = {
version = "5.12.6"; version = "5.12.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtxmlpatterns-everywhere-src-5.12.6.tar.xz"; url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtxmlpatterns-everywhere-src-5.12.7.tar.xz";
sha256 = "76977bc834e6c6118ae2bab31e68ae54843358936b03e432d919ad15cd2184d0"; sha256 = "9002014129a1f2a44700df333a7776e23bdfd689e7a619c3540fd9f6819b417b";
name = "qtxmlpatterns-everywhere-src-5.12.6.tar.xz"; name = "qtxmlpatterns-everywhere-src-5.12.7.tar.xz";
}; };
}; };
} }

4
pkgs/development/python-modules/Mako/default.nix
View file

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Mako"; pname = "Mako";
version = "1.1.0"; version = "1.1.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b"; sha256 = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4";
}; };
checkInputs = [ markupsafe nose mock ]; checkInputs = [ markupsafe nose mock ];

4
pkgs/development/python-modules/autopep8/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "autopep8"; pname = "autopep8";
version = "1.4.4"; version = "1.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee"; sha256 = "0f592a0447acea0c2b0a9602be1e4e3d86db52badd2e3c84f0193bfd89fd3a43";
}; };
propagatedBuildInputs = [ pycodestyle ]; propagatedBuildInputs = [ pycodestyle ];

4
pkgs/development/python-modules/boto3/default.nix
View file

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.10.1"; # N.B: if you change this, change botocore too version = "1.11.13"; # N.B: if you change this, change botocore too
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2904bfb928116fea3a83247de6c3687eb9bf942d764e361f5574d5ac11be2ad3"; sha256 = "09eccb6cd41381c4ff1d626c3a19884b5b1f1424d15a96004d077b532ef393d1";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

8
pkgs/development/python-modules/botocore/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.13.2"; # N.B: if you change this, change boto3 and awscli to a matching version version = "1.14.13"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8223485841ef4731a5d4943a733295ba69d0005c4ae64c468308cc07f6960d39"; sha256 = "6478d9207db6dbcb5106fd4db2cdd5194d0b2dc0b73776019d56877ab802fe87";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -28,6 +28,10 @@ buildPythonPackage rec {
urllib3 urllib3
]; ];
postPatch = ''
substituteInPlace setup.py --replace ",<0.16" ""
'';
checkInputs = [ mock nose ]; checkInputs = [ mock nose ];
checkPhase = '' checkPhase = ''

3
pkgs/development/python-modules/diskcache/default.nix
View file

@ -6,6 +6,7 @@
, pytest_xdist , pytest_xdist
, pytest-django , pytest-django
, mock , mock
, django
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -27,6 +28,8 @@ buildPythonPackage rec {
mock mock
]; ];
disabled = lib.versionAtLeast django.version "2.0";
checkPhase = '' checkPhase = ''
pytest pytest
''; '';

3
pkgs/development/python-modules/django-compat/default.nix
View file

@ -1,6 +1,9 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python, { stdenv, buildPythonPackage, fetchFromGitHub, python,
django, six django, six
}: }:
if stdenv.lib.versionAtLeast django.version "2.0"
then throw "django-compat requires django < 2.0"
else
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-compat"; pname = "django-compat";
version = "1.0.15"; version = "1.0.15";

5
pkgs/development/python-modules/django-configurations/default.nix
View file

@ -9,6 +9,7 @@
, django-cache-url , django-cache-url
, six , six
, django , django
, setuptools_scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -20,7 +21,9 @@ buildPythonPackage rec {
sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915"; sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915";
}; };
checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ]; buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ six ];
checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ];
checkPhase = '' checkPhase = ''
export PYTHONPATH=.:$PYTHONPATH export PYTHONPATH=.:$PYTHONPATH

4
pkgs/development/python-modules/django-pglocks/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, django }: { lib, buildPythonPackage, fetchPypi, django, six }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-pglocks"; pname = "django-pglocks";
@ -16,7 +16,7 @@ buildPythonPackage rec {
}; };
buildInputs = [ django ]; buildInputs = [ django ];
propagatedBuildInputs = [ django ]; propagatedBuildInputs = [ django six ];
# tests need a postgres database # tests need a postgres database
doCheck = false; doCheck = false;

4
pkgs/development/python-modules/django-raster/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, { stdenv, buildPythonPackage, fetchPypi, isPy3k,
numpy, django_colorful, pillow, psycopg2, numpy, django_colorful, pillow, psycopg2,
pyparsing, django, celery, boto3 pyparsing, django, celery, boto3, importlib-metadata
}: }:
if stdenv.lib.versionOlder django.version "2.0" if stdenv.lib.versionOlder django.version "2.0"
then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2."
@ -20,7 +20,7 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 propagatedBuildInputs = [ numpy django_colorful pillow psycopg2
pyparsing django celery boto3 ]; pyparsing django celery boto3 importlib-metadata ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Basic raster data integration for Django"; description = "Basic raster data integration for Django";

14
pkgs/development/python-modules/django-sesame/default.nix
View file

@ -1,21 +1,21 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchFromGitHub
, django }: , django }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-sesame"; pname = "django-sesame";
version = "1.7"; version = "1.7";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "aaugustin";
sha256 = "e68bad4a6ef44322380f1f01d009f9d3cb55d1ffef0b669574b511db5ab0c6c0"; repo = pname;
rev = version;
sha256 = "0k8s44zn2jmasp0w064vrx685fn4pbmdfx8qmhkab1hd5ys6pi44";
}; };
checkInputs = [ django ]; checkInputs = [ django ];
checkPhase = '' checkPhase = ''
PYTHONPATH="$(pwd):$PYTHONPATH" \ make test
DJANGO_SETTINGS_MODULE=sesame.test_settings \
django-admin test sesame
''; '';
meta = with lib; { meta = with lib; {

10
pkgs/development/python-modules/django_appconf/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, six, django }: { stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-appconf"; pname = "django-appconf";
version = "1.0.3"; version = "1.0.3";
@ -12,6 +12,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six django ]; propagatedBuildInputs = [ six django ];
patches = [
(fetchpatch {
name = "backport_django_2_2.patch";
url = "https://github.com/django-compressor/django-appconf/commit/1526a842ee084b791aa66c931b3822091a442853.patch";
sha256 = "1vl2s6vlf15089s8p4c3g4d5iqm8jva66bdw683r8440f80ixgmw";
})
];
checkPhase = '' checkPhase = ''
# prove we're running tests against installed package, not build dir # prove we're running tests against installed package, not build dir
rm -r appconf rm -r appconf

14
pkgs/development/python-modules/docutils/default.nix
View file

@ -9,20 +9,18 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "docutils"; pname = "docutils";
version = "0.15.2"; version = "0.16";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "168s5v7bff5ar9jspr6wn823q1sbn0jhnbp9clk41nl8j09fmbm2"; sha256 = "c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc";
}; };
# Only Darwin needs LANG, but we could set it in general. # Only Darwin needs LANG, but we could set it in general.
# It's done here conditionally to prevent mass-rebuilds. # It's done here conditionally to prevent mass-rebuilds.
checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + (if isPy3k then '' checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + ''
${python.interpreter} test3/alltests.py
'' else ''
${python.interpreter} test/alltests.py ${python.interpreter} test/alltests.py
''); '';
# Create symlinks lacking a ".py" suffix, many programs depend on these names # Create symlinks lacking a ".py" suffix, many programs depend on these names
postFixup = '' postFixup = ''
@ -31,10 +29,6 @@ buildPythonPackage rec {
done done
''; '';
# Four tests are broken with 3.8.
# test_writers.test_odt.DocutilsOdtTestCase
doCheck = !isPy38;
meta = { meta = {
description = "Docutils -- Python Documentation Utilities"; description = "Docutils -- Python Documentation Utilities";
homepage = http://docutils.sourceforge.net/; homepage = http://docutils.sourceforge.net/;

4
pkgs/development/python-modules/ipython/default.nix
View file

@ -22,12 +22,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ipython"; pname = "ipython";
version = "7.10.2"; version = "7.12.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "762d79a62b6aa96b04971e920543f558dfbeedc0468b899303c080c8068d4ac2"; sha256 = "d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6";
}; };
prePatch = lib.optionalString stdenv.isDarwin '' prePatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/python-modules/jinja2/default.nix
View file

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Jinja2"; pname = "Jinja2";
version = "2.10.3"; version = "2.11.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de"; sha256 = "93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

4
pkgs/development/python-modules/matplotlib/default.nix
View file

@ -20,14 +20,14 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt5 != null; assert enableQt -> pyqt5 != null;
buildPythonPackage rec { buildPythonPackage rec {
version = "3.1.2"; version = "3.1.3";
pname = "matplotlib"; pname = "matplotlib";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8e8e2c2fe3d873108735c6ee9884e6f36f467df4a143136209cff303b183bada"; sha256 = "db3121f12fb9b99f105d1413aebaeb3d943f269f3d262b45586d12765866f0c6";
}; };
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

3
pkgs/development/python-modules/mezzanine/default.nix
View file

@ -18,6 +18,9 @@
, chardet , chardet
}: }:
if stdenv.lib.versionOlder django.version "1.11" || stdenv.lib.versionAtLeast django.version "2.0"
then throw "mezzanine requires django-1.11. Consider overriding python package set to use django_1_11"
else
buildPythonPackage rec { buildPythonPackage rec {
version = "4.3.1"; version = "4.3.1";
pname = "Mezzanine"; pname = "Mezzanine";

5
pkgs/development/python-modules/moto/default.nix
View file

@ -78,6 +78,11 @@ buildPythonPackage rec {
-e test_passthrough_requests -e test_passthrough_requests
''; '';
# Disabling because of 20 failing tests due to https://github.com/spulec/moto/issues/2728
# We should enable these as soon as possible again though. Note the issue
# is unrelated to the docutils 0.16 bump.
doCheck = false;
meta = with lib; { meta = with lib; {
description = "Allows your tests to easily mock out AWS Services"; description = "Allows your tests to easily mock out AWS Services";
homepage = https://github.com/spulec/moto; homepage = https://github.com/spulec/moto;

4
pkgs/development/python-modules/multidict/default.nix
View file

@ -8,11 +8,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "multidict"; pname = "multidict";
version = "4.7.2"; version = "4.7.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d4dafdcfbf0ac80fc5f00603f0ce43e487c654ae34a656e4749f175d9832b1b5"; sha256 = "d7d428488c67b09b26928950a395e41cc72bb9c3d5abfe9f0521940ee4f796d4";
}; };
checkInputs = [ pytest pytestrunner pytestcov ]; checkInputs = [ pytest pytestrunner pytestcov ];

4
pkgs/development/python-modules/packaging/default.nix
View file

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "packaging"; pname = "packaging";
version = "19.2"; version = "20.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47"; sha256 = "e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334";
}; };
propagatedBuildInputs = [ pyparsing six ]; propagatedBuildInputs = [ pyparsing six ];

4
pkgs/development/python-modules/pandas/default.nix
View file

@ -30,11 +30,11 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "pandas"; pname = "pandas";
version = "1.0.0"; version = "1.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3ea6cc86931f57f18b1240572216f09922d91b19ab8a01cf24734394a3db3bec"; sha256 = "3c07765308f091d81b6735d4f2242bb43c332cc3461cae60543df6b10967fe27";
}; };
checkInputs = [ pytest glibcLocales moto hypothesis ]; checkInputs = [ pytest glibcLocales moto hypothesis ];

4
pkgs/development/python-modules/reportlab/default.nix
View file

@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "reportlab"; pname = "reportlab";
version = "3.5.32"; version = "3.5.34";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "83ef44936ef4e9c432d62bc2b72ec8d772b87af319d123e827a72e9b6884c851"; sha256 = "9675a26d01ec141cb717091bb139b6227bfb3794f521943101da50327bff4825";
}; };
checkInputs = [ glibcLocales ]; checkInputs = [ glibcLocales ];

4
pkgs/development/python-modules/s3transfer/default.nix
View file

@ -14,11 +14,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "s3transfer"; pname = "s3transfer";
version = "0.2.1"; version = "0.3.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d"; sha256 = "921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db";
}; };
propagatedBuildInputs = propagatedBuildInputs =

9
pkgs/development/python-modules/setuptools_scm/default.nix
View file

@ -1,14 +1,17 @@
{ stdenv, buildPythonPackage, fetchPypi, pip }: { stdenv, buildPythonPackage, fetchPypi, pip, pytest }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "setuptools_scm"; pname = "setuptools_scm";
version = "3.3.3"; version = "3.4.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx"; sha256 = "26b8a108783cd88f4b15ff1f0f347d6b476db25d0c226159b835d713f9487320";
}; };
# Requires pytest, circular dependency
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://bitbucket.org/pypa/setuptools_scm/; homepage = https://bitbucket.org/pypa/setuptools_scm/;
description = "Handles managing your python package versions in scm metadata"; description = "Handles managing your python package versions in scm metadata";

4
pkgs/development/python-modules/six/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "six"; pname = "six";
version = "1.13.0"; version = "1.14.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"; sha256 = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

4
pkgs/development/python-modules/sphinx/default.nix
View file

@ -32,11 +32,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sphinx"; pname = "sphinx";
version = "2.2.2"; version = "2.3.1";
src = fetchPypi { src = fetchPypi {
pname = "Sphinx"; pname = "Sphinx";
inherit version; inherit version;
sha256 = "1wjcm382824rq8ijls9mlqwl2h8l26s201v5fwprhnins671m72m"; sha256 = "19a28nsb0w4bs6k8rdfyk6vzrcwdpvhs2wq77rgpmww59yvndrz6";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

19
pkgs/development/python-modules/sqlalchemy/default.nix
View file

@ -1,17 +1,16 @@
{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 { stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35
, mock , mock
, pysqlite , pysqlite
, fetchpatch
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "SQLAlchemy"; pname = "SQLAlchemy";
version = "1.3.10"; version = "1.3.13";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0f0768b5db594517e1f5e1572c73d14cf295140756431270d89496dc13d5e46c"; sha256 = "64a7b71846db6423807e96820993fa12a03b89127d278290ca25c0b11ed7b4fb";
}; };
checkInputs = [ checkInputs = [
@ -29,20 +28,6 @@ buildPythonPackage rec {
disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "] disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]
++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ]; ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ];
patches = [
# Two patches for sqlite 3.30 compatibility.
# https://github.com/sqlalchemy/sqlalchemy/pull/4921
(fetchpatch {
url = https://github.com/sqlalchemy/sqlalchemy/commit/8b35ba54ab31aab13a34c360a31d014da1f5c809.patch;
sha256 = "065csr6pd7j1fjnv72wbz8s6xhydi5f161gj7nyqq86rxkh0nl0n";
})
(fetchpatch {
url = https://github.com/sqlalchemy/sqlalchemy/commit/e18534a9045786efdaf4963515222838c62e0300.patch;
sha256 = "0bwfwp5gmgg12qilvwdd2a5xi76bllzzapb23ybh1k34c5pla195";
})
];
meta = with lib; { meta = with lib; {
homepage = http://www.sqlalchemy.org/; homepage = http://www.sqlalchemy.org/;
description = "A Python SQL toolkit and Object Relational Mapper"; description = "A Python SQL toolkit and Object Relational Mapper";

4
pkgs/development/python-modules/urllib3/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "urllib3"; pname = "urllib3";
version = "1.25.7"; version = "1.25.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"; sha256 = "87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc";
}; };
NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [

10
pkgs/development/python-modules/werkzeug/default.nix
View file

@ -1,18 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, itsdangerous, hypothesis , itsdangerous, hypothesis
, pytest, requests }: , pytest, requests
, pytest-timeout
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "Werkzeug"; pname = "Werkzeug";
version = "0.16.0"; version = "0.16.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7"; sha256 = "b353856d37dec59d6511359f97f6a4b2468442e454bd1c98298ddce53cac1f04";
}; };
propagatedBuildInputs = [ itsdangerous ]; propagatedBuildInputs = [ itsdangerous ];
checkInputs = [ pytest requests hypothesis ]; checkInputs = [ pytest requests hypothesis pytest-timeout ];
checkPhase = '' checkPhase = ''
pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"} pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"}

4
pkgs/development/python-modules/zeroconf/default.nix
View file

@ -10,12 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zeroconf"; pname = "zeroconf";
version = "0.24.3"; version = "0.24.4";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "de62e5067ea7ab356f7168a3562d79fececa8632ed0fad0e82f505e01fafbc6d"; sha256 = "f66d38f16026097572939ab78b1f46a97f556bca415491eb0fd094d0b5827dfe";
}; };
propagatedBuildInputs = [ ifaddr ] propagatedBuildInputs = [ ifaddr ]

4
pkgs/development/tools/documentation/doxygen/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "doxygen-1.8.15"; name = "doxygen-1.8.17";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
"http://doxygen.nl/files/${name}.src.tar.gz" "http://doxygen.nl/files/${name}.src.tar.gz"
]; ];
sha256 = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d"; sha256 = "16dmv0gm1x8rvbm82fmjvi213q8fxqxinm75pcf595flya59ific";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/tools/misc/help2man/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perlPackages, gettext }: { stdenv, fetchurl, perlPackages, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "help2man-1.47.11"; name = "help2man-1.47.12";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz"; url = "mirror://gnu/help2man/${name}.tar.xz";
sha256 = "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar"; sha256 = "0q5ixbxz1v7wqnpg4bq7k7nbv9ssnmcvdbqsq5ycjvniz56ac2vx";
}; };
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];

4
pkgs/development/tools/parsing/bison/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bison"; pname = "bison";
version = "3.5"; version = "3.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "1l8k2fcklwy0y57yidxvk5lbf0kb96ci3zffg2djivk8k05j0dhb"; sha256 = "09bg544pavpsivwh175ghgm7y3mkvdxfbwq41lfbwlb7v4i27vsc";
}; };
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;

4
pkgs/os-specific/linux/intel-compute-runtime/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "intel-compute-runtime"; pname = "intel-compute-runtime";
version = "19.44.14658"; version = "20.02.15268";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "compute-runtime"; repo = "compute-runtime";
rev = version; rev = version;
sha256 = "1pl7yhmgzf7r2b8jyxzmwdc7772gd24izy2z2g4n5s205s125k7x"; sha256 = "138gi92w85bn6haw5x38k39pgiyvvzfhiwpvz6hqlx2j03n8cs2k";
}; };
# Build script tries to write the ICD to /etc # Build script tries to write the ICD to /etc

4
pkgs/servers/mail/mailman/web.nix
View file

@ -1,7 +1,11 @@
{ buildPythonPackage, lib, fetchgit, isPy3k { buildPythonPackage, lib, fetchgit, isPy3k
, git, makeWrapper, sassc, hyperkitty, postorius, whoosh , git, makeWrapper, sassc, hyperkitty, postorius, whoosh
, django
}: }:
if lib.versionOlder "2.2" django.version
then throw "mailman-web requires django < 2.2"
else
buildPythonPackage rec { buildPythonPackage rec {
pname = "mailman-web-unstable"; pname = "mailman-web-unstable";
version = "2019-09-29"; version = "2019-09-29";

31
pkgs/tools/admin/awscli/default.nix
View file

@ -14,39 +14,26 @@ let
sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
}; };
}); });
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
version = "5.1.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81";
};
});
colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
version = "0.4.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "0ba247bx5pc60hcpbf3rjsqk0whilg241i9qdfnlcwij5qgdgvh5";
};
});
}; };
}; };
in py.pkgs.buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "awscli"; pname = "awscli";
version = "1.16.266"; # N.B: if you change this, change botocore to a matching version too version = "1.17.13"; # N.B: if you change this, change botocore to a matching version too
src = py.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9c59a5ca805f467669d471b29550ecafafb9b380a4a6926a9f8866f71cd4f7be"; sha256 = "c42fc35d4e9f82ce72b2a8b8d54df3a57fe363b0763a473e72d0006b0d1e06ff";
}; };
postPatch = ''
substituteInPlace setup.py --replace ",<0.16" ""
'';
# No tests included # No tests included
doCheck = false; doCheck = false;
propagatedBuildInputs = with py.pkgs; [ propagatedBuildInputs = [
botocore botocore
bcdoc bcdoc
s3transfer s3transfer

4
pkgs/tools/networking/modem-manager/default.nix
View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "modem-manager"; pname = "modem-manager";
version = "1.12.2"; version = "1.12.4";
package = "ModemManager"; package = "ModemManager";
src = fetchurl { src = fetchurl {
url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
sha256 = "1si5bnm0d3b5ccpgj7xakl7pgy9mypm8ds6xgj1q0rzds2yx4xjg"; sha256 = "0nx9b6wfz2r29gb3wgsi5vflycibfhnij5wvc068s6hcbrsn2bc5";
}; };
nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ];

4
pkgs/tools/text/gnugrep/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pcre, libiconv, perl }: { stdenv, fetchurl, pcre, libiconv, perl }:
let version = "3.3"; in let version = "3.4"; in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "gnugrep"; pname = "gnugrep";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.xz"; url = "mirror://gnu/grep/grep-${version}.tar.xz";
sha256 = "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r"; sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq";
}; };
# Perl is needed for testing # Perl is needed for testing

19
pkgs/top-level/all-packages.nix
View file

@ -8733,17 +8733,17 @@ in
inherit (darwin) apple_sdk; inherit (darwin) apple_sdk;
}; };
rust_1_40_0 = callPackage ../development/compilers/rust/1_40_0.nix { rust_1_41_0 = callPackage ../development/compilers/rust/1_41_0.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix { rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
rust = rust_1_40_0; rust = rust_1_41_0;
rustPackages_1_40_0 = rust_1_40_0.packages.stable; rustPackages_1_41_0 = rust_1_41_0.packages.stable;
rustPackages_1_38_0 = rust_1_38_0.packages.stable; rustPackages_1_38_0 = rust_1_38_0.packages.stable;
rustPackages = rustPackages_1_40_0; rustPackages = rustPackages_1_41_0;
inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rustPackages) cargo clippy rustc rustPlatform;
inherit (rust) makeRustPlatform; inherit (rust) makeRustPlatform;
@ -9458,6 +9458,7 @@ in
}; };
ruby = ruby_2_6; ruby = ruby_2_6;
rubyPackages = rubyPackages_2_6;
rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems;
rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems;
@ -13830,7 +13831,7 @@ in
kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
syndication threadweaver kirigami2 kholidays kpurpose; syndication threadweaver kirigami2 kholidays kpurpose kcontacts;
### KDE PLASMA 5 ### KDE PLASMA 5
@ -15313,7 +15314,11 @@ in
mailman-rss = callPackage ../development/python-modules/mailman-rss { }; mailman-rss = callPackage ../development/python-modules/mailman-rss { };
mailman-web = with python3.pkgs; toPythonApplication mailman-web; mailman-web = with (python3.override {
packageOverrides = self: super: {
django = self.django_1_11;
};
}).pkgs; toPythonApplication mailman-web;
mattermost = callPackage ../servers/mattermost { }; mattermost = callPackage ../servers/mattermost { };
matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { };
@ -19837,7 +19842,7 @@ in
inherit (kdeApplications) inherit (kdeApplications)
akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;

4
pkgs/top-level/python-packages.nix
View file

@ -3228,7 +3228,9 @@ in {
crayons = callPackage ../development/python-modules/crayons{ }; crayons = callPackage ../development/python-modules/crayons{ };
django = self.django_1_11; django = self.django_lts;
django_lts = self.django_2_2;
django_1_11 = callPackage ../development/python-modules/django/1_11.nix { django_1_11 = callPackage ../development/python-modules/django/1_11.nix {
gdal = self.gdal; gdal = self.gdal;

355
pkgs/top-level/ruby-packages.nix
View file

File diff suppressed because it is too large Load diff