Project import generated by Copybara.

GitOrigin-RevId: 007126eef72271480cb7670e19e501a1ad2c1ff2
This commit is contained in:
Default email 2020-10-20 09:25:03 +10:00
parent 787e89c24d
commit 02a8431f10
80 changed files with 2220 additions and 2191 deletions

View file

@ -1102,6 +1102,8 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
<package>nextcloud18</package> before upgrading to <package>nextcloud19</package>
since Nextcloud doesn't support upgrades across multiple major versions.
</para>
</listitem>
<listitem>
<para>
The <literal>nixos-run-vms</literal> script now deletes the
previous run machines states on test startup. You can use the

View file

@ -86,8 +86,8 @@ in {
};
packages = mkOption {
default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ];
defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]";
default = [ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ];
defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]";
type = types.listOf types.package;
description = ''
Packages to add to PATH for the jenkins process.
@ -207,7 +207,7 @@ in {
# For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
script = ''
${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
${pkgs.jdk11}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
--httpPort=${toString cfg.port} \
--prefix=${cfg.prefix} \
-Djava.awt.headless=true \

View file

@ -1,12 +1,12 @@
{ mkDerivation
, cmake
, fetchgit
, fetchFromGitLab
, gst_all_1
, lib
, libpulseaudio
, ninja
, pcre
, pkgconfig
, pkg-config
, qtbase
, qttools
, taglib
@ -15,34 +15,16 @@
mkDerivation rec {
pname = "sayonara-player";
version = "1.5.1-stable5";
version = "1.6.0-beta6";
src = fetchgit {
url = "https://git.sayonara-player.com/sayonara.git";
src = fetchFromGitLab {
owner = "luciocarreras";
repo = "sayonara-player";
rev = version;
sha256 = "13l7r3gaszrkyf4z8rdijfzxvcnilax4ki2mcm30wqk8d4g4qdzj";
sha256 = "sha256-SbJS0DQvbW++CNXbuDHQxFlLRb1kTtDdIdHOqu0YxeQ=";
};
# all this can go with version 1.5.2
postPatch = ''
# if we don't delete this, sayonara will look here instead of the provided taglib
rm -r src/3rdParty/taglib
for f in \
src/DBus/DBusNotifications.cpp \
src/Gui/Resources/Icons/CMakeLists.txt \
src/Utils/Utils.cpp \
test/Util/FileHelperTest.cpp \
; do
substituteInPlace $f --replace /usr $out
done
substituteInPlace src/Components/Shutdown/Shutdown.cpp \
--replace /usr/bin/systemctl systemctl
'';
nativeBuildInputs = [ cmake ninja pkgconfig qttools ];
nativeBuildInputs = [ cmake ninja pkg-config qttools ];
buildInputs = [
libpulseaudio

View file

@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
version = "0.7.2";
version = "0.8.2";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg=";
sha256 = "sha256-tJcpjviCXA1Y/PX1jlXphXZZMWBAAg3kdbsj41tmunE=";
};
buildInputs = [

View file

@ -5,15 +5,15 @@
rustPlatform.buildRustPackage rec {
pname = "kibi";
version = "0.2.0";
version = "0.2.1";
cargoSha256 = "0zyqzb3k4ak7h58zjbg9b32hz1vgbbn9i9l85j4vd4aw8mhsz0n9";
cargoSha256 = "1cbiidq0w5f9ynb09b6828p7p7y5xhpgz47n2jsl8mp96ydhy5lv";
src = fetchFromGitHub {
owner = "ilai-deutel";
repo = "kibi";
rev = "v${version}";
sha256 = "1cqnzw6gpsmrqcz82zn1x5i6najcr3i7shj0wnqzpwppff9a6yac";
sha256 = "1x5bvvq33380k2qhs1bwz3f9zl5q1sl7iic47pxfkzv24bpjnypb";
};
meta = with stdenv.lib; {

View file

@ -0,0 +1,112 @@
{ stdenv
, fetchFromGitHub
, lzma
, qt5
, wrapQtAppsHook
, miniupnpc_2
, swftools
, pythonPackages
}:
pythonPackages.buildPythonPackage {
pname = "hydrus";
version = "413";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "9fbed11bef499e01a6799b298bea7d0967d30430";
sha256 = "1dl7qpzmlxl376lzm0chmwvf4nl55wz6fwcsw0ikb33rm8r33gq4";
};
nativeBuildInputs = [
wrapQtAppsHook
];
propagatedBuildInputs = with pythonPackages; [
beautifulsoup4
html5lib
lxml
numpy
opencv4
pillow
psutil
pyopenssl
pyyaml
requests
send2trash
service-identity
twisted
lz4
lzma
pysocks
matplotlib
qtpy
pyside2
];
checkInputs = with pythonPackages; [ nose httmock ];
# most tests are failing, presumably because we are not using test.py
checkPhase = ''
nosetests $src/hydrus/test \
-e TestClientAPI \
-e TestClientConstants \
-e TestClientDaemons \
-e TestClientData \
-e TestClientDB \
-e TestClientDBDuplicates \
-e TestClientDBTags \
-e TestClientImageHandling \
-e TestClientImportOptions \
-e TestClientListBoxes \
-e TestClientMigration \
-e TestClientNetworking \
-e TestClientTags \
-e TestClientThreading \
-e TestDialogs \
-e TestFunctions \
-e TestHydrusNATPunch \
-e TestHydrusSerialisable \
-e TestHydrusServer \
-e TestHydrusSessions \
-e TestServer \
'';
extraOutputsToLink = [ "doc" ];
postPatch = ''
sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \
-i ./hydrus/core/HydrusNATPunch.py
sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \
-i ./hydrus/core/HydrusFlashHandling.py
'';
#doCheck = true;
installPhase = ''
# Move the hydrus module and related directories
mkdir -p $out/${pythonPackages.python.sitePackages}
mv {hydrus,static} $out/${pythonPackages.python.sitePackages}
mv help $out/doc/
# install the hydrus binaries
mkdir -p $out/bin
install -m0755 server.py $out/bin/hydrus-server
install -m0755 client.py $out/bin/hydrus-client
'';
dontWrapQtApps = true;
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = with stdenv.lib; {
description = "Danbooru-like image tagging and searching system for the desktop";
license = licenses.wtfpl;
homepage = "https://hydrusnetwork.github.io/hydrus/";
maintainers = [ maintainers.evanjs ];
};
}

View file

@ -1,8 +1,23 @@
{ stdenv, fetchFromGitHub
, freeimage, fontconfig, pkgconfig
, asciidoc, docbook_xsl, libxslt, cmocka
, librsvg, pango, libxkbcommon, wayland
, libGLU, icu
{ asciidoc
, cmocka
, docbook_xsl
, fetchFromGitHub
, fontconfig
, freeimage
, icu
, libGLU
, libheif
, libjpeg_turbo
, libpng
, librsvg
, libtiff
, libxkbcommon
, libxslt
, netsurf
, pango
, pkgconfig
, stdenv
, wayland
}:
stdenv.mkDerivation rec {
@ -10,37 +25,31 @@ stdenv.mkDerivation rec {
version = "4.1.0";
src = fetchFromGitHub {
owner = "eXeC64";
repo = "imv";
rev = "v${version}";
owner = "eXeC64";
repo = "imv";
rev = "v${version}";
sha256 = "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx";
};
preBuild = ''
# Version is 4.0.1, but Makefile was not updated
sed -i 's/echo v4\.0\.0/echo v4.0.1/' Makefile
'';
nativeBuildInputs = [
asciidoc
cmocka
docbook_xsl
libxslt
];
nativeBuildInputs = [ asciidoc cmocka docbook_xsl libxslt ];
buildInputs = [
freeimage
icu
libGLU
libjpeg_turbo
librsvg
libxkbcommon
netsurf.libnsgif
pango
pkgconfig
wayland
icu
];
installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ];
makeFlags = [ "BACKEND_LIBJPEG=yes" "BACKEND_LIBNSGIF=yes" ];
postFixup = ''
# The `bin/imv` script assumes imv-wayland or imv-x11 in PATH,
# so we have to fix those to the binaries we installed into the /nix/store
@ -53,9 +62,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A command line image viewer for tiling window managers";
homepage = "https://github.com/eXeC64/imv";
license = licenses.gpl2;
homepage = "https://github.com/eXeC64/imv";
license = licenses.gpl2;
maintainers = with maintainers; [ rnhmjoj markus1189 ];
platforms = platforms.all;
platforms = platforms.all;
};
}

View file

@ -4,25 +4,23 @@
karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem
}:
let
mkDerivation rec {
pname = "krusader";
version = "2.7.2";
in mkDerivation rec {
pname = "krusader";
inherit version;
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ];
meta = with lib; {
description = "Norton/Total Commander clone for KDE";
license = licenses.gpl2;
homepage = "http://www.krusader.org";
license = licenses.gpl2Only;
maintainers = with maintainers; [ sander turion ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ];
}

View file

@ -11,16 +11,17 @@
, pandas
, pyshp
, setuptools
, withPcap ? true, dpkt ? null, dnslib ? null
}:
buildPythonApplication rec {
pname = "visidata";
version = "1.5.2";
version = "2.0.1";
src = fetchFromGitHub {
owner = "saulpw";
repo = "visidata";
rev = "v${version}";
sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0";
sha256 = "sha256-AkGU9p00y+psBS/fL2YLyQYRSMOp1aPs21E9bpN9z0M=";
};
propagatedBuildInputs = [
@ -34,7 +35,7 @@ buildPythonApplication rec {
pandas
pyshp
setuptools
];
] ++ lib.optionals withPcap [ dpkt dnslib ];
doCheck = false;

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "kube-router";
version = "1.0.1";
version = "1.1.0";
goPackagePath = "github.com/cloudnativelabs/kube-router";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "cloudnativelabs";
repo = pname;
rev = "v${version}";
sha256 = "00bypaccv8q9xdcz6vlvl1qxqxqssl21bs4nkd1a6q8b4jpl339z";
sha256 = "0nsd371w667qhgiygxcg4kmynwldb0pbip6x03rc7j854hg8l7k0";
};
buildFlagsArray = ''

View file

@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "kubernetes";
version = "1.19.1";
version = "1.19.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "1wnlw2rl14q7cb8shhldbavdamvl3w3mlfvymwfvmvxfxzhrjlaq";
sha256 = "0fpkgrykkjmkrh327g6zf3r6s39bnv5w1wlqsvvzyp2zsswgw81v";
};
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubespy";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "pulumi";
repo = "kubespy";
sha256 = "1p0qmn6458pa9la6zkvyrkgs2rhzfwsk9m3rk5fkmcfbh7b031r8";
sha256 = "1xrwhxw2y0zpzsxp1rlm1wd0aqw6jda5ai5y1ards5djqsbsv87g";
};
vendorSha256 = "0q85is01cbgxflnqdvxc9w5iqdizgvsc44h8z21j712bm2w7blqq";
vendorSha256 = "0ajhbjs9ijpxp3svvj7pjiac78ps7vkqmqrizq18mllsry0m9pcl";
doCheck = false;

View file

@ -0,0 +1,84 @@
{ stdenv
, fetchFromGitHub
, python3Packages
, sox
, flac
, lame
, wrapQtAppsHook
, ffmpeg
, vorbis-tools
, pulseaudio
, nodejs
, youtube-dl
, opusTools
, gst_all_1
}:
let packages = [
vorbis-tools
sox
flac
lame
opusTools
gst_all_1.gstreamer
nodejs
ffmpeg
youtube-dl
] ++ stdenv.lib.optionals stdenv.isLinux [ pulseaudio ];
in
python3Packages.buildPythonApplication rec {
pname = "mkchromecast-unstable";
version = "2020-10-17";
src = fetchFromGitHub rec {
owner = "muammar";
repo = "mkchromecast";
rev = "eb9da74d887acd70ed179e6e4c0cbed4ff83de04";
sha256 = "1l565n3rmyghc4vzh80gazvdks1i97j1h94x33pkmxxlf9a9rncj";
};
propagatedBuildInputs = with python3Packages; [
PyChromecast
psutil
mutagen
flask
netifaces
requests
pyqt5
];
postPatch = ''
substituteInPlace setup.py \
--replace 'platform.system() == "Darwin"' 'False' \
--replace 'platform.system() == "Linux"' 'True'
'';
nativeBuildInputs = [ wrapQtAppsHook ];
# Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs.
# Is also I/O bound and impure, testing an actual device, so we disable.
doCheck = false;
dontWrapQtApps = true;
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
"--prefix PATH : ${stdenv.lib.makeBinPath packages}"
];
postInstall = ''
substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/video.py \
--replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/'
'' + stdenv.lib.optionalString stdenv.isDarwin ''
install -Dm 755 -t $out/bin bin/audiodevice
substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/audio_devices.py \
--replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice'
'';
meta = with stdenv.lib; {
homepage = "https://mkchromecast.com/";
description = "Cast macOS and Linux Audio/Video to your Google Cast and Sonos Devices";
license = licenses.mit;
maintainers = with maintainers; [ shou ];
};
}

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A generic parser and tool package for the BTOR2 format";
homepage = "https://github.com/Boolector/btor2tools";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
};
}

View file

@ -8,11 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
};
patchPhase = stdenv.lib.optionalString stdenv.cc.isClang ''
patches = [
./gfan-0.6.2-cddlib-prefix.patch
];
postPatch = stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
'';
buildFlags = [ "CC=cc" "CXX=c++" "cddnoprefix=1" ];
buildFlags = [ "CC=cc" "CXX=c++" ];
installFlags = [ ''PREFIX=$(out)'' ];
buildInputs = [ gmp mpir cddlib ];

