diff options
Diffstat (limited to 'pkgs')
75 files changed, 360 insertions, 211 deletions
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index eafde7957a21..089fffdc0e83 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.5"; + version = "0.5.6"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5"; + sha256 = "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 37677cc211cc..21bcd158f7ae 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.2"; + version = "0.5.3"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "0y2w3rymvc35r291sp2qaxn36wjwvxzk2iaw9y30q9fqc0vlpdns"; + sha256 = "0li6iz1anm8pzz7j12yrfyxlyslsfsksmz0kk0iapa4yx3kifn10"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 69bf41e1e4fb..aef0d013e9fe 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "02xazvz8iaksglbgq3jhw4fq3f5pdcq9sss79jxs082md0mry17d"; + sha256 = "1hk0j63zzdyji5dd89spbyw79i74n28zjryyy0a4gsaq0m7j2dry"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 9729b136d905..0c432acf4afe 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { name = "traverso-${version}"; - version = "0.49.5"; + version = "0.49.6"; src = fetchurl { - url = "http://traverso-daw.org/traverso-0.49.5.tar.gz"; - sha256 = "169dsqrf807ciavrd82d3iil0xy0r3i1js08xshcrn80ws9hv63m"; + url = "http://traverso-daw.org/traverso-0.49.6.tar.gz"; + sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index aa49f0e3d751..bf2de7271abd 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, gsettings-desktop-schemas, gtk3, gobject-introspection, wrapGAppsHook }: let - version = "1.0.140"; - sha256 = "1114v141jayqhvkkxf7dr864j09nf5nz002c7z0pprzr00fifqzx"; + version = "1.0.142"; + sha256 = "0k7lnv3qqz17a2a2d431sic3ggi3373r5k0kwxm4017ama7d72m1"; in stdenv.mkDerivation rec { name = "joplin-${version}"; @@ -12,7 +12,8 @@ in inherit sha256; }; - buildInputs = [ appimage-run ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; unpackPhase = ":"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 15de1a763d90..207f069f86a9 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -11,7 +11,7 @@ , hunspell, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages -, rust-cbindgen, nodejs, nasm +, rust-cbindgen, nodejs, nasm, fetchpatch , debugBuild ? false ### optionals @@ -30,11 +30,13 @@ , privacySupport ? isTorBrowserLike || isIceCatLike # WARNING: NEVER set any of the options below to `true` by default. -# Set to `privacySupport` or `false`. +# Set to `!privacySupport` or `false`. -# webrtcSupport breaks the aarch64 build on version >= 60. +# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63. # https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 -, webrtcSupport ? (if lib.versionAtLeast ffversion "60" && stdenv.isAarch64 then false else !privacySupport) +, webrtcSupport ? !privacySupport && (!stdenv.isAarch64 || !( + lib.versionAtLeast ffversion "60" && lib.versionOlder ffversion "63" + )) , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false @@ -92,6 +94,15 @@ let browserPatches = [ ./env_var_for_system_dir.patch + ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66") [ + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; + sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch"; + sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; + }) ] ++ patches; in diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 464722612c7d..9df43b690fd1 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.15"; - previewVersion = "2.2.0a3"; + previewVersion = "2.2.0a4"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "110mghkhanz92p8vfzyh4199mnihb24smxsc44a8v534ds6hww74"; + sha256Hash = "1a64c314v7mbaiipyap2skqgf69pyp1ld58cn2g3d89w2zrhf5q7"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "104pvrba7n9gp7mx31xg520cfahcy0vsmbzx23007c50kp0nxc56"; + sha256Hash = "1jlz8a34q3s1sz9r6swh3jnlp96602axnvh1byywry5fb9ga8mfy"; }; } diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 2019d9930ef0..54cdf8fa4e15 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "jmeter-${version}"; - version = "4.0"; + version = "5.1"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; + sha256 = "04n7srrg47iyrzhskm2w5g8pd8269kjsly5ixsgifl6aqcbvxpcz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 421a3cfbe3b7..9ce51657031f 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2"; }; - buildInputs = [ libsmbios ]; + buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a131355963ce..0bf2cfce6e4b 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,35 +1,22 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite , inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch +, libcloudproviders }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchgit { url = "git://github.com/nextcloud/desktop.git"; rev = "refs/tags/v${version}"; - sha256 = "0r6jj3vbmwh7ipv83c8w1b25pbfq3mzrjgcijdw2gwfxwx9pfq7d"; + sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr"; fetchSubmodules = true; }; - # Patches contained in next (>2.5.1) release - patches = [ - (fetchpatch { - name = "fix-qt-5.12-build"; - url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch"; - sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n"; - }) - (fetchpatch { - name = "fix-qtwebengine-crash"; - url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch"; - sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0"; - }) - ]; - nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; - buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; + buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index c855277e2259..8bdb7b456c37 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2"; + "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; "i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h"; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 39144935e9cd..7cdc73419538 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, postInstall ? "" }: buildGoPackage rec { - version = "1.1.0"; + version = "1.1.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1qmrh3c4p5vxzjqd0zdmvcqffq75gl4qfg0s8qpkgvdc7qrzzi7i"; + sha256 = "1nkc4ivc8mg9c1njqlkhb9i5f4c1via1rdqfbhwgkj86s6cnxrg7"; }; goPackagePath = "github.com/syncthing/syncthing"; diff --git a/pkgs/applications/networking/syncthing/deps.nix b/pkgs/applications/networking/syncthing/deps.nix index 351b4e30d568..4a58a490cc5a 100644 --- a/pkgs/applications/networking/syncthing/deps.nix +++ b/pkgs/applications/networking/syncthing/deps.nix @@ -392,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "0fcca4842a8d"; - sha256 = "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { @@ -419,8 +419,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "4d1cda033e06"; - sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; }; } { diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 562874ccc136..ab411999a216 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -69,6 +69,11 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; + # The store path to "which" is baked into src/library/base/R/unix/system.unix.R, + # but Nix cannot detect it as a run-time dependency because the installed file + # is compiled and compressed, which hides the store path. + postInstall = "echo ${which} > $out/nix-support/undetected-runtime-dependencies"; + doCheck = true; preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 0ad0b04e7e4b..21c2404f4ee7 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,78 +1,55 @@ { stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, ncurses, systemd, perl +, gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true -}: -let - - version = "2.4.0"; +}: stdenv.mkDerivation rec { name = "vdr-${version}"; + version = "2.4.0"; - mkPlugin = name: stdenv.mkDerivation { - name = "vdr-${name}-${version}"; - inherit (vdr) src; - buildInputs = [ vdr ]; - preConfigure = "cd PLUGINS/src/${name}"; - installFlags = [ "DESTDIR=$(out)" ]; + src = fetchurl { + url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; + sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; }; - vdr = stdenv.mkDerivation { - - inherit name; - - src = fetchurl { - url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; - sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; - }; - - enableParallelBuilding = true; - - postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; + enableParallelBuilding = true; - buildInputs = [ fontconfig libjpeg libcap freetype ] - ++ stdenv.lib.optional enableSystemd systemd - ++ stdenv.lib.optional enableBidi fribidi; + postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; - buildFlags = [ "vdr" "i18n" ] - ++ stdenv.lib.optional enableSystemd "SDNOTIFY=1" - ++ stdenv.lib.optional enableBidi "BIDI=1"; + buildInputs = [ fontconfig libjpeg libcap freetype ] + ++ lib.optional enableSystemd systemd + ++ lib.optional enableBidi fribidi; - nativeBuildInputs = [ perl ]; + buildFlags = [ "vdr" "i18n" ] + ++ lib.optional enableSystemd "SDNOTIFY=1" + ++ lib.optional enableBidi "BIDI=1"; - # plugins uses the same build environment as vdr - propagatedNativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ perl ]; - installFlags = [ - "DESTDIR=$(out)" - "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix - ]; + # plugins uses the same build environment as vdr + propagatedNativeBuildInputs = [ pkgconfig gettext ]; - installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n" - "install-includes" ]; + installFlags = [ + "DESTDIR=$(out)" + "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix + ]; - postInstall = '' - mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin - mkdir -p $out/share/vdr/conf - cp *.conf $out/share/vdr/conf - ''; + installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n" + "install-includes" ]; - outputs = [ "out" "dev" "man" ]; + postInstall = '' + mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin + mkdir -p $out/share/vdr/conf + cp *.conf $out/share/vdr/conf + ''; - meta = with stdenv.lib; { - homepage = http://www.tvdr.de/; - description = "Video Disc Recorder"; - maintainers = [ maintainers.ck3d ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = licenses.gpl2; - }; + outputs = [ "out" "dev" "man" ]; + meta = with lib; { + homepage = http://www.tvdr.de/; + description = "Video Disc Recorder"; + maintainers = [ maintainers.ck3d ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl2; }; -in vdr // { - plugins = { - skincurses = (mkPlugin "skincurses").overrideAttrs( - oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; }); - } // (stdenv.lib.genAttrs [ - "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" - ] mkPlugin); } diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 0e543390c4bb..4fc3783ba510 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,7 +1,24 @@ { stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg -, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }: -{ +, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses }: +let + mkPlugin = name: stdenv.mkDerivation { + name = "vdr-${vdr.version}-${name}"; + inherit (vdr) src; + buildInputs = [ vdr ]; + preConfigure = "cd PLUGINS/src/${name}"; + installFlags = [ "DESTDIR=$(out)" ]; + }; +in { + + skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: { + buildInputs = oldAttr.buildInputs ++ [ ncurses ]; + }); + + inherit (stdenv.lib.genAttrs [ + "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" + ] mkPlugin); + femon = stdenv.mkDerivation rec { name = "vdr-femon-2.4.0"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 91a6a4e67066..908e888503e7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -77,6 +77,11 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2019-3812.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=b05b267840515730dbf6753495d5b7bd8b04ad1c"; + sha256 = "03a5vc5wvirbyi5r8kb2r4m2w6f1zmh9bqsr2psh4pblwar0nf55"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 9f3613fccf0e..53f9ae27c553 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -38,6 +38,7 @@ let go-dbus-generator = callPackage ./go-dbus-generator { }; go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; + qcef = callPackage ./qcef { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix new file mode 100644 index 000000000000..18d64c5645ca --- /dev/null +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, + qtwebchannel, qtx11extras, dtkcore, dtkwidget, qt5integration, + libXScrnSaver, gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, + expat, fontconfig, gdk_pixbuf, glib, gtk2, libX11, libXcomposite, + libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, + libXrender, libXtst, libxcb, pango, pulseaudio, xorg, deepin }: + +let + rpahtLibraries = [ + stdenv.cc.cc.lib # libstdc++.so.6 + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + gdk_pixbuf + glib + gnome2.GConf + gtk2 + libxcb + nspr + nss + pango + pulseaudio + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + ]; + libPath = stdenv.lib.makeLibraryPath rpahtLibraries; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "qcef"; + version = "1.1.4.6"; + + srcs = [ + (fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "06909sd0gf7n4hw6p4j96apjym219zabflgpwjafm7v00bgnwxxs"; + name = pname; + }) + (fetchFromGitHub { + owner = "linuxdeepin"; + repo = "cef-binary"; + rev = "059a0c9cef4e289a50dc7a2f4c91fe69db95035e"; + sha256 = "1h7cq63n94y2a6fprq4g63admh49rcci7avl5z9kdimkhqb2jb84"; + name = "cef-binary"; + }) + ]; + + sourceRoot = pname; + + nativeBuildInputs = [ + pkgconfig + cmake + qttools + deepin.setupHook + ]; + + buildInputs = [ + qtbase + qtwebchannel + qtx11extras + ] ++ rpahtLibraries; + + postUnpack = '' + rmdir ${pname}/cef + ln -s ../cef-binary ${pname}/cef + ''; + + postPatch = '' + searchHardCodedPaths + fixPath $out /usr src/core/qcef_global_settings.{h,cpp} + sed '/COMMAND rm -rf Release Resources/a COMMAND ldd qcef/libcef.so' -i src/CMakeLists.txt + sed '/COMMAND rm -rf Release Resources/a COMMAND patchelf --set-rpath ${libPath} qcef/libcef.so' -i src/CMakeLists.txt + ''; + + postFixup = '' + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Qt5 binding of Chromium Embedded Framework"; + homepage = https://github.com/linuxdeepin/qcef; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 3b4cc86aaaa4..93e76c621822 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; + sha256 = "105hvpn2z3qiyc01wyzpmfbrpmy20kz1nb9j1c2s0kz1r0v92gqi"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix new file mode 100644 index 000000000000..7292debfc3f6 --- /dev/null +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, libuuid, gtest }: + +stdenv.mkDerivation rec { + pname = "lib3mf"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "3MFConsortium"; + repo = pname; + rev = "v${version}"; + sha256 = "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd"; + }; + + nativeBuildInputs = [ cmake ninja ]; + + buildInputs = [ libuuid ]; + + postPatch = '' + rmdir UnitTests/googletest + ln -s ${gtest.src} UnitTests/googletest + ''; + + meta = with stdenv.lib; { + description = "Reference implementation of the 3D Manufacturing Format file standard"; + homepage = "https://3mf.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index a1e43d6d13db..468738224dea 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppxlib"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0qpjl84x8abq9zivifb0k8ld7fa1lrhkbajmmccvfv06ja3as1v4"; + sha256 = "0d2nyp4mlx7m3vdvcdhs51x570vw30j645yfbwlhjpwdd8243fya"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 0e25734cb7c0..1db067838fbb 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3"; + sha256 = "0nvdq15gmkzhwpwkln8wmkq0h4izznnr6zmrnwqza8lsa1c0jz5f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 0dd5e22abf57..2921970ff28a 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "click-completion"; - version = "0.5.0"; + version = "0.5.1"; disabled = (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "0k3chs301cnyq2jfl12lih5fa6r06nmxmbyp9dwvjm09v8f2c03n"; + sha256 = "1ysn6kzv3fgakn0y06i3cxynd8iaybarrygabk9a0pp2spn2w1vq"; }; propagatedBuildInputs = [ click jinja2 shellingham six ]; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 5a27e2b746fd..2ba308596d49 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.97.11"; + version = "0.98.0"; src = fetchPypi { inherit pname version; - sha256 = "8aa5a73d8b140aa3c511a3b5b204a67d391962e90c66b380dd048fcae6ddbb68"; + sha256 = "089h98gpjf9ffxzbkbd9k9wd8n3s7g0nhfpn3rf44h51hllgqxxb"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 6f10e69c0ec7..16e94bd785f0 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "0.8.9"; + version = "0.8.10"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "b6bb626566f2949da409d7a871576271e2d6254dfb3d416b21713dabc4b6b00f"; + sha256 = "1jb22n1jczxgbpcnfiw12r8dcs74556g1d09mzms44f52kgs7lgc"; }; # https://github.com/nicfit/eyeD3/pull/284 diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 5ac7ccd1adc5..4d9d250815a9 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -2,13 +2,13 @@ requests, mt-940, sepaxml, bleach, isPy3k }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.1"; pname = "fints"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78"; + sha256 = "06p6p0xxw0n10hmf7z4k1l29fya0sja433s6lasjr1bal5asdhaq"; }; propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index ff6f0716d714..b8d203d515a9 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.4"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "aec9ab2e3513c9503ec123b1a8573bee55fc6a66e2ac07088c3376bf6738a424"; + sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs"; }; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index c523d7b963c8..92e4542bfef7 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.9.0"; + version = "0.10.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "db7aff4130eb99fd05ab78fd2e2c58843ba0f208899aeb1c14aff9cd98ae8c80"; + sha256 = "1xvk289628l3pp56gidwhmd54cgdczpsxhxfw0bfcsd120k1svfv"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index f1a0efc07139..59dd32053ca6 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "031c624pdqm7cc0xh4yz5k69gqxn2bbrjz13s17684q5shn0ik21"; + sha256 = "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index cdbdcf7d16e2..d53556f0d07a 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.3.1"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e"; + sha256 = "0krf632nz24v2da7g9xivq6l2w9za3vph4vix7mm1k3byzwjnawk"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index 9e49147315b5..c9b49fee4cb6 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "future-fstrings"; - version = "0.4.5"; + version = "1.0.0"; src = fetchPypi { inherit version; pname = "future_fstrings"; - sha256 = "891c5d5f073b3e3ff686bebde0a4c45c479065f45c8cbd6de19323d5a50738a8"; + sha256 = "1pra33in6rinrcs5wvdb1rbxmx223j93ahdwhzwgf7wyfsnjda98"; }; # No tests included in Pypi archive diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index fbbcaa82dd2a..eebf2794d4b2 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "7d66d01af82d22bc37d3ebb1e73713b87ac5e116b3bc82ea4ec0584bbaa89f89"; + sha256 = "0bzm9zgz2gfy6smlvdgxnf6y14rfhr4vj3mjfwlxdx2vcfc95hqa"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index c0ad2dc3ac9b..07fca0d2404c 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.6.1"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875"; + sha256 = "18icw5cbsq4gnhx4vsjwhxzcx11mbnz6kmwgrylkf82m7m1v2921"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 99edea703c60..657a8178440f 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1dp3fakzp0fqdajf6xsfmisdwj1avk4lvxjmw5k9wkhdbpi6vnbm"; + sha256 = "0hriag4d4gx4bsqisiz29478sj54b215p6xzmshlw6x9af4z5vxg"; }; # ImportError: No module named tests diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index 13af20ba79b9..163dbba07f79 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "j2cli"; - version = "0.3.5.post1"; + version = "0.3.6.post1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c0439a79308aae320bfd01d82b56893b02fe461195d8b69b438ba9b333075642"; + sha256 = "1j8s09b75w041b2lawjz341ri997n9fnxbd2ipm9czxj6fhj8hi2"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index cbf966785e17..59d8538bb1e5 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "4.4.1"; + version = "4.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; + sha256 = "0zxx8ffk5ycapy2d41dfgzskl5jfwjc10hsd91jsrax5alkhrh7x"; }; patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 9d111c3eb6fa..5fa8c52a97a8 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "72d916a73957a880cdb885def6d8664a6d1b2760ef5dca5ad665aa1e8d1bb783"; + sha256 = "13b728z5ls0g3p1gq5hvfqg7302clxna5grvgjfwbfzss0avlpjc"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 0f257fb13c20..e68bd1615fa9 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.4.5"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "1p9sr9vl96xz8qrgdrjiql9qkch2qx29pkq7igk28clgc6zbn510"; + sha256 = "01jlklfgvggkyq5yj0zhk46xv91jhha2cshq8kbxv9f7043c201i"; }; checkInputs = [ pytest six mock ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index cce640cce366..604f9bad3c36 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2018.12.19"; + version = "2019.02.23"; src = fetchPypi { inherit pname version; - sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc"; + sha256 = "0rlv9l1w80n2jpw2yy1g6x83rvldwzkmkafdalxkar32czbi2xv4"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 42162d62aac4..1f06f7f250a9 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.9.2"; + version = "3.9.3"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0f515a8r3qz3i2cm4lvs5aw59193jl9mk7bmaj9545n4miyar4nr"; + sha256 = "0v6hgsz6yvp6csgx4y440ksqj24rdsd06vyfqcihiy3dfvp9229y"; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 8582f8a29f92..0d8382f9b6ff 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.0"; + version = "0.16.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c"; + sha256 = "0dv9imc41xg0k9xv0fb8ygfip7iznsnf8g33z74zz2bf1dbhricr"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index fa6ea72129f3..c6e7089cdd9b 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.0"; + version = "0.4.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "15g58z3hy1pgi5sygpif28jyqj79iz4vw2mh5nxdydl4w20micvf"; + sha256 = "1fl6zb36cqsdiay1mn3nmjv5jw4jys5av7hb1y9995qlycg0hm49"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index f592edf2cd90..a274da71ce40 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.4.2"; + version = "1.5.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0c0sklgrmv15ygliin8qq0hp7vanmbi74m6zpi0r1ksr0hssyd5r"; + sha256 = "1nf0cjja94zsfbp8dw83b36c4cmz9v4b0h51yh8g3q2z9w8d2n62"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index ec68cb54afe3..b586a36aa88a 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.1.1"; + version = "0.6.2"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0dlhbgn90nj110kmylyrzxd301611g63ynbpm5dfsb09s9c569zm"; + sha256 = "04qmk1diplpvcdmk0clbsy0mdg04pkmgjjysz31g82v477if9m54"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index f0ac35feefdc..0aa89eb76203 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415"; + sha256 = "1xb68q4rdi0is22cwvrfk1xwg6yngdxcvmjpdlkgmbdxf3y1sy33"; }; prePatch = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 4fcc20d2d0d7..af9232b174cd 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.6"; + version = "8.10.8"; src = fetchPypi { inherit pname version; - sha256 = "2fe47dbf947cc74643ef1a49411466483d1165ced2b62578a14b513dd09642a9"; + sha256 = "1ka7fnlvmvmw984k89mlkdlwbnnyap186a1yfnykx833bp364yg2"; }; meta = { diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ec00a2e400ae..40f2afcafb60 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pika"; - version = "0.13.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1104b0jm7qs9b211hw6siddflvf56ag4lfsjy6yfbczds4lxhf2k"; + sha256 = "119lpjzw8wd7c6ikn35c0pvr3zzfy20rklpxdkcmp12wnf9i597v"; }; # Tests require twisted which is only availalble for python-2.x diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6a2d49996b3d..253288088c46 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.6.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91"; + sha256 = "1gad00c0p56zvmk2yzy03m0f3fcq67q9kdgdfxph2aw905mkwddc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index e08fe05d8226..30ac00155604 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "19c0f950x544ndsdkfhga58x69iiin2vqiz59pqn9mymk2vrlpkg"; + sha256 = "0rwn5ca7ns3yh6bp785zdd2l4018ccpd5i0m2d1fsd9nhxvcgkfj"; }; meta = { diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 7a3d2264c283..a8afd97c4340 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.39.2"; + version = "3.39.3"; src = fetchPypi { inherit pname version; - sha256 = "6eb5135b987caca4212d2c7abc2923d4ad5ba18bb34ccbe7044b3628f52efc2c"; + sha256 = "0fgy4327xzn232br4as74r6ddg5v6ycmfwga7xybp4s1w0cm8nwf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 624dca05e1e3..e17ec16f436d 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.3"; + version = "2018.2.5"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6"; + sha256 = "1qgi6diw9m7yldmql9kh08792053ib6zkplh8v2mqv6waaflmrnn"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index ccb9ae782aa9..53e1fce493d1 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "214fc59d06fb81696fce3028b56dff522168ac1cfc784cfc0077b7b1e425b4cd"; + sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw"; }; # package has no tests diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 53f06cff9221..5bd6722939b6 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "7ad4ff0c2166f0296ee070049ce21341f868f907003714eb6eaf1630ea8e241a"; + sha256 = "045bjs8na3q0fy8zzq4pghyz05d9aid1lcv11992f62z2jrf6m2q"; }; propagatedBuildInputs = [ param ]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index ecc531d82cec..d0bea83ad268 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f"; + sha256 = "0gjg7farw6mkmrwqcg6ms7j74g8py2msvawddji4wy8yfvql1ifl"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 6306267ba2ac..f5a563545a10 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.18"; + version = "1.0.22"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "05miivbn2c5slc5nn7fpdn1da42qwzg4z046i71f4r70bc49vsj9"; + sha256 = "1gx48qjiahlwflmjlkndp3ricd03jmzfx7i9ffgq7a2i6gcm36zp"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 0ec53528df2e..287ae0391df3 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; - version = "1.0.12"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1wc62d0f80kw1kjv8nlxychh0iy66a6pydi4vfvhh2shffm935fx"; + sha256 = "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi"; }; # The package does not ship tests, and the setup machinary confuses diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index b91709446b3f..66340f917704 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rope"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7"; + sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index 623b94124d13..c57d10cf8908 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.0"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "09219c45hafq6pb8z6rsinsfhp3rsx5mr9cgz2099rcs4if2gk6g"; + sha256 = "1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index d3d78620a3de..f08d8c47c826 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d"; + sha256 = "0ija4pl8wg36ldsdv5jmqr5i75qi17vijcwwf2jdn1k15kqg35j4"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 9a589ccf1f87..25acc4f88bce 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "1.4.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "cf9701dac0111c09ea009ab06cbb81f27b1d9c23ebf58ebdf08b6994a37f13ac"; + sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 997c4a2deeb6..cf5243296613 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.11.3"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1pc4p7yxvmhn3x121wgslwclaqnjlx51wxs6ihb4cxynh2vcwgfc"; + sha256 = "1wspvvp8hh9ar7pl6w1qhmakajsjsg4cm11pmi4a422jqmid0vw5"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 7b7dab1481e7..7dc0b7b88e97 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib +, file, libvirt, glib, vips, taglib, libopus , libselinux ? null, libsepol ? null }@args: @@ -275,6 +275,15 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + opus-ruby = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace lib/opus-ruby.rb \ + --replace "ffi_lib 'opus'" \ + "ffi_lib '${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + }; + ovirt-engine-sdk = attrs: { buildInputs = [ curl libxml2 ]; }; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index c811b8a99e91..d9d70f64d73e 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "07fwp5sczyivdz37ag9fa258gr9jbz3k3395hp5db7cwizaip2vm"; + sha256 = "1hdwgsw3ggmdzv523wq037kjxhxqp1xq8n8m1qb22vvdj7l1dwd0"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index 8def71568e79..f0a4f6c34e25 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -52,6 +52,6 @@ in stdenv.mkDerivation { homepage = "https://cr.yp.to/cdb"; license = lib.licenses.publicDomain; maintainers = [ lib.maintainers.Profpatsch ]; - platforms = [ lib.platforms.unix ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 286e408e2555..50fb7ba19c40 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.4"; + name = "tintin-2.01.7"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "1g7bh8xs1ml0iyraps3a3dzaycci922y7fk5j0wyr4ssyjzsy8nx"; + sha256 = "033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d803817a03e5..f49d7de1a53d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "4.14.111"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 9f8ebab4e91c..85a8ff54df4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "4.19.34"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index aefac13e4e75..a418e4b4bcc0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "5.0.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 99f5ac312177..7a86b05dafca 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -48,10 +48,7 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Rewrite the expression - sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - fi + sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d0d0480e5eae..3138cc8ee1e3 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.5"; + version = "15.0.6"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "125ra0rdgk17d8s80i54w0s58dqvjgkdpcxbczchqd3sg6dqcqa6"; + sha256 = "1k1c0wlrhdpkvwf7iq8yjxd8gqmmj7dyd913rqzrg9jbnvz5jc82"; }; installPhase = '' diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 7381238e4acb..77f15aa99b6d 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.7.0"; + version = "8.7.4"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw"; + sha256 = "0mcax1qg5i4iqlvgkz3s0c938d7ymx24pv3q2n3w2pjylnnd489s"; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 57ab0bab5167..38a24eddc288 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "wget-${version}"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "0a29qsqxkk8145vkyy35q5a1wc7qzwx3qj3gmfrkmi9xs96yhqqg"; + sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"; }; patches = [ diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 294aa1576801..e565b37fc9ee 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.5.1"; + version = "5.6.0"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; - sha256 = "1x8kj1yr3b7b6qrvc5b8mm90ff3m4qdbdqplvzii2xlkpvik92ff"; + sha256 = "0v4hn72npjlcf5aaw3kqmvf05vf15mp2r1s2nbj5ggxpprjj6dsm"; }; nativeBuildInputs = [ pkgconfig python3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09fd0e1bcc3e..c91c8a32f600 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10763,6 +10763,8 @@ in lib3ds = callPackage ../development/libraries/lib3ds { }; + lib3mf = callPackage ../development/libraries/lib3mf { }; + libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -23568,7 +23570,7 @@ in ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; vdr = callPackage ../applications/video/vdr { }; - vdrPlugins = vdr.plugins // (recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { })); + vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; |