diff options
Diffstat (limited to 'pkgs')
192 files changed, 1673 insertions, 813 deletions
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 6695b9a7237..3e8360e1eaf 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: stdenv.mkDerivation { - version = "2018-10-11"; + version = "2020-07-23"; pname = "cmusfm-unstable"; src = fetchFromGitHub { owner = "Arkq"; repo = "cmusfm"; - rev = "ad2fd0aad3f4f1a25add1b8c2f179e8859885873"; - sha256 = "0wpwdwgyrp64nvwc6shy0n387p31j6aw6cnmfi9x2y1jhl5hbv6b"; + rev = "73df3e64d8aa3b5053b639615b8f81d512420e52"; + sha256 = "1p9i65v8hda9bsps4hm9m2b7aw9ivk4ncllg8svyp455gn5v8xx6"; }; # building configureFlags = [ "--enable-libnotify" ]; diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix new file mode 100644 index 00000000000..031203dda75 --- /dev/null +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, boost, flac, id3lib, pkg-config +, taglib, zlib }: + +stdenv.mkDerivation rec { + pname = "dsf2flac"; + version = "unstable-2018-01-02"; + + src = fetchFromGitHub { + owner = "hank"; + repo = pname; + rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16"; + sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc"; + }; + + buildInputs = [ boost flac id3lib taglib zlib ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + preConfigure = '' + export LIBS="$LIBS -lz" + ''; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + + meta = with stdenv.lib; { + description = "A DSD to FLAC transcoding tool"; + homepage = "https://github.com/hank/dsf2flac"; + license = licenses.gpl2; + maintainers = with maintainers; [ dmrauh ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 77a04221b84..76b5617d23c 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , unzip +, copyDesktopItems , makeDesktopItem , imagemagick , SDL @@ -37,7 +38,7 @@ in stdenv.mkDerivation rec { }; sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src"; - nativeBuildInputs = [ unzip imagemagick ]; + nativeBuildInputs = [ copyDesktopItems unzip imagemagick ]; buildInputs = [ SDL ]; # PREFIX gets treated as BINDIR. @@ -51,11 +52,16 @@ in stdenv.mkDerivation rec { # Other files get installed during the build phase. installPhase = '' + runHook preInstall + convert goattrk2.bmp goattracker.png install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png - ${desktopItem.buildCommand} + + runHook postInstall ''; + desktopItems = [ desktopItem ]; + meta = { description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" + optionalString isStereo " - Stereo version"; @@ -66,4 +72,3 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index e027680f5fe..c243a81ac2e 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -13,8 +13,7 @@ with pythonPackages; buildPythonApplication rec { sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v"; }; - buildInputs = with pythonPackages; [ feedparser ]; - propagatedBuildInputs = buildInputs; + propagatedBuildInputs = [ setuptools feedparser ]; meta = with stdenv.lib; { homepage = "https://github.com/manolomartinez/greg"; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index fa779a7f0f4..3765d2ca678 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,14 +1,15 @@ -{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -mkDerivation { +mkDerivation rec { pname = "iannix"; - version = "2016-01-31"; + version = "0.9.20-b"; + src = fetchFromGitHub { owner = "iannix"; repo = "IanniX"; - rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755"; - sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; + rev = "v${version}"; + sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q="; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -20,11 +21,11 @@ mkDerivation { enableParallelBuilding = true; - meta = { - description = "Graphical open-source sequencer,"; + meta = with lib; { + description = "Graphical open-source sequencer"; homepage = "https://www.iannix.org/"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 0de043d35db..83b1ef3b043 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.9.5"; + version = "3.9.6"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd"; + sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg"; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index cdf36bc3c21..43ab2a796eb 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -355,9 +355,6 @@ rec { url = "https://download.jboss.org/drools/release/${version}/droolsjbpm-tools-distribution-${version}.zip"; sha512 = "2qzc1iszqfrfnw8xip78n3kp6hlwrvrr708vlmdk7nv525xhs0ssjaxriqdhcr0s6jripmmazxivv3763rnk2bfkh31hmbnckpx4r3m"; extraPostFetch = '' - # work around https://github.com/NixOS/nixpkgs/issues/38649 - chmod go-w $out; - # update site is a couple levels deep, alongside some other irrelevant stuff cd $out; find . -type f -not -path ./binaries/org.drools.updatesite/\* -exec rm {} \; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix index 512f1f09207..4b67f760976 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-auto-pairs"; - version = "2019-07-27"; + version = "2020-07-14"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "886449b1a04d43e5deb2f0ef4b1aead6084c7a5f"; - sha256 = "0knfhdvslzw1f1r1k16733yhkczrg3yijjz6n2qwira84iv3239j"; + rev = "5b4b3b723c34c8b7f40cee60868204974349bf9f"; + sha256 = "1wgrv03f1lkzflbbaz8n23glij5rvfxf8pcqysd668mbx1hcrk9i"; }; installPhase = '' diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix index 4db60e53ad2..51740b5ad60 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitLab , qmake -, qtbase , qtcharts , qtsvg , marble @@ -12,18 +11,17 @@ mkDerivation rec { pname = "zombietrackergps"; - version = "1.01"; + version = "1.03"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; rev = "v_${version}"; - sha256 = "0h354ydbahy8rpkmzh5ym5bddbl6irjzklpcg6nbkv6apry84d48"; + sha256 = "1rmdy6kijmcxamm4mqmz8638xqisijlnpv8mimgxywpf90h9rrwq"; }; buildInputs = [ ldutils - qtbase qtcharts qtsvg marble.dev @@ -49,7 +47,8 @@ mkDerivation rec { meta = with lib; { description = "GPS track manager for Qt using KDE Marble maps"; - homepage = "https://gitlab.com/ldutils-projects/zombietrackergps"; + homepage = "https://www.zombietrackergps.net/ztgps/"; + changelog = "https://www.zombietrackergps.net/ztgps/history.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sohalt ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 7bb4e921794..6ffe1e2de8a 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared-mime-info, + extra-cmake-modules, shared-mime-info, qtbase, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: @@ -10,6 +10,7 @@ mkDerivation { meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13"; }; patches = [ ./0001-akonadi-paths.patch diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index e9505a72e85..15dfe7f2e49 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -8,6 +8,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; + broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase karchive ]; diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-passwordsafe/default.nix index 7b0553f7f9e..dc84b312626 100644 --- a/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -5,7 +5,7 @@ , gettext , fetchFromGitLab , python3 -, libhandy +, libhandy_0 , libpwquality , wrapGAppsHook , gtk3 @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib gdk-pixbuf - libhandy + libhandy_0 ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 11b373ac131..a081076ac83 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.36"; + version = "7.37"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j"; + sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index f561f15ab3e..f3d8d5cbc20 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; sha256 = "0srkzivxa4qlf3x9zdkri7xfq7kjj4fsmn978vzmzsvbxkqswd5a"; - extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; installPhase = '' diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index e3b7c48d2b4..3acb7754505 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -25,7 +25,7 @@ }: let - version = "4.3.4"; + version = "4.4"; binpath = stdenv.lib.makeBinPath [ cabextract @@ -65,7 +65,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "019dvb55zqrhlbx73p6913807ql866rm0j011ix5mkk2g79dzhqp"; + sha256 = "0n40927c8cnjackfns68zwl7h4d7dvhf7cyqdkazzwwx4k2xxvma"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ac924730989..4987988eb3e 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -26,6 +26,7 @@ , libXext , libXfixes , libXi +, libxkbcommon , libXrandr , libXrender , libXScrnSaver @@ -61,6 +62,7 @@ rpath = lib.makeLibraryPath [ libdrm libpulseaudio libX11 + libxkbcommon libXScrnSaver libXcomposite libXcursor @@ -68,6 +70,7 @@ rpath = lib.makeLibraryPath [ libXext libXfixes libXi + libxkbcommon libXrandr libXrender libXtst @@ -86,11 +89,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.16.76"; + version = "1.17.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1nbgiwflmr3ik428yarmnpx10dmqai2m4k910miqd92mwmfb0pib"; + sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 92434806a12..988f47f3bfb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -386,4 +386,6 @@ buildStdenv.mkDerivation ({ # on aarch64 this is also required dontUpdateAutotoolsGnuConfigScripts = true; + + requiredSystemFeatures = [ "big-parallel" ]; }) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 543d5925547..73a095b0827 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core +, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa , libxkbcommon, wayland # ozone/wayland @@ -38,7 +38,7 @@ , chromium , gsettings-desktop-schemas -, gnome2, gnome3 +, gnome3 }: with stdenv.lib; @@ -49,8 +49,6 @@ let }; version = chromium.upstream-info.version; - gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; - gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr @@ -65,7 +63,7 @@ let kerberos libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio - ++ [ gtk ]; + ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -79,10 +77,10 @@ in stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + gnome3.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index f3f5f54f409..63afa5ce76f 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, wrapPython }: +{ stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }: with lib; @@ -13,6 +13,13 @@ stdenv.mkDerivation { sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff"; }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch"; + sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ="; + }) + ]; + nativeBuildInputs = [ wrapPython ]; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 3b1fb255b6e..9c99741823a 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2"; + sha256 = "0n86cdpw85qzlcr1ynvar0f0zbphmdz1jia9r75lmj07iw4r5hk9"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 761d7cfcbd4..521e60c78f0 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, autoPatchelfHook, writeScript }: +{ stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.12.1"; + version = "3.13.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "1dxbnk12ry6arn1p38hpv5jfak55pmfmxkkl7aihn3sp1aizpgyg" - else "0nfzx7pbzd95a7v08g29l84sc0lnv9fx8vz3mrmzhs0xqn9gxdkq"; + then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz" + else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g"; }; - buildInputs = [ stdenv.cc.cc ]; + buildInputs = [ stdenv.cc.cc postgresql.lib ]; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 8560a8b9447..c9dd22f1831 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2"; + sha256 = "1y0k9vfb4818b3s313jlxbpjwdxd62cc4kc1vpxdjvs8mx543vrv"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index ee5b7c5e17b..60dc1205484 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -4,6 +4,7 @@ , bzip2 , cargo , common-updater-scripts +, copyDesktopItems , coreutils , curl , dbus @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo + copyDesktopItems gnused llvmPackages.llvm m4 @@ -262,8 +264,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = let - desktopItem = makeDesktopItem { + desktopItems = [ + (makeDesktopItem { categories = lib.concatStringsSep ";" [ "Application" "Network" ]; desktopName = "Thunderbird"; genericName = "Mail Reader"; @@ -283,12 +285,11 @@ stdenv.mkDerivation rec { "x-scheme-handler/snews" "x-scheme-handler/nntp" ]; - }; - in '' + }) + ]; + postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - - ${desktopItem.buildCommand} ''; preFixup = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8295e8dbc87..b692fe7d9c8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -2,6 +2,7 @@ , bzip2 , cargo , common-updater-scripts +, copyDesktopItems , coreutils , curl , dbus @@ -82,6 +83,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo + copyDesktopItems gnused llvmPackages.llvm m4 @@ -257,8 +259,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = let - desktopItem = makeDesktopItem { + desktopItems = [ + (makeDesktopItem { categories = lib.concatStringsSep ";" [ "Application" "Network" ]; desktopName = "Thunderbird"; genericName = "Mail Reader"; @@ -278,12 +280,12 @@ stdenv.mkDerivation rec { "x-scheme-handler/snews" "x-scheme-handler/nntp" ]; - }; - in '' + }) + ]; + + postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - - ${desktopItem.buildCommand} ''; preFixup = '' @@ -321,6 +323,8 @@ stdenv.mkDerivation rec { gnugrep curl runtimeShell; }; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with stdenv.lib; { description = "A full-featured e-mail client"; homepage = "https://www.thunderbird.net"; diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix new file mode 100644 index 00000000000..f4d41ee79e6 --- /dev/null +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, qttools +, cmake +, clang +, grpc +, protobuf +, openssl +, pkgconfig +, c-ares +, abseil-cpp +, libGL +, zlib +}: + +mkDerivation rec { + pname = "qv2ray"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "Qv2ray"; + repo = "Qv2ray"; + rev = "v${version}"; + sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI="; + fetchSubmodules = true; + }; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DQV2RAY_DISABLE_AUTO_UPDATE=on" + "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" + ]; + + preConfigure = '' + export _QV2RAY_BUILD_INFO_="Qv2ray Nixpkgs" + export _QV2RAY_BUILD_EXTRA_INFO_="(Nixpkgs build) nixpkgs" + ''; + + buildInputs = [ + libGL + zlib + grpc + protobuf + openssl + abseil-cpp + c-ares + ]; + + nativeBuildInputs = [ + cmake + clang + pkgconfig + qmake + qttools + ]; + + meta = with stdenv.lib; { + description = "An GUI frontend to v2ray"; + homepage = "https://qv2ray.github.io/en/"; + license = licenses.gpl3; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 1140bb9bee2..ec8e2b396c5 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; sha256 = "091dhjkx7fdn23cj7c4071swncsbmknpvidmmjzhc0355l3p4k2g"; - extraPostFetch = "chmod go-w $out"; }; tools = [ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e0399a0cdf6..e11aea576e9 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -409,7 +409,11 @@ in (mkDrv rec { librevenge libe-book libmwaw glm ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] - ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + gst-libav + ]) ++ lib.optional kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]; passthru = { diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 29ca574a417..fbde26058e1 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper +{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems # Dynamic Libraries , curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender @@ -27,6 +27,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook + copyDesktopItems makeWrapper ]; @@ -110,17 +111,14 @@ in stdenv.mkDerivation { # remove broken symbolic links find $out -xtype l -ls -exec rm {} \; - # Add desktop items - ${desktopItems.planmaker.buildCommand} - ${desktopItems.presentations.buildCommand} - ${desktopItems.textmaker.buildCommand} - # Add mime types install -D -t $out/share/mime/packages ${pname}/mime/softmaker-*office*${shortEdition}.xml runHook postInstall ''; + desktopItems = builtins.attrValues desktopItems; + meta = with stdenv.lib; { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index cc8412e1ac5..9ab7446fe3c 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -12,7 +12,7 @@ , cups , dbus , expat -, ffmpeg_3 +, ffmpeg , fontconfig , freetype , gdk-pixbuf @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.9505"; + version = "11.1.0.9615"; src = fetchurl { - url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9505/wps-office_11.1.0.9505.XA_amd64.deb"; - sha256 = "1bvaxwd3npw3kswk7k1p6mcbfg37x0ym4sp6xis6ykz870qivqk5"; + url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9615/wps-office_11.1.0.9615.XA_amd64.deb"; + sha256 = "0dpd4njpizclllps3qagipycfws935rhj9k5gmdhjfgsk0ns188w"; }; unpackCmd = "dpkg -x $src ."; sourceRoot = "."; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cairo dbus.lib expat - ffmpeg_3 + ffmpeg fontconfig freetype gdk-pixbuf diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 106d2103ec4..7aab2b8fd64 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.13.5"; + version = "2.14"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx"; + sha256 = "1iz4lgk99v5bwzk35wi4jg8nn3gbp0vm1p6svs42mxxxf9f99j7i"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 9adb8e3674b..e09abccad12 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.17"; + version = "14.31.18"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1cg3a56bbvlq5wfjgwclg9vsj61kmj6fnqvgf7fdvklhdvnijla2"; + sha256 = "0hkc7c08azbw3k91ygwz6r5y4yw6k8l7h4gcq5p71knd5k1fa5jd"; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 4d3acb331d5..e61017ea330 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, -libzip, boost, fftw, qtbase, -libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl +{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake +, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl +, libsigrokdecode4dsl, python3, fetchpatch }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "dsview"; - version = "0.99"; + version = "1.12"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; - rev = version; - sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2"; + rev = "v${version}"; + sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U="; }; - postUnpack = '' - export sourceRoot=$sourceRoot/DSView - ''; + sourceRoot = "source/DSView"; patches = [ # Fix absolute install paths ./install.patch + + # Fix buld with Qt5.15 already merged upstream for future release + # Using local file instead of content of commit #33e3d896a47 because + # sourceRoot make it unappliable + ./qt515.patch ]; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + python3 ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; + maintainers = with maintainers; [ bachp ]; }; } diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch index e30a28d80fa..75c3e962865 100644 --- a/pkgs/applications/science/electronics/dsview/install.patch +++ b/pkgs/applications/science/electronics/dsview/install.patch @@ -2,10 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c1c33e1..208a184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) - install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) - install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) - install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) +@@ -427,8 +427,8 @@ + install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) + install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) + install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/) +install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) diff --git a/pkgs/applications/science/electronics/dsview/qt515.patch b/pkgs/applications/science/electronics/dsview/qt515.patch new file mode 100644 index 00000000000..552f2062ec5 --- /dev/null +++ b/pkgs/applications/science/electronics/dsview/qt515.patch @@ -0,0 +1,13 @@ +diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp +index 921d3db..16cdce9 100755 +--- a/pv/view/viewport.cpp ++++ b/pv/view/viewport.cpp +@@ -37,7 +37,7 @@ + + #include <QMouseEvent> + #include <QStyleOption> +- ++#include <QPainterPath> + + #include <math.h> + diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 5c445459a36..c9e97375b6c 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -3,7 +3,7 @@ }: let - version = "1.6.0"; + version = "1.7.0"; arch = "x86_64"; desktopItem = makeDesktopItem rec { @@ -25,7 +25,7 @@ in stdenv.mkDerivation { inherit version; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm"; + sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix new file mode 100644 index 00000000000..e1cf5a0f08d --- /dev/null +++ b/pkgs/applications/science/math/gretl/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, curl, fftw, gmp, gnuplot, gtk3, gtksourceview3, json-glib +, lapack, libxml2, mpfr, openblas, pkg-config, readline }: + +stdenv.mkDerivation rec { + pname = "gretl"; + version = "2020b"; + + src = fetchurl { + url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; + sha256 = "0mpb8gc0mcfql8lzwknpkf1sg7mj9ikzd8r1x5xniabd9mmdhplm"; + }; + + buildInputs = [ + curl + fftw + gmp + gnuplot + gtk3 + gtksourceview3 + json-glib + lapack + libxml2 + mpfr + openblas + readline + ]; + + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A software package for econometric analysis"; + longDescription = '' + gretl is a cross-platform software package for econometric analysis, + written in the C programming language. + ''; + homepage = "http://gretl.sourceforge.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ dmrauh ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 477d9ca3ea6..bf6591a8cb9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -203,6 +203,8 @@ let inherit (darwin.apple_sdk.frameworks) Security AppKit; }; + glab = callPackage ./glab { }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix new file mode 100644 index 00000000000..9c2e4f00ca7 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "glab"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "profclems"; + repo = pname; + rev = "v${version}"; + sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw="; + }; + + vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc="; + runVend = true; + + # Tests are trying to access /homeless-shelter + doCheck = false; + + subPackages = [ "cmd/glab" ]; + + meta = with lib; { + description = "An open-source GitLab command line tool"; + license = licenses.mit; + homepage = "https://glab.readthedocs.io/"; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 48667ad8be3..b574c03248f 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true @@ -6,25 +6,26 @@ with stdenv.lib; -buildGoPackage rec { +buildGoModule rec { pname = "gogs"; - version = "0.11.91"; + version = "0.12.3"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "1yfimgjg9n773kdml17119539w9736mi66bivpv5yp3cj2hj9mlj"; + sha256 = "0ix3mxy8cpqbx24qffbzyf5z88x7605icm7rk5n54r8bdsr7cckd"; }; - patches = [ ./static-root-path.patch ]; + vendorSha256 = "0m0g4dsiq8p2ngsbjxfi3wff7x4xpm67qlhgcgf8b48mqai4d2gc"; + + subPackages = [ "." ]; postPatch = '' patchShebangs . - substituteInPlace pkg/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper openssh ]; buildInputs = optional pamSupport pam; @@ -34,18 +35,12 @@ buildGoPackage rec { ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); - outputs = [ "out" "data" ]; - postInstall = '' - mkdir $data - cp -R $src/{public,templates} $data wrapProgram $out/bin/gogs \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; - goPackagePath = "github.com/gogs/gogs"; - meta = { description = "A painless self-hosted Git service"; homepage = "https://gogs.io"; diff --git a/pkgs/applications/version-management/gogs/static-root-path.patch b/pkgs/applications/version-management/gogs/static-root-path.patch deleted file mode 100644 index 9eaa72a0c85..00000000000 --- a/pkgs/applications/version-management/gogs/static-root-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go -index f206592d..796da6ef 100644 ---- a/pkg/setting/setting.go -+++ b/pkg/setting/setting.go -@@ -474,7 +474,7 @@ func NewContext() { - LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/") - OfflineMode = sec.Key("OFFLINE_MODE").MustBool() - DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() -- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) -+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") - AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") - EnableGzip = sec.Key("ENABLE_GZIP").MustBool() - diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 0e23eac9a86..6863ef9ca62 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -481,12 +481,12 @@ let self = rec { plugin = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.3.12"; + version = "2.4.6"; src = fetchFromGitHub { owner = "peak3d"; repo = "inputstream.adaptive"; - rev = version; + rev = "${version}-${rel}"; sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; }; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 535913c6f2b..7aef0bfd035 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "2020.09.1"; + version = "2020.09.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1by52b56s9c3h23n40iccygkazwlhii2gb28zhnj2xz5805j05y2"; + sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; }; patches = [ diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 89b4fecc206..5bdb04688ca 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation { - name = "lemonbar-1.3"; + name = "lemonbar-1.4"; src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz"; - sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza"; + url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; + sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; }; buildInputs = [ libxcb perl ]; diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index c61df8ceb00..44748f231bc 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -44,8 +44,13 @@ mv "$unpackDir/$fn" "$out" '' else '' mv "$unpackDir" "$out" - '') #*/ - + extraPostFetch; + '') + + extraPostFetch + # Remove write permissions for files unpacked with write bits set + # Fixes https://github.com/NixOS/nixpkgs/issues/38649 + + '' + chmod -R a-w "$out" + ''; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 142109cef49..84d1b2300f1 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -15,7 +15,7 @@ ++ [(mkRustcDepArgs dependencies crateRenames)] ++ [(mkRustcFeatureArgs crateFeatures)] ++ extraRustcOpts - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro" diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 18587f7047c..5ada40b3b9b 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -135,8 +135,8 @@ in '' export CARGO_MANIFEST_DIR=$(pwd) export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" - export TARGET="${rust.toRustTarget stdenv.hostPlatform}" - export HOST="${rust.toRustTarget stdenv.buildPlatform}" + export TARGET="${rust.toRustTargetSpec stdenv.hostPlatform}" + export HOST="${rust.toRustTargetSpec stdenv.buildPlatform}" export PROFILE=${if release then "release" else "debug"} export OUT_DIR=$(pwd)/target/build/${crateName}.out export CARGO_PKG_VERSION_MAJOR=${lib.elemAt version 0} diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index f6177ce198d..8e47a2b0bf2 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -4,6 +4,10 @@ , cargo , diffutils , fetchCargoTarball +, runCommandNoCC +, rustPlatform +, callPackage +, remarshal , git , rust , rustc @@ -26,12 +30,15 @@ , cargoBuildFlags ? [] , buildType ? "release" , meta ? {} -, target ? null +, target ? rust.toRustTargetSpec stdenv.hostPlatform , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} , cargoParallelTestThreads ? true +# Toggles whether a custom sysroot is created when the target is a .json file. +, __internal_dontAddSysroot ? false + # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the # case for `rustfmt`/etc from the `rust-sources). @@ -69,13 +76,26 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; - rustTarget = if target == null then rust.toRustTarget stdenv.hostPlatform else target; + targetIsJSON = stdenv.lib.hasSuffix ".json" target; + useSysroot = targetIsJSON && !__internal_dontAddSysroot; + + # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 + # the "${}" is needed to transform the path into a /nix/store path before baseNameOf + shortTarget = if targetIsJSON then + (stdenv.lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) + else target; + + sysroot = (callPackage ./sysroot {}) { + inherit target shortTarget; + RUSTFLAGS = args.RUSTFLAGS or ""; + originalCargoToml = src + /Cargo.toml; # profile info is later extracted + }; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - releaseDir = "target/${rustTarget}/${buildType}"; + releaseDir = "target/${shortTarget}/${buildType}"; tmpDir = "${releaseDir}-tmp"; # Specify the stdenv's `diff` by abspath to ensure that the user's build @@ -85,7 +105,13 @@ let in -stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { +# Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`. +# See https://os.phil-opp.com/testing/ for more information. +assert useSysroot -> !(args.doCheck or true); + +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optionalAttrs useSysroot { + RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); +} // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; @@ -115,7 +141,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${rustTarget}"] + [target."${shortTarget}"] "linker" = "${ccForHost}" ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' @@ -185,7 +211,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ - --target ${rustTarget} \ + --target ${target} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) @@ -205,7 +231,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { ''; checkPhase = args.checkPhase or (let - argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; + argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} diff --git a/pkgs/build-support/rust/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock new file mode 100644 index 00000000000..61fcef61744 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/Cargo.lock @@ -0,0 +1,29 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "alloc" +version = "0.0.0" +dependencies = [ + "compiler_builtins", + "core", +] + +[[package]] +name = "compiler_builtins" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369" +dependencies = [ + "rustc-std-workspace-core", +] + +[[package]] +name = "core" +version = "0.0.0" + +[[package]] +name = "rustc-std-workspace-core" +version = "1.99.0" +dependencies = [ + "core", +] diff --git a/pkgs/build-support/rust/sysroot/cargo.py b/pkgs/build-support/rust/sysroot/cargo.py new file mode 100644 index 00000000000..09f6fba6d1c --- /dev/null +++ b/pkgs/build-support/rust/sysroot/cargo.py @@ -0,0 +1,45 @@ +import os +import toml + +rust_src = os.environ['RUSTC_SRC'] +orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None + +base = { + 'package': { + 'name': 'alloc', + 'version': '0.0.0', + 'authors': ['The Rust Project Developers'], + 'edition': '2018', + }, + 'dependencies': { + 'compiler_builtins': { + 'version': '0.1.0', + 'features': ['rustc-dep-of-std', 'mem'], + }, + 'core': { + 'path': os.path.join(rust_src, 'libcore'), + }, + }, + 'lib': { + 'name': 'alloc', + 'path': os.path.join(rust_src, 'liballoc/lib.rs'), + }, + 'patch': { + 'crates-io': { + 'rustc-std-workspace-core': { + 'path': os.path.join(rust_src, 'tools/rustc-std-workspace-core'), + }, + }, + }, +} + +if orig_cargo is not None: + with open(orig_cargo, 'r') as f: + src = toml.loads(f.read()) + if 'profile' in src: + base['profile'] = src['profile'] + +out = toml.dumps(base) + +with open('Cargo.toml', 'x') as f: + f.write(out) diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix new file mode 100644 index 00000000000..4db7cf0dc39 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -0,0 +1,41 @@ +{ stdenv, rust, rustPlatform, buildPackages }: + +{ shortTarget, originalCargoToml, target, RUSTFLAGS }: + +let + cargoSrc = stdenv.mkDerivation { + name = "cargo-src"; + preferLocalBuild = true; + phases = [ "installPhase" ]; + installPhase = '' + RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} ORIG_CARGO=${originalCargoToml} \ + ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} + mkdir -p $out + cp Cargo.toml $out/Cargo.toml + cp ${./Cargo.lock} $out/Cargo.lock + ''; + }; +in rustPlatform.buildRustPackage { + inherit target RUSTFLAGS; + + name = "custom-sysroot"; + src = cargoSrc; + + RUSTC_BOOTSTRAP = 1; + __internal_dontAddSysroot = true; + cargoSha256 = "0y6dqfhsgk00y3fv5bnjzk0s7i30nwqc1rp0xlrk83hkh80x81mw"; + + doCheck = false; + + installPhase = '' + export LIBS_DIR=$out/lib/rustlib/${shortTarget}/lib + mkdir -p $LIBS_DIR + for f in target/${shortTarget}/release/deps/*.{rlib,rmeta}; do + cp $f $LIBS_DIR + done + + export RUST_SYSROOT=$(rustc --print=sysroot) + host=${rust.toRustTarget stdenv.buildPlatform} + cp -r $RUST_SYSROOT/lib/rustlib/$host $out + ''; +} diff --git a/pkgs/build-support/rust/sysroot/update-lockfile.sh b/pkgs/build-support/rust/sysroot/update-lockfile.sh new file mode 100755 index 00000000000..83d29832384 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/update-lockfile.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p python3 python3.pkgs.toml cargo + +set -e + +HERE=$(dirname "${BASH_SOURCE[0]}") +NIXPKGS_ROOT="$HERE/../../../.." + +# https://unix.stackexchange.com/a/84980/390173 +tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile') + +cd "$tempdir" +nix-build -E "with import (/. + \"${NIXPKGS_ROOT}\") {}; pkgs.rustPlatform.rustcSrc.override { minimalContent = false; }" +RUSTC_SRC="$(pwd)/result" python3 "$HERE/cargo.py" +RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's needed is the lockfile." + +cp Cargo.lock "$HERE" + +rm -rf "$tempdir" + + diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh new file mode 100644 index 00000000000..f96a10f33d5 --- /dev/null +++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh @@ -0,0 +1,42 @@ +# shellcheck shell=bash + +# Setup hook that installs specified desktop items. +# +# Example usage in a derivation: +# +# { …, makeDesktopItem, copyDesktopItems, … }: +# +# let desktopItem = makeDesktopItem { … }; in +# stdenv.mkDerivation { +# … +# nativeBuildInputs = [ copyDesktopItems ]; +# +# desktopItems = [ desktopItem ]; +# … +# } +# +# This hook will copy files which are either given by full path +# or all '*.desktop' files placed inside the 'share/applications' +# folder of each `desktopItems` argument. + +postInstallHooks+=(copyDesktopItems) + +copyDesktopItems() { + if [ "${dontCopyDesktopItems-}" = 1 ]; then return; fi + + if [ -z "$desktopItems" ]; then + return + fi + + for desktopItem in $desktopItems; do + if [[ -f "$desktopItem" ]]; then + echo "Copying '$f' into '$out/share/applications'" + install -D -m 444 -t "$out"/share/applications "$f" + else + for f in "$desktopItem"/share/applications/*.desktop; do + echo "Copying '$f' into '$out/share/applications'" + install -D -m 444 -t "$out"/share/applications "$f" + done + fi + done +} diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index c9a549462c1..03dd7a49cda 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.9"; + version = "1.10"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "11fzd44ysy76iwyiwkshpf0vf6m3i3hcxyyihl0lg68nb3cv0g9y"; + sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; }; sourceRoot = "."; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 2107cad4a5b..79334e5b194 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zfh48ibap6jnw20rxls7nbv4zzqs6n5abr2dzyvfx5p2cmq2gha"; + sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; }; patches = [ diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 74c076c204b..25876cc6380 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -24,9 +24,10 @@ if platform.isDarwin then "macos" else platform.parsed.kernel.name; - # Target triple. Rust has slightly different naming conventions than we use. + # Returns the name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. toRustTarget = platform: with platform.parsed; let - cpu_ = platform.rustc.arch or { + cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; @@ -34,6 +35,13 @@ in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + # Returns the name of the rust target if it is standard, or the json file + # containing the custom target spec. + toRustTargetSpec = platform: + if (platform.rustc or {}) ? platform + then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) + else toRustTarget platform; + # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions from # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index 8977fb84caf..489795ecec4 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -1,4 +1,4 @@ -{ stdenv, rustc }: +{ stdenv, rustc, minimalContent ? true }: stdenv.mkDerivation { name = "rust-src"; @@ -6,6 +6,9 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mv src $out - rm -rf $out/{ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch} + rm -rf $out/{${if minimalContent + then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch" + else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor" + }} ''; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 65d8920c4a4..1fd3bbaba92 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,4 +1,5 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget +, targetPackages , fetchurl, file, python3 , llvm_10, darwin, cmake, rust, rustPlatform , pkgconfig, openssl @@ -70,9 +71,9 @@ in stdenv.mkDerivation rec { "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTarget stdenv.buildPlatform}" - "--host=${rust.toRustTarget stdenv.hostPlatform}" - "--target=${rust.toRustTarget stdenv.targetPlatform}" + "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" + "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--target=${rust.toRustTargetSpec stdenv.targetPlatform}" "${setBuild}.cc=${ccForBuild}" "${setHost}.cc=${ccForHost}" @@ -92,6 +93,8 @@ in stdenv.mkDerivation rec { "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ "--enable-profiler" # build libprofiler_builtins + ] ++ optionals stdenv.targetPlatform.isMusl [ + "${setTarget}.musl-root=${targetPackages.stdenv.cc.libc}" ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 26bd8a8f360..e6ab1f21879 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -18,8 +18,8 @@ , ucsEncoding ? 4 # For the Python package set , packageOverrides ? (self: super: {}) -, buildPackages , pkgsBuildBuild +, pkgsBuildHost , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget @@ -28,6 +28,7 @@ , passthruFun , static ? false , enableOptimizations ? (!stdenv.isDarwin) +, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: assert x11Support -> tcl != null @@ -38,9 +39,8 @@ assert x11Support -> tcl != null with stdenv.lib; let - - pythonAttr = "python${sourceVersion.major}${sourceVersion.minor}"; - pythonForBuild = buildPackages.${pythonAttr}; + buildPackages = pkgsBuildHost; + inherit (passthru) pythonForBuild; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -49,11 +49,12 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch pythonForBuild; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + inherit hasDistutilsCxxPatch; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; } // { inherit ucsEncoding; }; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 02777063a77..cd06c2b6367 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -19,12 +19,11 @@ , nukeReferences # For the Python package set , packageOverrides ? (self: super: {}) -, buildPackages , pkgsBuildBuild +, pkgsBuildHost , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget -, pythonForBuild ? buildPackages.${pythonAttr} , sourceVersion , sha256 , passthruFun @@ -58,7 +57,8 @@ assert bluezSupport -> bluez != null; with stdenv.lib; let - + buildPackages = pkgsBuildHost; + inherit (passthru) pythonForBuild; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -67,11 +67,12 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch pythonForBuild; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + inherit hasDistutilsCxxPatch; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; }; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; @@ -95,8 +96,6 @@ let hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - inherit pythonForBuild; - pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" else pythonForBuild.interpreter; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 19a7f44de36..2f350738238 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -14,12 +14,12 @@ with pkgs; , packageOverrides , sitePackages , hasDistutilsCxxPatch - , pythonPackagesBuildBuild - , pythonForBuild # provides pythonPackagesBuildHost - , pythonPackagesBuildTarget - , pythonPackagesHostHost - , self # is pythonPackagesHostTarget - , pythonPackagesTargetTarget + , pythonOnBuildForBuild + , pythonOnBuildForHost + , pythonOnBuildForTarget + , pythonOnHostForHost + , pythonOnTargetForTarget + , self # is pythonOnHostForTarget }: let pythonPackages = callPackage ({ pkgs, stdenv, python, overrides }: let @@ -28,11 +28,11 @@ with pkgs; python = self; }; otherSplices = { - selfBuildBuild = pythonPackagesBuildBuild; - selfBuildHost = pythonForBuild.pkgs; - selfBuildTarget = pythonPackagesBuildTarget; - selfHostHost = pythonPackagesHostHost; - selfTargetTarget = pythonPackagesTargetTarget; + selfBuildBuild = pythonOnBuildForBuild.pkgs; + selfBuildHost = pythonOnBuildForHost.pkgs; + selfBuildTarget = pythonOnBuildForTarget.pkgs; + selfHostHost = pythonOnHostForHost.pkgs; + selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget. }; keep = self: { # TODO maybe only define these here so nothing is needed to be kept in sync. @@ -99,7 +99,10 @@ with pkgs; inherit sourceVersion; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; - inherit hasDistutilsCxxPatch pythonForBuild; + inherit hasDistutilsCxxPatch; + # TODO: rename to pythonOnBuild + # Not done immediately because its likely used outside Nixpkgs. + pythonForBuild = pythonOnBuildForHost; tests = callPackage ./tests.nix { python = self; @@ -188,7 +191,6 @@ in { # Minimal versions of Python (built without optional dependencies) python3Minimal = (python38.override { self = python3Minimal; - pythonForBuild = pkgs.buildPackages.python3Minimal; # strip down that python version as much as possible openssl = null; readline = null; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 0647ce87864..8feeb3c51bf 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -5,10 +5,16 @@ , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget , sourceVersion , pythonVersion , sha256 , passthruFun +, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}" }: assert zlibSupport -> zlib != null; @@ -25,12 +31,11 @@ let sitePackages = "site-packages"; hasDistutilsCxxPatch = false; - # No cross-compiling for now. - pythonForBuild = self; - pythonPackagesBuildBuild = {}; - pythonPackagesBuildTarget = {}; - pythonPackagesHostHost = {}; - pythonPackagesTargetTarget = {}; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; diff --git a/pkgs/development/libraries/ldutils/default.nix b/pkgs/development/libraries/ldutils/default.nix index 6d7745b0e32..5f09c08d4d1 100644 --- a/pkgs/development/libraries/ldutils/default.nix +++ b/pkgs/development/libraries/ldutils/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitLab -, qtbase , qtcharts , qtsvg , qmake @@ -9,17 +8,16 @@ mkDerivation rec { pname = "ldutils"; - version = "1.01"; + version = "1.03"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; rev = "v_${version}"; - sha256 = "09k2d5wj70xfr3sb4s9ajczq0lh65705pggs54zqqqjxazivbmgk"; + sha256 = "0pi05py71hh5vlhl0kjh9wxmd7yixw10s0kr2wb4l4c0abqxr82j"; }; buildInputs = [ - qtbase qtcharts qtsvg ]; diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 09456433c1a..25422c8b7d9 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "1d6ql4vq338dvz61d5im06dh8m9rqfk37f9i356j3njpq604i1f6"; + sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d"; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f436f947d0a..42c680835f1 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.2"; + version = "1.5.2.pl01"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "09sjrvq8xsj1gnl2wwyv4lbmicyzzl6x1ac2rrn53xnp34bxnckv"; + sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index 413e404ce1d..8cdbdbd747a 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { - name = "libnova-0.12.3"; + pname = "libnova"; + version = "0.16"; - src = fetchurl { - url = "mirror://sourceforge/libnova/${name}.tar.gz"; - sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; + # pull from git repo because upstream stopped tarball releases after v0.15 + src = fetchgit { + url = "https://git.code.sf.net/p/libnova/${pname}"; + rev = "v${version}"; + sha256 = "0icwylwkixihzni0kgl0j8dx3qhqvym6zv2hkw2dy6v9zvysrb1b"; }; + nativeBuildInputs = [ + autoreconfHook + ]; + meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = "http://libnova.sf.net"; - platforms = platforms.unix; license = licenses.gpl2; + maintainers = with maintainers; [ hjones2199 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 55171cd3de4..2ceb2125dbc 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.38.0"; + version = "2.40.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "12rs0gklgzn8bplqjmaxixk04pr870i333mmcp9i5bhkn8x86zbx"; + sha256 = "KZNriNDxRKR14KFJrAbzZLfSQ3iiZ8PKC80fVh0AQls="; }; buildInputs = [ diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index e9b89e83907..64eb6d79abd 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nlopt"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "stevengj"; repo = pname; rev = "v${version}"; - sha256 = "1k6x14lgyfhfqpbs7xx8mrgklp8l6jkkcs39zgi2sj3kg6n0hdc9"; + sha256 = "0xm8y9cg5p2vgxbn8wn8gqfpxkbm0m4qsidp0bq1dqs8gvj9017v"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index d9b04781ba1..8b070671fe4 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" '' else '' - export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; preConfigure = '' diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index f4c9e1e7117..cedffcaaef9 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -63,7 +63,8 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - TARGET = buildPackages.rust.toRustTarget stdenvNoCC.targetPlatform; + # TODO: should be hostPlatform + TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 42ba4f25204..3943c4dbbca 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -17,13 +17,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "blis"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; rev = version; - sha256 = "13g9kg7x8j9icg4frdq3wpl2cmp0jnh93mw48daa7ym399w17423"; + sha256 = "0fp0nskydan3i7sj7qkabwc9sjh7mw73pjpgzh50qchkkcv0s3n1"; }; inherit blas64; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 6b83b5c051d..fa506733c16 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "07yz459xnj7cs99mfhnq8wr9cvkrnbd479scqyxz55nlimrg8dc9"; + sha256 = "106yhsjwjadxsl9dqxywg287mdwsksman02hdalhav18vcnvnlpj"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index e08aea2e1ee..05b23e25aff 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; + sha256 = "0czk8xw1jra0fjf6w4bcaridyz3wz2br3v7ik1g7z0j5grx9n8r1"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 546fc904ffc..5e04c73c302 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.6"; + name = "ocaml${ocaml.version}-extlib-1.7.7"; src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz"; - sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 852c3b63c4e..2ebdaa2f577 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mongodb"; - version = "1.8.2"; - sha256 = "01l300204ph9nd7khd9qazpdbi1biqvmjqbxbngdfjk9n5d8vvzw"; + version = "1.9.0"; + sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 411c6353ea7..1cbcdb9a73d 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.55"; + version = "0.12.57"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "1qyywsivfal1d8485v2iyg5x3f9krnviv5nidgfv53ywrm9k4lgp"; + sha256 = "0i1ycfmi638myl9840k4rl0z9klk0q25l8ykkkfg20kx5mdidvgc"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 129fbaf4ed3..272ed24f51a 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psalm"; - version = "4.1.1"; + version = "4.2.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "05qjrg8wxlqxihv7xl31n73ygx7ykvcpbh2gq958iin4rr1bcy88"; + sha256 = "0g6s3bn8aaggpqjgr0bqchgkgb4my5ksfycyyqy7nrly2bgn1kbz"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 76a55f70f0b..53b0fe5e1cc 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "2.9.8"; - sha256 = "12igfrdfisqfmfqpc321g93pm2w1y7h24bclmxjrjv6rb36bcmgm"; + version = "3.0.0"; + sha256 = "0qnaqgn2rdjxc70lyrm3nmy7cfma69c7zn6if23hhkhx5kl0fl44"; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 00a08b3e7a8..84aef2dfb03 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -1,32 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch -, pep8, nose, unittest2, docutils, blockdiag, reportlab }: +{ stdenv, buildPythonPackage, fetchPypi +, nose, docutils, blockdiag, reportlab }: buildPythonPackage rec { pname = "actdiag"; - version = "0.5.4"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af"; + sha256 = "0g51v9dmdq18z33v332f1f0cmb3hqgaga5minj0mc2sglark1s7h"; }; - patches = fetchpatch { - name = "drop_test_pep8.py.patch"; - url = "https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw"; - sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4"; - }; - - buildInputs = [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = [ blockdiag ]; + propagatedBuildInputs = [ blockdiag docutils ]; - checkInputs = [ reportlab ]; + checkInputs = [ nose reportlab ]; meta = with stdenv.lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index be51a1248a2..f77c938b1d7 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.25"; + version = "1.1.26"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054"; + sha256 = "b2866238aea5d7492cfb0282fc8b8d5f6d06fb433872345864d45753c10b6e4f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 16fc468d044..0ad45dceb2b 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.8.2"; + version = "1.9.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "621b53271f7988b766f8a7d7f7a2c44241e3d2c1d8db13e68089d6da6241748e"; + sha256 = "ef8ae93a2ce8b595f231395579be11aadc1838168cbc2582e2d0bbd8b15c461f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 4cea19742b9..e7d2d5c83ac 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.4.1"; + version = "1.5.0"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7b071089faf0789059ac24052e311e2b096a002c173d42b96896db09c6e2ba5d"; + sha256 = "872adfa760b2efdd62595659b283deba92d47b7a67557eb9ff48f0b5d04ee396"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 400d421ee09..a622c6a94c9 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "0.61.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f5cceea3add04e9445ea88492f15eecf6c126f0406d967c95f6e48b79be8db75"; + sha256 = "9a9fc16866b46387853381ab4fa0f84c1765e0afea5b0124709ea9fae10ee752"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 8ce4201a2d4..2aca8fdbd7d 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "17.0.0"; + version = "18.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c7350b404e5d10a548ceddb034394c8fad6c852ce33a3d3b211065813c1da404"; + sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index a693820a14f..7a4d8005c9e 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "2.0.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b"; + sha256 = "9f624df0664ba80ba886bc96ffe5e468c620eb5b681bc3bc2a28ce26042fd465"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 41089fdeaed..8e93026b602 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "10.0.0"; + version = "14.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9b44b2d0b281fc1999324a715fb5cf4f47d392a35bc0a01f24bb8dbc4c123acd"; + sha256 = "fbb13448fb52a4090ee91940ae8676403dbe8ae81044b7a5cd3c9e58b47d66de"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index e7e8c91acca..c824f3725a7 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a3906fa77edfedfcc3229dc3b69489d5ed63b107c7eacbc50092e6cbfbfd83f0"; + sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index b91a9ea398c..3814770b2e5 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "1.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723"; + sha256 = "15e4140870f2756fbd43965ccceca55361a634a0504bbdb033a1909eff14dfb1"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 81b886bed22..fb43f130ba3 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "6.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "db999e104edeee3a13a8ceb1881e15196fe03a02635e0e20855eb52c1e2ecca1"; + sha256 = "8ae563e3df82a2f206d0483ae6f05d93d0d1835111c0bbca7236932521eed356"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 5c437e472dd..9de17636b23 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c0d232cdb5ad74f4590db2e44df74c0872fcb9fded7f03c7b57188a63b54ecfa"; + sha256 = "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 1c63c61e24e..2deaf2b91dd 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "1.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bb37d97eb3798740a0bc1bfa37b04946a193a6d1a3b0849fdc5e1dc2a9f25d81"; + sha256 = "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 5fe942a220f..60c1022e603 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.24.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "da391ed00d82cd8e20ca50affdc43b99fd9a7919b54a3a0d53c73cb41eea09d3"; + sha256 = "c7904f8798fbb285a2160c41c8bd7a416c6bd987f5d36a9b98c16f41e24e9f47"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 13369eb014b..2135853ff9d 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.4.0"; + version = "0.5.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "ebd4dcb980a6425f4db7dd94225332b6bd74e1089b0c6e57af868d96ceab1d3c"; + sha256 = "4eb76230c38525b71eb1addefebd265bc3d9b68ba7ff60ce5356d39f68ed2837"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 32c0542ca45..f02bee6befe 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.48.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "da0f9e3b57528c72a7bc92e3515413a4a4fdbc9626c26ac04b7551a7739a81ec"; + sha256 = "c4b218a5d1353cd7c55b39c9b2bd1b13bfbe3b8a71bc735122b171eab81670d1"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 9c48f5b56c2..2f61a2d9bad 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -3,6 +3,7 @@ , fetchPypi , uamqp , azure-common +, azure-core , msrestazure , futures , isPy3k @@ -10,17 +11,18 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.3"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4"; + sha256 = "875527251c1fed99fcb90597c6abb7daa4bc0ed88e080b4c36f897b704668450"; }; buildInputs = [ uamqp azure-common + azure-core msrestazure ] ++ lib.optionals (!isPy3k) [ futures diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index dc955ff3799..9ded3d5c761 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.5.0"; + version = "12.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1469a5a0410296fb5ff96c326618d939c9cb0c0ea45eb931c89c98fa742d8daa"; + sha256 = "dc7832d48ae3f5b31a0b24191084ce6ef7d8dfbf73e553dfe34eaddcb6813be3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index b8a642f665c..ad228046449 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.2.0"; + version = "12.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b649ed8afd67c10c9833f349a7c579d771a6425ad6b88027130a6b8cfa433ffb"; + sha256 = "9f24a0ab51fd7ad294353594660b21081233f68ed8ee7483cdca26a70ce0ccbc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index ceaa31874ec..ff53884ef37 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils -, pillow, webcolors, funcparserlib +{ stdenv, buildPythonPackage, fetchFromGitHub +, setuptools, funcparserlib, pillow, webcolors, reportlab, docutils }: buildPythonPackage rec { pname = "blockdiag"; - version = "1.5.3"; + version = "2.0.1"; - src = fetchurl { - url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; - sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; + src = fetchFromGitHub { + owner = "blockdiag"; + repo = "blockdiag"; + rev = version; + sha256 = "1cvcl66kf4wdh2n4fdk37zk59lp58wd2fhf84n7pbn0lilyksk5x"; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + propagatedBuildInputs = [ setuptools funcparserlib pillow webcolors reportlab docutils ]; - propagatedBuildInputs = [ pillow webcolors funcparserlib ]; - - # One test fails: - # ... - # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) + # require network and fail doCheck = false; meta = with stdenv.lib; { @@ -25,6 +23,6 @@ buildPythonPackage rec { homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix b/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix deleted file mode 100644 index 6190adcba5f..00000000000 --- a/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, blockdiag -}: - -buildPythonPackage rec { - pname = "blockdiagcontrib-cisco"; - version = "0.1.8"; - - src = fetchPypi { - inherit pname version; - sha256 = "06iw3q1w4g3lbgcmyz8m93rv0pfnk2gp8k83rs9ir671ym99gwr2"; - }; - - buildInputs = [ blockdiag ]; - - meta = with stdenv.lib; { - description = "Noderenderer plugin for blockdiag containing Cisco networking symbols"; - homepage = "https://bitbucket.org/blockdiag/blockdiag-contrib/"; - maintainers = [ maintainers.bjornfor ]; - license = licenses.psfl; - }; - -} diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix new file mode 100644 index 00000000000..6a86a2000d2 --- /dev/null +++ b/pkgs/development/python-modules/hjson/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "hjson"; + version = "3.0.2"; + + # N.B. pypi src tarball does not have tests + src = fetchFromGitHub { + owner = "hjson"; + repo = "hjson-py"; + rev = "v${version}"; + sha256 = "1jc7j790rcqnhbrfj4lhnz3f6768dc55aij840wmx16jylfqpc2n"; + }; + + meta = with stdenv.lib; { + description = "A user interface for JSON"; + homepage = "https://github.com/hjson/hjson-py"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix new file mode 100644 index 00000000000..16ee8dcbace --- /dev/null +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, python +, gcc10 +, cmake +, boost172 +, icu +, swig +, pcre +, opencascade-occt +, opencollada +, libxml2 +}: + +buildPythonPackage rec { + pname = "ifcopenshell"; + version = "0.6.0b0"; + format = "other"; + + src = fetchFromGitHub { + owner = "IfcOpenShell"; + repo = "IfcOpenShell"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1ad1s9az41z2f46rbi1jnr46mgc0q4h5kz1jm9xdlwifqv9y04g1"; + }; + + patches = [ + (substituteAll { + name = "site-packages.patch"; + src = ./site-packages.patch; + site_packages = "lib/${python.libPrefix}/site-packages"; + }) + ]; + + nativeBuildInputs = [ gcc10 cmake ]; + + buildInputs = [ + boost172 + icu + pcre + libxml2 + ]; + + preConfigure = '' + cd cmake + ''; + + cmakeFlags = [ + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + "-DOCC_LIBRARY_DIR=${opencascade-occt}/lib" + "-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada" + "-DOPENCOLLADA_LIBRARY_DIR=${opencollada}/lib/opencollada" + "-DSWIG_EXECUTABLE=${swig}/bin/swig" + "-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2" + "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}" + ]; + + meta = with stdenv.lib; { + description = "Open source IFC library and geometry engine"; + homepage = http://ifcopenshell.org/; + license = licenses.lgpl3; + maintainers = with maintainers; [ fehnomenal ]; + }; +} diff --git a/pkgs/development/python-modules/ifcopenshell/site-packages.patch b/pkgs/development/python-modules/ifcopenshell/site-packages.patch new file mode 100644 index 00000000000..e61fe2056f7 --- /dev/null +++ b/pkgs/development/python-modules/ifcopenshell/site-packages.patch @@ -0,0 +1,32 @@ +--- a/src/ifcwrap/CMakeLists.txt ++++ b/src/ifcwrap/CMakeLists.txt +@@ -68,26 +68,17 @@ endif() + # directory in which the wrapper can be installed. + FIND_PACKAGE(PythonInterp) + IF(PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "") +- EXECUTE_PROCESS( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import get_python_lib; sys.stdout.write(get_python_lib(1))" +- OUTPUT_VARIABLE python_package_dir +- ) +- +- IF("${python_package_dir}" STREQUAL "") +- MESSAGE(WARNING "Unable to locate Python site-package directory, unable to install the Python wrapper") +- ELSE() + FILE(GLOB_RECURSE sourcefiles "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/*.py") + FOREACH(file ${sourcefiles}) + FILE(RELATIVE_PATH relative "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/" "${file}") + GET_FILENAME_COMPONENT(dir "${relative}" DIRECTORY) + INSTALL(FILES "${file}" +- DESTINATION "${python_package_dir}/ifcopenshell/${dir}") ++ DESTINATION "@site_packages@/ifcopenshell/${dir}") + ENDFOREACH() + INSTALL(FILES "${CMAKE_BINARY_DIR}/ifcwrap/ifcopenshell_wrapper.py" +- DESTINATION "${python_package_dir}/ifcopenshell") ++ DESTINATION "@site_packages@/ifcopenshell") + INSTALL(TARGETS _ifcopenshell_wrapper +- DESTINATION "${python_package_dir}/ifcopenshell") +- ENDIF() ++ DESTINATION "@site_packages@/ifcopenshell") + ELSE() + MESSAGE(WARNING "No Python interpreter found, unable to install the Python wrapper") + ENDIF() diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index b7fbe41f691..c0f6fe92050 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inflect"; - version = "4.1.0"; + version = "5.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "def6f3791be9181f0c01e0bf5949304007ec6e04c6674fbef7cc49c657b8a9a5"; + sha256 = "d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 59c3f47d2ca..69774b58eb6 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "127n4sqdcip1ld42w9wz49pxkpvi765qzvivvwl26720n11zq5cd"; + sha256 = "190xw3cvk4amr9pl8ip2i7k3xdjd0231kn2zl6chny5axx22p1dv"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 50b81cef945..66cb8ea774f 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -1,19 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder +{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder , sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch }: buildPythonPackage rec { pname = "mautrix"; - version = "0.5.8"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0"; + sha256 = "0bnflaz0nkjvps3b87ig02d3pymnrgrwcd0p0s6qyzx9s08lcz5x"; }; propagatedBuildInputs = [ aiohttp - future-fstrings # defined in optional-requirements.txt sqlalchemy @@ -22,7 +21,7 @@ buildPythonPackage rec { lxml ]; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; # no tests available doCheck = false; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index 91f7ecf9667..82ef6fc77f0 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.2.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9"; + sha256 = "0qbq5qn46053aclpwyzac5zs2xgqirn4hwrf1plrg0m8bnhxy8sm"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index e67868912f2..6bbdc6f5e5f 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.5.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7efb0256c96a7b2eadab49ce29ecdb91352a91440c12a40bed44303724b62fda"; + sha256 = "15mx1fakz9c5qrrspsckd3yr3l5lac0pbjq8v65r26n3203xx5f9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 65325f70b45..5834dd76036 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -41,7 +41,10 @@ buildPythonPackage rec { install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf" install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf" - cp -ra powerline/bindings/{bash,fish,shell,tcsh,tmux,vim,zsh} $out/share/ + install -dm755 "$out/share/fish/vendor_functions.d" + install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish" + + cp -ra powerline/bindings/{bash,shell,tcsh,tmux,vim,zsh} $out/share/ rm $out/share/*/*.py ''; diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 2c0c23ebdca..3ad238f553d 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "2.1.1"; + version = "3.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1iap9rzxx9pkvz6im3px8xj37pb098lvvf9yiqh93qq5w68w6jka"; + sha256 = "407adfe8c748a6bb7e68a430ebe3766ffe51e43fc5442f78b261229c03078be4"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index e14af1b21c8..9b4f7cc9271 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "799fa5fc172ff0a5bc8eb5dfcd1db200747c114320d2dc40060594a71efa3e53"; + sha256 = "a5c8805759114aac3a1db1b20f42af1124da5315be903ccb4c472cc8452393fb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 6b366ee517c..44e19997569 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "5.2.2"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c"; + sha256 = "5b4240808a6d21eab9c49e69ad5ac0cb3efb03fe2e94763d23c860f85ec6a799"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ] diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index f8c0661f0cd..4772c13d9c3 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,16 +2,15 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.14.0"; + version = "1.17.5"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq"; + sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m"; }; propagatedBuildInputs = [ - async_generator rsa pyaes ]; diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 02269cdbfb2..29764259910 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , internetarchive , fetchPypi -, youtube-dl +, youtube-dlc , docopt , isPy27 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + propagatedBuildInputs = [ internetarchive docopt youtube-dlc ]; pythonImportsCheck = [ "tubeup" ]; diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 6e1dc982567..b93050144eb 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -53,7 +53,10 @@ buildPythonPackage rec { export DETERMINISTIC_TESTS=true ''; - disabledTests = [ "test_verbosity" ]; + disabledTests = [ + "test_verbosity" + "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837 + ]; meta = with stdenv.lib; { homepage = "https://github.com/pimutils/vdirsyncer"; diff --git a/pkgs/development/python-modules/youtube-dlc/default.nix b/pkgs/development/python-modules/youtube-dlc/default.nix new file mode 100644 index 00000000000..9599828e65e --- /dev/null +++ b/pkgs/development/python-modules/youtube-dlc/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "youtube_dlc"; + version = "2020.11.11.post3"; + + src = fetchPypi { + inherit pname version; + sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM="; + }; + + # They are broken + doCheck = false; + + pythonImportsCheck = [ "youtube_dlc" ]; + + meta = with lib; { + homepage = "Media downloader supporting various sites such as youtube"; + description = "https://github.com/blackjack4494/yt-dlc"; + platforms = platforms.linux; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 384385356d0..a3865e2c52c 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.8.0"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "04pf76iyrbq2h2hksx0r2fmnd0d9mi6an24zvfv7k79rch11cql1"; + sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index ea417daa584..dbb45df40c2 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pack"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "0i3lzfn5m38f8aiwqydffdq2j8gfcnkmcgasfjxbn6rrs0hw5g92"; + sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c"; }; vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7"; diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 71050356069..925d10b23b4 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.flexw ]; }; } diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d394103cb70..48250d7ceb3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -36,6 +36,7 @@ rec { i686-linux = "bf96b1736141737bb064e48bdb543302fd259de634b1790b7cf930525f47859f"; armv7l-linux = "2d970b3020627e5381fd4916dd8fa50ca9556202c118ab4cba09c293960689e9"; aarch64-linux = "938b7cc5f917247a120920df30374f86414b0c06f9f3dc7ab02be1cadc944e55"; + headers = "0943wc2874s58pkpzm1l55ycgbhv60m62r8aix88gl45i6zngb2g"; }; electron_5 = mkElectron "5.0.13" { @@ -44,6 +45,7 @@ rec { i686-linux = "ccf4a5ed226928a30bd3ea830913d99853abb089bd4a6299ffa9fa0daa8d026a"; armv7l-linux = "96ad83802bc61d87bb952027d49e5dd297f58e4493e66e393b26e51e09065add"; aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; + headers = "0najajj1kjj0rbqzjvk9ipq0pgympwad77hs019cz2m8ssaxqfrv"; }; electron_6 = mkElectron "6.1.12" { @@ -52,6 +54,7 @@ rec { i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; + headers = "0im694h8wqp31yzncwfnhz5g1ijrmqnypcakl0h7xcn7v25yp7s3"; }; electron_7 = mkElectron "7.3.3" { @@ -60,6 +63,7 @@ rec { i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; + headers = "0ink72nac345s54ws6vlij2mjixglyn5ygx14iizpskn4ka1vr4b"; }; electron_8 = mkElectron "8.5.5" { @@ -68,14 +72,16 @@ rec { i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74"; armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874"; aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; + headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - electron_9 = mkElectron "9.3.4" { - x86_64-linux = "4791d854886cba4f461f37db41e6be1fbd8e41e7da01f215324f1fe19ad18ebf"; - x86_64-darwin = "d6878093683ef901727d3b557f1ac928de86b7fffd2abd2c8315d0a9cfe20375"; - i686-linux = "bd3cc9ddab3a9e54499f98e68b12f0aa30554c6527e1434b78743041aaae9417"; - armv7l-linux = "1b175fe3e83494015714afb298b756187053dd84604746c60649a2abbb49ee36"; - aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3"; + electron_9 = mkElectron "9.3.5" { + x86_64-linux = "9db6610289a4e0ce39c71501384baef5a58dde24d947fdead577f2a6b59123aa"; + x86_64-darwin = "d30aca66a0280a47284a3625d781c62fd0bb9b7f318bb05b8b34751ee14a3a78"; + i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61"; + armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f"; + aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30"; + headers = "10snhi8q0izd3aqdfymhidfja34n4xbmd7h3lzghcczp77is2i5b"; }; electron_10 = mkElectron "10.1.6" { @@ -84,13 +90,15 @@ rec { i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e"; armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951"; aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; + headers = "1qj6s0h612hwmh4nzafz406vybr1rhskal2mcm1ll62rnzf98k3z"; }; - electron_11 = mkElectron "11.0.2" { - x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636"; - x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516"; - i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8"; - armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d"; - aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0"; + electron_11 = mkElectron "11.0.3" { + x86_64-linux = "e2b397142ea10f494c9922ee0176fef1ea4a1899a3064feb038c9505e57fb1ff"; + x86_64-darwin = "32d5eeb03447203e1ae797bf273baf6fb7775ef0db9a3cfa875fdcddf7286027"; + i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729"; + armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e"; + aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0"; + headers = "1r2s7088g72nanjc0fqrz1gqrbf1akrq6b7a9w6x7wj95ysc85q0"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 4e3f3511b96..ee3609783c2 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -33,6 +33,11 @@ let sha256 = hash; }; + headersFetcher = vers: hash: fetchurl { + url = "https://atom.io/download/electron/v${vers}/node-v${vers}-headers.tar.gz"; + sha256 = hash; + }; + tags = { i686-linux = "linux-ia32"; x86_64-linux = "linux-x64"; @@ -47,6 +52,7 @@ let common = platform: { inherit name version meta; src = fetcher version (get tags platform) (get hashes platform); + passthru.headers = headersFetcher version hashes.headers; }; electronLibPath = with stdenv.lib; makeLibraryPath ( diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh index de380fd5223..d6c5d94ec41 100755 --- a/pkgs/development/tools/electron/print-hashes.sh +++ b/pkgs/development/tools/electron/print-hashes.sh @@ -20,6 +20,7 @@ SYSTEMS=( ) hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" +headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node-v${VERSION}-headers.tar.gz")" # Entry similar to the following goes in default.nix: @@ -30,4 +31,6 @@ for S in "${!SYSTEMS[@]}"; do echo " $S = \"$hash\";" done +echo " headers = \"$headers\";" + echo " };" diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 8605ef398a1..63c7e01a4b8 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, oniguruma }: +{ stdenv, nixosTests, fetchurl, oniguruma }: stdenv.mkDerivation rec { pname = "jq"; - version="1.6"; + version = "1.6"; src = fetchurl { - url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256="0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; + url = + "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + sha256 = "0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; }; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; buildInputs = [ oniguruma ]; - configureFlags = - [ + configureFlags = [ "--bindir=\${bin}/bin" "--sbindir=\${bin}/bin" "--datadir=\${doc}/share" "--mandir=\${man}/share/man" - ] - # jq is linked to libjq: + ] + # jq is linked to libjq: ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; @@ -30,8 +30,10 @@ stdenv.mkDerivation rec { $bin/bin/jq --help >/dev/null ''; + passthru.tests = { inherit (nixosTests) jq; }; + meta = with stdenv.lib; { - description = ''A lightweight and flexible command-line JSON processor''; + description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 24722741184..e955a844dc8 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.22.0-02"; + version = "3.28.1-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "12433fgva03gsgi37xqgkdnbglgq4b66lmzk5cyxfg22szl4xvwz"; + sha256 = "0qba2qaz85hf0vgix3qyqdl8yzdb6qr91sgdmxv3fgjhyvnvqyy8"; }; preferLocalBuild = true; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index c3d1c07c2a4..7802bd6ebcb 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "5.3.0"; + version = "6.0.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0f3sw71ridpwcy0m8xl9gs76zl9zfsrfwzbqjidvlnszvx3177bl"; + sha256 = "0hii7kp48ba07gsd521wwl288p808xr2wqgk1iidxkzj2v6g71by"; }; # don't remove runtime deps diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 07361f1c742..f5f12b47dd7 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -63,11 +63,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; }; - experimental = bdist { sha256 = "0z7krilzk91sblik2i9lvsifwq9j5j6jv7jhmndkz4qmp845w1ax"; version = "1.1.1"; withAuth = true; }; + experimental = bdist { sha256 = "0cmia16d5dhy3f8mck926d7rrnavxmvb6a72ymjllxm37slsx60j"; version = "1.1.2"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; - experimental = bdist { sha256 = "1nb9w876dij3ar14s5y96k04nbh9i4a7rggbbck5xmr7pa6snqx4"; version = "1.1.1"; }; + experimental = bdist { sha256 = "0x3lwz11z8cczqr5i799m4yg8x3yk6h5qz48pfzw4l2ikrrwgahd"; version = "1.1.2"; }; }; demo = { stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; }; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 5cf39ec35b0..77181692ec2 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre_headless }: +{ stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; version = "1.16.4"; @@ -25,7 +25,10 @@ stdenv.mkDerivation { phases = "installPhase"; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) minecraft-server; }; + updateScript = ./update.sh; + }; meta = with stdenv.lib; { description = "Minecraft Server"; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 7ef2f533476..f419be8d63b 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, nixosTests +, copyDesktopItems , makeDesktopItem , makeWrapper , wrapGAppsHook @@ -37,7 +39,6 @@ let comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; categories = "Game;"; - fileValidation = false; }; envLibPath = stdenv.lib.makeLibraryPath [ @@ -99,7 +100,7 @@ stdenv.mkDerivation rec { sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems ]; buildInputs = [ gobject-introspection ]; sourceRoot = "."; @@ -109,11 +110,14 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/opt mv minecraft-launcher $out/opt - ${desktopItem.buildCommand} install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg + + runHook postInstall ''; preFixup = '' @@ -139,6 +143,8 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; + desktopItems = [ desktopItem ]; + meta = with stdenv.lib; { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; @@ -147,5 +153,8 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) minecraft; }; + updateScript = ./update.sh; + }; } diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index b9e521bce36..0e1bd9eb4a9 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nudoku"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jubalh"; repo = pname; rev = version; - sha256 = "0rj8ajni7gssj0qbf1jn51699sadxwsr6ca2718w74psv7acda8h"; + sha256 = "12v00z3p0ymi8f3w4b4bgl4c76irawn3kmd147r0ap6s9ssx2q6m"; }; # Allow gettext 0.20 @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "An ncurses based sudoku game"; homepage = "http://jubalh.github.io/nudoku/"; license = licenses.gpl3; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 13bc046e864..304a810c3db 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile , openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb -, pcre, makeWrapper }: +, pcre, makeWrapper, fetchpatch }: let version = "784-october-preview"; @@ -41,6 +41,13 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; + patches = [ + (fetchpatch { + url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch"; + sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9"; + }) + ]; + buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo libjpeg libogg tbb pcre @@ -50,10 +57,6 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/xrCore/xrCore.cpp \ --replace /usr/share $out/share - - # https://github.com/OpenXRay/xray-16/issues/667 - echo "inline const char* xr_sys_errlist[100] = {};" >> src/Common/PlatformLinux.inl - echo "#define _sys_errlist xr_sys_errlist" >> src/Common/PlatformLinux.inl ''; postInstall = '' diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index b8a4935aa26..656bde2ac74 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -3,14 +3,14 @@ }: mkDerivation rec { - version = "18.3"; + version = "18.4"; pname = "pentobi"; src = fetchFromGitHub { owner = "enz"; repo = "pentobi"; rev = "v${version}"; - sha256 = "9AymvAlXi0zkkcakTR0mC4gmyrweZR4EwlhORkmVshw="; + sha256 = "1wawy6s3i4pcc6n6kfspn5b4g957ds0728mgwzw19agp5yyid73b"; }; nativeBuildInputs = [ cmake docbook_xsl qttools ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index ab6ac022b6c..60ebdcf8eeb 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem -, xonotic-data +, xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl , # glx @@ -131,7 +131,8 @@ in rec { xonotic = runCommandNoCC "xonotic${variant}-${version}" { inherit xonotic-unwrapped; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + desktopItems = [ desktopItem ]; passthru = { inherit version; meta = meta // { @@ -151,7 +152,7 @@ in rec { '' + lib.optionalString (withSDL || withGLX) '' mkdir -p $out/share ln -s ${xonotic-unwrapped}/share/icons $out/share/icons - ${desktopItem.buildCommand} + copyDesktopItems '' + '' for binary in $out/bin/xonotic-*; do wrapProgram $binary --add-flags "-basedir ${xonotic-data}" diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 5610b2c694c..f1ad962020f 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -246,6 +246,17 @@ in rec { }; }; + onedark-theme = mkDerivation { + pluginName = "onedark-theme"; + version = "unstable-2020-06-07"; + src = fetchFromGitHub { + owner = "odedlaz"; + repo = "tmux-onedark-theme"; + rev = "3607ef889a47dd3b4b31f66cda7f36da6f81b85c"; + sha256 = "19jljshwp2p83b634cd1mw69091x42jj0dg40ipw61qy6642h2m5"; + }; + }; + pain-control = mkDerivation { pluginName = "pain-control"; version = "unstable-2020-02-18"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 42c1ca045b8..a026dc79ad3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-07-26"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "3c92e212a05eb254849a597d8d002abf69699aa0"; - sha256 = "0m3kinhzjk0cky372j1kw6hhy14khshkh9jbw35a5q18c4xvy4pq"; + rev = "81b0a1a612621f3b8d9ce30c48527cc85a950f1c"; + sha256 = "1yqvcyw8zaryqy2hbbq4iaf5af0n4wpw07i8508z7dp9ib92w85v"; }; meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-11-14"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "48fe0dd4f629bb1282277ba8a6757a84c13a4dda"; - sha256 = "192wb50cv7yv6c4gmjmlmh8b5891v51xcxm396sm4d5y9pzw52mc"; + rev = "1365dce921c1fb84a668ae121d5d5aeebef99fbc"; + sha256 = "0dfdcs8pcplnam7qiynykabn4k8s3wnp4vny5q4ij6b6yxjzd9km"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -135,14 +135,26 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + async-vim = buildVimPluginFrom2Nix { + pname = "async-vim"; + version = "2020-06-20"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "async.vim"; + rev = "6102020b4690f05ab6509a37fa25bc53e2d799a9"; + sha256 = "1b39nnym8lwdwhpbrbl6438s7ragnfm3n2lbs8acp78jl4jraiwz"; + }; + meta.homepage = "https://github.com/prabirshrestha/async.vim/"; + }; + asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-11-04"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "ed75b1c92fb144bbe236bfb4d60a98dccf637c58"; - sha256 = "1szxam9hq3s1s542i5fk5pkr5kdpdlz5849yq68i2nnkkh8xwrar"; + rev = "c5f5808581bd3a41ee379836ebf804eb46a189a5"; + sha256 = "1izxr4lx6nncajaiszff3w38qc8c6hrpkd6rj8q7wasqcsxd3fcj"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -221,12 +233,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2020-11-14"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "2122af3641f138281a351611861900ca823a2324"; - sha256 = "1wqkq6cwhwbr6cypn05mbb2n7ry6b5b7ic7ad8s1hmc4gxgfxk6h"; + rev = "447a5863f91ac4e2b1e843829e3e200f59d687bb"; + sha256 = "1x7jjh444ddn1rxyvn5sn2cpm6xdag05x2kj4lm14q96przi5f90"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -305,12 +317,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-10-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "84335b66be1e323002380280f265983dc635fd99"; - sha256 = "0p9f7hy751ayjh6pna8gi0vi09lk0dwpi69rh21nidiqiph6n5l5"; + rev = "9eb05f05f11ce281bff8b2ee980e70244e29d7ae"; + sha256 = "15d763gv1939jhxg8431pxjxq8a86bfz898hdscakq7wf3wsc6kr"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -365,12 +377,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2020-11-07"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "8a53f6267dffd1dea3f50adc4b61653178c00115"; - sha256 = "1bwprg23d593pplm5cwfkg5yj0i8k2gqb3aj8yp8sdiccikfbswk"; + rev = "d105c5978eb983d44461f83fc3b1033eb11d1a55"; + sha256 = "1nbb8zq2nhsbxn3lzh9sdhds2hv4n91vxafia7ydmzmyz9gyh6qw"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -413,36 +425,36 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-09-10"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "8ff425faab53e8bb8c53eec1afdf19a29c8086f6"; - sha256 = "06ddv9brb4zy8ylas36dkmblr93n6c5dp6vpp3c7asxc1kx58gc5"; + rev = "ea22e4462f9ac77f9c0cf3b1413bcd4d3b86a135"; + sha256 = "15rx4ws7hvssi7z1fkh7mzadc9xifi4hzb9g91lbinds12v19gg9"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "654fe4ece0ff49b62d3f19d678436522f92c3a08"; - sha256 = "1j38g0c81rnk502vr6n7zf7r1v3p48mimsd13dc7cqsvnhrh34ix"; + rev = "942152abc7907a0a82ce364bc50a4a463a6e925c"; + sha256 = "15pzzv6s8vks6xdms3pz5mcd8qb0lv89wnnpbipsyxlkz393yj36"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-11-17"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "f3d792518982d58a7d7f846f31f01f0ef0c5434a"; - sha256 = "10xl2gx1n9c34amca7zq4chczfc126dwz7733fi55ks29fdl708c"; + rev = "ce0cdfd91b184da76874024265d6e7d1ac06e073"; + sha256 = "07v094rn7vh8sa5psw0cg47m5v2qypzndd4ddcpgmxdr64z8xqgs"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -473,12 +485,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-11-17"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "103d5e995127937bdeb42cf248c2325cce93b9eb"; - sha256 = "1llgy5m8smrvbsaafirx4a0sdzvia2rxwk57jylm5hh376kll6kl"; + rev = "708aaad11cb2b7a6473f2d527182647f889fee66"; + sha256 = "0z3si82c3kzvm1kc4a96nmcs77dyhv1ym1kqw86al5nlpz5iadvp"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -558,24 +570,24 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-11-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "8c028d007ca314d7734d83dcc05db1ed103db9b5"; - sha256 = "0ym17vamf5hk4lqmkfknkf0mm91vsjayhjnjyvnvc0qhyyhgsi67"; + rev = "936bbd17577101a4ffb07ea7f860f77dd8007d43"; + sha256 = "1z399q3v36hx2ipj1fhxcc051pi4q0lifyglmclxi5zkbmm0z6a7"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; completion-tabnine = buildVimPluginFrom2Nix { pname = "completion-tabnine"; - version = "2020-10-03"; + version = "2020-10-31"; src = fetchFromGitHub { owner = "aca"; repo = "completion-tabnine"; - rev = "a7e6e2e249fec79f4260f388cd0c8adb38c0b3ad"; - sha256 = "1hnbhr4sgl7a8mj2ygma9avc7hfsv18wxrxypik62x7vijsnv9aq"; + rev = "373b556ce383da4cd35eae87c615cc4806af96d8"; + sha256 = "05n1vlyjis6wr08k11zfbz6lic8c9gmplsfq8h0zskq01n7gs044"; }; meta.homepage = "https://github.com/aca/completion-tabnine/"; }; @@ -630,12 +642,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-11-13"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "5e40da6c7119bfc31b3737d7ced2b8098f56a99f"; - sha256 = "0ggp8sw1dym9zlr8q0qhshjdgh83wr91cv5yh9b6im08rf89ddxf"; + rev = "2556bf597c7230bf89fbe2c2d842192a212b05e2"; + sha256 = "1g5g74s6g90rard81h467wrs0piz0x5nin34z7pn5z04v6jv80mq"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +786,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-11-16"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c5b0eaa606af67fccd0d0e972ae5e8f16678ef9e"; - sha256 = "0d54gg0brcflijv2xq3x06d561z9vj2b2y658pcv9bwjmbr3pwyy"; + rev = "c5f1a646122eb4f6048f97b1ef8a936ad49f18eb"; + sha256 = "08j9msy49i1lz12bg2z98r7226c1khdixnj81c0pfnq4m8mprfz5"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -810,12 +822,12 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-09-10"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "2c80ef41fa56bbb4a0d48c4153404be694368141"; - sha256 = "08kdhn4kry8sc8gyffp8zl609nlajhd1x6qi50n5216r9dk03jlk"; + rev = "df995dae2ea31a2af5df12e1d405d9f1cf702ab1"; + sha256 = "14fcr2i3nq1x6rcjw3bqd4qdxdns7z67q92pj4w349qnqzr8pd0m"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; @@ -1064,12 +1076,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-11-17"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "27c5ddba448e50e182985e1582dd519342986cef"; - sha256 = "09i3p0r4vjc5xipqrykm83wa9p96k609c1p1c2frakskhy7zkidz"; + rev = "a39f78f5e599ef29cc15c46c352ec5560e0f8e73"; + sha256 = "0g0n1xbz2429ghsys06ij4csd88y2nx0yz7lqpp8924nhzlw2355"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1112,12 +1124,12 @@ let direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; - version = "2020-11-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "def4982fa3a613cfb59a4cd8d35d4c99e4e1688c"; - sha256 = "1xrr8pdxmpxz79qgw1kl5wdb4i2afmvl5zjxhkjinvpqnmimx0xz"; + rev = "ff37d76da391e1ef299d2f5eb84006cb27a67799"; + sha256 = "136z8axjd66l4yy6rkjr6gqm86zxnqpbw9pzkvii0lsaz11w9wak"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1367,12 +1379,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-11-11"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "53b3aea0da5e3581e224c958dbc13558cbe5daee"; - sha256 = "0r19v3431ps7mmq2vb0vf1phwmgi1xp0n7z43wa68i4ilyjhbnr6"; + rev = "cc13a4b728c7b76c63e6dc42f320cec955d74227"; + sha256 = "1fg4vnya4mbxn268hx5qvl77qyhqpgqyk0ypx2mpv5b2qsyhw4rn"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1403,12 +1415,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-08-12"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "d6191a111a1160ddecb05292eefe28ae362ccbaa"; - sha256 = "17dp28a3ipbx8fwsj0h9imkrgd0nfjzpcsn1zjdbih1kfh494smf"; + rev = "2c82ecf78b709a60ce7b3023ff6f49e01fa4275d"; + sha256 = "0hfbz11g887kdn9zsry53gf5gfh0n84h3ww9bjn7fkq9qpkkq9mv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1631,12 +1643,12 @@ let idris2-vim = buildVimPluginFrom2Nix { pname = "idris2-vim"; - version = "2020-05-25"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "edwinb"; repo = "idris2-vim"; - rev = "099129e08c89d9526ad092b7980afa355ddaa24c"; - sha256 = "1gip64ni2wdd5v4crl64f20pbrx24dmr3ci7w5c9da9hs85x1p29"; + rev = "964cebee493c85f75796e4f4e6bbb4ac54e2da9e"; + sha256 = "1hgil24c7zv7m1glzzm3an60pimd3l9dbma26xdxly7bv210ssmz"; }; meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; @@ -1691,12 +1703,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-11-11"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "9662ef8f0443211b11fd87919343d12179bca548"; - sha256 = "1mdbppz3xb8dzbw61fcv3gn3ad4hgia9i5s96vyw5frwxlkfyqpm"; + rev = "a03953d4e89ebc372674f88303c5d4933709fea6"; + sha256 = "0yxx925wrxf3hyllvqnbyiy39bw075vmzzys9jx0aimk7dmf1w9l"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1944,36 +1956,36 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-10-13"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "e541328a67fe10f1323630a30a37b58c934d7819"; - sha256 = "09w33f4cyg9wdj8jas5h43cc7byqfmmm9wyc0xjaw9jxcp78ygg9"; + rev = "72c5c03ea2fa8e3f0003c3dbdd5d6431bb2cb863"; + sha256 = "1niswynnsnl2fhfy2hlvqngikm87i49il92vaj83hnkn93p7jc83"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-09-30"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "5b43087089798be70de0119e4f2476d2a2c0f6cb"; - sha256 = "04iw79ahfxm4ym5caj8iirs02l7qw9b49igzpg9vxs2ylqyfk3pn"; + rev = "16520df9bcb57a5c150efff5a8bf2cd64f659f07"; + sha256 = "0hnn7hw1a7a5ld742mlw070xnj2zyvyq2kzrzsp2ky7ir3lhn7x2"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-11-10"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "38a20127dc8aaf76f686b0b96023b51c466969b9"; - sha256 = "19pw4mmhp4cj2xjb6ygiahmix2wq123a738whjg5137zkrzfqz2j"; + rev = "0edb04acd77b9e5e498314b6345d422d93921ffa"; + sha256 = "1cndwbwx9pg6550k7j2z0pw91dll0idspd0jpd0kycpxm4330jy9"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -1992,24 +2004,24 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-11-17"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "ad6f73578316dc6d1e016f9083ef35a4538c02d9"; - sha256 = "19496bhdzyrykxs8j2mx69ml9a8548jdz0s0n5qq72cxhm2b3p03"; + rev = "087893a9c67fb5f49ad209866194a128e00f95f1"; + sha256 = "0savwpgnff4sm7ij3ii2mkrd9lv4nmihyab7mcp9w66i8zdq1kyh"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-11-14"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "543ee323a4a63fd32cc17dc57edea9c00962bb12"; - sha256 = "1x75hd3ibnlrqnshhhrcg1z3i6z0gk58sfvjys22dvirv1r6lg37"; + rev = "709b2d8dc88fa622d6c076f34b05b58fcccf393f"; + sha256 = "08v68ymwj6rralfmjpjggd29sc2pvan4yg1y7sysylwlmwl7nhlp"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2508,12 +2520,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-10-30"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "85750560a680907c50c1545abc4dd0e0b2452ff4"; - sha256 = "1395m95ry4c52bj2zpxryks70c3abfwhb140kpx4rifl2ccpnwwp"; + rev = "253eafd3a71ce2a48306fe4a7bdfc4208d0c2eb5"; + sha256 = "1v6rwsndnl9g77vscxyy8lffb3viydk9r44vkikdrdqwl4h6h0n2"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2544,12 +2556,12 @@ let neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-11-17"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "neuron.vim"; - rev = "ccaf20fdd028f21cf7281e7b94a0687ecf4e203b"; - sha256 = "1c5dk3xr4lgnc8226rhjmz4c1wjv18p5iqbc4z4bk3m32bq7rhxp"; + rev = "853fbe273f9f40defe69a9d50d267fee1bbc6b5a"; + sha256 = "0l6qxmd1y67jam8np37ywks95nbs53bvmh51y4ak4078mz2n1nji"; }; meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; @@ -2604,12 +2616,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2020-11-15"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "de6b08e0e2f4dc8b8fd0c862a36cb17b9faecf14"; - sha256 = "1a7ygblpwgrnnwqjrwmc7ppgla22z1yr1n33qw5h2wp0hlvy7z3l"; + rev = "f94ec5a9259b4fd2deb495ead0341a38c19c2799"; + sha256 = "1f7z23dn7vnldc82d6x1j8wqvj9vsi169rbcg0scfphh79fq61pc"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -2640,12 +2652,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2020-11-15"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "52f38f925a3116c6bad0b7f4d54d5daa576a5cdf"; - sha256 = "0806zbrwc1la4k6nnwih5kx8zv97dw9p9hnpyxqd3s45rnb7izsa"; + rev = "07538909ab5934313d8bdb234481d05d6cefa565"; + sha256 = "0jvz0j0pp53r080cz4r2z81vx73czhis9a5yl7p3xaw88sr5s23g"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2676,12 +2688,12 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2020-11-18"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b8b78237b8002f6a1cda1a205db11770ca748777"; - sha256 = "136zd50kj3mzvh5m1f73spbfl7wsmac7676p8yhw4mhg9wv0vv7w"; + rev = "c4f98237c54bd2478bb3826500f9c9b654612801"; + sha256 = "0x82fsc9hvydyhi31wh7if2gdi8azgls88klc4hn476jx7rm5n58"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -2700,24 +2712,24 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2020-11-18"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4f19567fb76438d39ed196ae5b4e06b749e75e16"; - sha256 = "16iddpk10mgh4pah9lc35ijh7idinc7v37pkbyaixnljjm64jwqw"; + rev = "09fc9449e88b8a4f97d14e87af3685a48df2137f"; + sha256 = "0fygy2qnsk8kqlb5233hb16rq3xyqqr00nn5nxzrhbqsdwy2xw7r"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2020-11-13"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "6abfc5411c8292eea756816b2db9f0ee9ab344ff"; - sha256 = "07s3psv27nr99f6d6173cykvqqiv22dqljy89j8wnqkh2rskzfrq"; + rev = "7582dc5b176c8990d00d16a2d69b0555ead09051"; + sha256 = "0pwafd9hjkhxxn08nh2c1k01y67gdl3n2bx36k41452pkzxc8x9c"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -2736,36 +2748,36 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2020-10-31"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "ef893b523d366a0dde44b61d9cb327f2bea65f1d"; - sha256 = "0g4sz0q5mipa6f8hybbkd42jg6ayw3ih2lv1ml4pjyp378cqbkg6"; + rev = "d3eb9cc4c6f0a1e0d6dd376f45376ad4604c7cdc"; + sha256 = "1vl541h3dac5aixyqp7wfqz64p0fqg242x26kdffmfj54vk6q5jh"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "289cdc9da8f7f21dcbf814032e9277ef0e9790a0"; - sha256 = "0fqsl6rva6rb0zdpkv8myn7x5frxg5nmjykhx0jxc23zx5q65nj3"; + rev = "299b874d2fa96e193bd7bedd265e62b220a4cdb0"; + sha256 = "1zmqkxl7nxzl46hx6azkkxnih8chqzs8fiqii6ipvwwiwbzd9cqh"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2020-11-14"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "f70b9e30ff0b149c0eb2c1e4bdbdef594bdab30b"; - sha256 = "04mjl32gahaw2xky8yaghmgakiiy47dcjj6k4p793xfcs1kf4bsh"; + rev = "192baea80c5b1a98a267eb7f13769f33adab7de8"; + sha256 = "0bap7ckwha4halhdz0hv69iad0wrcdwd9843rnzvfkz3b1bdbvdn"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -2784,12 +2796,12 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2020-11-18"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "be31f77bcf66fdf07bef286382e7eb563c2643fc"; - sha256 = "02y4y4na91hjj6kw944wiww16xby7brd306jkhd5bzsb8asi223n"; + rev = "42bca9550fa6ad5389d6e95ba9876bf05a8d0406"; + sha256 = "0zvjjbffvpnmc9rgrkj8cx5jqbkw8yvjwnj0jk8ccxpl0s9v2yi6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -2832,12 +2844,12 @@ let oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2020-11-08"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "9fa644b0f545cad22ee28ee3dd9a719a9a6bf75b"; - sha256 = "0xxc6im5rvd2c14i0jpnsgjhcsc7l5zs30razc4gqvv753g663qs"; + rev = "29d694b9f6323c90fb0f3f54239090370caa99fb"; + sha256 = "0lwwzfayv7ql1qpydqgyr0g024shzck2m8d04dn5g0vf5qqf3qi6"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; @@ -2964,12 +2976,12 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2020-10-19"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "0cb0a18378db84c4c2bdb38c28e897958d2ec14d"; - sha256 = "1808kwf3ccrjaqxr43l23kfj8s0zijdk0rpriymqk143b29nk52c"; + rev = "86ad6e00dfbc80aeffa841043582f170c4c744ac"; + sha256 = "02ji6p77v85gq8df5fs9lnns6kyf41806iq38zd92y5blps04ihl"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -3000,12 +3012,12 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2020-11-16"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "f7bb13a4e22716154904f8417928cb91e4284f22"; - sha256 = "1xmqhryr1san24386fxd60j7qrjlqx6zka87x3bjgg66rq4wqcrh"; + rev = "070461e65a69b8457da6e04ceb4b3836bdd79dbc"; + sha256 = "1s9947r1qgcg43b2g7qs0przrngbmw6i3k5xw7b07nvacz3za081"; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; }; @@ -3613,12 +3625,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-11-13"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "68a77323cb707e227d16302d39d35949dbb0f85a"; - sha256 = "1038p1w7pfwg6ydqxbahb9plab8d40mdqmnbm6z36y7yrssmjhsj"; + rev = "ed1bbe554d7ce4d9b6286ee3514ed4d3021408ee"; + sha256 = "0h8ai0lhb52d279fw9fc06zmi5sxvjf468mwrbpfh0cq7fkb45yz"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3661,12 +3673,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-11-18"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "aff22f5bf107af69b0a6189debae613e36d3455f"; - sha256 = "1l1c8za5qffvz7klzmxbyk0sv6j0869cpq8njrqzgzzah301pmlq"; + rev = "7514137e2acade815fec910ceedd9a08b9d5200f"; + sha256 = "0q21yxssmsicy8nvq23j9b34p9sgfd5fkv6rsd46ia160rf4ssp9"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3806,12 +3818,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-11-09"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b837416c1ffe39b168baee35c0938739e96211c5"; - sha256 = "1c1ahpdw0d18x5g5s5mpv7mcf0igrpla33k2khmk4q739ywb21qc"; + rev = "8554371b57c8989cf73f73f288c456fb3f2a3a3a"; + sha256 = "0v3gyql3br11rl6ycl7i3zkx8kkc5f2w075y6cm6cslb9v124h6q"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -3830,12 +3842,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-10-07"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "5f21e3e7e60f6d032daa4769e7ee84885fb0ce4d"; - sha256 = "0sfbv620zl8lqdzsypxcn9gasaaqpwarsynjxa25c4cd843cz3d2"; + rev = "631c0850dd0fa36d29c9cd20169735a60b41bd71"; + sha256 = "0ql1w6q8w48jxqf1fs1aphcjjfvh8br7sv26nk6kgsm9h4xamnp5"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -4154,12 +4166,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-11-14"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "536667191d5bdc0afa3a18d7df229731e778815e"; - sha256 = "0ay2bkqj92gzp2r36f5s92rb9gnhwkf09cx4y67gvd4b6rbqrkwi"; + rev = "06117a61e1218b2a866451d2ac4d8ddcd82c8543"; + sha256 = "0c3qgk248bkvmfh5rzhgnz0z0i1yxlmfcaz1bn91g41n9k1a50ab"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4178,12 +4190,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-11-08"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "cd6f16978d5af4b9fb861be9d728732d72789df3"; - sha256 = "0ifb43q053grj2fvjjw52xsr79xnpc00k9302xnx1x4li9s5l64d"; + rev = "5cf03c355b64836ebcb681136539f48ada34f363"; + sha256 = "1wjsmm0bf6714rxnrvfb9080ycgcy4x3vp3qs46nznxsxrxx935n"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4382,12 +4394,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-11-15"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "b2fe93fbee23c3dba24439e0e0bf8c5b77eb5447"; - sha256 = "03grw812c67m63gpdaayn7dfdlkzrhcki2fkcpfq3a80cwq1fvzf"; + rev = "4ca999b5c302610fb5de8ef8a74f77408a2c4a64"; + sha256 = "0as6mngcmn1g0d8lgrmrs1pazby31s5svydwr367ik0waqf9rl8s"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4790,12 +4802,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-09-27"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c0f7b40260d6733c2c283407bea02806e6acb9e5"; - sha256 = "0h1vpswfxvl6kwinn4hk01qzmjzbbinkn2fhw4i9j5bpq0z3w8wp"; + rev = "1ad996e64dadf0d2a65c8a079d55a0ad057c08b4"; + sha256 = "1f4g7m09x67xfajanm9aw4z6rl1hcp24c5a01m1avn9594qgnh2c"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -4946,12 +4958,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-11-18"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "be20785a72925df1ff19a54ce5259d006bc92598"; - sha256 = "1ns9za11w2b5xvcbd8kh4a5pasy3dd4qx7zs4k4f2ay49f98c7v1"; + rev = "60facc9c12049b16015490ecff61a0dd4e580ee9"; + sha256 = "0fm43d2m0s07y5b448drf6smb7fpz38vv1wvd5r0ch6ac53mc74m"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4994,12 +5006,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-10-27"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "1a77f1c00e12e8460f39098ec3289c5433d32512"; - sha256 = "14w43j0gnh10kyshikz4cl6m3f04a6hpiqasn2n71isvdd1p24kp"; + rev = "7bcfe539beee5fe8c542092732b6fd3786c6080e"; + sha256 = "06z5l59x30pqz5sqkrz1v9q739i48hahrxhqyfwvj4bydg52nv30"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5054,12 +5066,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-11-05"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "987a33355ef424161fdbc4e5d625b5b5aed9704c"; - sha256 = "1qg5ri74wipf0krnwgii2jqdzy36hpwnx8nvgf7vkw8a3l90rswj"; + rev = "dfe55e2b924b86c654b63edb9bedc42aa4e08048"; + sha256 = "1b725iv0d2bgd2dqfjb36ifv1y5q4kybz4sj7vm3arvyqr0ly5j1"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5090,12 +5102,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-11-17"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "baaf2d6ebcffd8d5674c9c5518cc0e2b5cdd0db4"; - sha256 = "1kbmncrny39v671czcy7mmr7ighmjhr27zajq01xadr6sdmrrbr0"; + rev = "069113c1c03ec9330fbcccb36f79b268f8b88c1d"; + sha256 = "10423k7rxs34qxb7nfdyfs0yjhgnkmlkd33bwrv2zrahp342kfwv"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5548,12 +5560,12 @@ let vim-jsx-typescript = buildVimPluginFrom2Nix { pname = "vim-jsx-typescript"; - version = "2020-07-08"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "peitalin"; repo = "vim-jsx-typescript"; - rev = "07370d48c605ec027543b52762930165b1b27779"; - sha256 = "190nyy7kr6i3xr6nrjlfv643s1c48kxlbh8ynk8p53yf32gcxwz7"; + rev = "b099549ffd1810eb6f7979202202406939abb77e"; + sha256 = "1jlifxhwjarxqn1i22q3r7rh5z5ianmay91rrazjkahhji2701yy"; }; meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; @@ -5644,12 +5656,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2020-06-08"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "d5f2af4883351aa437ca1c3157d21917dc2bb1b0"; - sha256 = "0bdyhbablays384gssfdfavkxcrwcj89y8vn5kdk11xs0r78b5wr"; + rev = "532979346087c029badd02c9605a4efa84ac032a"; + sha256 = "1hjhwaw5bl37a2c9s0wd16z3x9pf0d26dwbrh6s3jk6ivwiz0v7p"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -5716,12 +5728,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-11-15"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "b8c9256f61fd0e1e1256f7f03eda386ebcfb4c93"; - sha256 = "067pzkxxjna3775za58v7g7lvzw9ykxc9lpkjxh5l35xph0dhw64"; + rev = "a56304f238f5368ad6c1b3b14b96308edd25a1f9"; + sha256 = "164sbwv6y9sf3isxp08zz1w05nz6aas63z1ib146di2r6wkslx57"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5801,12 +5813,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-09-07"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "9e0b6f37113e21fecd42ef6b04762de4aafe2cf3"; - sha256 = "0cy7k96458qk5fn7fbvki42b2pgrrk803shixs4ww43iipya6m5b"; + rev = "ac1d0f73a0eee3d2597f09789d45d9d332c64be5"; + sha256 = "1zi16whmc21iwbkvax65a883ylphcdjjhagmxihp1i52vx90vz5i"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6293,12 +6305,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "c228e993ad6a8b79db5a5a77aecfdbd8e92ea31f"; - sha256 = "1cvdrisarw4yc4lwm80q99k7kb72zq9bd6w98786djas6asdfnll"; + rev = "73c518717741fb3ebb6822645d38f37ffae7c19b"; + sha256 = "08zwvnlg08v3h04iw754wl9wkirqcvqip86hh4m7bxxl0qkysnv6"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6365,12 +6377,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-07-31"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "21d8d9a9db864f230a2d12d5076351daf20d7a44"; - sha256 = "0s6mi1mzlk40sfdqghdsv709fs89hf9d6iqaw3arzs9lmin2i4ka"; + rev = "26a75886caef937bfad4201d5478571a992984c2"; + sha256 = "1qgwn57hs82a6pjilnqafd4c2za4r3vkys9i9apbxqhcxypx05hl"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -6737,12 +6749,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2019-12-02"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "d3de4fbd7a9331b3eb05fa632611ebd34882cc83"; - sha256 = "1bsqnz02jaydr92mmcrdlva4zxs28zgxwgznr2bwk4wnn26i54p6"; + rev = "f3120afee5ee7cca5f3ccc2bac0933125d0a1efc"; + sha256 = "0ndvs48g68ygminnrjis847qcf7zi7mafhnjzvdz9x8kly2jp7pc"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -6785,12 +6797,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-11-15"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e438b06d59115d4b491f7aa73d3140af44f86175"; - sha256 = "0z9c6rgix722d023jb53ynbns9zvibwaglzcb2q2h4jp1xbwq4qq"; + rev = "6fe515ee5778c4a704b581b2b9ad0f13dd803c25"; + sha256 = "1ikfkvh1jkijhzf12zaymzs67r6snadzsd5qjz9ws4pax84hi82g"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6821,12 +6833,12 @@ let vim-sourcetrail = buildVimPluginFrom2Nix { pname = "vim-sourcetrail"; - version = "2018-06-26"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "vim-sourcetrail"; - rev = "0fd679321ce51f65a37d04e4ea9031be6eaed85d"; - sha256 = "1xgvvmah3zn22rjaa093vghwrchmpm5wj30lwwl6h398dyywz8bg"; + rev = "103ad3f96ebf3518494350afaa72763e9e769eec"; + sha256 = "1hpin1x5l8k54qkckc8v3c2gkv1sbqj3hxikwa0vxr5mz0zaz2wc"; }; meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; @@ -6845,12 +6857,12 @@ let vim-spirv = buildVimPluginFrom2Nix { pname = "vim-spirv"; - version = "2020-06-12"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "9b005a0569fa5e18f71fcccbacda227c1cef7eaa"; - sha256 = "0qby4bfjav2xijh732l7d2jli0adnv6cc8kcalbh5315vi4mpnfk"; + rev = "50669efc68a0a8b455f12727753b2413dab96f07"; + sha256 = "19h3pavy65irchpy9xn3kkf3lb531479v6apfa5lg02c18gmxq1f"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -7086,12 +7098,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-11-18"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "5d65b4e4fba91b499dc3c7db47d2ca0491ae6084"; - sha256 = "0nv2a1wfykncyfr7k9whxybhi66v7y6f348jz4rjyvcl0996hzbb"; + rev = "01960ebe01e3999d2c5fc614cf85c1ec99d1cab1"; + sha256 = "0z1ypl4ks2wg3mh4fjvhz8984z7js2k9k2bgszd2n6jdma8xp4cw"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -7266,12 +7278,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-11-14"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "3b9c8c630daba920741f1fbf6696b7d32d020660"; - sha256 = "0hrsz624flscp8m6wjbr4sfqybw20ssbc78jdrh3q3n92gz1d50s"; + rev = "aa66db40e6c765fd6293c69e71b38b6a87dd3a08"; + sha256 = "048qir6djrbrpyg70b4scslc5scw3c3mxb1rvbmmnp4i3qmcmm4z"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7290,12 +7302,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-11-16"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "70af9531f131b2f1e6674780dfe1e81893de02ab"; - sha256 = "0gjcifybfjwa33njy2pkfcmblgna922c5hg1sf8kwyahmn4v5ix8"; + rev = "7983a425d676e79d7fbd8e8870ecee3b15f9a78c"; + sha256 = "0c3rh0vkg65n2d2kmqfizigwn9jkb8azjla1ymgc49yzmy49jghf"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7554,12 +7566,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-11-16"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "b7de25e3d1e9d003df63d85a8781e16cbc7635ee"; - sha256 = "06wk6hgpb2n83g3bpn7cwsyz06mpxgc0wyjwbmh2skac81piilrv"; + rev = "4ac9785217557bb8ba063aa8c7f8320ac7a452fa"; + sha256 = "1vyzf5pixiv0glq8asmg7qicspn527yxij5xicaaih1c3x3sawks"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7567,12 +7579,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-11-12"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "01762d18f86422ddc85361c86b849f9707f23ef3"; - sha256 = "0ncgfd23x8g5n568amzd9x7bvvm5mgjs7qqmr9qn7hjpprad5icq"; + rev = "d19055bf318721b5a336c028687c6ff54a39b04c"; + sha256 = "1iqw9cdwaq58jycp7g3n2yrgpaxxszw52nwdy0bssy7fpszmqrzh"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7615,12 +7627,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-11-10"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "bc3b2a74efb253be4b79cc7b70b192e1360f26c1"; - sha256 = "0qfdykp7sf4p2h8gfx40qmnfj94p4hksngqqkzrhzi9z3i6fqk2a"; + rev = "d77828b043d980b99e386840d57629f6499e9995"; + sha256 = "084sy17xlly63m06pxb926rs4j3r1vqij2q7r815daaclsapmvq3"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7735,12 +7747,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-11-16"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "9404065e3ba943a1204d11d333980c9ae7ab2a22"; - sha256 = "1pfkbmy38ppl1fw0fw4zh53f7dazflvzfyb02gsj6bpyg6jvjqdz"; + rev = "49c70e60159e9607f8c787f4105133353d020dc0"; + sha256 = "116c7lyl0jpfqpzrwdsbpranbiw61f4vpq8nvpik2yx1wizv77lx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7748,12 +7760,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-11-13"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "604a2a02e070bbd46f58c79a46f4df048e26a97c"; - sha256 = "0m9wfpm855cp9zzg0nsd6bb7ijmgj9vhfhm7x5nhmqjqjfyl8282"; + rev = "4496153a3efdb0891dac24510ac1ee519f1778a6"; + sha256 = "0j2mzq726fly457j8fjbvijgg50l497qbp6lq0vpfbiz4b3hm46k"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 935d640b074..dce8d948585 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -236,8 +236,8 @@ kassio/neoterm kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim -keith/swift.vim keith/investigate.vim +keith/swift.vim kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold @@ -413,6 +413,7 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +prabirshrestha/async.vim prabirshrestha/asyncomplete.vim prabirshrestha/vim-lsp preservim/nerdcommenter diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix new file mode 100644 index 00000000000..9e745077514 --- /dev/null +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, kernel, qmake }: + +stdenv.mkDerivation rec { + pname = "akvcam"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "webcamoid"; + repo = "akvcam"; + rev = version; + sha256 = "ULEhfF+uC/NcVUGAtmP1+BnrcgRgftNS97nLp81avQ8="; + }; + + nativeBuildInputs = [ qmake ]; + + qmakeFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko + ''; + + meta = with lib; { + description = "Virtual camera driver for Linux"; + homepage = "https://github.com/webcamoid/akvcam"; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index fc7c8ecba2d..9fbeda708e0 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.11.0"; + version = "0.11.4"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y"; + sha256 = "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index fadf5df7140..a3be5484a04 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation { name = "${s.name}.tar.bz2"; }; + patches = [ + # Adds the /nix directory when using an overlay. + # Required to run any programs under this mode. + ./mount-nix-dir-on-overlay.patch + # By default fbuilder hardcodes the firejail binary to the install path. + # On NixOS the firejail binary is a setuid wrapper available in $PATH. + ./fbuilder-call-firejail-on-path.patch + ]; + prePatch = '' # Allow whitelisting ~/.nix-profile substituteInPlace etc/firejail.config --replace \ diff --git a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch new file mode 100644 index 00000000000..6016891655b --- /dev/null +++ b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch @@ -0,0 +1,11 @@ +--- a/src/fbuilder/build_profile.c ++++ b/src/fbuilder/build_profile.c +@@ -67,7 +67,7 @@ + errExit("asprintf"); + + char *cmdlist[] = { +- BINDIR "/firejail", ++ "firejail", + "--quiet", + "--noprofile", + "--caps.drop=all", diff --git a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch new file mode 100644 index 00000000000..685314f9075 --- /dev/null +++ b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch @@ -0,0 +1,27 @@ +--- a/src/firejail/fs.c ++++ b/src/firejail/fs.c +@@ -1143,6 +1143,16 @@ + errExit("mounting /dev"); + fs_logger("whitelist /dev"); + ++ // mount-bind /nix ++ if (arg_debug) ++ printf("Mounting /nix\n"); ++ char *nix; ++ if (asprintf(&nix, "%s/nix", oroot) == -1) ++ errExit("asprintf"); ++ if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0) ++ errExit("mounting /nix"); ++ fs_logger("whitelist /nix"); ++ + // mount-bind run directory + if (arg_debug) + printf("Mounting /run\n"); +@@ -1201,6 +1211,7 @@ + free(odiff); + free(owork); + free(dev); ++ free(nix); + free(run); + free(tmp); + } diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index f0ef1126154..2e97f9da1ea 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "169"; + version = "173"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0ghkwfaky026qwj6hmcvz2w2hm8qqj3ysbkxxi603vslmwj56chv"; + sha256 = "1ili11kqacn6jkjpk11vhycgygdl92mymgb1sx22lcwq2x0d248m"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index bef9231385a..0433715a5fb 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0lpp271g0749sx7qgpwl6myi0kgfpsxk1kc4yp3r9k1pynv8bq1b"; + sha256 = "sha256-lYjMvxMIReANNwMr62u881Nugrs9piOaN3EmrvGzRns="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4fd5b6c4751..8bb7aafc3c5 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TESTS=OFF" + "-DUSE_INTERNAL_LLVM_LIBRARY=OFF" ]; postInstall = '' diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index df886ffe9dc..8257d4ef252 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "12z59xf63iskid08c3y55h238ma2chgvcbks0zprag7i00p97g06"; + sha256 = "162nczipxnsbgg7clap697yikxjz1vdsjkaxxsn6hb6l6m3a6zzr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index b8374d62ddf..72e6c00278a 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.34.v20201102"; + version = "9.4.35.v20201120"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0c5zsnzcg2bz6z1s6hdzwzn813cgs26h1hwjjfhh1msfzyig30ma"; + sha256 = "1cpdrqz6wi7fd228lh4ijs82jq51qr5aym6vff464w3y2sd0jbav"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 318fcd498ab..f4379aa6fa2 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, nixosTests, which +, pcre2 , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses , withPHP73 ? false, php73 @@ -30,19 +31,19 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.21.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; - repo = "unit"; + repo = pname; rev = version; - sha256 = "1qmcz01ifmd80qgpvf1y8nhad6yk56772xdhqvwfxn3mdjfqvcs8"; + sha256 = "1jczdxixxyj16w10pkcplchbqvx3m32nkmcl0hqap5ffqj08mmf7"; }; nativeBuildInputs = [ which ]; - buildInputs = [ ] + buildInputs = [ pcre2.dev ] ++ optional withPython2 python2 ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP73 php73-unit diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 5499d2bb8cb..582bf94b0de 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "ircd-hybrid-8.2.24"; + name = "ircd-hybrid-8.2.35"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; - sha256 = "03nmzrhqfsxwry316nm80m9p285v65fz75ns7fg623hcy65jv97a"; + sha256 = "045wd3wa4i1hl7i4faksaj8l5r70ld55bggryaf1ml28ijwjwpca"; }; buildInputs = [ openssl zlib ]; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index c39d4fc0d86..178606ec7d6 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -11,20 +11,24 @@ let in buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.8.2"; - disabled = pythonOlder "3.6"; + version = "0.9.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "0mhy9b933haz1bldkglvn81warjxdjdzgkviiv5k6fykghq473jf"; + sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn"; }; postPatch = '' sed -i -e '/alembic>/d' requirements.txt ''; + nativeBuildInputs = [ + pytestrunner + ]; + propagatedBuildInputs = [ Mako aiohttp @@ -32,7 +36,6 @@ in buildPythonPackage rec { sqlalchemy CommonMark ruamel_yaml - future-fstrings python_magic telethon telethon-session-sqlalchemy @@ -53,9 +56,12 @@ in buildPythonPackage rec { ]; }); + # Tests are broken and throw the following for every test: + # TypeError: 'Mock' object is not subscriptable + doCheck = false; + checkInputs = [ pytest - pytestrunner pytest-mock pytest-asyncio ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 182ca6bcd90..0435d0e1d40 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.8"; + version = "1.6.9"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "0fbrrn7mkhv5xci4cffxxb8qzr9c0n3y58jymq2aqlpzyq8klfz2"; + sha256 = "1lcjy1b9krnb2gk72qd1fvivlfiyfvknfi3wngyvyk9ifzijr9nm"; }; configureFlags = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index fb86600eaa6..fe16eae04c8 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.1"; + version = "0.37.2"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1mqkaagd452kygch47jsqzcjcsian4pp5xcvr3nnm3p3mah79wyi"; + sha256 = "0rhwnma8p3lgdld9nslmnii2v83g8gac6ybgk58af9gpypivwpvr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 22c741024b2..b0ab129fc84 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "bosun"; - version = "0.5.0"; + version = "0.8.0-preview"; src = fetchFromGitHub { owner = "bosun-monitor"; repo = "bosun"; rev = version; - sha256 = "1qj97wiqj6awivvac1n00k0x8wdv4ambzdj4502nmmnr5rdbqq88"; + sha256 = "172mm006jarc2zm2yq7970k2a9akmyzvsrr8aqym4wk5v9x8kk0r"; }; subPackages = [ "cmd/bosun" "cmd/scollector" ]; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index e5bce49d057..0245f087c93 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.16.2"; + version = "0.17.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "0xrgwsw4xrn6fjy1ra4ycam50kdhyqqsms4yxblj5c5z7w4hnlmk"; + sha256 = "1dla70k6rxg34qzspq0j12zcjk654jrf3gm7gd45w4qdg8h2fyyg"; }; meta = { diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index a1aad75ce3f..bb81d0ca791 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.17"; - sha256 = "0568r5xdy78pl29zby5g4m9qngf29cb9222sc1q1wisapb7zkl2p"; + version = "3.0.23"; + sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz"; }) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 2ca829b62b1..38e12010f41 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd; + buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] - ++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"]; + ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]; enableParallelBuilding = true; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c38541c4e9d..7ec59c6873b 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -41,6 +41,8 @@ let enableParallelBuilding = !stdenv.isDarwin; + separateDebugInfo = true; + buildFlags = [ "world" ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; @@ -54,6 +56,7 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" + "--enable-debug" (lib.optionalString enableSystemd "--with-systemd") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ]; @@ -161,6 +164,7 @@ let ]; buildInputs = [ makeWrapper ]; + # We include /bin to ensure the $out/bin directory is created, which is # needed because we'll be removing the files from that directory in postBuild # below. See #22653 @@ -229,5 +233,4 @@ in self: { this = self.postgresql_13; inherit self; }; - } diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 0f8e2f61a6e..03d571c03ba 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_topn"; - version = "2.3.0"; + version = "2.3.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "05mjzm7rz5j7byzag23526hhsqsg4dsyxxsg8q9ray1rwxjbr392"; + sha256 = "0ai07an90ywhk10q52hajgb33va5q76j7h8vj1r0rvq6dyii0wal"; }; installPhase = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; + changelog = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.agpl3; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index b95ef73308d..665cb1dc069 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.13.1"; + version = "1.15.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "19vcvfhxh0922qgibahmkyf7czniycqbzccxdw65j1ia7fd8yyc3"; + sha256 = "0rjbzcdvwx19ql0ilccr47inilf7kh5hn7aacjqs1nxk91g3x7yf"; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 1fbf94beb18..c7e88eb0c46 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,54 +1,48 @@ -{stdenv, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python, buildPythonApplication, bash, setuptools, wrapPython, makeWrapper }: -stdenv.mkDerivation rec { - version = "2.2.4"; +buildPythonApplication rec { pname = "Tautulli"; + version = "2.6.1"; + format = "other"; - pythonPath = [ python.pkgs.setuptools ]; - buildInputs = [ python.pkgs.setuptools ]; - nativeBuildInputs = [ python.pkgs.wrapPython ]; + pythonPath = [ setuptools ]; + nativeBuildInputs = [ wrapPython makeWrapper ]; src = fetchFromGitHub { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0yg7r7yscx6jbs1lnl9nbax3v9r6ppvhr4igdm3gbvd2803j8fs7"; + sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34="; }; - buildPhase = ":"; + doBuild = false; installPhase = '' - mkdir -p $out - cp -R * $out/ + mkdir -p $out/bin $out/libexec/tautulli + cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli - # Remove the PlexPy.py compatibility file as it won't work after wrapping. - # We still have the plexpy executable in bin for compatibility. - rm $out/PlexPy.py - - # Remove superfluous Python checks from main script; - # prepend shebang - echo "#!${python.interpreter}" > $out/Tautulli.py - tail -n +7 Tautulli.py >> $out/Tautulli.py - - - mkdir $out/bin # Can't just symlink to the main script, since it uses __file__ to # import bundled packages and manage the service - echo "#!/bin/bash" > $out/bin/tautulli - echo "$out/Tautulli.py \$*" >> $out/bin/tautulli - chmod +x $out/bin/tautulli + makeWrapper $out/libexec/tautulli/Tautulli.py $out/bin/tautulli + wrapPythonProgramsIn "$out/libexec/tautulli" "$pythonPath" # Creat backwards compatibility symlink to bin/plexpy ln -s $out/bin/tautulli $out/bin/plexpy + ''; + + checkPhase = '' + runHook preCheck + + $out/bin/tautulli --help - wrapPythonProgramsIn "$out" "$out $pythonPath" + runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python based monitoring and tracking tool for Plex Media Server"; homepage = "https://tautulli.com/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ csingley ]; + maintainers = with maintainers; [ csingley ]; }; } diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index ad3a6995800..92d50ff67c8 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -11,8 +11,6 @@ in stdenv.mkDerivation rec { url = "https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; - # This is needed, because the zip contains a directory with world write access, which is not allowed in nix - extraPostFetch = "chmod -R a-w $out"; }; buildInputs = [ phpExt ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 7062fc60783..8fbbfd47fb9 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-25"; + version = "2020-11-26"; pname = "oh-my-zsh"; - rev = "d88887195fd5535ef2fd95180baa73af2a8c88f8"; + rev = "05e2956dc61198d4767b96d97c5d10c93cedd6e3"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0p7j3y1g8x486g2fd2baap1nhfyg5hmcl9dyf4r4dj4l0xzb45wi"; + sha256 = "1Eh6L92hvSHcQeQL+1bCDrg/2FKaZshKTTF2PeVGhLs="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index a978ac93a9b..c8e845eec99 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -7,25 +7,25 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec { - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s"; + sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf"; }; }); in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.13.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "0w5rv7z47nys3x113mdddpb2pf1d9pmz9myh4xjzrcy4hp4qv421"; + sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7"; }; patches = [ diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 0ceb60535f5..160ca5d4e06 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -49,6 +49,18 @@ let isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses; + hasUnfreeLicense = attrs: + hasLicense attrs && + isUnfree (lib.lists.toList attrs.meta.license); + + isMarkedBroken = attrs: attrs.meta.broken or false; + + hasUnsupportedPlatform = attrs: + (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || + lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])); + + isMarkedInsecure = attrs: (attrs.meta.knownVulnerabilities or []) != []; + # Alow granular checks to allow only some unfree packages # Example: # {pkgs, ...}: @@ -62,16 +74,15 @@ let # package has an unfree license and is not explicitely allowed by the # `allowUnfreePredicate` function. hasDeniedUnfreeLicense = attrs: + hasUnfreeLicense attrs && !allowUnfree && - hasLicense attrs && - isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; allowInsecureDefaultPredicate = x: builtins.elem (getName x) (config.permittedInsecurePackages or []); allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x; hasAllowedInsecure = attrs: - (attrs.meta.knownVulnerabilities or []) == [] || + !(isMarkedInsecure attrs) || allowInsecurePredicate attrs || builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; @@ -203,6 +214,9 @@ let platforms = listOf str; hydraPlatforms = listOf str; broken = bool; + unfree = bool; + unsupported = bool; + insecure = bool; # TODO: refactor once something like Profpatsch's types-simple will land # This is currently dead code due to https://github.com/NixOS/nix/issues/2532 tests = attrsOf (mkOptionType { @@ -254,17 +268,22 @@ let # # Return { valid: Bool } and additionally # { reason: String; errormsg: String } if it is not valid, where - # reason is one of "unfree", "blacklisted" or "broken". + # reason is one of "unfree", "blacklisted", "broken", "insecure", ... + # Along with a boolean flag for each reason checkValidity = attrs: - if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then + { + unfree = hasUnfreeLicense attrs; + broken = isMarkedBroken attrs; + unsupported = hasUnsupportedPlatform attrs; + insecure = isMarkedInsecure attrs; + } + // (if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } else if hasBlacklistedLicense attrs then { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowUnsupportedSystem && - (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || - lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])) then + else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } @@ -272,14 +291,14 @@ let { valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; } else let res = checkMeta (attrs.meta or {}); in if res != [] then { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } - else { valid = true; }; + else { valid = true; }); assertValidity = { meta, attrs }: let validity = checkValidity attrs; in validity // { # Throw an error if trying to evaluate an non-valid derivation handled = if !validity.valid - then handleEvalIssue { inherit meta attrs; } (removeAttrs validity ["valid"]) + then handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; } else true; }; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 491951e6121..0eb799e4525 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -328,8 +328,9 @@ in rec { # Fill `meta.position` to identify the source location of the package. // lib.optionalAttrs (pos != null) { position = pos.file + ":" + toString pos.line; - # Expose the result of the checks for everyone to see. } // { + # Expose the result of the checks for everyone to see. + inherit (validity) unfree broken unsupported insecure; available = validity.valid && (if config.checkMetaRecursively or false then lib.all (d: d.meta.available or true) references diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 7ee7d21fd56..8746f065b1b 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -38,6 +38,8 @@ with pkgs; cross = callPackage ./cross {}; + rustCustomSysroot = callPackage ./rust-sysroot {}; + nixos-functions = callPackage ./nixos-functions {}; patch-shebangs = callPackage ./patch-shebangs {}; diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix new file mode 100644 index 00000000000..3a786ad6f00 --- /dev/null +++ b/pkgs/test/rust-sysroot/default.nix @@ -0,0 +1,60 @@ +{ lib, rust, rustPlatform, fetchFromGitHub }: + +let + mkBlogOsTest = target: rustPlatform.buildRustPackage rec { + name = "blog_os-sysroot-test"; + + src = fetchFromGitHub { + owner = "phil-opp"; + repo = "blog_os"; + rev = "4e38e7ddf8dd021c3cd7e4609dfa01afb827797b"; + sha256 = "0k9ipm9ddm1bad7bs7368wzzp6xwrhyfzfpckdax54l4ffqwljcg"; + }; + + cargoSha256 = "1cbcplgz28yxshyrp2krp1jphbrcqdw6wxx3rry91p7hiqyibd30"; + + inherit target; + + RUSTFLAGS = "-C link-arg=-nostartfiles"; + + # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ + doCheck = false; + + meta = with lib; { + description = "Test for using custom sysroots with buildRustPackage"; + maintainers = with maintainers; [ aaronjanse ]; + platforms = lib.platforms.x86_64; + }; + }; + + # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. + # The justification in the book for using rust-lld suggests that gcc can still be used for testing: + # > Instead of using the platform's default linker (which might not support Linux targets), + # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. + # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 + targetContents = { + "llvm-target" = "x86_64-unknown-none"; + "data-layout" = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"; + "arch" = "x86_64"; + "target-endian" = "little"; + "target-pointer-width" = "64"; + "target-c-int-width" = "32"; + "os" = "none"; + "executables" = true; + "linker-flavor" = "gcc"; + "panic-strategy" = "abort"; + "disable-redzone" = true; + "features" = "-mmx,-sse,+soft-float"; + }; + +in { + blogOS-targetByFile = mkBlogOsTest (builtins.toFile "x86_64-blog_os.json" (builtins.toJSON targetContents)); + blogOS-targetByNix = let + plat = lib.systems.elaborate { config = "x86_64-none"; } // { + rustc = { + config = "x86_64-blog_os"; + platform = targetContents; + }; + }; + in mkBlogOsTest (rust.toRustTargetSpec plat); +} diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index a2a7e5e6922..054e061c4ac 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake +, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, xorg +, opencl-headers, opencl-clhpp, ocl-icd +}: stdenv.mkDerivation rec { pname = "virtualgl-lib"; - version = "2.6.2"; + version = "2.6.5"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0ngqwsm9bml6lis0igq3bn92amh04rccd6jhjibj3418hrbzipvr"; + sha256 = "1giin3jmcs6y616bb44bpz30frsmj9f8pz2vg7jvb9vcfc9456rr"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; @@ -15,7 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo libGL libGLU fltk libX11 libXv libXtst ]; + buildInputs = [ libjpeg_turbo libGL libGLU fltk + libX11 libXv libXtst xorg.xcbutilkeysyms + opencl-headers opencl-clhpp ocl-icd + ]; + + fixupPhase = '' + substituteInPlace $out/bin/vglrun \ + --replace "LD_PRELOAD=libvglfaker" "LD_PRELOAD=$out/lib/libvglfaker" \ + --replace "LD_PRELOAD=libdlfaker" "LD_PRELOAD=$out/lib/libdlfaker" \ + --replace "LD_PRELOAD=libgefaker" "LD_PRELOAD=$out/lib/libgefaker" + ''; enableParallelBuilding = true; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 2f7b0d7697e..5ed827b5a54 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, autoreconfHook, pkgconfig }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-29074.patch"; + url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch"; + sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index dbd8de5fe55..81389f39dd3 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.14.2"; + version = "2.15.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "1d5qd39b0i5icg193ybr9gzl0axqw5ml5zjwqin1zxqj5y3r6sc2"; + sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d"; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index ce3b3f657b8..29787cfb17a 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -83,6 +83,11 @@ let ++ lib.optionals isPy3k [ antlr4-python3-runtime ] ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" + ''; + doCheck = stdenv.isLinux; # ignore tests that does network call checkPhase = '' @@ -128,8 +133,8 @@ let azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; - azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "0.2.0" "zip" - "1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5"; + azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip" + "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; @@ -191,8 +196,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip" - "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip" + "1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; @@ -248,8 +253,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b3" "zip" - "1w8kp4r8v54cr4sskkgv5mbqx2pisrly2066ma5msg6amy97jnr6"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" + "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; @@ -269,8 +274,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip" - "0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip" + "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5"; azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; @@ -278,8 +283,8 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" - "0nq9gbhc2qlllz6v6mdymw25acxpay9cxiafb63pss30jyyj04cx"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip" + "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8"; azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz" "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf"; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index cdb8a16708e..6e63b578812 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "4.0.0"; + version = "4.0.1"; pname = "oxipng"; src = fetchCrate { inherit version pname; - sha256 = "0p9h006l75ci324lbcx496732pb77srcd46g6dnfw3mcrg33cspc"; + sha256 = "0mgd33cb112yg1bz8jhsbk2w8p2gdiw510bfv4z82b2mg6pl6b9r"; }; - cargoSha256 = "1r2zw7p95abxqc31b5gswdyhm4msxsiml34dsh9x8zydhqnwy17j"; + cargoSha256 = "01g3qansrvvv85b1kxg4609lnj3bizavg3r7651hn03cnlychj2n"; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index da1f0d54f6f..5c60305a2e7 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,5 @@ { stdenv +, nixosTests , rustPlatform , fetchFromGitHub , pkg-config @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}" ''; + passthru.tests = { inherit (nixosTests) bat; }; + meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 88e3eada916..243bf66e70c 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.13.1) - html-proofer (3.17.2) + html-proofer (3.17.3) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -18,7 +18,7 @@ GEM mini_portile2 (2.4.0) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.3) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) parallel (1.20.1) public_suffix (4.0.6) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index c4974af034d..2aeb5bfd9c0 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05h3liirjx6wvh97vdl59hmwzgji1ih61xq1w5nl87cmhpsxaqsf"; + sha256 = "1i05vgyhyyps867zgpcd13wdidf0cpra39rhfff1jhkc1hn766lm"; type = "gem"; }; - version = "3.17.2"; + version = "3.17.3"; }; mercenary = { groups = ["default"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nif9bn7zlizfcsk464b8n5gvspdim34hl7ldw2y7w4lcnwgg4zg"; + sha256 = "0pxm7hx2lhmanm8kljd39f1j1742kl0a31zx98jsjiwrkfb5hhc6"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; parallel = { groups = ["default"]; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 5e6c0bdd596..ae70e0f3e61 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jre, makeDesktopItem }: +{ stdenv, fetchurl, unzip, jre, makeDesktopItem, copyDesktopItems }: let desktopItem = makeDesktopItem { @@ -18,11 +18,12 @@ stdenv.mkDerivation { sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ unzip ]; inherit jre; installPhase = '' - source $stdenv/setup + runHook preInstall unzip $src @@ -38,9 +39,11 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/jdiskreport - ${desktopItem.buildCommand} + runHook postInstall ''; + desktopItems = [ desktopItem ]; + meta = with stdenv.lib; { homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index ea80a299510..2acd5a789ab 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -1,4 +1,5 @@ { stdenv +, nixosTests , fetchFromGitHub , rustPlatform , installShellFiles @@ -26,6 +27,8 @@ rustPlatform.buildRustPackage rec { "--skip meta::filetype::test::test_socket_type" ]; + passthru.tests = { inherit (nixosTests) lsd; }; + meta = with stdenv.lib; { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 80b135e524b..2c1732007b5 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8"; + sha256 = "0jyaxwgghvgd599acxr91hr2v4wyv3bd1j45k0gb4q2v58jz2fwd"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 6a14b5f1c82..d425e16782b 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: -let version = "1.2.1"; in +let version = "1.3.0"; in stdenv.mkDerivation { pname = "minidlna"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; - sha256 = "1v1ffhmaqxpvf2vv4yyvjsks4skr9y088853awsh7ixh7ai8nf37"; + sha256 = "0qrw5ny82p5ybccw4pp9jma8nwl28z927v0j2561m0289imv1na7"; }; preConfigure = '' diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index ba715571000..2c626e81cd2 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-10-03T02-54-56Z"; + version = "2020-11-17T00-39-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "0pc08w0xdkk9w8xya0q7d1601wprshq852419pwpi8hd7y3q381h"; + sha256 = "122fb9ghxwjifhvwiw07pm3szqfj3pc55m4bhq3v8nshzwrbcjf4"; }; - vendorSha256 = "0bkidqcdfjyqjlzxy9w564c6s3vw850wgq6ksx5y1p8f5r4plzxs"; + vendorSha256 = "148fb86v059skcf8dgcrqibwkl1h4lbwi60qnwmdi03q6rvaw33m"; doCheck = false; diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6f00c7fc8b7..6ace8e139e1 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # Temporary work-around; most likely fixed by next upstream release sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' ''; + postInstall = '' + cp src/proxychains.conf $out/etc + ''; meta = { description = "Proxifier for SOCKS proxies"; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index 2db9ee6d9b3..0b40e2b7143 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -10,16 +10,16 @@ let in rustPlatform.buildRustPackage rec { pname = "cached-nix-shell"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "xzfc"; repo = pname; rev = "v${version}"; - sha256 = "1ni671wr2lrvyz6myaz3v4llrjvq4jc1ygw1m7rvnadzyf3va3lw"; + sha256 = "0w6khry1ncyqy5h6996xw1f6viw4wdrfji5m8lz9gm487xlq5v0b"; }; - cargoSha256 = "19i39b1yqdf81ql4psr3nfah6ci2mw3ljkv740clqmz088j2av8g"; + cargoSha256 = "0d4fz0rhqy1n30wfl2pmf76zpp21agr3h0hswp3r5bfnxqp6i54h"; # The BLAKE3 C library is intended to be built by the project depending on it # rather than as a standalone library. @@ -29,14 +29,11 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ ronn ]; postBuild = '' - ronn -r cached-nix-shell.1.md + make -f nix/Makefile post-build ''; postInstall = '' - mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty - cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib - cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh - cp cached-nix-shell.1 $out/share/man/man1 + make -f nix/Makefile post-install ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 5ede7af10bf..b4cb6d03041 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.9"; + name = "DisnixWebService-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz"; - sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; + sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 310ddc9b84e..f63c7dd737c 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,17 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: stdenv.mkDerivation { - name = "disnix-0.9.1"; + name = "disnix-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz"; - sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; + sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; }; - configureFlags = [ - " --with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 709c5454e10..2fa7d3ed9d7 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.8"; - + name = "disnixos-0.9"; + src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz"; - sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; + sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 2485becc9e5..031e926e78a 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null +{ stdenv, fetchurl, netcat +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -9,6 +9,9 @@ , enableTomcatWebApplication ? false , enableMongoDatabase ? false , enableInfluxDatabase ? false +, enableSupervisordProgram ? false +, enableDockerContainer ? true +, enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" , getopt @@ -20,12 +23,14 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; +assert enableSupervisordProgram -> supervisor != null; +assert enableDockerContainer -> docker != null; stdenv.mkDerivation { - name = "dysnomia-0.9.1"; + name = "dysnomia-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz"; - sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; + sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -40,17 +45,22 @@ stdenv.mkDerivation { (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") + (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") + (if enableDockerContainer then "--with-docker" else "--without-docker") "--with-job-template=${jobTemplate}" - ]; + ] ++ stdenv.lib.optional enableLegacy "--enable-legacy"; - buildInputs = [ getopt ] + buildInputs = [ getopt netcat ] + ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql.out ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb ++ stdenv.lib.optional enableMongoDatabase mongodb-tools - ++ stdenv.lib.optional enableInfluxDatabase influxdb; + ++ stdenv.lib.optional enableInfluxDatabase influxdb + ++ stdenv.lib.optional enableSupervisordProgram supervisor + ++ stdenv.lib.optional enableDockerContainer docker; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index c4b7706c266..91c092922f0 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, perl, writeText, runtimeShell }: +{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }: let pname = "jd-gui"; @@ -55,9 +55,9 @@ let } ''; - desktopItem = launcher: makeDesktopItem { + desktopItem = makeDesktopItem { name = "jd-gui"; - exec = "${launcher} %F"; + exec = "jd-gui %F"; icon = "jd-gui"; comment = "Java Decompiler JD-GUI"; desktopName = "JD-GUI"; @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { inherit pname version src; name = "${pname}-${version}"; - nativeBuildInputs = [ jdk gradle_5 ]; + nativeBuildInputs = [ jdk gradle_5 copyDesktopItems ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { installPhase = let jar = "$out/share/jd-gui/${name}.jar"; in '' + runHook preInstall + mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps} cp build/libs/${name}.jar ${jar} cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png @@ -92,9 +94,11 @@ in stdenv.mkDerivation rec { EOF chmod +x $out/bin/jd-gui - ${(desktopItem "$out/bin/jd-gui").buildCommand} + runHook postInstall ''; + desktopItems = [ desktopItem ]; + meta = with stdenv.lib; { description = "Fast Java Decompiler with powerful GUI"; homepage = "https://java-decompiler.github.io/"; diff --git a/pkgs/tools/security/keysmith/default.nix b/pkgs/tools/security/keysmith/default.nix index b9ab7bb0b4a..142e9c1e4a0 100644 --- a/pkgs/tools/security/keysmith/default.nix +++ b/pkgs/tools/security/keysmith/default.nix @@ -10,30 +10,25 @@ , qtgraphicaleffects , kirigami2 , oathToolkit +, ki18n +, libsodium }: mkDerivation rec { pname = "keysmith"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "KDE"; repo = "keysmith"; rev = "v${version}"; - sha256 = "15fzf0bvarivm32zqa5w71mscpxdac64ykiawc5hx6kplz93bsgx"; + sha256 = "1gvzw23mly8cp7ag3xpbngpid9gqrfj8cyv9dar6i9j660bh03km"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; - buildInputs = [ oathToolkit kirigami2 qtquickcontrols2 qtbase ]; - - postInstall = '' - mv $out/bin/org.kde.keysmith $out/bin/.org.kde.keysmith-wrapped - makeWrapper $out/bin/.org.kde.keysmith-wrapped $out/bin/org.kde.keysmith \ - --set QML2_IMPORT_PATH "${lib.getLib kirigami2}/lib/qt-5.12.7/qml:${lib.getBin qtquickcontrols2}/lib/qt-5.12.7/qml:${lib.getBin qtdeclarative}/lib/qt-5.12.7/qml:${qtgraphicaleffects}/lib/qt-5.12.7/qml" \ - --set QT_PLUGIN_PATH "${lib.getBin qtbase}/lib/qt-5.12.7/plugins" - ln -s $out/bin/org.kde.keysmith $out/bin/keysmith - ''; + buildInputs = [ libsodium ki18n oathToolkit kirigami2 qtquickcontrols2 qtbase ]; + propagatedBuildInput = [ oathToolkit ]; meta = with lib; { description = "OTP client for Plasma Mobile and Desktop"; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 12367949e9e..8c5e2833212 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "bottom"; @@ -11,12 +11,18 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk="; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0="; doCheck = false; + postInstall = '' + installShellCompletion $releaseDir/build/bottom-*/out/btm.{bash,fish} --zsh $releaseDir/build/bottom-*/out/_btm + ''; + meta = with stdenv.lib; { description = "A cross-platform graphical process/system monitor with a customizable interface"; homepage = "https://github.com/ClementTsang/bottom"; @@ -25,4 +31,3 @@ rustPlatform.buildRustPackage rec { platforms = platforms.unix; }; } - diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 6b6aa40a0f7..7a212f5bbee 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.70"; + version = "21.71"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z"; + sha256 = "1g671fvkg6r30n9vwwlqpdd6yn6jf7n9ynjmslblk7kbnabzayby"; }; patchPhase = '' diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index a918770aa7b..e4e80e694fe 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.57"; + version = "3.59"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf"; + sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb"; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3c968a77fa..bca4235be78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -240,6 +240,8 @@ in digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; + gretl = callPackage ../applications/science/math/gretl { }; + grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { @@ -461,6 +463,8 @@ in madonctl = callPackage ../applications/misc/madonctl { }; + copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; + makeDesktopItem = callPackage ../build-support/make-desktopitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { }; @@ -3430,7 +3434,7 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; @@ -4616,7 +4620,7 @@ in hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; @@ -5053,7 +5057,7 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; @@ -6535,7 +6539,7 @@ in tab = callPackage ../tools/text/tab { }; - tautulli = callPackage ../servers/tautulli { python = python2; }; + tautulli = python3Packages.callPackage ../servers/tautulli { }; ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; @@ -15629,6 +15633,8 @@ in quicksynergy = callPackage ../applications/misc/quicksynergy { }; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; + qwt = callPackage ../development/libraries/qwt {}; qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { @@ -18317,6 +18323,10 @@ in acpi_call = callPackage ../os-specific/linux/acpi-call {}; + akvcam = callPackage ../os-specific/linux/akvcam { + inherit (qt5) qmake; + }; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; @@ -20784,10 +20794,12 @@ in buildServerGui = false; }; - droopy = python37Packages.callPackage ../applications/networking/droopy { }; + droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; + dsf2flac = callPackage ../applications/audio/dsf2flac { }; + dunst = callPackage ../applications/misc/dunst { }; du-dust = callPackage ../tools/misc/dust { }; @@ -25060,7 +25072,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { }; + zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; @@ -27841,7 +27853,9 @@ in disnix = callPackage ../tools/package-management/disnix { }; - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {}); + dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { + inherit (pythonPackages) supervisor; + }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e613b931d63..2d25ea149a9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -96,7 +96,7 @@ in { }; ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 then + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then packages.ghc8102BinaryMinimal else packages.ghc865Binary; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a72b5218070..c7d805d4c74 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -493,7 +493,9 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; - lwt = callPackage ../development/ocaml-modules/lwt { }; + lwt = callPackage ../development/ocaml-modules/lwt { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_lwt = lwt; @@ -670,7 +672,9 @@ let ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; @@ -816,7 +820,9 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; + sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; tsort = callPackage ../development/ocaml-modules/tsort { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7878f1910e..274c56665ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10703,21 +10703,25 @@ let }; }; - LaTeXML = buildPerlPackage { + LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz"; - sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; + url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; + sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; - propagatedBuildInputs = [ shortenPerlShebang ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; - doCheck = false; # epub test fails - postInstall = '' - shortenPerlShebang $out/bin/latexml - shortenPerlShebang $out/bin/latexmlc - shortenPerlShebang $out/bin/latexmlfind - shortenPerlShebang $out/bin/latexmlmath - shortenPerlShebang $out/bin/latexmlpost + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; + preCheck = '' + rm t/931_epub.t # epub test fails + ''; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + # shebangs need to be patched before executables are copied to $out + preBuild = '' + patchShebangs bin/ + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for file in bin/*; do + shortenPerlShebang "$file" + done ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65d41643a7f..a2e087c3f4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -910,7 +910,7 @@ in { blockdiag = callPackage ../development/python-modules/blockdiag { }; - blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 block-io = callPackage ../development/python-modules/block-io { }; @@ -2757,6 +2757,8 @@ in { hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + hjson = callPackage ../development/python-modules/hjson { }; + hkdf = callPackage ../development/python-modules/hkdf { }; hmmlearn = callPackage ../development/python-modules/hmmlearn { }; @@ -2896,6 +2898,8 @@ in { ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + ifcopenshell = callPackage ../development/python-modules/ifcopenshell { }; + ignite = callPackage ../development/python-modules/ignite { }; ihatemoney = callPackage ../development/python-modules/ihatemoney { }; @@ -7893,6 +7897,8 @@ in { phantomjsSupport = false; }; + youtube-dlc = callPackage ../development/python-modules/youtube-dlc { }; + yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { }; |