View file

@ -0,0 +1,55 @@
diff -ru gfan0.6.2.orig/src/app_librarytest.cpp gfan0.6.2/src/app_librarytest.cpp
--- gfan0.6.2.orig/src/app_librarytest.cpp 2020-10-19 08:41:27.981863500 +0900
+++ gfan0.6.2/src/app_librarytest.cpp 2020-10-19 08:42:44.551863500 +0900
@@ -12,8 +12,8 @@
#include "setoper.h"
#include "cdd.h"
#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
+#include "cddlib/setoper.h"
+#include "cddlib/cdd.h"
#endif
#include <iostream>
#include <fstream>
diff -ru gfan0.6.2.orig/src/gfanlib_zcone.cpp gfan0.6.2/src/gfanlib_zcone.cpp
--- gfan0.6.2.orig/src/gfanlib_zcone.cpp 2020-10-19 08:41:27.981863500 +0900
+++ gfan0.6.2/src/gfanlib_zcone.cpp 2020-10-19 08:42:44.571863500 +0900
@@ -16,8 +16,8 @@
#include "setoper.h"
#include "cdd.h"
#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
+#include "cddlib/setoper.h"
+#include "cddlib/cdd.h"
#endif
//}
@@ -52,8 +52,8 @@
"dd_free_global_constants()\n"
"in your deinitialisation code (only available for cddlib version>=094d).\n"
"This requires the header includes:\n"
- "#include \"cdd/setoper.h\"\n"
- "#include \"cdd/cdd.h\"\n"
+ "#include \"cddlib/setoper.h\"\n"
+ "#include \"cddlib/cdd.h\"\n"
"\n"
"Alternatively, you may call gfan:initializeCddlibIfRequired() and deinitializeCddlibIfRequired()\n"
"if gfanlib is the only code using cddlib. If at some point cddlib is no longer required by gfanlib\n"
diff -ru gfan0.6.2.orig/src/lp_cdd.cpp gfan0.6.2/src/lp_cdd.cpp
--- gfan0.6.2.orig/src/lp_cdd.cpp 2020-10-19 08:41:27.991863500 +0900
+++ gfan0.6.2/src/lp_cdd.cpp 2020-10-19 08:42:44.571863500 +0900
@@ -5,9 +5,9 @@
#include "cdd.h"
#include "cdd_f.h"
#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
-#include "cdd/cdd_f.h"
+#include "cddlib/setoper.h"
+#include "cddlib/cdd.h"
+#include "cddlib/cdd_f.h"
#endif
//}
#include "termorder.h"

View file

