diff options
Diffstat (limited to 'pkgs')
136 files changed, 3077 insertions, 645 deletions
diff --git a/pkgs/applications/audio/ebumeter/default.nix b/pkgs/applications/audio/ebumeter/default.nix new file mode 100644 index 0000000000000..9ebcbec001d0d --- /dev/null +++ b/pkgs/applications/audio/ebumeter/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl +, libX11, libXft, libclthreads, libclxclient, libjack2, libpng, libsndfile, zita-resampler +}: + +stdenv.mkDerivation rec { + pname = "ebumeter"; + version = "0.4.2"; + + src = fetchurl { + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; + sha256 = "1wm9j1phmpicrp7jdsvdbc3mghdd92l61yl9qbps0brq2ljjyd5s"; + }; + + buildInputs = [ + libX11 libXft libclthreads libclxclient libjack2 libpng libsndfile zita-resampler + ]; + + preConfigure = '' + cd source + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Level metering according to the EBU R-128 recommendation"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 1733aef41775a..fbd94ebd3d16e 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitLab -, fetchpatch , meson , ninja , gettext diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 200e457c5685c..785c334e15236 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -40,11 +40,6 @@ in pythonPackages.buildPythonApplication rec { dateutil ]; - prePatch = '' - # Pesky unicode punctuation. - substituteInPlace setup.cfg --replace "‘" "'" - ''; - # In order to spare double wrapping, we use: preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index a503d3b344cb2..96433221e9321 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -14,7 +14,6 @@ , openssl , pkg-config , python3 -, rust , rustc , rustPlatform , sqlite diff --git a/pkgs/applications/audio/tuijam/default.nix b/pkgs/applications/audio/tuijam/default.nix index 8a08b64508d78..4a215528b7cda 100644 --- a/pkgs/applications/audio/tuijam/default.nix +++ b/pkgs/applications/audio/tuijam/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , lib , python3Packages -, youtube-dl }: buildPythonApplication rec { diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 776253ac9cddc..dd3904b27cb86 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -1,6 +1,12 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: -buildGoModule rec { +let + # A list of binaries to put into separate outputs + bins = [ + "geth" + ]; + +in buildGoModule rec { pname = "go-ethereum"; version = "1.9.25"; @@ -16,6 +22,13 @@ buildGoModule rec { doCheck = false; + outputs = [ "out" ] ++ bins; + + # Move binaries to separate outputs and symlink them back to $out + postInstall = lib.concatStringsSep "\n" ( + builtins.map (bin: "mkdir -p \$${bin}/bin && mv $out/bin/${bin} \$${bin}/bin/ && ln -s \$${bin}/bin/${bin} $out/bin/") bins + ); + subPackages = [ "cmd/abidump" "cmd/abigen" @@ -40,7 +53,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; - license = with licenses; [ lgpl3 gpl3 ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ]; }; } diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 67cb0028ae589..da7b70cecd2ab 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -35,7 +35,6 @@ , wrapGAppsHook , dbus , xvfb_run -, glib }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index af98580a8bf80..12b9c638c4c1e 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-40VgWfSjyERHJapiIXSk89O3X1V8rb8JEWqfnAyf1Sc="; + sha256 = "sha256-MFCQwhdF+WCTqDt4q5qw431y/zqEy9vHudcUYb4BYNQ="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix new file mode 100644 index 0000000000000..d7b0703b8d5e2 --- /dev/null +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libxml2 +, libpeas +, glib +, gtk3 +, gtksourceview4 +, gspell +, xapps +, pkg-config +, meson +, ninja +, wrapGAppsHook +, intltool +, itstool }: + +stdenv.mkDerivation rec { + pname = "xed-editor"; + version = "2.8.4"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "xed"; + rev = version; + sha256 = "1hqr4157kp110p01jygqnnzj86zxlfiq4b53j345vqpx0f80c340"; + }; + + nativeBuildInputs = [ + meson + cmake + pkg-config + intltool + itstool + ninja + wrapGAppsHook + ]; + + buildInputs = [ + libxml2 + glib + gtk3 + gtksourceview4 + libpeas + gspell + xapps + ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then + echo "${pname} smoke test passed" + else + echo "${pname} smoke test failed" + return 1 + fi + ''; + + meta = with lib; { + description = "Light weight text editor from Linux Mint"; + homepage = "https://github.com/linuxmint/xed"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index faa25f4aef0e9..26de91ee2252d 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , gnome3 , pkg-config , meson diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index f3fec316bf9bc..8646a6716a457 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -5,11 +5,11 @@ watchdog, wtforms, html2text, flask-compress }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "53a43e26e9081ac266412d8643c66c07c289c4639bbaec374fd5147441253a4f"; + sha256 = "6f706b925175852d8101a4afe2304ab7ee7d56e9658538b9a8e49e925978b87e"; }; # Relax some dependencies diff --git a/pkgs/applications/misc/lscolors/cargo.lock.patch b/pkgs/applications/misc/lscolors/cargo.lock.patch new file mode 100644 index 0000000000000..2f233a0667b8e --- /dev/null +++ b/pkgs/applications/misc/lscolors/cargo.lock.patch @@ -0,0 +1,159 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..3528c6c +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,153 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "getrandom" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" ++ ++[[package]] ++name = "lscolors" ++version = "0.7.1" ++dependencies = [ ++ "ansi_term", ++ "tempfile", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "rand" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix new file mode 100644 index 0000000000000..76e4792ab1c2c --- /dev/null +++ b/pkgs/applications/misc/lscolors/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "lscolors"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "0av3v31fvanvn59bdm9d0v9zh5lzrq0f4vqhg6xlvabkgsa8jk04"; + }; + + cargoPatches = [ + ./cargo.lock.patch + ]; + + cargoSha256 = "02k23idwy0sb4lnjrwnyah3qp22zj161ilbc13p75k0hdijfaxl5"; + + meta = with lib; { + description = "Rust library and tool to colorize paths using LS_COLORS"; + homepage = "https://github.com/sharkdp/lscolors"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index cb8494e1c48db..bacaf88e5cf53 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchFromGitHub, fetchpatch +{ buildPythonApplication, lib, fetchFromGitHub # build inputs , atk diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index b64654ad6758e..76009b96a3320 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.10.13"; + version = "0.11.0"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "J4kaNtB6DVivNDhrGwrRZJBvu4Bpzl0jY1ZtlAtQiZE="; + sha256 = "AkPx7X00kEds7B1syXJPSV1+TJlqQ7NnR6w9wSG2BRw="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index d52120e0fb7d0..745d03bb189e6 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -6,7 +6,6 @@ , atspiSupport ? true , bash , glib -, glibcLocales , dconf , gobject-introspection , gsettings-desktop-schemas @@ -130,8 +129,7 @@ python3.pkgs.buildPythonApplication rec { --replace "/etc" "$out/etc" substituteInPlace ./Onboard/LanguageSupport.py \ - --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \ - --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" substituteInPlace ./Onboard/Indicator.py \ --replace "/usr/bin/yelp" "${yelp}/bin/yelp" diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 84ba3ced8fc78..ec78c43dbe041 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook , webkitgtk, discount, json-glib }: diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index afbf5b364ed4f..2f0a58b8e4253 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: +{ lib +, stdenv +, fetchurl +, fetchsvn +, makeWrapper +, makeDesktopItem +# sweethome3d 6.4.2 does not yet build with jdk 9 and later. +# this is fixed on trunk (7699?) but let's build with jdk8 until then. +, jdk8 +# it can run on the latest stable jre fine though +, jre +, ant +, gtk3 +, gsettings-desktop-schemas +, p7zip +, libXxf86vm +}: let @@ -27,23 +42,29 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - patchPhase = '' + postPatch = '' patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; + buildInputs = [ ant jdk8 makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' + runHook preBuild + ant furniture textures help mkdir -p $out/share/{java,applications} mv "build/"*.jar $out/share/java/. ant + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp install/${module}-${version}.jar $out/share/java/. @@ -59,6 +80,8 @@ let --set MESA_GL_VERSION_OVERRIDE 2.1 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" + + runHook postInstall ''; dontStrip = true; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 08bc5b90fd9ca..a008b49ba7183 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, sweethome3dApp }: +{ lib +, stdenv +, fetchcvs +, makeWrapper +, makeDesktopItem +# sweethome3d 6.4.2 does not yet build with jdk 9 and later. +# this is fixed on trunk (7699?) but let's build with jdk8 until then. +, jdk8 +# it can run on the latest stable jre fine though +, jre +, ant +, gtk3 +, gsettings-desktop-schemas +, sweethome3dApp }: let @@ -23,15 +35,19 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; + buildInputs = [ ant jdk8 makeWrapper gtk3 gsettings-desktop-schemas ]; - patchPhase = '' + postPatch = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml ''; buildPhase = '' - ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk}/lib + runHook preBuild + + ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk8}/lib + + runHook postBuild ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 12adbc0a9b79e..e5282d79a28c8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.13.5"; + version = "0.14.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "067l9m47j40039q8mvvnxd1amwrac3x6vv0c0svimfpvj4ammgkg"; + sha256 = "sha256-LxJJ0yBlw9hJ/agyL9dbVe4STKdXE8rtk1mMFqe1fFI="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 64f4c27c96c6b..78eef775558ba 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.1.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "0c7w4a19cwx3bkmbhc9c1wx0zmqd3a1grrj4ffifdic95wdihv7x"; + sha256 = "sha256-EN0fQ5Scwrd7Tv31upQVbuqoNCoYudtruwtPR1IKTzE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index b4bec6ead3f64..861b5a15ee067 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, lispPackages, sbcl +{ stdenv, lib, lispPackages , makeWrapper, wrapGAppsHook, gst_all_1 , glib, gdk-pixbuf, cairo , mime-types, pango, gtk3 diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 01797397f4ef2..fcd27eceaa840 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -19,9 +19,7 @@ , dbus , vala , wrapGAppsHook -, xorg , xvfb_run -, libxml2 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index d11461366b619..23f4dfe14c3b4 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -15,10 +15,10 @@ buildGoModule rec { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw="; + sha256 = "sha256-QhAN30ge0dbC9dGT1yP4o0VgrcS9+g+r6YJ07ZjPJtg="; }; - vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM="; + vendorSha256 = "sha256-bX1GfKbAbdEAnW3kPNsbF/cJWufxvuhm//G88qJ3u08="; nativeBuildInputs = [ makeWrapper ]; @@ -30,6 +30,9 @@ buildGoModule rec { "-X github.com/AkihiroSuda/nerdctl/pkg/version.Revision=<unknown>" ]; + # Many checks require a containerd socket and running nerdctl after it's built + doCheck = false; + postInstall = '' wrapProgram $out/bin/nerdctl \ --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ @@ -39,6 +42,9 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck + # nerdctl expects XDG_RUNTIME_DIR to be set + export XDG_RUNTIME_DIR=$TMPDIR + $out/bin/nerdctl --help # --version will error without containerd.sock access $out/bin/nerdctl --help | grep "${version}" diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 4004402475d56..6bf2e47616306 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.6"; + version = "0.28.7"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DzC/HNwFNNEJhic/8KpHchrBmsSbrn7xf1DjY0JTH08="; + sha256 = "sha256-pM3R85gdP2eVoXx//2tKePNAi14eM8Ut+eXR+vB0Ukk="; }; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; @@ -22,6 +22,14 @@ buildGoModule rec { "-X main.VERSION=v${version}" ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/terragrunt --help + $out/bin/terragrunt --version | grep "v${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://terragrunt.gruntwork.io"; changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}"; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index a18a5198d058e..bb5776b65e341 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -1,13 +1,14 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: + let pname = "deltachat-electron"; - version = "1.14.1"; + version = "1.15.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "0w00qr8wwrxwa2g71biyz42k8y5y766m6k876bnzq927vcjilq6b"; + sha256 = "sha256-lItI1aIFHYQ3wGRVn4Yw0nA7qgfhyHT/43kKbY/1cgI="; }; appimageContents = appimageTools.extract { inherit name src; }; @@ -16,6 +17,10 @@ in appimageTools.wrapType2 { inherit name src; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} install -m 444 -D \ diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 8ea277e1af3b9..8bd1d8f974b31 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee +{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook , appstream, desktop-file-utils }: diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c917c43969131..c9b1099f8b96b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext +{ stdenv, fetchurl, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 739b003bbef6d..91673ed146aae 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.89"; + version = "5.0.95"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl"; + sha256 = "16rahl14clgnl7gzpw7rxx23yxbw1nbrz219q051zkjkkw5ai8lv"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc ]; - patchPhase = '' + postPatch = '' sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js ''; @@ -103,33 +103,36 @@ stdenv.mkDerivation rec { mimeType = "text/plain"; }; - installPhase = - '' - mkdir -p "$prefix/usr/lib/zotero-bin-${version}" - cp -r * "$prefix/usr/lib/zotero-bin-${version}" - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" + installPhase = '' + runHook preInstall - # install desktop file and icons. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications/ - for size in 16 32 48 256; do - install -Dm444 chrome/icons/default/default$size.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png - done + mkdir -p "$prefix/usr/lib/zotero-bin-${version}" + cp -r * "$prefix/usr/lib/zotero-bin-${version}" + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" - for executable in \ - zotero-bin plugin-container \ - updater minidump-analyzer - do - if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/zotero-bin-${version}/$executable" - fi - done - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/zotero-bin-${version}/{}" \; + # install desktop file and icons. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications/ + for size in 16 32 48 256; do + install -Dm444 chrome/icons/default/default$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png + done + + for executable in \ + zotero-bin plugin-container \ + updater minidump-analyzer + do + if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/zotero-bin-${version}/$executable" + fi + done + find . -executable -type f -exec \ + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/zotero-bin-${version}/{}" \; + + runHook postInstall ''; preFixup = '' @@ -141,7 +144,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.linux; + maintainers = with maintainers; [ i077 ]; }; } diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3ed6234b4f86f..1a5c0de5fb7f5 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -1,5 +1,5 @@ -{ lib, stdenv -, fetchFromGitLab +{ lib +, stdenv , cmake , libGLU , libGL @@ -18,9 +18,7 @@ , pcre , libpthreadstubs , libXdmcp -, fetchpatch , lndir -, callPackage , stable , baseName diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 88bb79788812b..dcf51e657c4a1 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -15,19 +15,15 @@ , stable ? true , oceSupport ? false , withOCE ? false -, opencascade , withOCCT ? false , withOCC ? true -, opencascade-occt , ngspiceSupport ? false , withNgspice ? true , libngspice , scriptingSupport ? false , withScripting ? true -, swig , python3 , debug ? false -, valgrind , with3d ? true , withI18n ? true , srcs ? { } diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 086f23d528a79..db6cf2600c360 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C-style arbitrary precision calculator"; homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; - license = licenses.lgpl21Only; + # The licensing situation depends on readline (see section 3 of the LGPL) + # If linked against readline then GPLv2 otherwise LGPLv2.1 + license = with licenses; if enableReadline then gpl2Only else lgpl21Only; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 931e83defdc92..b55e4047fe472 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -9,7 +9,6 @@ , gtk3 , glib , pantheon -, libsoup , gtksourceview , libgee , nix-update-script diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 26ca10e3f3fbd..e41d9bee5b4b7 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib +{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib , future, psutil, setuptools # Optional dependencies: , bottle, pysnmp diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index a4080fbdacbbf..a52b11bff92b0 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "03bsramq75i5sw08gdmjh94n1xh743mq6h4dzaix78i531x7y34i"; + sha256 = "1wq8k626w3w2cnqp9gqdk7g4pjnqjjybkjgbfq5cvqsql3jdjg65"; }; vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g"; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index d22657d651cbc..e60acf87da6f9 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -1,32 +1,26 @@ { lib, python3 }: -let - py = python3.override { - packageOverrides = self: super: { - PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { - version = "6.0.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm"; - }; - }); - }; - }; +with python3.pkgs; -in with py.pkgs; buildPythonApplication rec { +buildPythonApplication rec { pname = "catt"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1vq1wg79b7855za6v6bsfgypm0v3b4wakap4rash45mhzbgjj0kq"; + sha256 = "sha256-6RUeinHhAvvSz38hHQP5/MXNiY00rCM8k2ONaFYbwPc="; }; propagatedBuildInputs = [ - youtube-dl PyChromecast click ifaddr requests + click + ifaddr + PyChromecast + requests + youtube-dl ]; doCheck = false; # attempts to access various URLs + pythonImportsCheck = [ "catt" ]; meta = with lib; { description = "Cast All The Things allows you to send videos from many, many online sources to your Chromecast"; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index f060a7b2e5a64..7e7d80e9fca79 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders +{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders , pkg-config, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring -, boost, avahi, lame, autoreconfHook +, boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless , libxml2, systemd -, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl +, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index e388d5a67fe62..45c96fb180d3b 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,4 @@ { lib -, fetchFromGitHub , fetchurl , pkg-config , gettext diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix new file mode 100644 index 0000000000000..d3f87f879c593 --- /dev/null +++ b/pkgs/applications/video/xplayer/default.nix @@ -0,0 +1,103 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, autoconf-archive +, clutter-gst +, clutter-gtk +, gettext +, glib +, gobject-introspection +, gst-plugins-bad +, gst-plugins-base +, gst-plugins-good +, gstreamer +, gtk-doc +, gtk3 +, intltool +, itstool +, libpeas +, libxml2 +, libxplayer-plparser +, pkg-config +, python3 +, wrapGAppsHook +, xapps +, yelp-tools }: + +let + pythonenv = python3.withPackages (ps: [ + ps.pygobject3 + ps.dbus-python # For one plugin + ]); +in + +stdenv.mkDerivation rec { + pname = "xplayer"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "1xcv6nr2gc0vji5afwy283v7bgx46kzgrq79hl8q9pz995qq2kbp"; + }; + + # configure wants to find gst-inspect-1.0 via pkgconfig but + # the gstreamer toolsdir points to the wrong derivation output + postPatch = '' + substituteInPlace configure.ac \ + --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer.dev}/bin/gst-inspect-1.0' \ + ''; + + preBuild = '' + makeFlagsArray+=( + "INCLUDES=-I${glib.dev}/include/gio-unix-2.0" + "CFLAGS=-Wno-error" # Otherwise a lot of deprecated warnings are treated as error + ) + ''; + + nativeBuildInputs = [ + autoreconfHook + wrapGAppsHook + autoconf-archive + gettext + gtk-doc + intltool + itstool + pkg-config + yelp-tools + ]; + + buildInputs = [ + clutter-gst + clutter-gtk + glib + gobject-introspection + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer + gtk3 + libpeas + libxml2 + libxplayer-plparser + pythonenv + xapps + # to satisfy configure script + pythonenv.pkgs.pygobject3 + ]; + + postInstall = '' + wrapProgram $out/bin/xplayer \ + --prefix PATH : ${lib.makeBinPath [ pythonenv ]} + ''; + + meta = with lib; { + description = "A generic media player from Linux Mint"; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + homepage = "https://github.com/linuxmint/xplayer"; + maintainers = with maintainers; [ tu-maurice ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/xplayer/plparser.nix b/pkgs/applications/video/xplayer/plparser.nix new file mode 100644 index 0000000000000..da3daa445f6a3 --- /dev/null +++ b/pkgs/applications/video/xplayer/plparser.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, intltool +, gobject-introspection +, gmime +, libxml2 +, libsoup +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "xplayer-plparser"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "1i7sld8am6b1wwbpfb18v7qp17vk2a5p8xcfds50yznr30lddsb2"; + }; + + nativeBuildInputs = [ + intltool + pkg-config + gobject-introspection + ]; + + buildInputs = [ + gmime + libxml2 + libsoup + ]; + + meta = with lib; { + description = "Playlist parsing library for xplayer"; + homepage = "https://github.com/linuxmint/xplayer-plparser"; + maintainers = with maintainers; [ tu-maurice ]; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 6592621570ce9..572f12cdf835e 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -80,9 +80,9 @@ let if [[ -d ${env}/etc ]]; then for i in ${env}/etc/*; do path="/''${i##*/}" - # NOTE: we're binding /etc/fonts from the host so we don't want to - # override it with a path from the FHS environment. - if [[ $path == '/fonts' ]]; then + # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we + # don't want to override it with a path from the FHS environment. + if [[ $path == '/fonts' || $path == '/ssl' ]]; then continue fi ro_mounts+=(--ro-bind "$i" "/etc$path") diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 82dd336e5e506..7ab25da3cc431 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic + make $makeFlags cc=${stdenv.cc.nativePrefix}cc AR=${stdenv.cc.nativePrefix}ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 198cfe40a6de8..4e951bfcc5865 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -8,18 +8,11 @@ , intltool , gtk3 , libnotify -, gnome-menus , libxml2 -, systemd -, upower , gnome-online-accounts , cinnamon-settings-daemon , colord , polkit -, ibus -, libpulseaudio -, isocodes -, kerberos , libxkbfile , cinnamon-menus , dbus-glib @@ -27,7 +20,6 @@ , libxklavier , networkmanager , libwacom -, gnome3 , libtool , wrapGAppsHook , tzdata diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index f0972f8d6f183..60ec6792e5dd7 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , vala , meson , ninja diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 3ca257db49bf2..a209f2d2d9c2c 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , pkg-config , gtk3 , vala diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index e20983380a43a..efc94e4baf487 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; rev = "icedtea-web-${version}"; - sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; + sha256 = "sha256-AC6D6n8jLdATXIXrDTHhs2QFnIZNaaZvJyFEqfxCxYQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config bc ]; diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index defe78d7c318e..cfbec681e8a1c 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -27,13 +27,13 @@ let ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ])); in stdenv.mkDerivation rec { pname = "bluespec"; - version = "unstable-2020.11.04"; + version = "unstable-2021.02.14"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; - rev = "103357f32cf63f2ca2b16ebc8e2c675ec5562464"; - sha256 = "0iikzx0fxky0fmc31lyxfldy1wixr2mayzcn24b8d76wd4ix1vk3"; + rev = "c085ecd807d85f31d102d8bec71f5c28dc96b31d"; + sha256 = "0c86gwhrarw78cr9c9slb9vij6kcwx3x281kbqji96qqzs0dfb32"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 6ad25d24eae67..72f3dd552de6d 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -95,12 +95,12 @@ let null ; in mkDerivation rec { - version = "6.1.0"; + version = "6.2.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "0mqa1g3fq0q45mqc0didr8vl6bk7jzj6gjsf1522qqjq2r04xwvg"; + sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw="; }; buildInputs = [ diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 23d7f9d8629ad..937eef2d0d99b 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -26,5 +26,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; + # https://github.com/awslabs/aws-c-common/issues/754 + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 313a063cae898..178bf64f5c296 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,10 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext -, config , pkg-config , python3 , gst-plugins-base diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a032f5f5b5a49..cdf1660d4fa36 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -30,6 +30,7 @@ , mpg123 , twolame , gtkSupport ? false, gtk3 ? null +, qt5Support ? false, qt5 ? null , raspiCameraSupport ? false, libraspberrypi ? null , enableJack ? true, libjack2 , libXdamage @@ -102,7 +103,12 @@ stdenv.mkDerivation rec { ] ++ optionals gtkSupport [ # for gtksink gtk3 - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals qt5Support (with qt5; [ + qtbase + qtdeclarative + qtwayland + qtx11extras + ]) ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l @@ -118,7 +124,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps + ] ++ optionals (!qt5Support) [ + "-Dqt5=disabled" ] ++ optionals (!gtkSupport) [ "-Dgtk3=disabled" ] ++ optionals (!enableJack) [ @@ -131,7 +138,6 @@ stdenv.mkDerivation rec { "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only - "-Dpulse=disabled" # TODO check if we can keep this enabled ] ++ optionals (!raspiCameraSupport) [ "-Drpicamsrc=disabled" ]; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 5ab6dde09d785..43092f71c571a 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -9,7 +9,6 @@ , docbook_xsl , docbook_xml_dtd_43 , gtk3 -, gnome3 , glade , dbus , xvfb_run diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index a5b6e3b117ea1..8bd187b5300c1 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.16.1"; + version = "3.17.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-mTxxiyN4t84BD4bBysvsrvP7L+DNbP6sMlcNFg4eMF8="; + sha256 = "sha256-VlKJrGZOMmnWFmdwV3SchBfyRsHM78eNV+uWONLZbJI="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index c0019ee268afb..fd7d80574a7d5 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -23,5 +23,8 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libwnck"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ johnazoidberg ]; + # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found + # #include <gdk/gdkx.h> + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index f61811428ce6f..dbbaca7e11a7a 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus -, telepathy-farstream, telepathy-glib, fetchpatch }: +, telepathy-farstream, telepathy-glib }: let inherit (python3Packages) python dbus-python; diff --git a/pkgs/development/python-modules/PyRMVtransport/default.nix b/pkgs/development/python-modules/PyRMVtransport/default.nix index ca44e5a80f92f..cfbf3be1c40c5 100644 --- a/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "PyRMVtransport"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "1y412xmdskf13673igzsqsglpdc3d5r6pbm8j85csax0blv7rn1m"; + sha256 = "1savzndg8l7rrc5dgzgsrdz9hnnjfv6qs5drznqmdw4f2rq84ypa"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index f6822ede08cd6..8d3de12cd9930 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -4,7 +4,6 @@ , asyncio-dgram , asynctest , buildPythonPackage -, cryptography , fetchFromGitHub , poetry , pytest-aiohttp diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index aae46e4e3225c..98ab09fd8e6bf 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.57"; + version = "0.0.58"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-xOLMUf72VHeBzbMnhJGOnUIKkflnY4rV9NS/P1aYLJc="; + sha256 = "sha256-/5sYiYRFa8XJJ4QSxLzJBHaKfAKsGETiVDHerNQ79U8="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index 1797f1d4264d1..c9fc464f06941 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; + doCheck = false; + pythonImportsCheck = [ "gmusicapi" ]; + meta = with lib; { description = "An unofficial API for Google Play Music"; homepage = "https://pypi.python.org/pypi/gmusicapi/"; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 1ad50642e2b9b..3caa89d06f787 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ]; + # no tests executed + doCheck = false; + + pythonImportsCheck = [ "gpsoauth" ]; + meta = with lib; { description = "A python client library for Google Play Services OAuth"; homepage = "https://github.com/simon-weber/gpsoauth"; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index f3b8393a2759b..110c28ee2f406 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,13 +2,15 @@ buildPythonPackage rec { pname = "identify"; - version = "1.5.13"; + version = "1.5.14"; src = fetchPypi { inherit pname version; - sha256 = "70b638cf4743f33042bebb3b51e25261a0a10e80f978739f17e7fd4837664a66"; + sha256 = "de7129142a5c86d75a52b96f394d94d96d497881d2aaf8eafe320cdbe8ac4bcc"; }; + pythonImportsCheck = [ "identify" ]; + # Tests not included in PyPI tarball doCheck = false; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 107febe4041bb..2f87f24639a6e 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.37.0"; + version = "0.38.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "1501lk3fjxqmzxffahbj33y795gwl96yqvk3fs86cchm6vz2gnkk"; + sha256 = "0b2gnym7p6cwgviwdq8pg2dy28pm5535f8kkc8rzc50knqdifl7g"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/json-rpc/default.nix b/pkgs/development/python-modules/json-rpc/default.nix new file mode 100644 index 0000000000000..e475c3117df30 --- /dev/null +++ b/pkgs/development/python-modules/json-rpc/default.nix @@ -0,0 +1,24 @@ +{ lib, isPy27, buildPythonPackage, fetchPypi, pytestCheckHook, mock }: + +let + pythonEnv = lib.optional isPy27 mock; +in buildPythonPackage rec { + pname = "json-rpc"; + version = "1.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12bmblnznk174hqg2irggx4hd3cq1nczbwkpsqqzr13hbg7xpw6y"; + }; + + checkInputs = pythonEnv ++ [ pytestCheckHook ]; + + nativeBuildInputs = pythonEnv; + + meta = with lib; { + description = "JSON-RPC 1/2 transport implementation"; + homepage = "https://github.com/pavlov99/json-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index 5a70dcb4676d4..8b9823b6f031d 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "keep"; - version = "2.10"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "ce71d14110df197ab5afdbd26a14c0bd266b79671118ae1351835fa192e61d9b"; + sha256 = "3abbe445347711cecd9cbb80dab4a0777418972fc14a14e9387d0d2ae4b6adb7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 0446299fd1bdc..cc0ba39e64efb 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "14ljk7rywy3fiv23dpayvk14y1ywma729r3b1x2cxf68919g2gnh"; + sha256 = "17hqck808m59jv6m2g4hasnay44pycy3y0im01fq9jpr3ymcdbi7"; }; postPatch = '' diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 6b1d5ec2bb4c1..ad9d09b326629 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -4,7 +4,6 @@ , impacket , netaddr , pypykatz -, pytestCheckHook }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index c51f8cb54e005..7645fdaec8aa0 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"; }; + dontUseCmakeConfigure = true; + nativeBuildInputs = with pkgs; [ swig qmake cmake ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index e4bab25fd9c12..8c9c0ea004ca4 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , pycryptodomex , pytestCheckHook -, pyyaml , pytest-vcr , pytest-asyncio , requests diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 9eefaa5f364fb..742ea3d08c680 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0dlxgh57j25cvk2pqr2dj4lv6yn0pix2rcl2kzqsg2405rdjks91"; + sha256 = "sha256-3wKV9lPO51LeOM+O8J8TrZeCxTkk37qhkcpivV4dzhQ="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index b5dd0be5445c5..b5875818b952c 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, pythonOlder , geos, pytest, cython , numpy }: @@ -31,7 +31,12 @@ buildPythonPackage rec { libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) - ]; + # included in next release. + (fetchpatch { + url = "https://github.com/Toblerity/Shapely/commit/ea5b05a0c87235d3d8f09930ad47c396a76c8b0c.patch"; + sha256 = "sha256-egdydlV+tpXosSQwQFHaXaeBhXEHAs+mn7vLUDpvybA="; + }) + ]; # Disable the tests that improperly try to use the built extensions checkPhase = '' diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 96f489ec6ed90..a2f6a7aae92b8 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -57,11 +57,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \ - --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ - --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \ - --replace "'idna<2.10'," "'idna'," \ - --replace "'requests<2.24.0'," "'requests'," + --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," ''; # tests require encrypted secrets, see diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix deleted file mode 100644 index edc4bbdebb133..0000000000000 --- a/pkgs/development/python-modules/tiros/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchPypi, buildPythonPackage -, semantic-version, boto3, flask, docutils, requests -}: - -buildPythonPackage rec { - pname = "tiros"; - version = "1.0.44"; - - src = fetchPypi { - inherit pname version; - sha256 = "d6bf7410967554ec283f9d4eabc0ce6821d6e6d36001afbdb7fe0826423d4f37"; - }; - - patchPhase = '' - sed -E -i "s/'([[:alnum:].-_]+)[=><]{2}[[:digit:].]*'/'\\1'/g" setup.py - sed -i "s/'datetime',//" setup.py - ''; - - propagatedBuildInputs = [ semantic-version boto3 flask docutils requests ]; -} diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index d72d4aa35d4d9..2fc9a98a26f9e 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -10,9 +10,6 @@ , doxygen , ncurses , libintl -, numpy -, pillow -, six , wxGTK , wxmac , IOKit diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index e4cb6ec79e014..a86e07729d971 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -6,7 +6,6 @@ , pkg-config , python , isPy27 -, pyopengl , doxygen , cairo , ncurses diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix deleted file mode 100644 index 65e2b3711fa04..0000000000000 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchurl, isPy3k }: -buildPythonPackage rec { - pname = "xmpp.py"; - version = "0.5.0rc1"; - - patches = [ ./ssl.patch ]; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; - sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; - }; - - preInstall = '' - mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) - export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) - ''; - - disabled = isPy3k; - - meta = with lib; { - description = "XMPP python library"; - homepage = "http://xmpppy.sourceforge.net/"; - license = licenses.gpl3; - maintainers = [ maintainers.mic92 ]; - }; -} diff --git a/pkgs/development/python-modules/xmpppy/ssl.patch b/pkgs/development/python-modules/xmpppy/ssl.patch deleted file mode 100644 index 915602dc23e5c..0000000000000 --- a/pkgs/development/python-modules/xmpppy/ssl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py ---- xmpppy-0.5.0rc1/xmpp/transports.py 2009-04-07 12:34:09.000000000 +0400 -+++ xmpppy-0.5.0rc1.q/xmpp/transports.py 2015-05-08 13:06:03.049252065 +0300 -@@ -27,7 +27,7 @@ - Also exception 'error' is defined to allow capture of this module specific exceptions. - """ - --import socket,select,base64,dispatcher,sys -+import socket,ssl,select,base64,dispatcher,sys - from simplexml import ustr - from client import PlugIn - from protocol import * -@@ -312,9 +312,9 @@ - """ Immidiatedly switch socket to TLS mode. Used internally.""" - """ Here we should switch pending_data to hint mode.""" - tcpsock=self._owner.Connection -- tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None) -- tcpsock._sslIssuer = tcpsock._sslObj.issuer() -- tcpsock._sslServer = tcpsock._sslObj.server() -+ tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, None, None) -+ tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer') -+ tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server') - tcpsock._recv = tcpsock._sslObj.read - tcpsock._send = tcpsock._sslObj.write - diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 5578e03dc96e5..5c6fd8e3b90d7 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.144.0"; + version = "0.145.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Qr/fizCV+t6SbETEqns72Xv24ucLcqi1JRXF8SAtQRU="; + sha256 = "sha256-6fRKXKh+hB/d2CcmZYYSlMzP1IGCl7fLdXCQ1M0wuY4="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 8401e4b7ee11a..1c26f64b21a16 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.38.3"; + version = "0.38.4"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "0vw62cagggqpv3q68ypz3wykhyghz6dzl59hxsahy8lr9b1npy8a"; + sha256 = "sha256-BWWW54AXj/aV+Yar0EVZPl9fN2l29SgzpRDin1Y76BA="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 12fd01e5e4ed6..1b4f74f91d43a 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.6"; + version = "1.4.8"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "1fx80yrf03llhxcd8az5vzralz01wdfk7000q8l04rj1ax3daqia"; + sha256 = "1hfd5gc98bp4p4m85jva2mlkh10q10n9s5136z8620mmjq93rx70"; }; bloop-bash = fetchurl { @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hg02a3ildgqv8864zg08hvk4y0kmsxsg7ncbsl933rclhk2lybd" - else if stdenv.isDarwin && stdenv.isx86_64 then "1i9kh4h5w3gr4w6rf5m7xpfqwps91mfddl1zk25v7f6vsraayam0" - else throw "unsupported platform"; + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1cs3ng6bj9s7xf6c4xaiqgg5qr34abnipfgc44sy2ljklr7x0jwa" + else if stdenv.isDarwin && stdenv.isx86_64 then "0l9vqvzcmxya1s04cps96skw4dslh3i3ks73dl53ing50zb0ga9r" + else throw "unsupported platform"; }; dontUnpack = true; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index efc6523cd986f..06bf2c54678c2 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript -, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused -, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, which +, curl +, makeWrapper +, jdk +, writeScript +, common-updater-scripts +, cacert +, git +, nixfmt +, nix +, jq +, coreutils +, gnused +}: stdenv.mkDerivation rec { pname = "sbt-extras"; @@ -28,41 +42,40 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} ''; - passthru = { - tests = { inherit (nixosTests) sbt-extras; }; - - updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -xo errexit - PATH=${ - lib.makeBinPath [ - common-updater-scripts - curl - cacert - git - nixfmt - nix - jq - coreutils - gnused - ] - } - - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + doInstallCheck = true; + installCheckPhase = '' + $out/bin/sbt -h >/dev/null + ''; - if [ ! "null" = "$latestSha" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" - latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version ${pname} "$latestSha" --version-key=rev - update-source-version ${pname} "$latestDate" --ignore-same-hash - nixfmt "$default_nix" - else - echo "${pname} is already up-to-date" - fi - ''; - }; + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -xo errexit + PATH=${ + lib.makeBinPath [ + common-updater-scripts + curl + cacert + git + nixfmt + nix + jq + coreutils + gnused + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + if [ ! "null" = "$latestSha" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" + latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" + update-source-version ${pname} "$latestSha" --version-key=rev + update-source-version ${pname} "$latestDate" --ignore-same-hash + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; meta = { description = diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index c20e2866dc7ec..d78b54b33e4fa 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.1"; + version = "0.3.10"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zc2ZlyeWdRvyuJLDDTONfh0/q+HKR4lNtSFMjgJWrRY="; + sha256 = "sha256-oS3ZGQkDSRdVLluLNg56VGp6MCrRDlgjk1va1+xocas="; }; - vendorSha256 = "sha256-4IJKXcnMXBqoEjsV4Xg2QYvKwxDDUjcZtrj9IRuT6i4="; + vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; @@ -25,7 +25,15 @@ buildGoModule rec { preCheck = '' # Remove tests that use networking - rm pkg/scanner/scan_test.go pkg/utils/fetch_test.go + rm pkg/scanner/scan_test.go + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/dockle --help + $out/bin/dockle --version | grep "dockle version ${version}" + runHook postInstallCheck ''; meta = with lib; { diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 633e13d25f772..4f475440b0480 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -1,5 +1,4 @@ -{ buildEnv -, fetchurl +{ fetchurl , fontconfig , freetype , glib diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 57e836d8f4ed3..8e58a81130561 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.2.1"; + version = "2020.2.2"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh"; + sha256 = "1vk9c4hsv8i3zhkyrsd0cb5mscxl35ws5bykpp5h6g366rpl0dy1"; }; vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak"; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 2e973e9a0b062..49928b1a08b52 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.36.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-AObZI104q+kOvV3/6aAusl5PMro1nbNUasvmJ4mRGz8="; + sha256 = "sha256-x0VLNQeTVN9aPO06Yi1DTb8bTjq+9VemJaX1R+8s/Bg="; }; - vendorSha256 = "sha256-jr8sYfonggAHqtq3A8YVuTqJu3/iIu0OgBEUWj6bq+A="; + vendorSha256 = "sha256-uduT4RL6p6/jdT8JeTx+FY9bz0P2eUSaFNDIzi7jcqg="; doCheck = false; @@ -19,7 +19,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=19700101-00:00:00" ]; + preBuild = '' + buildFlagsArray+=("-ldflags=-s -w -X main.version=${version} -X main.commit=v${version} -X main.date=19700101-00:00:00") + ''; postInstall = '' for shell in bash zsh; do @@ -31,7 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Fast linters Runner for Go"; homepage = "https://golangci-lint.run/"; - license = licenses.gpl3; - maintainers = with maintainers; [ anpryl manveru ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ anpryl manveru mic92 ]; }; } diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 435edd61623bf..d75dae12bcb3e 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-eJxrdR3JYqF+GexcwnyHV4xO75stEDNFzxDtky7PVc8="; + sha256 = "sha256-/DpsB3MS0iPYFSug3RTWOprB8tclVP6v3dbS3mC3S+g="; }; - vendorSha256 = "sha256-VQ3/VkxoYtY71xJQj6/XAoIEH4jr4Rq4hFqFnwxzkSU="; + vendorSha256 = "sha256-AOdWv0PkDi8o5V71DVzAd/sRibbMf3CkqmJGmuxHtuc="; doCheck = false; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index e8fe27aae099f..ad4304fc6e1f7 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { postInstallCheck = '' $bin/bin/jq --help >/dev/null + $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null ''; - passthru.tests = { inherit (nixosTests) jq; }; - meta = with lib; { description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index f444f86dbfbe6..2db336a4991e5 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: stdenv.mkDerivation rec { pname = "msitools"; - version = "0.98"; + version = "0.99"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; + sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU="; }; - nativeBuildInputs = [ intltool pkg-config ]; + nativeBuildInputs = [ bison intltool pkg-config ]; buildInputs = [ glib libgsf libuuid gcab bzip2 ]; passthru = { @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = "https://wiki.gnome.org/msitools"; license = [ licenses.gpl2 licenses.lgpl21 ]; + maintainers = with maintainers; [ PlushBeaver ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix index 47c9c15a0cc7b..60124ef44c93a 100644 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "005i66d2gkyixqh9sk452la7z86d5x9q3njngjf4z9slcbpgk7bl"; + sha256 = "sha256-y6cgBYiqy+M8dfcNS6iDohqyip6xAs222MJHJFhloiI="; }; - vendorSha256 = "02i1q11nivdlkhf9chpi03p8jpa0fx9wbf79j834qv4fqy7jqf6l"; + vendorSha256 = "sha256-PQj3+qcmN/raDrAbufAcVT+vSumGuOY47i7ZYfvx3yk="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 4d6603d31d994..addcab582f6ea 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-02-15"; + rev = "2021-02-22"; version = "unstable-${rev}"; - sha256 = "sha256-4Dgj2RQDe2FoOSXjL7oaHg8WlYX1vnc66LzzbXvTmjM="; - cargoSha256 = "sha256-c6kr2PWSG3Sns6/O1zOVUFdkLWHAXcQ8LMeensCEuSk="; + sha256 = "sha256-QiVSwpTTOqR2WEm0nXyLLavlF2DnY9GY93HtpgHt2uI="; + cargoSha256 = "sha256-934ApOv/PJzkLc/LChckb/ZXKrh4kU556Bo/Zck+q8g="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index 10f0c6b26ad75..0ce33f0f23361 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -41,6 +41,8 @@ rustPlatform.buildRustPackage { runHook postInstallCheck ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "An experimental modular compiler frontend for the Rust language"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index a3639e559f1c4..5344c1b833ca0 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchFromGitHub , cmake , pkg-config @@ -8,7 +7,6 @@ , wayland-protocols , libwpe , libwpe-fdo -, glib , glib-networking , webkitgtk , makeWrapper diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix index 2c2634959bdf0..022651b64c20c 100644 --- a/pkgs/development/web/nodejs/v15.nix +++ b/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.8.0"; - sha256 = "1a9h88zdzk98k618jascfrivq3v51viw60sfyxn0ci0l33vf4fp2"; + version = "15.9.0"; + sha256 = "1hyq6zj2z3kyfpa8znxa6jwzkw9bvb8mssalify2sjiv00f9dmxx"; } diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 6f3cdab9ab45c..df645171a7f8e 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -29,20 +29,20 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "124.1"; + version = "125.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "1k4k559y8l6wmj9m4980f7xmaaxzx84x86rqc77j4nd3y3x53546"; + sha256 = "0p05ndxhl3zgwm4k9cbqclp995kvcjxxhmbkmpjvv7cphiw82hvw"; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "08v929sgxy1pclzc00p7l7fak2h9l306447w5k5db3719kacj059"; + sha256 = "1injdyxwgc9dn49zvr4qggsfrsslkvh5d53z3yv28ayx48qpsgxk"; }; soloud = fetchFromGitHub { owner = "Anuken"; @@ -114,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "18yfchv55f0fza6gdxd3f6gm0m4wy2a9jkw5wgl84id518jal6la"; + outputHash = "0dk4w8h0kg0mgbn0ifmk29rw8aj917k3nf27qdf1lyr6wl8k7f8k"; }; in diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 71c482fe76608..ef9c7fbe4d642 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -10,6 +10,7 @@ let arch = if stdenv.isDarwin then archDarwin else if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else + if stdenv.isAarch64 then "armv8" else "unknown"; version = "12"; @@ -55,7 +56,7 @@ stdenv.mkDerivation { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro peti ]; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 12561880c6415..e23879815d594 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-02-18"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "1ee7f6c97bb73bb6e12f00e527b664c5ea0df167"; - sha256 = "1z05wvbrsjlqxaw1p4c3d16jj3g43ril56w51ld78wzkc9xh5hh9"; + rev = "76965615558e9398ef4cc79991632a7b68a6c7bc"; + sha256 = "06djm6di95sci45gwm1mrvd8hhiwxh59lix1p34ky0k7yjb6vygk"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-02-18"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "70c97fab3ba6be835aa502642bdd8621b8595713"; - sha256 = "00kmjnr7sbkidcy66b60k409ggwn4rwnyx2lc4bp2cwg4d0f9rcb"; + rev = "de933417e5d37b10d1834095fcd0a1c8c360d34a"; + sha256 = "1fwjpkzkpwy808949iqbsgi6kxyglfyzr1d5hc1911vbayn8wyjy"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -233,12 +233,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-01-29"; + version = "2021-02-21"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "8f437c8960abbd4b29c05a19eaad8c3e792ace05"; - sha256 = "039xln6bwxa6mbwvzdfk32b3v8p4glghb3104nydscy9zbsmpick"; + rev = "d41cf6a68af44dd74bd4a1af0b2c7f33f4475730"; + sha256 = "1ibj1drcj56gjsqhkid3la58jj7y32ygiib3sjsw35091yamcqc2"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-02-18"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0663608e29fda10526af83152840ca549c80e053"; - sha256 = "1h1ghwmqyss2bvz99c6cyjzi7xf8lhqlqnwxdd84d74zj2d446gv"; + rev = "30b987585d83389e05fde6443160f570aa39e1e7"; + sha256 = "1snz1wskla014cxk3dw290bpd0krznhwpm341a9v5vcidhciaprx"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -425,12 +425,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-02-13"; + version = "2021-02-21"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "a98f31d7ab86d4886d72f50064fb85d86c6843eb"; - sha256 = "0s2mgxyzhaj9hvdinkal608yrxyigm7al22cwif6f9ls7aik20zs"; + rev = "29eee5e5c23b3fde59192df92baf7ba775867092"; + sha256 = "0plq37r00d5sn6hci7wn8df09dca3cigvd80pq08pcngbm4h19wl"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -485,36 +485,36 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-02-07"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "8c839426885e290ff5f63d87778f6325339ecf1f"; - sha256 = "03ssv8b5pq44dnj9iplpc76js5mpwg0l77wg4zal5gx0ashgm39p"; + rev = "e4409b415a7c299282556422c71a070ad33c8c71"; + sha256 = "19j0p6ar0kr97xw5sxyywhy4r3wgyzplb482s23rglgxzcdfvp4c"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-02-15"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "633cf6e4564a31f970dc924338e393ca79149209"; - sha256 = "10yvw128zibyp9z49p1mpf3sbj9qgzw3831hh254f6sr9ri69vz1"; + rev = "087ab5582607fca8e35e8afd5121b3b39b7cdb32"; + sha256 = "0vpzhhnyybyq90c525263dan2mha64hwrmbc22kw6rwm1n9smxx8"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-02-09"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "9fd7f97b9696e53066a8e62f528f26b6bc1858b0"; - sha256 = "0lnkz1janblic4a15lr9fm6r62691wpgggdq8hyc5dz0m32jr0hn"; + rev = "228e27dd3118703b4d169b134b458635a3043918"; + sha256 = "1wxz1bljg7p1gyasf71gm3953pkrmaafw84bmwghfgrp8l3914h2"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-01-28"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a336a8bc251702d9526a6818ae56e86d92fafc0c"; - sha256 = "0jh5ik1w6qyp9scr9qxi47n7b8xgznknhsriwcpw2axs9ff00zz8"; + rev = "2bec473a4d8eab4b6a933fc4d2c564a323fb34f8"; + sha256 = "1a6i7mlylpbvj7dbqpd6mcfw8r7cjdjb1mdvk7snaizh7ahl2cc9"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -618,12 +618,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-02-17"; + version = "2021-02-21"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "481cfc3bb7fa66a8fdcf4a8a2e8e226634b5f2dc"; - sha256 = "152z0ixvz89n7wfhr41fipx7mmhjkwx8r50r1mf6ik36gicw0szf"; + rev = "d717a953dbb745289ea794e86e32deb3750a3a18"; + sha256 = "1d8nqcfarcwxyz7cwn200g118v0gky0snvzhc22xl766pacgvslk"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -918,24 +918,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-02-17"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "972ba554fea50378b34a6711f6d0a0e2904c6a0b"; - sha256 = "0rmknirs5a0rkcpprd7wrf5fq85590aj5wdnrmr5vp59wg8677gm"; + rev = "2b5360f3f2965ee5a6f82e09648d0c18e78142f3"; + sha256 = "09bya9rqzk809s5i1xda94f64jnzm3vkh8kiziclgyg42sv6in9b"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-02-09"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "907cf91cc491348bf383f3eb447c1be2a9330cb4"; - sha256 = "1xsri4chlzfr0zc93wl96fpy381maygc3dlvy58nz2yswdr0g103"; + rev = "d66c706c9788aa47399485a3ec29a2a76711a188"; + sha256 = "09bj5442xln6a98ncnq1lxkyrl8c973p9sfd02zl1a3f16sms415"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1136,12 +1136,12 @@ let deoplete-vim-lsp = buildVimPluginFrom2Nix { pname = "deoplete-vim-lsp"; - version = "2021-02-06"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = "deoplete-vim-lsp"; - rev = "fd80985bfd9f140c8e38b303ab325ec86c05b976"; - sha256 = "1h9xprfqrfnfs50hgiah0c2y9lafhc2lldvmc7cl8xa5p9bslxj3"; + rev = "af5432f1e063fd4c3a5879aa8c2afe82c17dc1c9"; + sha256 = "1s6fw6vkpl0yiya22g13v4i14w3n1ds2zr8zdlwpkk44bf0225px"; }; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; @@ -1342,12 +1342,12 @@ let far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2021-01-21"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "b3e7b62ef6820ccdcbdc6070f3573b658aafba43"; - sha256 = "0lf2vlsyk4ymhyscnpla417hvh6qdi8cablammnc5vsk1hmqvc3i"; + rev = "e67b1dbe5842b709687c214fea38ca00f0ffe6c6"; + sha256 = "1ljvl7p2k3bgl54srf6kvshqq16qwfa34ppj982fp2bzzal819l1"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1511,12 +1511,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-02-17"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "daf37458d9bf02783f0a0246a7d76247d60e9aac"; - sha256 = "1d53274h7465w4dxjgqmdj9c60m5yzvf92gw7h9w6hnfchin2bd4"; + rev = "916c00d6a53ab492a46b1f8aa3e052136e804483"; + sha256 = "18yvbxa5rc2s1qyv94d7y6jd2b10ivcv01i42w80gp2kbipp9nay"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1571,12 +1571,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-16"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "aae5f492786aba161138fa1bce9ba42964363ad9"; - sha256 = "063j3h6jy5hi1mj9bjkg627gmk1f6x2axbj07gjg3kal2d1iy90s"; + rev = "bac4f07c9c70aeed25d2a3f5173b782f4efe7c17"; + sha256 = "00m9j6lvg96xaxnzg0vwridhk1m9zaxna2qcki4y2cr083bsc0vd"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1691,12 +1691,12 @@ let gundo-vim = buildVimPluginFrom2Nix { pname = "gundo-vim"; - version = "2020-01-15"; + version = "2021-02-21"; src = fetchFromGitHub { owner = "sjl"; repo = "gundo.vim"; - rev = "99e6240340d9ba07b66c544daf44fa7caffbf7e7"; - sha256 = "0py35mmwnfl581isnbh33j3bjgghq17jnamdi1bg3akwyn1jyhqb"; + rev = "c5efef192b975b8e7d5fa3c6db932648d3b76323"; + sha256 = "1smavxh0nmx4la75b1fjh8cs2x8p8ahxls034254vnm05wiwvghh"; }; meta.homepage = "https://github.com/sjl/gundo.vim/"; }; @@ -2004,12 +2004,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-02-03"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e16cb07240903999e8c62e6d27b4aee8146d29fc"; - sha256 = "10ms35xl218kr5n02y353kg535icj0zzyrsxzzlmn99w90hbnkl7"; + rev = "b2bda998c0e141ee9215ccc123fb7d8ddc8c9d16"; + sha256 = "1lrhydjjriczcf05sj1gzs8yasnixar40mlbzph5fnx4d044jsk4"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2220,12 +2220,12 @@ let lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; - version = "2021-01-27"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "0c45512ffabc6997f74c26b9c87d4b3cb021ab19"; - sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl"; + rev = "2410236d448aa8f407f6a203d90282c34d48b52a"; + sha256 = "0kkg7nbnqj1v46bqq73l58m743p0p7jcbgpscjb16n9ab0n8jqns"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; @@ -2268,24 +2268,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-18"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "ef1997dea263b7043d424034e9c4f5150105b911"; - sha256 = "113y7mbvcqc13ffxcaj468ldfrxq6p3jifv5cjgf33wkjjd1hclf"; + rev = "1fb30cb0334a0b12aa1dbf40a00e7a06c9539f44"; + sha256 = "0kvfbcck0f3nj5fb08yr2yfpp0cszxxp556jix59g3y6drah6bnn"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-17"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "0dd0a23cac1adeaa4dbfc15b4a5cabe44ed59401"; - sha256 = "11bl6gs63wkvb0pjxpx03ls8s27z1rn9llbrrcaf3fbkff2qbrsy"; + rev = "e59ac51ca90fe1b914e94be2f38292c81388912c"; + sha256 = "0v1ijxmqyjk05xzcx2nycrpqbyahai8y380qd9xyl4gmgyfmhvs9"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2352,12 +2352,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-02-11"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "05a9ef7981ff6438e3de5e30323474092badccb8"; - sha256 = "1nr40222fcf1zfacwn2qdzzr074kvcp0p50ii8s6na99qp00nq78"; + rev = "fcf8aa05f3a3c128011236147b4cd1ced718b671"; + sha256 = "1ya5scd3rwiypiwj3xgwr153n3a1d4mg9r5m1wbj3cb7x0s6ddjk"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2580,12 +2580,12 @@ let neco-ghc = buildVimPluginFrom2Nix { pname = "neco-ghc"; - version = "2020-12-19"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "eagletmt"; repo = "neco-ghc"; - rev = "ba23875fadc5e9022acb9d746b99f6fe5155d586"; - sha256 = "08q3wlaq6a8acfcbhh3gdhzwn5rr7w18aqqww0z76hgblav11a4k"; + rev = "699897c2f4ba82c4fd2be6b93c9a2e8e548efe4e"; + sha256 = "03g2mky83a5zd54wzjhc1cv4pwkzcadskjm1c7b36k85yw35v88a"; }; meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; @@ -2916,12 +2916,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-02-15"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "3ce7f98158e604d4578f44ed4181b6f9a4d37900"; - sha256 = "0plkpb1rk82q5plsjnqkwwpdp4knbn93ai6b2c83kwbfiqrka31i"; + rev = "c1764beef2ceba2adb62de5ed89475c71f183a57"; + sha256 = "0h8b2hnqn21lyzla8w79sl8r702702dyi0q8jr1kpqny0s57s0jg"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2964,12 +2964,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-02-15"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "53fc0cee121ef05e719b1df1beacfe0dc07c4520"; - sha256 = "0ldyr1s5zr67viywkwzmjvrb8fi4il00w6ps4kddw2g4fp8ilk8n"; + rev = "b70aa802940db871b6a6b1e9668c5a3052327134"; + sha256 = "0ihij29p38669bdkc5mpbrdszs6iijsbm835n5qp6gj16768jasw"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3036,12 +3036,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-02-17"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "443d7552aca03c03a59e2c084c2e851c281e51de"; - sha256 = "0rh3c52wpgqsvhnsfmp8764d92lckz2c9bzi7kgpjmya4ynr5gzj"; + rev = "a21a509417aa530fb7b54020f590fa5ccc67de77"; + sha256 = "1xlksbcv6va3ih9zg6yw5x6q2d76pr5cs942lh5gcypkx9m2f6r5"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3060,24 +3060,24 @@ let nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-02-17"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "a89aed9833e71d9065ba80c4237a8e4dec2034b1"; - sha256 = "1jsphd9ghwzfzl8plxjvra2b5q3zxlv1679r9mxsp9nz33h1jblr"; + rev = "dde78e4adba0192c3986b20de28d26eca315dec6"; + sha256 = "1hmdrw60glr0lgixwblns73xzc6l5i1yfl7g64lp9plm8gkzb48b"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-01-09"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "426fc6549aff1d5a1b84127dd80807a4f134d4ab"; - sha256 = "0yadrawg9q49fiizn4k8ng9hsp9vi2l0bw73s6ib0szg641k1w42"; + rev = "ae7b979a87ff284c2381e6b6d36ac35ac0bbfd84"; + sha256 = "0dh2wspygagcxzscl2626nhb8pnwqyjzsgivy162xmmy3g0sbppw"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3096,24 +3096,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-02-16"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "58a5e4ab48f201a80d58af965cbaa8468ad64144"; - sha256 = "12dz1x36dwr0wfilb5va42mmqvdar4ibgzanqf80myv0zjg1wc03"; + rev = "905afba20900caea1e6f0f541c2ed7302de9f598"; + sha256 = "1hcqplvlk2cymxv7lx0yv7m5gc8p4281q1s3rhizvf4jvv973g59"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-02-17"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "5757f8a50d5d26b8c184b3a51713db763cdd9702"; - sha256 = "077h9j4rk4fckr3zw61hvyp0b22z0wlpdysjl8dc7f69cfxa42ix"; + rev = "2d82a7fe07f3e4959219e231a58e0707d577262e"; + sha256 = "0qzv0vr89mj58aas30bqh3w479njd84qw7c965f9489p5sg9wg8x"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3288,12 +3288,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-02-15"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "19d24934cf6f132e84a03e722eb20458c4061870"; - sha256 = "0gq2xznchnb2wqqz79qdvv2cfn1adrgy8n8drq5p7cxs067nx4bl"; + rev = "e6b4bacf355c9ef2daed4ff40887f949da9da019"; + sha256 = "1x7m2pw2klk4m4hv0h5cjxzr46ljiyxrmwq4c38zbk2x5mncy5jr"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3384,12 +3384,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-02-12"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "877f7997c61bba8efa55950761dd23403ca3bc1e"; - sha256 = "11z44n8f2jmzi6m88g6r9zvgszkbnjrm9y7a247imcfq40p7yyma"; + rev = "116aedc7fb327eda6e7c05915f3d97088569c0e8"; + sha256 = "1mnf12bzdcpy0sgwl45sjxvzzifyy9k8mx7ffr7q8ddxwvbmmakp"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3757,12 +3757,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-02-13"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "3cb3b47646c95316a739e660d1501d7a85d7f2e5"; - sha256 = "0a9d4m2gjn9kajfl3dzdxxahly5lrfn46wj0nyfscx0ypz38fr7a"; + rev = "1a7f12cb1f878063d675924ac97f242950805541"; + sha256 = "1nmicnq2b6n8a9zmgqqkzd9y47x2d11n75ix114qv3xyin0vqnqc"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3913,12 +3913,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-02-13"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "966a3123a7d80333878443c0011e451c29f157cb"; - sha256 = "19kjvx49vpnl5xs5bib7xqrl5vnqqzavndkwl3cg34mnhnjfzka3"; + rev = "df823938421e66adbd6c570bacdc3ce85d6c776c"; + sha256 = "02hcdsdvbdybcpamj304jld4sh3mxp3j78idzv7ybkizvp8wjlpd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3948,6 +3948,18 @@ let meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; + stan-vim = buildVimPluginFrom2Nix { + pname = "stan-vim"; + version = "2020-08-05"; + src = fetchFromGitHub { + owner = "eigenfoo"; + repo = "stan-vim"; + rev = "9d3b6ec149f9559bd9bd021dfa827c29c5d1dc38"; + sha256 = "0qv748m1vrp1qcl41y7fj2jm8cac9b01ljq6ydq3z4syxdf7yzcc"; + }; + meta.homepage = "https://github.com/eigenfoo/stan-vim/"; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -4106,12 +4118,12 @@ let telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-02-10"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "ffa2027102f75e28dd8d8c2a97f3b9163dd80b56"; - sha256 = "1ipxqkfaqc75qzpj7vg3gr44r8fcx979pyf84wibxic3kby9qp7y"; + rev = "8b584bd88fbbeac0ce5c52af1ce7c1fecb7155b6"; + sha256 = "0a6sz6gx1qnr0ka9510mchca3b94553liw8ng386h60kh6lbc1k5"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -4143,12 +4155,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-02-12"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "1c5e42a6a5a6d29be8fbf8dcefb0d8da535eac9a"; - sha256 = "088scjf7iz4j3l0zl3sn4db6w6h456wrlz1g30fgz378cs022d35"; + rev = "d7c02e3b52b5a13265e071d0de2d6a989110a515"; + sha256 = "1xd080ysfi9mvxhv717cgsah7qk5z7ci0gxmq9sls6rsjrk8dykv"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4924,12 +4936,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-16"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "3985754b78d05858ec24538a708a6fcaed0ea2ad"; - sha256 = "1zsh1h6abrcry32hcrkxys182g098vrs4k74wisk5mcwd3wvgarx"; + rev = "b6d82bc748a80577a31f2a40eb36947d70197a67"; + sha256 = "0w7yhqzdiknqm2y2cyx04sqmyr0sixfk1lrxbmra01d4sv4p7lis"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5200,12 +5212,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-02-02"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0329d89c5114dc285939050fd5777dbcc450ddd7"; - sha256 = "0g8pipayg643xjs3dmpbwp91ycyg8b20qgr0mnmxzll0nan8zjny"; + rev = "4d14cb82cf7381c2f8eca284d1a757faaa73b159"; + sha256 = "1wwqchf50c19a5d5g037rjjpskn7dpsq9alhzim2x6bgffb5yamd"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5428,12 +5440,12 @@ let vim-erlang-tags = buildVimPluginFrom2Nix { pname = "vim-erlang-tags"; - version = "2021-02-03"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-tags"; - rev = "125d494953da1746bc16cb716019a3d855fd3536"; - sha256 = "1kaihn3bnw9pdr18vg09ya4ijjv0an6jzzva96v06lid2i66i9wi"; + rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611"; + sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; @@ -5560,12 +5572,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-02-18"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "c831ca0d8918fc7dcee78c9d3cce60ed926b88e9"; - sha256 = "0gd3qsfdmamvd7arlg8b364hzyhph8ci7n9vf3rl4g70lyk7zlm1"; + rev = "c66412d238bd2e6c7b84c01a7e92b399bfbf1915"; + sha256 = "0mlvm6x754251pcd9hdwwnjfbwnvkbpywfnyp090dkvhlx19rm0w"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5608,12 +5620,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-02-16"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c63bc47c44f4ad259300549fc02939ab2401ba79"; - sha256 = "1kmxm6spwzgyskdk8s32k93v8k0njfka3gq28wxnbswydnzszgrz"; + rev = "6c4c7c9aebc4c65c13f94597e4c9352dbba21fa5"; + sha256 = "09q6ijr3f6aaki17cpidn02lxk00gficsclg1zcprxcq8fp8v8d1"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5680,12 +5692,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-02-16"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "b90aad666aa7163b08d744d4585eefa4eaabb6ad"; - sha256 = "1jz9rvkyd05jw6mwcp96j0wscxnkm95g55pvzkidfn2fcjnl9ab6"; + rev = "1283ec1670d1f4fce37213c5d66924088b2e730c"; + sha256 = "1h5jh38ihbyy95cm57ppb6m871010pk521ygss2drcriwnx4agd2"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5728,12 +5740,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-02-14"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "08615366d82d0ceaee73a995e8dab75df63e2897"; - sha256 = "0fn0hi0irmb4ri4skdandahzl6zn916fxi31f8mhcrws72izqxzj"; + rev = "755b498c7604e7aee4d001d2a78c2d1e079eb8d5"; + sha256 = "048xqia30alvcshvmbqlqvvslk19zvqmsdy50ww8rzz9yzhff5bw"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6354,12 +6366,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2020-06-30"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "ac6444afb5fd11e3f7750f696a0c6b8b0b6ec116"; - sha256 = "182fvmfnpcqda0cm878lk79iprxsd7nb9r97jmr7lx5agdcvzaqb"; + rev = "0206f5f5a8721cc8c5c84ebb8ab2886e9afcd0ac"; + sha256 = "1zin6pk581cnkivm2kgks0wrvpxjcl1y3x46wpkzdqg1hhif2129"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -6390,12 +6402,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-02-12"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "6f8dfe19d59041a606f30b7764ccd51d4299d0e5"; - sha256 = "0rqlzp5qbidd1f02yx1l1cf0a5bdl7ha4wsixakixdrsy4ws68fh"; + rev = "a78536ad745852c73cdf2d0defffd6b81bc377f0"; + sha256 = "06xpv6k80jyrd6psjhrwq84a4dm2kn7c1a89yhql7jqkrsx0iyy2"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6475,12 +6487,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-01-29"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "52b3ec1ee8d0f78c69bae6cc32f3c2d1a023a8c8"; - sha256 = "1hn3w4hzx444cz5z7g2lkpzr90r9ngjpy5jirgs3c947njc24kr7"; + rev = "b131a5b35707eb0bf0cf088d85a8f100b4609332"; + sha256 = "0j8pryc4g0w329d27likagxg6ww9lll4fj653i3ka0cffb01jjri"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6715,12 +6727,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-01-10"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "f51b69f46d5eb0ebbdfcd39b5aa36bfd9454eafd"; - sha256 = "0fs5pn2hhi0mnjz0xpjl0sh4032s4n4afzjrnhygw9l9a5m51dm4"; + rev = "ba6a32d0d079b3670cc3c02257dccea4808fdfa1"; + sha256 = "0h4k9p5r7xwwwbi28p013dqhpl75k8458xiisl5ncswyw4wva75v"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -7183,12 +7195,12 @@ let vim-ragtag = buildVimPluginFrom2Nix { pname = "vim-ragtag"; - version = "2021-02-17"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-ragtag"; - rev = "703965fde904fbf29defed3b230e51ef60e9dc90"; - sha256 = "0vj2kqjr03hpgkmnkj1c2icsgli04993vjf56ncwhjg0p707v8v7"; + rev = "b8966c4f6503a8baaec39e17bd0bf38b2aadc9b2"; + sha256 = "0q4blsgnl4l2bkhgjry6xnszhsswdand52gc6gdjffwlzwa9jczy"; }; meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; @@ -7591,12 +7603,12 @@ let vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-01-11"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "37ab78eb837e3004e3cfb3a8e5ed8f8740f27f13"; - sha256 = "0x3h47hdbg2gp0ahf0ixkj3nks7qbnm25bmd7hq9k3c7b6912b5a"; + rev = "af70d17a863c9a33def9cafbb3911195a571c686"; + sha256 = "078xq6bwkbwsjajyq3c9bn8b3r0da6j70vp1ba934a6jjdv6vrj4"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -7902,6 +7914,18 @@ let meta.homepage = "https://github.com/cespare/vim-toml/"; }; + vim-tpipeline = buildVimPluginFrom2Nix { + pname = "vim-tpipeline"; + version = "2021-02-19"; + src = fetchFromGitHub { + owner = "vimpostor"; + repo = "vim-tpipeline"; + rev = "753c64f356da0e1bed43ce0b9e8923b1e9fc0670"; + sha256 = "06j03r6hqb72ahmdpwxxys9nw86b8c63zsxhrlngzqa5z02z6k9c"; + }; + meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; + }; + vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; version = "2020-11-18"; @@ -8288,12 +8312,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-02-16"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "85ca867cc25ab5e9ef9353158e8b786806ba005b"; - sha256 = "0zmy4dkc23i1lvdgjd4ras85q01pahfynajzf5v9lifn1dmyfrl3"; + rev = "6fac220ee55af66c0c2ab3dae630086da5b0263f"; + sha256 = "0q7zj8wmg88wzhjr4xz2rkcvw091jdi3mfyv8rn09plf2w4bkszy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8301,24 +8325,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-02-12"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "4ff3e993ef17c7101d8db9de79674e320a20fcec"; - sha256 = "1zx45jyddxx0gqwgwf426ybv1dgghjls685ngsq3j8yhzj3mldfr"; + rev = "d99f8ff57a13323d5d2fe7f3163679848bca334e"; + sha256 = "12h180awhpaj6x0aq8vfzdxp5w474lgncb1yl0ccj6kblkr1pp32"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-02-18"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "9214bf95784d330fe7e076e26aee9e3048f99253"; - sha256 = "1hl8zlqvlxjv671ih7q0gvxsa3r1yq4c3zaizja2lbf7l57as071"; + rev = "3bfe0ea285031f40f1a1e8e00f57a933eb8a8325"; + sha256 = "1jl9a1fms4vaq5fhi40dvk5nwfy7n0gzj75dmfyfyb41j0c2a5hl"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8531,24 +8555,24 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-02-08"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "e3646fc3124e33da4909e30caaad1167523e0c53"; - sha256 = "0a200497js325343prx638rkzg6544lxrrr3ij5g0i6dvazzwg21"; + rev = "79c05946ade40f211ca058e5c4678b438f6242e1"; + sha256 = "0p41dmhasl1xlsi2wvng35nb3rdz4yw36gdn5n6m744dha0z9khm"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-01-19"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "17170fd1c31f00132a91fb1598d0f3df5927e28d"; - sha256 = "0k8s5via1frpgdb94kgsk29g7h6fjq3cazyfa8zww7vra418acsh"; + rev = "fcafb4b64ffe6d308f5e312ddd1672e69e09fb1c"; + sha256 = "0bsz046sbf5g6lkgcjyllc8knbiqdcglpkf1wbzn7zi7whdhjxdx"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c52fc140c97ad..29d074a126e41 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -101,6 +101,7 @@ easymotion/vim-easymotion editorconfig/editorconfig-vim edwinb/idris2-vim ehamberg/vim-cute-python +eigenfoo/stan-vim eikenb/acp elixir-editors/vim-elixir elmcast/elm-vim @@ -678,6 +679,7 @@ vim-utils/vim-husk Vimjas/vim-python-pep8-indent vimlab/split-term.vim vimoutliner/vimoutliner +vimpostor/vim-tpipeline vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 8c8e646964d7a..f47786e80db31 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -276,6 +276,18 @@ let }; }; + formulahendry.code-runner = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "code-runner"; + publisher = "formulahendry"; + version = "0.11.2"; + sha256 = "0qwcxr6m1xwhqmdl4pccjgpikpq1hgi2hgrva5abn8ixa2510hcy"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + freebroccolo.reasonml = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog"; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 12a92c36c6921..f80b7425cd485 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.24"; + version = "0.02.25"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j"; + sha256 = "sha256-C6MCOXnElDI69QkLKd2X2SLved8cRCN0Q6BhUvvqsTY="; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index be3012740f545..9890f4ac06c6d 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ="; + sha256 = "sha256-IapgDqRZ7VMWerusWcv++Ky4yWgGLMaq8rFhbPshFjE="; }; - cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; + cargoSha256 = "sha256-+Ch6nEGxYm2L4S9FkIkenDQovMZvQUJGOu5mR9T8r/Y="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { - homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; - changelog = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + homepage = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; + changelog = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; description = "Very simple server for the Gemini hypertext protocol"; longDescription = '' Agate is a server for the Gemini network protocol, built with the Rust @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { static files. It uses async I/O, and should be quite efficient even when running on low-end hardware and serving many concurrent requests. ''; - license = licenses.asl20; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ jk ]; }; } diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index b8582f68ebc57..1abedead87d89 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { fi chmod -R u+w node_modules rake webpacker:compile + rails assets:precompile ''; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index d10907805aa90..bb918f1608407 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.0.1"; + version = "2.0.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "105zc5m3zvnrqr8409qdbycb4yp7znxmna76ri1m2djkdp5rh4q1"; + sha256 = "sha256-qJErkKNK90tdshSyGe4fjI2JI2OUCdBz9RrYUy85QMo="; }; # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix deleted file mode 100644 index ebb817f1645ce..0000000000000 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : - -stdenv.mkDerivation rec { - pname = "pyIRCt"; - version = "0.4"; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz"; - sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb"; - }; - - buildInputs = [ pythonPackages.wrapPython ]; - - pythonPath = [ - xmpppy pythonIRClib - ]; - - # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; - - installPhase = '' - mkdir -p $out/bin $out/share/${pname}-${version} - sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py - sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/${pname}-${version} - cat > $out/bin/pyIRCt <<EOF - #!${runtimeShell} - cd $out/share/${pname}-${version} - ./irc.py \"$@\" - EOF - chmod a+rx $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py - wrapPythonPrograms - ''; - - meta = with lib; { - description = "IRC transport module for XMPP"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix deleted file mode 100644 index 03ded7a5d5cde..0000000000000 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : - -stdenv.mkDerivation rec { - pname = "pyMAILt"; - version = "20090101"; - - src = fetchcvs { - cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; - module = "xmpppy/mail-transport"; - date = "2009-01-01"; - sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; - }; - - pythonPath = [ xmpppy ]; - buildInputs = [ pythonPackages.wrapPython ]; - - installPhase = '' - cd mail-transport - mkdir -p $out/bin $out/share/${pname}-${version} - sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py - sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/$name - cat > $out/bin/pyMAILt <<EOF - #!${runtimeShell} - cd $out/share/${pname}-${version} - ./mail.py \"$@\" - EOF - chmod a+rx $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py - wrapPythonPrograms - ''; - - meta = with lib; { - description = "Email transport module for XMPP"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index e957457c8c3b4..c7d5ba0e7734a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-02-09"; + version = "2021-02-21"; pname = "oh-my-zsh"; - rev = "f21e646ce6c09198f7f625c597f08af49551fdb0"; + rev = "9a9f3831925432fdf4352c24a002506a06d329c1"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "14m932zbzdbwyfqkn882jarpw4dbmxkfna5pakd4n5b123drjz46"; + sha256 = "befalsEX/o5WwVn0bzDnMVhlZawmpGV4AGzvxl7UHLI="; }; installPhase = '' diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 6db3e80d3f8d1..9460144998eb8 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clair"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FJqUYQDDOuO0EcZ8+el/MUcJJzWL7vgGhEFo7v4HpOw="; + sha256 = "sha256-uGvcr7TG/NCi0YoYZnQU11zOxXDhFTnCmLQVxOqmXLY="; }; vendorSha256 = "sha256-CO4U8uSQeHXLPj5PH/SsOI/LjT2Rs/mBHsvNTudx72I="; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 1478aa8c1e3af..df4211ad039ae 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.01.25"; + version = "2021.02.21"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1c2jx03ssm9yyv6rgr5wfv88ivfgdgq3889yaghjyvllm3nv9380"; + sha256 = "10fa2g8vsz0y7kb0wxnz857r2gd9b0b278j0a5ipjaa7cjd0gi1b"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index d531b22738baa..5f22ffa9602c2 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll , pythonPackages, imagemagick, gobject-introspection, gst_all_1 , runtimeShell -, fetchpatch , unstableGitUpdater # Attributes needed for tests of the external plugins diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index de86622126780..7449eedb3a7f1 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-dBgDIS6U2iKzyo5nO0NOD488zfEbaZJH7luJN6khrnc="; + sha256 = "sha256-Cm/w0bwDMu5REsQpkwMBgnROxpI+nMQwC16dY/VdOFU="; }; - cargoSha256 = "sha256-/i5ZBCWFlhoheHsCI5f9yJ7sa6l/DB4AJckq5orinwI="; + cargoSha256 = "sha256-fy8apB1UbpBAnp8mFnL7rNj/GSSUkNz/trqsVrAfFfI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 0daeaa794cee8..1b76cec554d87 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchurl , fetchFromGitHub , cmake , extra-cmake-modules diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile b/pkgs/tools/misc/anystyle-cli/Gemfile new file mode 100644 index 0000000000000..be47216200d23 --- /dev/null +++ b/pkgs/tools/misc/anystyle-cli/Gemfile @@ -0,0 +1,37 @@ +source 'https://rubygems.org' +gemspec + + +group :development, :test do + #gem 'anystyle-data', github: 'inukshuk/anystyle-data' + #gem 'wapiti', github: 'inukshuk/wapiti-ruby' + gem 'bibtex-ruby' + gem 'rake' + gem 'rspec', '~>3.0' + gem 'language_detector', github: 'feedbackmine/language_detector' + gem 'unicode-scripts' + gem 'edtf' + gem 'citeproc' + gem 'unicode_utils' if RUBY_VERSION < '2.4' +end + +group :coverage do + gem 'simplecov', require: false + gem 'coveralls', require: false if ENV['CI'] +end + +group :debug do + gem 'byebug', require: false +end + +group :profile do + gem 'ruby-prof', require: false + gem 'gnuplot', require: false +end + +group :extra do + gem 'lmdb' + gem 'redis' + gem 'redis-namespace' + gem 'yard' +end diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/pkgs/tools/misc/anystyle-cli/Gemfile.lock new file mode 100644 index 0000000000000..8d28ef808948d --- /dev/null +++ b/pkgs/tools/misc/anystyle-cli/Gemfile.lock @@ -0,0 +1,99 @@ +GIT + remote: https://github.com/feedbackmine/language_detector.git + revision: 89102790194150b3a8110ce691f9989b8ce70f8d + specs: + language_detector (0.1.2) + +PATH + remote: . + specs: + anystyle (1.3.10) + anystyle-data (~> 1.2) + bibtex-ruby (~> 5.0) + gli (~> 2.17) + namae (~> 1.0) + wapiti (~> 1.0, >= 1.0.2) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.3.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + anystyle-data (1.2.0) + bibtex-ruby (5.1.4) + latex-decode (~> 0.0) + builder (3.2.4) + byebug (11.1.3) + citeproc (1.0.10) + namae (~> 1.0) + concurrent-ruby (1.1.7) + diff-lcs (1.4.4) + docile (1.3.2) + edtf (3.0.5) + activesupport (>= 3.0, < 7.0) + gli (2.19.2) + gnuplot (2.6.2) + i18n (1.8.5) + concurrent-ruby (~> 1.0) + latex-decode (0.3.1) + lmdb (0.5.3) + minitest (5.14.1) + namae (1.0.1) + rake (13.0.1) + redis (4.2.1) + redis-namespace (1.8.0) + redis (>= 3.0.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) + ruby-prof (1.4.1) + simplecov (0.19.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov-html (0.12.2) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-scripts (1.6.0) + wapiti (1.0.7) + builder (~> 3.2) + yard (0.9.25) + zeitwerk (2.4.0) + +PLATFORMS + ruby + +DEPENDENCIES + anystyle! + bibtex-ruby + byebug + citeproc + edtf + gnuplot + language_detector! + lmdb + rake + redis + redis-namespace + rspec (~> 3.0) + ruby-prof + simplecov + unicode-scripts + yard + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/misc/anystyle-cli/anystyle.gemspec b/pkgs/tools/misc/anystyle-cli/anystyle.gemspec new file mode 100644 index 0000000000000..57db427fb0240 --- /dev/null +++ b/pkgs/tools/misc/anystyle-cli/anystyle.gemspec @@ -0,0 +1,52 @@ +# -*- encoding: utf-8 -*- +lib = File.expand_path('../lib/', __FILE__) +$:.unshift lib unless $:.include?(lib) + +require 'anystyle/version' + +Gem::Specification.new do |s| + s.name = 'anystyle' + s.version = AnyStyle::VERSION.dup + s.platform = Gem::Platform::RUBY + s.authors = ['Sylvester Keil'] + s.email = ['http://sylvester.keil.or.at'] + s.homepage = 'http://anystyle.io' + s.summary = 'Smart and fast bibliography parser.' + s.description = 'A sophisticated parser for academic reference lists and bibliographies based on machine learning algorithms using conditional random fields.' + s.license = 'BSD-2-Clause' + s.executables = [] + s.require_path = 'lib' + + s.required_ruby_version = '>= 2.2' + + s.add_runtime_dependency('bibtex-ruby', '~>5.0') + s.add_runtime_dependency('anystyle-data', '~>1.2') + s.add_runtime_dependency('gli', '~>2.17') + s.add_runtime_dependency('wapiti', '~>1.0', '>=1.0.2') + s.add_runtime_dependency('namae', '~>1.0') + + s.files = + `git ls-files`.split("\n") - `git ls-files spec`.split("\n") - %w{ + .coveralls.yml + .gitignore + .rspec + .simplecov + .travis.yml + Gemfile + Rakefile + appveyor.yml + anystyle.gemspec + res/core.xml + } + + s.rdoc_options = %w{ + --line-numbers + --inline-source + --title "AnyStyle" + --main README.md + } + s.extra_rdoc_files = %w{README.md LICENSE} + +end + +# vim: syntax=ruby diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix new file mode 100644 index 0000000000000..7a437cafc281a --- /dev/null +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildRubyGem +, bundlerEnv +, ruby +, poppler_utils +}: +let + deps = bundlerEnv rec { + name = "anystyle-cli-${version}"; + source.sha256 = lib.fakeSha256; + version = "1.3.1"; + inherit ruby; + gemdir = ./.; + gemset = lib.recursiveUpdate (import ./gemset.nix) { + anystyle.source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w79zcia60nnnyrmyvpd10pmxrpk5c7lj9gmmblhwi8x5mfq9k0n"; + type = "gem"; + }; + }; + }; +in +buildRubyGem rec { + inherit ruby; + gemName = "anystyle-cli"; + pname = gemName; + version = "1.3.1"; + source.sha256 = "1a3ifwxwqkp5dnfk9r8qq8kgfb8k1pl7jjdghbb8ixbxz9ac7awy"; + + propagatedBuildInputs = [ deps ]; + + preFixup = '' + wrapProgram $out/bin/anystyle --prefix PATH ${poppler_utils}/bin + ''; + + meta = with lib; { + description = "Command line interface to the AnyStyle Parser and Finder"; + homepage = "https://anystyle.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/anystyle-cli/gemset.nix b/pkgs/tools/misc/anystyle-cli/gemset.nix new file mode 100644 index 0000000000000..46444760b7bd8 --- /dev/null +++ b/pkgs/tools/misc/anystyle-cli/gemset.nix @@ -0,0 +1,1570 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; + type = "gem"; + }; + version = "6.0.3.2"; + }; + anystyle = { + dependencies = ["anystyle-data" "bibtex-ruby" "gli" "namae" "wapiti"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + path = ./.; + type = "path"; + }; + version = "1.3.10"; + }; + anystyle-data = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ry6836mq48d85hjcfp7xiw0yk3ivpiwjvmdwv5jag30ijfyaccy"; + type = "gem"; + }; + version = "1.2.0"; + }; + bibtex-ruby = { + dependencies = ["latex-decode"]; + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00zwmmmjrbrxhajdvn1d4rnv2qw00arcj021cwyx3hl6dsv22l2w"; + type = "gem"; + }; + version = "5.1.4"; + }; + builder = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + byebug = { + groups = ["debug"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + type = "gem"; + }; + version = "11.1.3"; + }; + citeproc = { + dependencies = ["namae"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13vl5sjmksk5a8kjcqnjxh7kn9gn1n4f9p1rvqfgsfhs54p0m6l2"; + type = "gem"; + }; + version = "1.0.10"; + }; + concurrent-ruby = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + type = "gem"; + }; + version = "1.1.7"; + }; + diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + type = "gem"; + }; + version = "1.4.4"; + }; + docile = { + groups = ["coverage" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + type = "gem"; + }; + version = "1.3.2"; + }; + edtf = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xknzamagsx68iq7zdiswr077sxirig77yggbcsw51m8365ajzpc"; + type = "gem"; + }; + version = "3.0.5"; + }; + gli = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q598mvl20isn3ja1ya0p72svmqwx3m6fjp5slnv0b2c5mh0ahvv"; + type = "gem"; + }; + version = "2.19.2"; + }; + gnuplot = { + groups = ["profile"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cvb84lahhy6qxkkgg0pfk9b85qrb1by2p3jlpqgczl6am58vhnj"; + type = "gem"; + }; + version = "2.6.2"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + type = "gem"; + }; + version = "1.8.5"; + }; + language_detector = { + groups = ["development" "test"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "89102790194150b3a8110ce691f9989b8ce70f8d"; + sha256 = "0wxs9i0wqmwysrz1c1i85i4f670m217y12rj5slcmd1y4ylsmvyi"; + type = "git"; + url = "https://github.com/feedbackmine/language_detector.git"; + }; + version = "0.1.2"; + }; + latex-decode = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dqanr69as05vdyp9gx9737w3g44rhyk7x96bh9x01fnf1yalyzd"; + type = "gem"; + }; + version = "0.3.1"; + }; + lmdb = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qk2ycgyyk052dvbgik35mr4n9im4k1j6v7anbjqhx52y5f07sfg"; + type = "gem"; + }; + version = "0.5.3"; + }; + minitest = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + type = "gem"; + }; + version = "5.14.1"; + }; + namae = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w0dgvmdy8lw2b5q9zvhqd5k98a192vdmka96qngi9cvnsh5snw"; + type = "gem"; + }; + version = "1.0.1"; + }; + rake = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + type = "gem"; + }; + version = "13.0.1"; + }; + redis = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19hm66kw5vx1lmlh8bj7rxlddyj0vfp11ajw9njhrmn8173d0vb5"; + type = "gem"; + }; + version = "4.2.1"; + }; + redis-namespace = { + dependencies = ["redis"]; + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv"; + type = "gem"; + }; + version = "1.8.0"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + type = "gem"; + }; + version = "3.9.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; + type = "gem"; + }; + version = "3.9.3"; + }; + ruby-prof = { + groups = ["profile"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cd91m08ih0imfpy4k87618hd4mhyz291a6bx2hcskza4nf6d27"; + type = "gem"; + }; + version = "1.4.1"; + }; + simplecov = { + dependencies = ["docile" "simplecov-html"]; + groups = ["coverage"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b082xrklq6k755cc3rzpnfdjv5338rlky9him36jasw8s9q68mr"; + type = "gem"; + }; + version = "0.19.0"; + }; + simplecov-html = { + groups = ["coverage" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v7b4mf7njw8kv4ghl4q7mwz3q0flbld7v8blp4m4m3n3aq11bn9"; + type = "gem"; + }; + version = "0.12.2"; + }; + thread_safe = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + unicode-scripts = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04xfy4f61xf7qnbfa68aqscmyxk7wx3swn571cijsfqalhz8swjg"; + type = "gem"; + }; + version = "1.6.0"; + }; + wapiti = { + dependencies = ["builder"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aw2l759cfmii9a67pn8pswip11v08nabkzm825mrmxa6r91izqs"; + type = "gem"; + }; + version = "1.0.7"; + }; + yard = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd"; + type = "gem"; + }; + version = "0.9.25"; + }; + zeitwerk = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + type = "gem"; + }; + version = "2.4.0"; + }; +} + diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index b8dc950773baf..3ecb201468a47 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.5"; in +let version = "0.2.6"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "sha256-DdK9qdF+rFtAhemPwMpiZrtUdgD0iFqjgiZ3Yp/vLAI="; + sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ="; }; - cargoSha256 = "sha256-bdSXyxiHwGtdyce2YyPKq+3RfZIL425RvwRfKi59RVI="; + cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index b808d88888f26..f0bb6905b43c5 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-c+3zB0bxohQQsOjcTLHgRQamJfm7iUdz79t8q8wAFL8="; + sha256 = "sha256-pjFApZQJqw0fJmJteO7VZWRLogV3rO5XDagZd1MliZg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-ORkj6T9O/NKuaILm5NFGePYxKMaCAAydascelaEvYVw="; + cargoSha256 = "sha256-xsTScRAu0SF1xtjUwBtNJUNIItoR0jjEd2CuSmmeh9c="; doCheck = false; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index aa9f175e90047..a504efbf1eb23 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s"; + sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law"; }; nativeBuildInputs = [ cmake flex bison ]; - patches = [ ./fix-luajit-darwin.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ]; + + # _FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O"; postPatch = '' substituteInPlace src/CMakeLists.txt \ diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index dc29aad2a549f..125f8f35acca7 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.3"; + version = "8.4"; src = fetchzip { # TODO: We're using the previous version of memtest86 because the @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # binaries that we make sure to version, then we could probably keep up # with the latest versions released by the company. url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96"; + sha256 = "sha256-jh4FKCYZbOQhRv6B7N8Hmw6RQCQvbBGaGFTMLwM1nk8="; stripRoot = false; }; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { ') mkdir $out mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 04f1c5ec33e55..a943f94a1827b 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "4.0.1"; + version = "4.2.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-YQrANrCd0nFdn98LfHH/Ishm+fDb12cUAkxlwtZ1ng8="; + sha256 = "sha256-r6qD7KyuBj67c+nhaRLHP5B46JV8VP9MKCloqYLua+Q="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 0443deae07755..70a9595785557 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = lib.optional stdenv.hostPlatform.isMusl + patches = [ + (fetchpatch { + # Fixes denial of services in encoding.c, remove > 4.8.0 + name = "CVE-2021-26937.patch"; + url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch"; + sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0"; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 014fdad13dca5..6dc47e317253e 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.5.2"; + version = "6.6.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7tgYVxZ4E6qi/HLgfC0ZreHuXgtd3JMg4ENQL50YWr4="; + sha256 = "sha256-YMg5HWDvBsYJZCxYrQuQqU4xLY8DORKYkK319pryA5I="; }; - cargoSha256 = "sha256-xxJfNFegvtHJno7o54Rqai9DvvffrkxTFci673Yq/NI="; + cargoSha256 = "sha256-G6ToQzPxuKpe1YQ4nLDJLjb3qx8D3VpuigXfdf7RHCQ="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 64ae387e1a6d2..79be68c8d5668 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.11"; + version = "1.8.12"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo="; + sha256 = "sha256-q4hJ6QAR8cXjXM2e5Et1/DzyEw9L0120sgpTtqGG5wQ="; }; dontBuild = true; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 59315c4bf4b36..f6263f187bf5b 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0pkqvsdmi85xrhzzc7mz87vdvvvp01lf8akhfdnmsdlks8zbzy44"; + sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 9ab08007ec716..50eb8d1a47e6d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -22,7 +22,7 @@ common = , stateDir , confDir , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp - , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp + , withAWS ? !enableStatic && !stdenv.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic , name, suffix ? "", src , patches ? [ ] diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index c208b44bfd6e9..9f6a65962ff37 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.0"; + version = "1.12.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0y3dcikw6gl436mhza5j0b3lm49jzl590a9ry53rkmzrv2lqx9w6"; + sha256 = "0ickzq2swhabxqcg32n1i99bam6ip7c0mhhncgvmw332w6pzgvlb"; }; - vendorSha256 = "09lbkm7c361c2s87qi1wpfsqgpp3r862wcn98dzdg5j6pvpgwbag"; + vendorSha256 = "0i0dhipp1gdn0xdl4bpi13ksxf7dc9biz9riapm988bldcr5s1kr"; subPackages = [ "." ]; @@ -41,6 +41,7 @@ buildGoModule rec { ); postInstall = '' + HOME=$TMPDIR for shell in bash fish zsh; do $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 80e6e25518e68..4e9b24818b476 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1jilsczz22fyqbgz43gl5ilz62gfqsahfk30gayj7q5bx9k35m4w"; + sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0="; }; - cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl"; + cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix new file mode 100644 index 0000000000000..71966a934d624 --- /dev/null +++ b/pkgs/tools/security/libtpms/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config, autoreconfHook +, openssl, perl +, tpm2Support ? false +}: + +stdenv.mkDerivation rec { + pname = "libtpms"; + version = "0.7.4"; + + src = fetchFromGitHub { + owner = "stefanberger"; + repo = "libtpms"; + rev = "v${version}"; + sha256 = "sha256-nZSBD3WshlZHVMBFmDBBdFkhBjNgtASfg6+lYOOAhZ8="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl # needed for pod2man + ]; + buildInputs = [ openssl ]; + + outputs = [ "out" "lib" "man" "dev" ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-openssl" + ] ++ lib.optionals tpm2Support [ + "--with-tpm2" # TPM2 support is flagged experimental by upstream + ]; + + meta = with lib; { + description = "The libtpms library provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)"; + homepage = "https://github.com/stefanberger/libtpms"; + license = licenses.bsd3; + maintainers = [ maintainers.baloo ]; + }; +} diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 0fd14901d0db9..11b4eecd14d99 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: let pythonEnv = pythonPackages.python.withPackages (p: [ diff --git a/pkgs/tools/security/ssh-to-pgp/default.nix b/pkgs/tools/security/ssh-to-pgp/default.nix index 487cc44cdd730..fc07714b55b06 100644 --- a/pkgs/tools/security/ssh-to-pgp/default.nix +++ b/pkgs/tools/security/ssh-to-pgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-pgp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-pgp"; rev = version; - sha256 = "sha256-TDrpnWAez8muysMdmKFBDZfK8CyhGn1VqHB8+zD6jSk="; + sha256 = "sha256-5Wg0ItAkAb0zlhzcuDT9o0XIIbG9kqk4mIYb6hSJlsI="; }; - vendorSha256 = "sha256-ZF/WsmqmGHZIAGTPKJ70UhtmssNhiInEZfzrKxQLw9I="; + vendorSha256 = "sha256-OMWiJ1n8ynvIGcmotjuGGsRuAidYgVo5Y5JjrAw8fpc="; checkInputs = [ gnupg ]; checkPhase = '' diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix new file mode 100644 index 0000000000000..2bd0326d4d920 --- /dev/null +++ b/pkgs/tools/security/swtpm/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libtasn1, openssl, fuse, glib, libseccomp +, libtpms +, unixtools, expect, socat +, gnutls +, perl +, python3, python3Packages +}: + +stdenv.mkDerivation rec { + pname = "swtpm"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "stefanberger"; + repo = "swtpm"; + rev = "v${version}"; + sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk="; + }; + + pythonPath = with python3Packages; requiredPythonModules [ + setuptools + cryptography + ]; + + patches = [ + # upstream looks for /usr directory in $prefix to check + # whether or not to proceed with installation of python + # tools (swtpm_setup utility). + ./python-installation.patch + ]; + + prePatch = '' + patchShebangs src/swtpm_setup/setup.py + patchShebangs samples/setup.py + ''; + + nativeBuildInputs = [ + pkg-config unixtools.netstat expect socat + perl # for pod2man + autoreconfHook + python3 + ]; + buildInputs = [ + libtpms + openssl libtasn1 libseccomp + fuse glib + gnutls + python3.pkgs.wrapPython + ]; + propagatedBuildInputs = pythonPath; + + configureFlags = [ + "--with-cuse" + ]; + + postInstall = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath" + ''; + + enableParallelBuilding = true; + + outputs = [ "out" "man" ]; + + meta = with lib; { + description = "Libtpms-based TPM emulator"; + homepage = "https://github.com/stefanberger/swtpm"; + license = licenses.bsd3; + maintainers = [ maintainers.baloo ]; + }; +} diff --git a/pkgs/tools/security/swtpm/python-installation.patch b/pkgs/tools/security/swtpm/python-installation.patch new file mode 100644 index 0000000000000..d2689f051c5b9 --- /dev/null +++ b/pkgs/tools/security/swtpm/python-installation.patch @@ -0,0 +1,60 @@ +commit 353794feb596d95e3f8893e39b174c5a89d1013e +Author: Arthur Gautier <baloo@superbaloo.net> +Date: Wed Feb 17 02:27:40 2021 +0000 + + python-install + + Signed-off-by: Arthur Gautier <baloo@superbaloo.net> + +diff --git a/samples/Makefile.am b/samples/Makefile.am +index 7d69bf8..1803bb9 100644 +--- a/samples/Makefile.am ++++ b/samples/Makefile.am +@@ -39,19 +39,9 @@ python-uninstall: + $(PIP3) uninstall -y $(PY_PACKAGE_NAME) + + if PYTHON_INSTALLATION +-install-exec-local: $(PY_PACKAGE) +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ +- else \ +- $(MAKE) python-install; \ +- fi ++install-exec-local: python-install + +-uninstall-local: +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Cleanup for distcheck build not implemented" ; \ +- else \ +- $(MAKE) python-uninstall; \ +- fi ++uninstall-local: python-uninstall + endif + + +diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am +index 529eefe..533b1b3 100644 +--- a/src/swtpm_setup/Makefile.am ++++ b/src/swtpm_setup/Makefile.am +@@ -29,19 +29,9 @@ python-uninstall: + $(PIP3) uninstall -y $(PY_PACKAGE_NAME) + + if PYTHON_INSTALLATION +-install-exec-local: $(PY_PACKAGE) +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ +- else \ +- $(MAKE) python-install; \ +- fi ++install-exec-local: python-install + +-uninstall-local: +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Cleanup for distcheck build not implemented" ; \ +- else \ +- $(MAKE) python-uninstall; \ +- fi ++uninstall-local: python-uninstall + endif + + # for out-of-tree builds we need to clean up diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 1051d48b8a5c2..c26db13300baa 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gdu"; - version = "4.6.3"; + version = "4.6.4"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vz8qqsFc1CETnrqStLyiGZ6w0jy+y5GlwQQgxdyJ5aY="; + sha256 = "sha256-d7rUvRHijBoot6OKsKjASNoSbuE7YIGXbRsIRZG7CFQ="; }; - vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU="; + vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ]; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 805373e8ee6c6..1040532eb3e00 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "28kwj053lm3510cq7pg4rqx6linv5zphhm2h6r9icigclfq7j9ybnd7vqbn2v4ay0r8ghac5cjbqab5zy8cjlgllwhwsxg0dnk75x2i"; + sha512 = "07xy6yjs24zkwrr06ly4ln5czvm3azw6iznx6m8gbrmzblkcp3gz1jcl9wclcyl8bs4xhgmyzkf5k67b95s0jndhyb9ap5zy6ixnias"; }; nativeBuildInputs = [ which ] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9a13aaa6b1fd..812f5cf49b44b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -769,6 +769,9 @@ mapAliases ({ xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 + xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" + "and is broken. Working alternatives are libinput and synaptics."); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd2f6c42ac5c..8ae84cda9651d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3068,6 +3068,8 @@ in anydesk = callPackage ../applications/networking/remote/anydesk { }; + anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; + atool = callPackage ../tools/archivers/atool { }; bash_unit = callPackage ../tools/misc/bash_unit { }; @@ -8225,6 +8227,13 @@ in swec = callPackage ../tools/networking/swec { }; + swtpm = callPackage ../tools/security/swtpm { }; + swtpm-tpm2 = swtpm.override { + libtpms = libtpms.override { + tpm2Support = true; + }; + }; + svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { git = gitSVN; }; @@ -9214,8 +9223,6 @@ in w3m = w3m-batch; }; - xmpppy = pythonPackages.xmpppy; - xiccd = callPackage ../tools/misc/xiccd { }; xidlehook = callPackage ../tools/X11/xidlehook { @@ -15594,6 +15601,8 @@ in libtoxcore_0_1 libtoxcore_0_2; libtoxcore = libtoxcore_0_2; + libtpms = callPackage ../tools/security/libtpms { }; + libtap = callPackage ../development/libraries/libtap { }; libtgvoip = callPackage ../development/libraries/libtgvoip { }; @@ -18453,10 +18462,6 @@ in pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; - - pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { @@ -21854,6 +21859,8 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; + ebumeter = callPackage ../applications/audio/ebumeter { }; + echoip = callPackage ../servers/echoip { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { @@ -23525,6 +23532,8 @@ in ltc-tools = callPackage ../applications/audio/ltc-tools { }; + lscolors = callPackage ../applications/misc/lscolors { }; + lumail = callPackage ../applications/networking/mailreaders/lumail { lua = lua5_1; }; @@ -24988,16 +24997,12 @@ in linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) - // (callPackage ../applications/misc/sweethome3d/editors.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - sweethome3dApp = sweethome3d.application; - }) - ); + sweethome3d = recurseIntoAttrs ( + (callPackage ../applications/misc/sweethome3d { }) // + (callPackage ../applications/misc/sweethome3d/editors.nix { + sweethome3dApp = sweethome3d.application; + }) + ); swingsane = callPackage ../applications/graphics/swingsane { }; @@ -26142,6 +26147,10 @@ in xdotool = callPackage ../tools/X11/xdotool { }; + xed-editor = callPackage ../applications/editors/xed-editor { + xapps = cinnamon.xapps; + }; + xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); xen = xenPackages.xen-vanilla; @@ -26244,6 +26253,13 @@ in xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; + + xplayer = callPackage ../applications/video/xplayer { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; + inherit (cinnamon) xapps; + }; + libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; + xrectsel = callPackage ../tools/X11/xrectsel { }; xrestop = callPackage ../tools/X11/xrestop { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9034877ecb96..2c3deaf142489 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3399,6 +3399,8 @@ in { jsonref = callPackage ../development/python-modules/jsonref { }; + json-rpc = callPackage ../development/python-modules/json-rpc { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; @@ -7878,8 +7880,6 @@ in { tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; - tiros = callPackage ../development/python-modules/tiros { }; - tissue = callPackage ../development/python-modules/tissue { }; titlecase = callPackage ../development/python-modules/titlecase { }; @@ -8512,8 +8512,6 @@ in { xmodem = callPackage ../development/python-modules/xmodem { }; - xmpppy = callPackage ../development/python-modules/xmpppy { }; - xnd = callPackage ../development/python-modules/xnd { }; xpybutil = callPackage ../development/python-modules/xpybutil { }; |