@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "50.0.0";
version = "51.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd";
sha256 = "06k2slgac0fhgypmdriwdc5s09mry22vxk316ixfj5sv3irwn7wc";
};
nativeBuildInputs = [

View file

@ -3,9 +3,8 @@
fixupOutputHooks+=(_validatePkgConfig)
_validatePkgConfig() {
local bail=0
for pc in $(find "$prefix" -name '*.pc'); do
local bail=0
# Do not fail immediately. It's nice to see all errors when
# there are multiple pkgconfig files.
if ! pkg-config --validate "$pc"; then

View file

@ -1,14 +1,14 @@
{ lib, fetchzip }:
let
version = "0.018";
version = "0.022";
in fetchzip {
name = "JuliaMono-${version}";
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip";
sha256 = "0ss79a9gymbhih5pgjkg1mipmk0qsvqqwlkqcdm9fz87d7kfhby3";
sha256 = "1v4a9qbvjlszamvqrj0g65z1nhahfmf1fzkgjwzkmsrdqn909dic";
postFetch = ''
mkdir -p $out/share/fonts
mkdir -p $out/share/fonts/truetype
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';

View file

@ -36,7 +36,12 @@ let
buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages.
elixir = elixir_1_10;
elixir = elixir_1_11;
elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix {
inherit erlang;
debugInfo = true;
};
elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
inherit erlang;

View file

@ -0,0 +1,9 @@
{ mkDerivation }:
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
version = "1.11.1";
sha256 = "0czyv98sq9drlvdwv3gw9vnhn8qa3va4xh5vdqpg7m6b93l1r3p1";
minimumOTPVersion = "21";
}

View file

@ -0,0 +1,100 @@
From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 28 Aug 2017 09:24:06 +0200
Subject: [PATCH] Don't use ldconfig
---
Lib/ctypes/util.py | 70 ++----------------------------------------------------
1 file changed, 2 insertions(+), 68 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 5e8b31a854..7b45ce6c15 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -94,46 +94,7 @@ elif os.name == "posix":
import re, tempfile
def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the
- # library name it prints out. The GCC command will fail because we
- # haven't supplied a proper program with main(), but that does not
- # matter.
- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
-
- c_compiler = shutil.which('gcc')
- if not c_compiler:
- c_compiler = shutil.which('cc')
- if not c_compiler:
- # No C compiler available, give up
- return None
-
- temp = tempfile.NamedTemporaryFile()
- try:
- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
-
- env = dict(os.environ)
- env['LC_ALL'] = 'C'
- env['LANG'] = 'C'
- try:
- proc = subprocess.Popen(args,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT,
- env=env)
- except OSError: # E.g. bad executable
- return None
- with proc:
- trace = proc.stdout.read()
- finally:
- try:
- temp.close()
- except FileNotFoundError:
- # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails
- pass
- res = re.search(expr, trace)
- if not res:
- return None
- return os.fsdecode(res.group(0))
+ return None
if sys.platform == "sunos5":
@@ -255,34 +216,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.15.0

View file

@ -28,6 +28,7 @@ with pkgs;
isPy37 = pythonVersion == "3.7";
isPy38 = pythonVersion == "3.8";
isPy39 = pythonVersion == "3.9";
isPy310 = pythonVersion == "3.10";
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
@ -115,6 +116,19 @@ in {
inherit passthruFun;
};
python310 = callPackage ./cpython {
self = python310;
sourceVersion = {
major = "3";
minor = "10";
patch = "0";
suffix = "a1";
};
sha256 = "0q59a99w1yad808mx4w6l0j7bk7dbd2kakngbk0w1h9z4dhr8wyv";
inherit (darwin) configd;
inherit passthruFun;
};
# Minimal versions of Python (built without optional dependencies)
python3Minimal = (python38.override {
self = python3Minimal;

View file

@ -0,0 +1,16 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.73.0";
src = fetchurl {
#url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2";
urls = [
"mirror://sourceforge/boost/boost_1_73_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_73_0.html
sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402";
};
})

View file

@ -0,0 +1,15 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.74.0";
src = fetchurl {
urls = [
"mirror://sourceforge/boost/boost_1_74_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_74_0.html
sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1";
};
})

View file

@ -0,0 +1,22 @@
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
index 4238f921e..8fc1ea269 100644
--- a/tools/boost_install/boost-install.jam
+++ b/tools/boost_install/boost-install.jam
@@ -649,7 +649,7 @@ rule generate-cmake-config- ( target : sources * : properties * )
""
"# Compute the include and library directories relative to this file."
""
- "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
: true ;
if [ path.is-rooted $(cmakedir) ]
@@ -668,6 +668,8 @@ rule generate-cmake-config- ( target : sources * : properties * )
" unset(_BOOST_CMAKEDIR_ORIGINAL)"
"endif()"
""
+ "# Assume that the installer actually did know where the libs were to be installed"
+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)"
: true ;
}

View file

@ -113,7 +113,8 @@ stdenv.mkDerivation {
if version == "1.55.0"
then ./darwin-1.55-no-system-python.patch
else ./darwin-no-system-python.patch)
++ optional (versionAtLeast version "1.70") ./cmake-paths.patch;
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch;
meta = {
homepage = "http://boost.org/";

View file

@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libtiff libjpeg zlib ];
# See https://trac.macports.org/ticket/60656
LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null;
meta = with stdenv.lib; {
description = "Color management engine";
homepage = "http://www.littlecms.com/";

View file

@ -9,6 +9,7 @@
, zlib
, zstd
, enableLite ? false
, enableShared ? true
}:
stdenv.mkDerivation rec {
@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
"-DFORCE_SSE42=1")
(stdenv.lib.optional enableLite "-DROCKSDB_LITE=1")
"-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}"
];
] ++ stdenv.lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
# otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format";

View file

@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
./spooles.patch
];
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name'
'';
buildPhase = ''
make lib
'';

View file

@ -166,7 +166,7 @@ index f014c7d..7c8042a 100755
#cd MPI ; make lib
-#cd MT ; make lib
+ cd MT ; make lib
+ gcc -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm
+ $(CC) -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm
+ ln -s libspooles.so.2.2 libspooles.so
global :

View file

@ -77,6 +77,7 @@
, {"fast-cli": "1.x"}
, "fkill-cli"
, "forever"
, "fx"
, "get-graphql-schema"
, "git-run"
, "git-ssb"
@ -160,6 +161,7 @@
, "pyright"
, "react-native-cli"
, "react-tools"
, "readability-cli"
, "redoc-cli"
, "reveal.js"
, "rollup"

File diff suppressed because it is too large Load diff

View file

@ -1,11 +1,15 @@
{ buildDunePackage, sqlexpr, ounit
, ppx_core, ppx_tools_versioned, re, lwt_ppx
, ppxlib, ppx_tools_versioned, re, lwt_ppx
}:
buildDunePackage {
pname = "ppx_sqlexpr";
inherit (sqlexpr) version src meta;
buildInputs = [ sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ];
postPatch = ''
substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib
'';
buildInputs = [ sqlexpr ounit ppxlib ppx_tools_versioned re lwt_ppx ];
doCheck = true;
}

View file

@ -4,30 +4,31 @@
, isPy27
, ansible
, pyyaml
, six
, nose
, setuptools_scm
, ruamel_yaml
, pathlib2
, rich
, pytestCheckHook
, pytestcov
, pytest_xdist
, git
}:
buildPythonPackage rec {
pname = "ansible-lint";
version = "4.2.0";
version = "4.3.5";
# pip is not able to import version info on raumel.yaml
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "eb925d8682d70563ccb80e2aca7b3edf84fb0b768cea3edc6846aac7abdc414a";
sha256 = "0mjn0drw3cx4pfl9qll5j7wib5r8msihs5yl8ri9fkfcbz7k1hmy";
};
format = "pyproject";
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ]
++ lib.optionals isPy27 [ pathlib2 ];
checkInputs = [ nose ];
propagatedBuildInputs = [ pyyaml ansible ruamel_yaml rich ];
checkInputs = [ pytestCheckHook pytestcov pytest_xdist git ];
postPatch = ''
patchShebangs bin/ansible-lint
@ -42,11 +43,11 @@ buildPythonPackage rec {
'';
checkPhase = ''
PATH=$out/bin:$PATH nosetests test
pytest -k 'not test_run_playbook_github and not test_run_single_role_path_no_trailing_slash_script'
'';
meta = with lib; {
homepage = "https://github.com/willthames/ansible-lint";
homepage = "https://github.com/ansible/ansible-lint";
description = "Best practices checker for Ansible";
license = licenses.mit;
maintainers = [ maintainers.sengaya ];

View file

@ -4,13 +4,13 @@ let
py = python;
in buildPythonPackage rec {
pname = "mysql-connector";
version = "8.0.21";
version = "8.0.22";
src = fetchFromGitHub {
owner = "mysql";
repo = "mysql-connector-python";
rev = version;
sha256 = "0ky7rn9259807gji3fhvkmdmrgyaps431l9l9y6gh66i84kw1b3l";
sha256 = "084q8x86ywgxgpsgdid8y9rjjys06146dqinfpmlggjswbq9kl0d";
};
propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];

View file

@ -0,0 +1,26 @@
{ aiohttp, async-timeout, buildPythonPackage, fetchPypi, isPy3k, lib }:
buildPythonPackage rec {
pname = "pyaftership";
version = "0.1.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "057dwzacc0lmsq00ipfbnxkq4rc2by8glmza6s8i6dzi1cc68v98";
};
propagatedBuildInputs = [ aiohttp async-timeout ];
# No tests
doCheck = false;
pythonImportsCheck = [ "pyaftership.tracker" ];
meta = with lib; {
description = "Python wrapper package for the AfterShip API";
homepage = "https://github.com/ludeeus/pyaftership";
license = licenses.mit;
maintainers = with maintainers; [ jamiemagee ];
};
}

View file

@ -18,12 +18,11 @@
buildPythonPackage rec {
pname = "pyatv";
version = "v0.7.4";
version = "0.7.4";
src = fetchFromGitHub {
owner = "postlund";
repo = pname;
rev = version;
rev = "v${version}";
sha256 = "17gsamn4aibsx4w50r9dwr5kr9anc7dd0f0dvmdl717rkgh13zyi";
};
@ -37,7 +36,6 @@ buildPythonPackage rec {
cryptography
netifaces
zeroconf
pytestCheckHook
];
checkInputs = [
@ -45,6 +43,7 @@ buildPythonPackage rec {
pytest
pytest-aiohttp
pytest-asyncio
pytestCheckHook
];
meta = with stdenv.lib; {

View file

@ -2,11 +2,13 @@
, buildPythonPackage
, fetchPypi
, markdown
, isPy27
}:
buildPythonPackage rec {
pname = "python-markdown-math";
version = "0.7";
disabled = isPy27;
src = fetchPypi {
inherit pname version;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.20.2";
version = "0.20.3";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "123ndg7byrflczxzhk2c48bb8wlwgqzf1m0dzi0mnw3h52qiqjyp";
sha256 = "1zy6v1srm5v6bg2rqb3hb4cz8g7zwhraf91y810y9csh6r4fv29b";
};
vendorSha256 = "1prf1hffvwl2hdkrr8hqz1wwcz2n9dzhf68ziz5k3fzsx30jki9l";
vendorSha256 = "0s367ikq6y1izjim72lnqc98vypl072nimcwnw9y9d7nld5y77c8";
doCheck = false;

View file

@ -48,9 +48,10 @@ let
srcs.bazel_skylib
srcs.io_bazel_rules_sass
srcs.platforms
(if stdenv.hostPlatform.isDarwin
then srcs."java_tools_javac11_darwin-v8.0.zip"
else srcs."java_tools_javac11_linux-v8.0.zip")
# `bazel query` wants all of these to be available regardless of platform.
srcs."java_tools_javac11_darwin-v8.0.zip"
srcs."java_tools_javac11_linux-v8.0.zip"
srcs."java_tools_javac11_windows-v8.0.zip"
srcs."coverage_output_generator-v2.1.zip"
srcs.build_bazel_rules_nodejs
srcs."android_tools_pkg-0.19.0rc1.tar.gz"
@ -131,10 +132,21 @@ let
bazelRC = writeTextFile {
name = "bazel-rc";
text = ''
build --override_repository=${remote_java_tools.name}=${remote_java_tools}
build --distdir=${distDir}
startup --server_javabase=${runJdk}
# Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
# Most commands inherit from 'build' anyway.
build --distdir=${distDir}
fetch --distdir=${distDir}
query --distdir=${distDir}
build --override_repository=${remote_java_tools.name}=${remote_java_tools}
fetch --override_repository=${remote_java_tools.name}=${remote_java_tools}
query --override_repository=${remote_java_tools.name}=${remote_java_tools}
# Provide a default java toolchain, this will be the same as ${runJdk}
build --host_javabase='@local_jdk//:jdk'
# load default location for the system wide configuration
try-import /etc/bazel.bazelrc
'';
@ -534,7 +546,7 @@ stdenv.mkDerivation rec {
export TEST_TMPDIR=$(pwd)
hello_test () {
$out/bin/bazel test --distdir=${distDir} \
$out/bin/bazel test \
--test_output=errors \
--java_toolchain='${javaToolchain}' \
examples/cpp:hello-success_test \

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
version = "0.23.2";
version = "0.23.6";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "sha256-G/oAKIG0TSEjaVi6vN2wg/apOztGLiqqYLfZy6Tmmgc=";
sha256 = "0afs3h8npbzmcrzm6kzfdva5id3zyifhhsh7zgyrxkmw60qhl498";
};
vendorSha256 = null;

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
sha256 = "1s5wb5m0d77qi90pyxld98ap37xnxrz3sz5gazq0pp5i9c9xa124";
sha256 = "1ccwa44hpmpd57ff6w02rvrs63wxwmgls2i1rn285rxypmbysrp0";
};
cargoSha256 = "10dzvzjqib751h2p1pl0z3dy2d17xwrcp9vyfrfr185yximcw2wx";
cargoSha256 = "1sffivpgrn4my57pcrg46b2yg6fmhxj61d2sqvg60fjljrg595zn";
nativeBuildInputs = [ perl pkg-config ];

View file

@ -2,10 +2,10 @@
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2020-10-12";
rev = "2020-10-19";
version = "unstable-${rev}";
sha256 = "194xax87pwdh3p8zx46igvqwznlpnl4jp8lj987616gyldfgall0";
cargoSha256 = "1rvf3a2fpqpf4q52pi676qzq7h0xfqlcbp15sc5vqc8nbbs7c7vw";
sha256 = "1xvyk1d26zn1d9i42h78qsm6bg57nhn1rgr46jwa46gsb31nabjh";
cargoSha256 = "18s5yrc9fdj2ndylwyf07l0kmwxka7mnbj254xmq3g7ragw71xjw";
};
rust-analyzer = callPackage ./wrapper.nix {} {

View file

@ -1,82 +0,0 @@
This patch revert 875ad9b5c410200f5072515ae91b4ff51cff0448 (Bump smol_str from 0.1.16 to 0.1.17 ).
diff --git a/Cargo.lock b/Cargo.lock
index 477af57aa..8b9055879 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1470,9 +1470,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
[[package]]
name = "smol_str"
-version = "0.1.17"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ca0f7ce3a29234210f0f4f0b56f8be2e722488b95cb522077943212da3b32eb"
+checksum = "2f7909a1d8bc166a862124d84fdc11bda0ea4ed3157ccca662296919c2972db1"
dependencies = [
"serde",
]
diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs
index a5750d829..49841c7a1 100644
--- a/crates/hir_expand/src/name.rs
+++ b/crates/hir_expand/src/name.rs
@@ -43,8 +43,8 @@ impl Name {
}
/// Shortcut to create inline plain text name
- const fn new_inline(text: &str) -> Name {
- Name::new_text(SmolStr::new_inline(text))
+ const fn new_inline_ascii(text: &[u8]) -> Name {
+ Name::new_text(SmolStr::new_inline_from_ascii(text.len(), text))
}
/// Resolve a name from the text of token.
@@ -127,7 +127,7 @@ pub mod known {
$(
#[allow(bad_style)]
pub const $ident: super::Name =
- super::Name::new_inline(stringify!($ident));
+ super::Name::new_inline_ascii(stringify!($ident).as_bytes());
)*
};
}
@@ -210,8 +210,8 @@ pub mod known {
);
// self/Self cannot be used as an identifier
- pub const SELF_PARAM: super::Name = super::Name::new_inline("self");
- pub const SELF_TYPE: super::Name = super::Name::new_inline("Self");
+ pub const SELF_PARAM: super::Name = super::Name::new_inline_ascii(b"self");
+ pub const SELF_TYPE: super::Name = super::Name::new_inline_ascii(b"Self");
#[macro_export]
macro_rules! name {
diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs
index 9a7785c76..2b53b8297 100644
--- a/crates/hir_ty/src/infer.rs
+++ b/crates/hir_ty/src/infer.rs
@@ -555,7 +555,7 @@ impl<'a> InferenceContext<'a> {
fn resolve_lang_item(&self, name: &str) -> Option<LangItemTarget> {
let krate = self.resolver.krate()?;
- let name = SmolStr::new_inline(name);
+ let name = SmolStr::new_inline_from_ascii(name.len(), name.as_bytes());
self.db.lang_item(krate, name)
}
diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs
index d987b2500..a8ad917fb 100644
--- a/crates/mbe/src/syntax_bridge.rs
+++ b/crates/mbe/src/syntax_bridge.rs
@@ -636,10 +636,7 @@ impl<'a> TreeSink for TtTreeSink<'a> {
let (text, id) = match leaf {
tt::Leaf::Ident(ident) => (ident.text.clone(), ident.id),
tt::Leaf::Punct(punct) => {
- assert!(punct.char.is_ascii());
- let char = &(punct.char as u8);
- let text = std::str::from_utf8(std::slice::from_ref(char)).unwrap();
- (SmolStr::new_inline(text), punct.id)
+ (SmolStr::new_inline_from_ascii(1, &[punct.char as u8]), punct.id)
}
tt::Leaf::Literal(lit) => (lit.text.clone(), lit.id),
};

View file

@ -16,16 +16,9 @@ rustPlatform.buildRustPackage {
inherit rev sha256;
};
# FIXME: Temporary fixes for our rust 1.45.0
cargoPatches = [
./downgrade-smol_str.patch # Requires rustc 1.46.0
];
# FIXME: Temporary fixes for our rust 1.46.0
patches = [
./no-track_env_var.patch # Requires rustc 1.47.0
./no-match-unsizing-in-const-fn.patch # Requires rustc 1.46.0
./no-loop-in-const-fn.patch # Requires rustc 1.46.0
./no-option-zip.patch # Requires rustc 1.46.0
./no-track_env_var.patch # Requires rustc 1.47.0
];
buildAndTestSubdir = "crates/rust-analyzer";

View file

@ -1,223 +0,0 @@
This patch revert 4b989009e3839cfc6f021d1552a46561cee6cde2 (CONST LOOPS ARE HERE).
diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs
index 5f885edfd..e72929f8c 100644
--- a/crates/parser/src/grammar/expressions.rs
+++ b/crates/parser/src/grammar/expressions.rs
@@ -316,7 +316,7 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option<CompletedMark
}
const LHS_FIRST: TokenSet =
- atom::ATOM_EXPR_FIRST.union(TokenSet::new(&[T![&], T![*], T![!], T![.], T![-]]));
+ atom::ATOM_EXPR_FIRST.union(token_set![T![&], T![*], T![!], T![.], T![-]]);
fn lhs(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> {
let m;
diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs
index 66a92a4e1..ba6dd2fbc 100644
--- a/crates/parser/src/grammar/expressions/atom.rs
+++ b/crates/parser/src/grammar/expressions/atom.rs
@@ -15,7 +15,7 @@ use super::*;
// let _ = b"e";
// let _ = br"f";
// }
-pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[
+pub(crate) const LITERAL_FIRST: TokenSet = token_set![
TRUE_KW,
FALSE_KW,
INT_NUMBER,
@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[
STRING,
RAW_STRING,
BYTE_STRING,
- RAW_BYTE_STRING,
-]);
+ RAW_BYTE_STRING
+];
pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
if !p.at_ts(LITERAL_FIRST) {
@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
// E.g. for after the break in `if break {}`, this should not match
pub(super) const ATOM_EXPR_FIRST: TokenSet =
- LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[
+ LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![
T!['('],
T!['{'],
T!['['],
@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet =
T![loop],
T![for],
LIFETIME,
- ]));
+ ]);
-const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]);
+const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR];
pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> {
if let Some(m) = literal(p) {
diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs
index 22810e6fb..8fd8f3b80 100644
--- a/crates/parser/src/grammar/items.rs
+++ b/crates/parser/src/grammar/items.rs
@@ -26,7 +26,7 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
}
}
-pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[
+pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![
FN_KW,
STRUCT_KW,
ENUM_KW,
@@ -41,7 +41,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[
USE_KW,
MACRO_KW,
T![;],
-]);
+];
pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) {
let m = p.start();
diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs
index 5d297e2d6..52562afa4 100644
--- a/crates/parser/src/grammar/paths.rs
+++ b/crates/parser/src/grammar/paths.rs
@@ -3,7 +3,7 @@
use super::*;
pub(super) const PATH_FIRST: TokenSet =
- TokenSet::new(&[IDENT, T![self], T![super], T![crate], T![:], T![<]]);
+ token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]];
pub(super) fn is_path_start(p: &Parser) -> bool {
is_use_path_start(p) || p.at(T![<])
diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs
index 796f206e1..07b1d6dd5 100644
--- a/crates/parser/src/grammar/patterns.rs
+++ b/crates/parser/src/grammar/patterns.rs
@@ -2,18 +2,9 @@
use super::*;
-pub(super) const PATTERN_FIRST: TokenSet =
- expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[
- T![box],
- T![ref],
- T![mut],
- T!['('],
- T!['['],
- T![&],
- T![_],
- T![-],
- T![.],
- ]));
+pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST
+ .union(paths::PATH_FIRST)
+ .union(token_set![T![box], T![ref], T![mut], T!['('], T!['['], T![&], T![_], T![-], T![.]]);
pub(crate) fn pattern(p: &mut Parser) {
pattern_r(p, PAT_RECOVERY_SET);
@@ -83,7 +74,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
}
const PAT_RECOVERY_SET: TokenSet =
- TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]);
+ token_set![LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA];
fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> {
let m = match p.nth(0) {
diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs
index 1ea130ac5..9d00eb9b9 100644
--- a/crates/parser/src/grammar/types.rs
+++ b/crates/parser/src/grammar/types.rs
@@ -2,7 +2,7 @@
use super::*;
-pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[
+pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![
T!['('],
T!['['],
T![<],
@@ -16,16 +16,16 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[
T![for],
T![impl],
T![dyn],
-]));
+]);
-const TYPE_RECOVERY_SET: TokenSet = TokenSet::new(&[
+const TYPE_RECOVERY_SET: TokenSet = token_set![
T![')'],
T![,],
L_DOLLAR,
// test_err struct_field_recover
// struct S { f pub g: () }
T![pub],
-]);
+];
pub(crate) fn type_(p: &mut Parser) {
type_with_bounds_cond(p, true);
diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs
index a68f0144e..994017acf 100644
--- a/crates/parser/src/token_set.rs
+++ b/crates/parser/src/token_set.rs
@@ -9,21 +9,15 @@ pub(crate) struct TokenSet(u128);
impl TokenSet {
pub(crate) const EMPTY: TokenSet = TokenSet(0);
- pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet {
- let mut res = 0u128;
- let mut i = 0;
- while i < kinds.len() {
- res |= mask(kinds[i]);
- i += 1
- }
- TokenSet(res)
+ pub(crate) const fn singleton(kind: SyntaxKind) -> TokenSet {
+ TokenSet(mask(kind))
}
pub(crate) const fn union(self, other: TokenSet) -> TokenSet {
TokenSet(self.0 | other.0)
}
- pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool {
+ pub(crate) fn contains(&self, kind: SyntaxKind) -> bool {
self.0 & mask(kind) != 0
}
}
@@ -32,10 +26,16 @@ const fn mask(kind: SyntaxKind) -> u128 {
1u128 << (kind as usize)
}
+#[macro_export]
+macro_rules! token_set {
+ ($($t:expr),*) => { TokenSet::EMPTY$(.union(TokenSet::singleton($t)))* };
+ ($($t:expr),* ,) => { token_set!($($t),*) };
+}
+
#[test]
fn token_set_works_for_tokens() {
use crate::SyntaxKind::*;
- let ts = TokenSet::new(&[EOF, SHEBANG]);
+ let ts = token_set![EOF, SHEBANG];
assert!(ts.contains(EOF));
assert!(ts.contains(SHEBANG));
assert!(!ts.contains(PLUS));
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index d829790d7..b25a6e301 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result};
use crate::not_bash::{pushd, run};
// Latest stable, feel free to send a PR if this lags behind.
-const REQUIRED_RUST_VERSION: u32 = 46;
+const REQUIRED_RUST_VERSION: u32 = 43;
pub struct InstallCmd {
pub client: Option<ClientOpt>,

View file

@ -1,30 +0,0 @@
diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs
index ea35e833a..4df80a3c0 100644
--- a/crates/assists/src/handlers/convert_integer_literal.rs
+++ b/crates/assists/src/handlers/convert_integer_literal.rs
@@ -105,7 +105,7 @@ impl IntegerLiteralBase {
}
}
- const fn base(&self) -> u32 {
+ fn base(&self) -> u32 {
match self {
Self::Binary => 2,
Self::Octal => 8,
@@ -114,14 +114,14 @@ impl IntegerLiteralBase {
}
}
- const fn prefix_len(&self) -> usize {
+ fn prefix_len(&self) -> usize {
match self {
Self::Decimal => 0,
_ => 2,
}
}
- const fn bases() -> &'static [IntegerLiteralBase] {
+ fn bases() -> &'static [IntegerLiteralBase] {
&[
IntegerLiteralBase::Binary,
IntegerLiteralBase::Octal,

View file

@ -1,52 +0,0 @@
diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs
index fe33cee53..2184a4154 100644
--- a/crates/assists/src/handlers/merge_imports.rs
+++ b/crates/assists/src/handlers/merge_imports.rs
@@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) {
let (merged, to_delete) =
next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| {
- try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2))
+ Some((try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full)?, use_item2))
})?;
rewriter.replace_ast(&use_item, &merged);
@@ -44,7 +44,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
} else {
let (merged, to_delete) =
next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| {
- try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree))
+ Some((try_merge_trees(&tree, &use_tree, MergeBehaviour::Full)?, use_tree))
})?;
rewriter.replace_ast(&tree, &merged);
diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs
index f6025c99a..f9bd31cf3 100644
--- a/crates/assists/src/utils/insert_use.rs
+++ b/crates/assists/src/utils/insert_use.rs
@@ -274,7 +274,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa
}
res = Some((lhs_curr.clone(), rhs_curr.clone()));
- match lhs_curr.parent_path().zip(rhs_curr.parent_path()) {
+ match zip(lhs_curr.parent_path(), rhs_curr.parent_path()) {
Some((lhs, rhs)) => {
lhs_curr = lhs;
rhs_curr = rhs;
@@ -452,7 +452,7 @@ fn find_insert_position(
let path_node_iter = scope
.as_syntax_node()
.children()
- .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node)))
+ .filter_map(|node| Some((ast::Use::cast(node.clone())?, node)))
.flat_map(|(use_, node)| {
let tree = use_.use_tree()?;
let path = tree.path()?;
@@ -989,3 +989,7 @@ use foo::bar::baz::Qux;",
assert_eq!(result.map(|u| u.to_string()), None);
}
}
+
+fn zip<T, U>(x: Option<T>, y: Option<U>) -> Option<(T, U)> {
+ Some((x?, y?))
+}

View file

@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "legendary-gl"; # Name in pypi
version = "0.0.14";
version = "0.20.1";
src = fetchFromGitHub {
owner = "derrod";
repo = "legendary";
rev = version;
sha256 = "05r88qi8mmbj07wxcpb3fhbl40qscbq1aqb0mnj9bpmi9gf5zll5";
sha256 = "0kdrhdvh9gxq1zinh5w852f5fjls9902pcrkhkhm2c0vvq7jfass";
};
propagatedBuildInputs = [ requests ];
@ -27,4 +27,3 @@ buildPythonApplication rec {
maintainers = with maintainers; [ wchresta ];
};
}

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.17";
version = "1.1.23";
src = fetchurl {
# To find new versions, visit
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm"
"https://web.archive.org/web/20200726093746if_/https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm"
"https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"
"https://web.archive.org/web/20201019154323if_/https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"
];
sha256 = "0bqqc04z9gayas5p7410la5nad7waykqyw1z1imcqimfl4qrz1m6";
sha256 = "1d5zd8cwgp3n25ramdqwqb770iim7kh4l7hmhf6a6ivpy0cxpwx6";
};
patches = [ ./cups-filter-ppd-dirs.patch ];

View file

@ -1,154 +0,0 @@
From 6cc95288ccea12ad7b67b2b5b3997dfad8e5b5c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Niew=C3=B6hner?=
<c0d3z3r0@users.noreply.github.com>
Date: Tue, 9 Jun 2020 01:32:02 +0200
Subject: [PATCH] BACKPORT: Linux 5.8 compat: __vmalloc()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The `pgprot` argument has been removed from `__vmalloc` in Linux 5.8,
being `PAGE_KERNEL` always now [1].
Detect this during configure and define a wrapper for older kernels.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/vmalloc.c?h=next-20200605&id=88dca4ca5a93d2c09e5bbc6a62fbfc3af83c4fca
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Co-authored-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
Co-authored-by: Michael Niewöhner <foss@mniewoehner.de>
Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Closes #10422
---
config/kernel-kmem.m4 | 26 ++++++++++++++++++++++++++
config/kernel.m4 | 2 ++
include/spl/sys/kmem.h | 9 +++++++++
module/spl/spl-kmem-cache.c | 4 ++--
module/spl/spl-kmem.c | 9 ++++-----
5 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/config/kernel-kmem.m4 b/config/kernel-kmem.m4
index cc055e530..f1c0d2412 100644
--- a/config/kernel-kmem.m4
+++ b/config/kernel-kmem.m4
@@ -56,3 +56,29 @@ AC_DEFUN([SPL_AC_DEBUG_KMEM_TRACKING], [
AC_MSG_CHECKING([whether detailed kmem tracking is enabled])
AC_MSG_RESULT([$enable_debug_kmem_tracking])
])
+
+dnl #
+dnl # 5.8 API,
+dnl # __vmalloc PAGE_KERNEL removal
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL], [
+ ZFS_LINUX_TEST_SRC([__vmalloc], [
+ #include <linux/mm.h>
+ #include <linux/vmalloc.h>
+ ],[
+ void *p __attribute__ ((unused));
+
+ p = __vmalloc(0, GFP_KERNEL, PAGE_KERNEL);
+ ])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL], [
+ AC_MSG_CHECKING([whether __vmalloc(ptr, flags, pageflags) is available])
+ ZFS_LINUX_TEST_RESULT([__vmalloc], [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_VMALLOC_PAGE_KERNEL, 1, [__vmalloc page flags exists])
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+])
+-
diff --git a/config/kernel.m4 b/config/kernel.m4
index b67fcef8c..23edfdcd8 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -45,6 +45,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
ZFS_AC_KERNEL_SRC_SCHED
ZFS_AC_KERNEL_SRC_USLEEP_RANGE
ZFS_AC_KERNEL_SRC_KMEM_CACHE
+ ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL
ZFS_AC_KERNEL_SRC_WAIT
ZFS_AC_KERNEL_SRC_INODE_TIMES
ZFS_AC_KERNEL_SRC_INODE_LOCK
@@ -163,6 +164,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
ZFS_AC_KERNEL_SCHED
ZFS_AC_KERNEL_USLEEP_RANGE
ZFS_AC_KERNEL_KMEM_CACHE
+ ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL
ZFS_AC_KERNEL_WAIT
ZFS_AC_KERNEL_INODE_TIMES
ZFS_AC_KERNEL_INODE_LOCK
diff --git a/include/spl/sys/kmem.h b/include/spl/sys/kmem.h
index 72d3a7765..ca15bfe7f 100644
--- a/include/spl/sys/kmem.h
+++ b/include/spl/sys/kmem.h
@@ -169,6 +169,15 @@ extern void *spl_kmem_alloc(size_t sz, int fl, const char *func, int line);
extern void *spl_kmem_zalloc(size_t sz, int fl, const char *func, int line);
extern void spl_kmem_free(const void *ptr, size_t sz);
+/*
+ * 5.8 API change, pgprot_t argument removed.
+ */
+#ifdef HAVE_VMALLOC_PAGE_KERNEL
+#define spl_vmalloc(size, flags) __vmalloc(size, flags, PAGE_KERNEL)
+#else
+#define spl_vmalloc(size, flags) __vmalloc(size, flags)
+#endif
+
/*
* The following functions are only available for internal use.
*/
diff --git a/module/spl/spl-kmem-cache.c b/module/spl/spl-kmem-cache.c
index d71b4b348..4866b2993 100644
--- a/module/spl/spl-kmem-cache.c
+++ b/module/spl/spl-kmem-cache.c
@@ -203,7 +203,7 @@ kv_alloc(spl_kmem_cache_t *skc, int size, int flags)
ASSERT(ISP2(size));
ptr = (void *)__get_free_pages(lflags, get_order(size));
} else {
- ptr = __vmalloc(size, lflags | __GFP_HIGHMEM, PAGE_KERNEL);
+ ptr = spl_vmalloc(size, lflags | __GFP_HIGHMEM);
}
/* Resulting allocated memory will be page aligned */
@@ -1242,7 +1242,7 @@ spl_cache_grow(spl_kmem_cache_t *skc, int flags, void **obj)
* allocation.
*
* However, this can't be applied to KVM_VMEM due to a bug that
- * __vmalloc() doesn't honor gfp flags in page table allocation.
+ * spl_vmalloc() doesn't honor gfp flags in page table allocation.
*/
if (!(skc->skc_flags & KMC_VMEM)) {
rc = __spl_cache_grow(skc, flags | KM_NOSLEEP);
diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c
index cee69ad43..ca1fc145f 100644
--- a/module/spl/spl-kmem.c
+++ b/module/spl/spl-kmem.c
@@ -172,16 +172,15 @@ spl_kmem_alloc_impl(size_t size, int flags, int node)
* kmem_zalloc() callers.
*
* For vmem_alloc() and vmem_zalloc() callers it is permissible
- * to use __vmalloc(). However, in general use of __vmalloc()
- * is strongly discouraged because a global lock must be
- * acquired. Contention on this lock can significantly
+ * to use spl_vmalloc(). However, in general use of
+ * spl_vmalloc() is strongly discouraged because a global lock
+ * must be acquired. Contention on this lock can significantly
* impact performance so frequently manipulating the virtual
* address space is strongly discouraged.
*/
if ((size > spl_kmem_alloc_max) || use_vmem) {
if (flags & KM_VMEM) {
- ptr = __vmalloc(size, lflags | __GFP_HIGHMEM,
- PAGE_KERNEL);
+ ptr = spl_vmalloc(size, lflags | __GFP_HIGHMEM);
} else {
return (NULL);
}
--
2.25.1

View file

@ -153,9 +153,6 @@ let
substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
done
# Fix pkgconfig.
ln -s ../share/pkgconfig $out/lib/pkgconfig
# Remove tests because they add a runtime dependency on gcc
rm -rf $out/share/zfs/zfs-tests
@ -195,10 +192,9 @@ in {
# incompatibleKernelVersion = "4.20";
# this package should point to the latest release.
version = "0.8.4";
version = "0.8.5";
sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp";
extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ];
sha256 = "0vhd3zs2i83pd59nk0llml4vyk4fc178j6nhg00p6k3f6r0l655b";
};
zfsUnstable = common {
@ -206,9 +202,9 @@ in {
# incompatibleKernelVersion = "4.19";
# this package should point to a version / git revision compatible with the latest kernel release
version = "2.0.0-rc3";
version = "2.0.0-rc4";
sha256 = "00fljxs6vacfhzc13bgsrmq6p3agpzcq6waw4iv2m58dr90jhlcz";
sha256 = "12ydycmmzqm70p6hgmmg7q93j8n1xlkk3j56vvqh1zmazr3sr6r0";
isUnstable = true;
};
}

View file

@ -15,11 +15,11 @@ let
in formatSet.generate "test-format-file" config;
runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} ''
if diff ${drv} ${builtins.toFile "expected" expected}; then
touch $out
if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then
touch "$out"
else
echo "Got: $(cat ${drv})"
echo "Should be: ${expected}"
echo
echo "Got different values than expected; diff above."
exit 1
fi
'';
@ -147,9 +147,7 @@ in runBuildTests {
foo = "foo"
[level1]
[level1.level2]
[level1.level2.level3]
level4 = "deep"
'';

View file

@ -11,7 +11,7 @@
"actiontec" = ps: with ps; [ ];
"adguard" = ps: with ps; [ adguardhome ];
"ads" = ps: with ps; [ pyads ];
"aftership" = ps: with ps; [ ]; # missing inputs: pyaftership
"aftership" = ps: with ps; [ pyaftership ];
"agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py
"air_quality" = ps: with ps; [ ];
"airly" = ps: with ps; [ ]; # missing inputs: airly

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "7.2.0";
version = "7.2.1";
excludedPackages = [ "release_publisher" ];
@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "1pzsg6kr5kq5767plji7m6ssy2z9jxjp9zp182baxjd634mmclcx";
sha256 = "0hf5i7190qvcypr1x8j516k2q90n2fhxvaf84m5axzmyb4i4ym0r";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "003sn06r94m68b6l91cjr3xr3i7hq54ay0gb562i6y5swrfkqqwz";
sha256 = "15kys49c4kwzh73ar54v9q3277m4vql2pi8y3pji6jq9gpw0piwr";
};
vendorSha256 = "1b33kibvfa1qgalqb9ngxqimcn92cy8sllsc81wc9gmz4giz9mn1";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "influxdb";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "influxdata";
repo = pname;
rev = "v${version}";
sha256 = "11zkia43i3in1xv84iz6rm9cfhf4k6nxn144m7dz7a7nv3chi20g";
sha256 = "1siv31gp7ypjphxjfv91sxzpz2rxk1nn2aj17pgk0cz7c8m59ic7";
};
vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp";
vendorSha256 = "1pylw30dg6ljxm9ykmsqapg1vq71bj1ngdq4arvmmzcdhy1nhmh0";
doCheck = false;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "routinator";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
sha256 = "12fgvalv12v8690pxmsdg179r170d4mc1kynsb25fm0zggy838jn";
sha256 = "1lldrb469vc7l6bkwgxz38n7lyxh74cb88xak5r0sjm1ip5q0glp";
};
cargoSha256 = "01118mnb5gm0xqi2c8jj3fk8y55jnnyg9zgn2g4xn7f3i8dcczka";
cargoSha256 = "sha256:19yzx9h02cx5dldliaq814n84f8w0s3nbyjk3pgia2siim5mdv94";
meta = with stdenv.lib; {
description = "An RPKI Validator written in Rust";

View file

@ -34,7 +34,7 @@ let
description = "Controller for Ubiquiti UniFi access points";
license = licenses.unfree;
platforms = platforms.unix;
maintainers = with maintainers; [ erictapen globin ];
maintainers = with maintainers; [ erictapen globin patryk27 ];
};
};
@ -52,4 +52,9 @@ in {
version = "5.14.23";
sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv";
};
unifiBeta = generic {
version = "6.0.23";
sha256 = "sha256-t/s0UEk0CgnAeydtLWTgpZjnAJqnyfyESNNVe1d5PHo=";
};
}

View file

@ -3,7 +3,7 @@ let
package = (import ./node.nix { inherit pkgs system; }).package;
in
package.override rec {
version = "1.14.4";
version = "1.15.0";
reconstructLock = true;
postInstall = ''
@ -20,7 +20,7 @@ package.override rec {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "1gyl4f7wh7796w4789pi0ix5y30677784miwylr8wrfqgb1hmddq";
sha256 = "1kbrkmam0x2mhqps58xwagp8y3q6zyz0qlx57ys2z2wcs12lpw4r";
};
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

File diff suppressed because it is too large Load diff

View file

@ -4,15 +4,15 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2020-10-15";
version = "2020-10-18";
pname = "oh-my-zsh";
rev = "5b717ab3e4bfb627a936d7c04367a39867734d63";
rev = "7525b1d533b927bc40e3cfb29e399e5f2e0828d4";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "0qm0mdvcvf5s6ypbq7z1x286sdv6ii2yfqvv1dss7zqjbg5j08gz";
sha256 = "1a92k8yv7zs830z33v9f4aqq1cv2gmvib1x05vb0kzynwv7p3gmd";
};
installPhase = ''

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.10.2";
version = "2.10.3";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "0qsk4pa7xywd6fdwd5v4qwj334hyp3xjlayjzgyhks7a87hdwjgs";
sha256 = "0zzansnbry73h7b2i4rz4rxc86xiw037n7f3va5gkz0pfdfa9mzi";
# 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 = "02wd4cw9hd8d96szwx8yxz6bll60f7w1z0xiz7k1h8h12mriaz4w";
cargoSha256 = "0wky0b9sv4hsj56s001m5gh16r8ms421l7h7xjh117fs87aaj42w";
doCheck = false;

View file

@ -1,19 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles
{ stdenv, fetchCrate, rustPlatform, installShellFiles
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "hyperfine";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "0389lmyipmm4irrl39zw2748f2sdddfzwms4i4763xdykdvi8b57";
src = fetchCrate {
inherit pname version;
sha256 = "0dla2jzwcxkdx3n4fqkkh6wirqs2f31lvqsw2pjf1jbnnif54mzh";
};
cargoSha256 = "06scvp7x1yixdadarsm461hbc256spx4aqhmjjn72x7hxn22h9cg";
cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw";
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kepubify";
version = "3.1.5";
version = "3.1.6";
src = fetchFromGitHub {
owner = "pgaskin";
repo = pname;
rev = "v${version}";
sha256 = "047pwn7yzm456cs175vgqk2pd6i3iqn8zxp38px3ah15vym2yjnp";
sha256 = "129izxgvhcybipfgcwzzwsir9zhi7axxadnw822zy5rk2ky4zjpk";
};
vendorSha256 = "0jzx5midawvzims9ghh8fbslvwcdczvlpf0k6a9q0bdf4wlp2z5n";
vendorSha256 = "0vwzm1c4kada7mqdkr444gj8c2vkvz7av9wkpgdpjrq0v2h0hpcc";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3bERQ480SuvrjyqlBd9wnE4iIJAbN8HODUj0X+Uxrvs=";
sha256 = "sha256-F1NbzcMoct0mjWKY2itz4cBqVToY7HpoaRzk3l683fY=";
};
cargoSha256 = "sha256-Bq2ytwbdhYeXIUM4tYSfUamhckraH5w34sAQ96ayJxI=";
cargoSha256 = "sha256-eBY+34VEPEAv5bqerxR3i7cJrVb1GtvmWyrM7uuef2E=";
buildInputs = with stdenv;
lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2020.16";
version = "1.2020.19";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
sha256 = "0k9dligb0b2kc8rl9k5wp9sh8z1kb8g97v5pfiiwa321lp8y6wpp";
sha256 = "0lb0gxww7fgbwazfj1z533crryvcgb5vdprpy8j9p6h6x929qaqi";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "iperf";
version = "3.8.1";
version = "3.9";
src = fetchurl {
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
sha256 = "15pdgnan9krf3dijan9in73ir8rcmhk3iw8085d732is4zrq1c75";
sha256 = "0f601avdmzpwsa3lbi0ppjhkrdipm5wifhhxy5czf99370k3mdi4";
};
buildInputs = [ openssl ];

View file

@ -0,0 +1,30 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "waitron-unstable-${version}";
version = "2020-01-24";
rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
goPackagePath = "github.com/ns1/waitron";
src = fetchgit {
inherit rev;
url = "https://github.com/ns1/waitron";
sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6";
};
patches = [
./staticfiles-directory.patch
];
goDeps = ./deps.nix;
meta = {
description = "A tool to manage network booting of machines";
homepage = "https://github.com/ns1/waitron";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ guibert ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -0,0 +1,57 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/flosch/pongo2";
fetch = {
type = "git";
url = "https://github.com/flosch/pongo2";
rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00";
sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
};
}
{
goPackagePath = "github.com/gorilla/handlers";
fetch = {
type = "git";
url = "https://github.com/gorilla/handlers";
rev = "f08afc1876ad882db8074bcb8a4cc96107d3a5f4";
sha256 = "1ysm6sw3jqa3h8pb5qpqgh44g91c23n3as277sh0vyp7282290jq";
};
}
{
goPackagePath = "github.com/juju/errors";
fetch = {
type = "git";
url = "https://github.com/juju/errors";
rev = "d42613fe1ab9e303fc850e7a19fda2e8eeb6516e";
sha256 = "0qggzzvh9lzlfk8ixlyw8bw645rh0lrjrd367505hhl6cg18v8yf";
};
}
{
goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
type = "git";
url = "https://github.com/julienschmidt/httprouter";
rev = "8c9f31f047a304abedb5614d4a18a843cd5f4a40";
sha256 = "00f5ja1yslrjclx3sf29mzpcsrpfd15kkw5ygv7n4jsyb4v3xgj6";
};
}
{
goPackagePath = "github.com/satori/go.uuid";
fetch = {
type = "git";
url = "https://github.com/satori/go.uuid";
rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b";
sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "53403b58ad1b561927d19068c655246f2db79d48";
sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
};
}
]

View file

@ -0,0 +1,13 @@
diff --git a/main.go b/main.go
index 4046911..a126bae 100644
--- a/main.go
+++ b/main.go
@@ -411,7 +411,7 @@ func main() {
if configuration.StaticFilesPath != "" {
fs := http.FileServer(http.Dir(configuration.StaticFilesPath))
- r.Handler("GET", "/files/:filename", http.StripPrefix("/files/", fs))
+ r.Handler("GET", "/files/*filepath", http.StripPrefix("/files/", fs))
log.Println("Serving static files from " + configuration.StaticFilesPath)
}

View file

@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
homepage = "http://aide.sourceforge.net/";
homepage = "https://aide.github.io/";
description = "A file and directory integrity checker";
license = licenses.free;
license = licenses.gpl2Plus;
maintainers = [ maintainers.tstrobel ];
platforms = platforms.linux;
};

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustscan";
version = "1.8.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "RustScan";
repo = pname;
rev = "${version}";
sha256 = "0rkqsh4i58cf18ad97yr4f68s5jg6z0ybz4bw8607lz7cjkfvjay";
sha256 = "0dhy7b73ipsxsr7wlc3r5yy39i3cjrdszhsw9xwjj31692s3b605";
};
cargoSha256 = "0mj214f2md7kjknmcayc5dcfmlk2b8mqkn7kxzdis8qv9a5xcbk8";
cargoSha256 = "00s1iv8yw06647ijw9p3l5n7d899gsks5j8ljag6ha7hgl5vs4ci";
postPatch = ''
substituteInPlace src/main.rs \
@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
"--skip=infer_ulimit_lowering_no_panic"
"--skip=google_dns_runs"
"--skip=parse_correct_ips_or_hosts"
"--skip=parse_correct_host_addresses"
"--skip=parse_hosts_file_and_incorrect_hosts"
];
meta = with lib; {

View file

@ -2,19 +2,19 @@
python3Packages.buildPythonApplication rec {
pname = "ssh-audit";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "jtesta";
repo = pname;
rev = "v${version}";
sha256 = "1z1h9nsgfaxdnkr9dvc0yzc23b3wz436rg2fycg2glwjhhal8az7";
sha256 = "1k5nv2cdnzd3j2p729vjw6ya0gwwkxhqijs2b7p68wvp0n3y3m77";
};
postPatch = ''
cp ./README.md pypi/sshaudit/
cp ./ssh-audit.py pypi/sshaudit/sshaudit.py
mv pypi/* .
cp ./README.md packages/sshaudit/
cp ./ssh-audit.py packages/sshaudit/sshaudit.py
mv packages/* .
ls -lah
'';
@ -39,6 +39,6 @@ python3Packages.buildPythonApplication rec {
description = "Tool for ssh server auditing";
homepage = "https://github.com/jtesta/ssh-audit";
license = licenses.mit;
maintainers = with maintainers; [ tv ];
maintainers = with maintainers; [ tv SuperSandro2000 ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
version = "1.7";
version = "2.0";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "1jkz99i10y6dwc4dyh2vp3p549jscgwjdp6x17mcw561bnam2287";
sha256 = "0cx650cz4ap1ng25n17pkz0n6zcs87l4bs0mabhqr289rfkf3ddd";
};
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];

View file

@ -1,32 +1,47 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security, ansi2html }:
{ stdenv
, fetchFromGitHub
, rustPlatform
, pkgconfig
, asciidoctor
, openssl
, Security
, ansi2html
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "mdcat";
version = "0.21.1";
version = "0.22.1";
src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "mdcat-${version}";
hash = "sha256-O7LlbSkxcyHQiTHYB/QBJVlShzTSzud3VJDIQ1ScvM4=";
hash = "sha256-4sM1xT/JQ+yM5tZkGwK7r0gUT5so9o1MnDJ7apZkRd4=";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-pvhYKyFraMI4w5nq6L8qs/ONSNDTHElhZnZmD5mmAZs=";
cargoSha256 = "sha256-LoNm2/6/FgTKp95ETODY39D8Ou+9X+IXIy625YW9AFI=";
checkInputs = [ ansi2html ];
checkPhase = ''
# Skip tests that use the network and that include files.
cargo test -- \
--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \
--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \
--skip magic::tests::detect_mimetype_of_png_image \
--skip magic::tests::detect_mimetype_of_svg_image \
--skip resources::tests::read_url_with_http_url_fails_when_status_404 \
--skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \
--skip iterm2_tests_render_md_samples_images_md
# Skip tests that use the network and that include files.
checkFlags = [
"--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length"
"--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length"
"--skip magic::tests::detect_mimetype_of_png_image"
"--skip magic::tests::detect_mimetype_of_svg_image"
"--skip resources::tests::read_url_with_http_url_fails_when_status_404"
"--skip resources::tests::read_url_with_http_url_returns_content_when_status_200"
"--skip iterm2_tests_render_md_samples_images_md"
];
postInstall = ''
installManPage $releaseDir/build/mdcat-*/out/mdcat.1
installShellCompletion --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash
installShellCompletion --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish
installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat
'';
meta = with stdenv.lib; {

View file

@ -1999,6 +1999,8 @@ in
futhark = haskell.lib.justStaticExecutables haskellPackages.futhark;
inherit (nodePackages) fx;
tllist = callPackage ../development/libraries/tllist { };
fcft = callPackage ../development/libraries/fcft { };
@ -2366,6 +2368,8 @@ in
pixiecore = callPackage ../tools/networking/pixiecore {};
waitron = callPackage ../tools/networking/waitron {};
pyCA = python3Packages.callPackage ../applications/video/pyca {};
pyrit = callPackage ../tools/security/pyrit {};
@ -10017,7 +10021,7 @@ in
inherit (beam.interpreters)
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (beam.packages.erlang)
rebar rebar3
@ -10256,7 +10260,7 @@ in
pkgs = pkgs.extend (final: _: {
});
};
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36;
# Python package sets.
python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
@ -10264,6 +10268,7 @@ in
python37Packages = recurseIntoAttrs python37.pkgs;
python38Packages = recurseIntoAttrs python38.pkgs;
python39Packages = python39.pkgs;
python310Packages = python310.pkgs;
pypyPackages = pypy.pkgs;
pypy2Packages = pypy2.pkgs;
pypy27Packages = pypy27.pkgs;
@ -12041,7 +12046,9 @@ in
boost170 = callPackage ../development/libraries/boost/1.70.nix { };
boost171 = callPackage ../development/libraries/boost/1.71.nix { };
boost172 = callPackage ../development/libraries/boost/1.72.nix { };
boost17x = boost172;
boost173 = callPackage ../development/libraries/boost/1.73.nix { };
boost174 = callPackage ../development/libraries/boost/1.74.nix { };
boost17x = boost174;
boost = boost16x;
boost_process = callPackage ../development/libraries/boost-process { };
@ -16635,6 +16642,8 @@ in
minio = callPackage ../servers/minio { };
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
# Backwards compatibility.
mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;
mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi;
@ -17245,7 +17254,8 @@ in
inherit (callPackages ../servers/unifi { })
unifiLTS
unifiStable;
unifiStable
unifiBeta;
unifi = unifiStable;
urserver = callPackage ../servers/urserver { };
@ -20941,6 +20951,11 @@ in
goffice = callPackage ../development/libraries/goffice { };
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
inherit miniupnpc_2 swftools;
inherit (qt5) wrapQtAppsHook;
};
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
jdk = jetbrains.jdk;
}) // {

View file

@ -96,8 +96,8 @@ rec {
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
# access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR22.elixir`.
inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
# `beam.packages.erlangR23.elixir`.
inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (packages.erlang) lfe lfe_1_2 lfe_1_3;
};

View file

@ -10984,6 +10984,7 @@ let
meta = {
description = "Perl extension to detect on which Linux distribution we are running";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.linux;
};
};
@ -11000,6 +11001,7 @@ let
meta = {
description = "Linux specific special filehandles";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.linux;
};
};
@ -11011,6 +11013,10 @@ let
sha256 = "0crlxmaa4lsgdjm5p9ib8rdxiy70qj1s68za3q3v57v8ll6s4hfx";
};
propagatedBuildInputs = [ commonsense ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
};
ListAllUtils = buildPerlPackage {

View file

@ -4760,6 +4760,8 @@ in {
pyaes = callPackage ../development/python-modules/pyaes { };
pyaftership = callPackage ../development/python-modules/pyaftership { };
pyairvisual = callPackage ../development/python-modules/pyairvisual { };
pyalgotrade = callPackage ../development/python-modules/pyalgotrade { };