JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-05 18:01:11 +00:00 committed by GitHub
commit e16d818a0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 1919 additions and 982 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/tests/mysql/mysql.nix
View File

@ -98,7 +98,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : {
}];
services.mysql.settings = {
mysqld = {
plugin-load-add = [ "ha_rocksdb.so" ];
plugin-load-add = [ "ha_mroonga.so" "ha_rocksdb.so" ];
};
};
services.mysql.package = pkgs.mariadb;
@ -172,6 +172,20 @@ import ./../make-test-python.nix ({ pkgs, ...} : {
"echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42"
)
# Check if Mroonga plugin works
mariadb.succeed(
"echo 'use testdb; create table mroongadb (test_id INT, PRIMARY KEY (test_id)) ENGINE = Mroonga;' | sudo -u testuser mysql -u testuser"
)
mariadb.succeed(
"echo 'use testdb; insert into mroongadb values (25);' | sudo -u testuser mysql -u testuser"
)
mariadb.succeed(
"echo 'use testdb; select test_id from mroongadb;' | sudo -u testuser mysql -u testuser -N | grep 25"
)
mariadb.succeed(
"echo 'use testdb; drop table mroongadb;' | sudo -u testuser mysql -u testuser"
)
# Check if RocksDB plugin works
mariadb.succeed(
"echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser"

1
nixos/tests/trafficserver.nix
View File

@ -104,6 +104,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
ats.wait_for_open_port(80)
httpbin.wait_for_unit("httpbin")
httpbin.wait_for_open_port(80)
client.wait_for_unit("network-online.target")
with subtest("Traffic Server is running"):
out = ats.succeed("traffic_ctl server status")

200
pkgs/applications/audio/pianoteq/default.nix Normal file
View File

@ -0,0 +1,200 @@
{ lib, stdenv, curl, gnugrep, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
let
versionForFile = v: builtins.replaceStrings ["."] [""] v;
mkPianoteq = { name, src, version, archdir, ... }:
stdenv.mkDerivation rec {
inherit src version;
pname = "pianoteq-${name}";
unpackPhase = ''
${p7zip}/bin/7z x $src
'';
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
];
buildInputs = [
stdenv.cc.cc.lib
xorg.libX11 # libX11.so.6
xorg.libXext # libXext.so.6
alsa-lib # libasound.so.2
freetype # libfreetype.so.6
];
installPhase = ''
mkdir -p $out/bin
mv -t $out/bin Pianoteq*/${archdir}/*
for f in $out/bin/Pianoteq*; do
if [ -x "$f" ] && [ -f "$f" ]; then
wrapProgram "$f" --prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath (buildInputs ++ [
xorg.libXcursor
xorg.libXinerama
xorg.libXrandr
libjack2
zlib
])
}
fi
done
'';
meta = with lib; {
homepage = "https://www.modartt.com/pianoteq";
description = "Software synthesizer that features real-time MIDI-control of digital physically modeled pianos and related instruments";
license = licenses.unfree;
platforms = [ "x86_64-linux" ]; # TODO extract binary according to each platform?
maintainers = [ maintainers.mausch ];
};
};
fetchWithCurlScript = { name, sha256, script, impureEnvVars ? [] }:
stdenv.mkDerivation {
inherit name;
builder = writeShellScript "builder.sh" ''
source $stdenv/setup
curlVersion=$(${curl}/bin/curl -V | head -1 | cut -d' ' -f2)
# Curl flags to handle redirects, not use EPSV, handle cookies for
# servers to need them during redirects, and work on SSL without a
# certificate (this isn't a security problem because we check the
# cryptographic hash of the output anyway).
curl=(
${curl}/bin/curl
--location
--max-redirs 20
--retry 3
--disable-epsv
--cookie-jar cookies
--insecure
--user-agent "curl/$curlVersion Nixpkgs/${lib.trivial.release}"
$NIX_CURL_FLAGS
)
${script}
'';
nativeBuildInputs = [ curl ];
outputHashAlgo = "sha256";
outputHash = sha256;
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ impureEnvVars ++ [
# This variable allows the user to pass additional options to curl
"NIX_CURL_FLAGS"
];
};
fetchPianoteqTrial = { name, sha256 }:
fetchWithCurlScript {
inherit name sha256;
script = ''
"''${curl[@]}" --silent --request POST \
--cookie cookies \
--header "modartt-json: request" \
--header "origin: https://www.modartt.com" \
--header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \
--data-raw '{"file": "${name}", "get": "url"}' \
https://www.modartt.com/json/download -o /dev/null
json=$(
"''${curl[@]}" --silent --request POST \
--cookie cookies \
--header "modartt-json: request" \
--header "origin: https://www.modartt.com" \
--header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \
--data-raw '{"file": "${name}", "get": "url"}' \
https://www.modartt.com/json/download
)
url=$(echo $json | ${jq}/bin/jq -r .url)
"''${curl[@]}" --progress-bar --cookie cookies -o $out "$url"
'';
};
fetchPianoteqWithLogin = { name, sha256 }:
fetchWithCurlScript {
inherit name sha256;
impureEnvVars = [ "NIX_MODARTT_USERNAME" "NIX_MODARTT_PASSWORD" ];
script = ''
if [ -z "''${NIX_MODARTT_USERNAME}" -o -z "''${NIX_MODARTT_PASSWORD}" ]; then
echo "Error: Downloading a personal Pianoteq instance requires the nix building process (nix-daemon in multi user mode) to have the NIX_MODARTT_USERNAME and NIX_MODARTT_PASSWORD env vars set." >&2
exit 1
fi
"''${curl[@]}" -s -o /dev/null "https://www.modartt.com/user_area"
${jq}/bin/jq -n "{connect: 1, login: \"''${NIX_MODARTT_USERNAME}\", password: \"''${NIX_MODARTT_PASSWORD}\"}" > login.json
"''${curl[@]}" --silent --request POST \
--cookie cookies \
--referer "https://www.modartt.com/user_area" \
--header "modartt-json: request" \
--header "origin: https://www.modartt.com" \
--header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \
--data @login.json \
https://www.modartt.com/json/session
json=$(
"''${curl[@]}" --silent --request POST \
--cookie cookies \
--header "modartt-json: request" \
--header "origin: https://www.modartt.com" \
--header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \
--data-raw '{"file": "${name}", "get": "url"}' \
https://www.modartt.com/json/download
)
url=$(echo $json | ${jq}/bin/jq -r .url)
"''${curl[@]}" --progress-bar --cookie cookies -o $out "$url"
'';
};
in {
# TODO currently can't install more than one because `lame` clashes
stage-trial = mkPianoteq rec {
name = "stage-trial";
version = "7.3.0";
archdir = "x86-64bit";
src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
sha256 = "12zbr54ng7cb4ngl1qrf5h0gs8c42d6d3j08492xr14m9x9y132k";
};
};
standard-trial = mkPianoteq rec {
name = "standard-trial";
version = "7.3.0";
archdir = "x86-64bit";
src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
sha256 = "04sh45hm3y3y6kfj3p32fi6p95r9fc6xf4r5i74laylms4f6gr6d";
};
};
stage-6 = mkPianoteq rec {
name = "stage-6";
version = "6.7.3";
archdir = "amd64";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
sha256 = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy";
};
};
stage-7 = mkPianoteq rec {
name = "stage-7";
version = "7.3.0";
archdir = "x86-64bit";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
sha256 = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx";
};
};
# TODO other paid binaries, I don't own that so I don't know their hash.
}

14
pkgs/applications/audio/shortwave/default.nix
View File

@ -8,8 +8,8 @@
, gitMinimal
, glib
, gst_all_1
, gtk3
, libhandy_0
, gtk4
, libadwaita
, meson
, ninja
, openssl
@ -22,20 +22,20 @@
stdenv.mkDerivation rec {
pname = "shortwave";
version = "1.1.1";
version = "2.0.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Shortwave";
rev = version;
sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld";
sha256 = "sha256-25qPb7qlqCwYJzl4qZxAZYx5asxSlXBlc/0dGyBdk1o=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-0+KEbjTLecL0u/3S9FWf2r2h9ZrgcRTY163kS3NKJqA=";
hash = "sha256-00dQXcSNmdZb2nSLG3q7jm4sugF9XR4LbH0OmcuHVxA=";
};
nativeBuildInputs = [
@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
dbus
gdk-pixbuf
glib
gtk3
libhandy_0
gtk4
libadwaita
openssl
sqlite
] ++ (with gst_all_1; [

12
pkgs/applications/blockchains/chia/default.nix
View File

@ -16,8 +16,6 @@ python3Packages.buildPythonApplication rec {
};
patches = [
# tweak version requirements to what's available in Nixpkgs
./dependencies.patch
# Allow later websockets release, https://github.com/Chia-Network/chia-blockchain/pull/6304
(fetchpatch {
name = "later-websockets.patch";
@ -66,6 +64,16 @@ python3Packages.buildPythonApplication rec {
"test_spend_zero_coin"
];
postPatch = ''
# tweak version requirements to what's available in Nixpkgs
substituteInPlace setup.py \
--replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \
--replace "sortedcontainers==2.3.0" "sortedcontainers>=2.3.0" \
--replace "click==7.1.2" "click>=7.1.2" \
--replace "clvm_rs==0.1.7" "clvm_rs>=0.1.7" \
--replace "clvm==0.9.6" "clvm>=0.9.6" \
'';
preCheck = ''
export HOME=`mktemp -d`
'';

13
pkgs/applications/blockchains/chia/dependencies.patch
View File

@ -1,13 +0,0 @@
diff --git a/setup.py b/setup.py
index c5cf95db..b783a9e6 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ dependencies = [
"clvm==0.9.6",
"clvm_rs==0.1.7",
"clvm_tools==0.4.3",
- "aiohttp==3.7.4", # HTTP server for full node rpc
+ "aiohttp==3.7.4.post0", # HTTP server for full node rpc
"aiosqlite==0.17.0", # asyncio wrapper for sqlite, to store blocks
"bitstring==3.1.7", # Binary data management library
"colorlog==5.0.1", # Adds color to logs

6
pkgs/applications/misc/dbeaver/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dbeaver";
version = "21.1.1"; # When updating also update fetchedMavenDeps.sha256
version = "21.1.2"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-enUwX+BxgPy4c1Vwo1+vN3lFYz4LgofgKvZOYuz/050=";
sha256 = "sha256-3q5LTllyqw7s8unJHTuasBCM4iaJ9lLpwgbXwBGUtIw=";
};
fetchedMavenDeps = stdenv.mkDerivation {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
dontFixup = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-vNC+LmGEepZCepPodY3c783moReppqNw32d7AUuvBZc=";
outputHash = "sha256-QPDnIXP3yB1Dn0LBbBBLvRDbCyguWvG9Zzb1Vjh72UA=";
};
nativeBuildInputs = [

8
pkgs/applications/misc/kile-wl/default.nix
View File

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "kile-wl";
version = "unstable-2021-06-01";
version = "unstable-2021-06-24";
src = fetchFromGitLab {
owner = "snakedye";
repo = "kile";
rev = "28235f85ece148e7010c5d6ac088688100a18e04";
sha256 = "sha256-UTfYYywOwa728zLkLWQaz6wN0TM/4OzbHQGedjdHGSI=";
rev = "6a306b0b5af0f250135eb88e0e72a5038fccd6a8";
sha256 = "sha256-DznIDzI5rNrlKJdXjpOpsLL8IO6tuIvW0pNdRN8N6Go=";
};
passthru.updateScript = unstableGitUpdater {
url = "https://gitlab.com/snakedye/kile.git";
};
cargoSha256 = "sha256-dzOkiZYHQu5AuwkbWEtIJAyZ1TNIGYkfz+S3q6K384w=";
cargoSha256 = "sha256-LFRqhgvziQ7a8OWRzXqNIfziP6bRHTe2oF55N09rFy8=";
nativeBuildInputs = [ scdoc ];

4
pkgs/applications/misc/metadata-cleaner/default.nix
View File

@ -17,7 +17,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
version = "1.0.6";
version = "1.0.7";
format = "other";
@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = "metadata-cleaner";
rev = "v${version}";
sha256 = "0k9qnycaqxnmsjsyxqgip6xr5w9affzxjc4zyb38ajbq4arfq5wv";
sha256 = "sha256-HlP/QahVFCAct06pKanjozFqeyTdHoHanIemq5ID2CQ=";
};
nativeBuildInputs = [

41
pkgs/applications/misc/usb-reset/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, libusb1
}:
stdenv.mkDerivation rec {
pname = "usb-reset";
# not tagged, but changelog has this with the date of the e9a9d6c commit
# and no significant change occured between bumping the version in the Makefile and that
# and the changes since then (up to ff822d8) seem snap related
version = "0.3";
src = fetchFromGitHub {
owner = "ralight";
repo = pname;
rev = "e9a9d6c4a533430e763e111a349efbba69e7a5bb";
sha256 = "0k9qmhqi206gcnv3z4vwya82g5nm225972ylf67zjiikk8pn8m0s";
};
buildInputs = [ libusb1 ];
postPatch = ''
substituteInPlace Makefile \
--replace /usr/include/libusb-1.0 ${libusb1.dev}/include/libusb-1.0
'';
makeFlags = [
"DESTDIR=${placeholder "out"}"
"prefix="
];
meta = with lib; {
description = "Perform a bus reset on a USB device using its vendor and product ID";
homepage = "https://github.com/ralight/usb-reset";
changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt";
license = licenses.mit;
maintainers = [ maintainers.evils ];
platforms = platforms.all;
};
}

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -149,9 +149,11 @@ in stdenv.mkDerivation {
+ "chromium${suffix}-${version}";
inherit version;
buildInputs = [
nativeBuildInputs = [
makeWrapper ed
];
buildInputs = [
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gtk3

4
pkgs/applications/networking/ids/suricata/default.nix
View File

@ -34,11 +34,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
version = "6.0.2";
version = "6.0.3";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
sha256 = "sha256-XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I=";
sha256 = "sha256-2vE0uy18mAA16a5g96rzEzI6gJNAAJ8m5IEQzN6B9gI=";
};
nativeBuildInputs = [

6
pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "kdeltachat";
version = "unstable-2021-06-27";
version = "unstable-2021-07-04";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
rev = "76b844bd6461d90f91a42fc02002accb694ec56d";
sha256 = "0kjpmh1zxfi3rglkd5sla49p6yd3kaljnmmg7j9alh3854yc5k1n";
rev = "5d3cddc47773b49d4a801d031c1de96c38617908";
sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad";
};
nativeBuildInputs = [

30
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib, stdenv, glibmm, pidgin, pkg-config, modemmanager, fetchFromGitLab } :
stdenv.mkDerivation rec {
pname = "purple-mm-sms";
version = "0.1.7";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "0917gjig35hmi6isqb62vhxd3lkc2nwdn13ym2gvzgcjfgjzjajr";
};
makeFlags = [
"DATA_ROOT_DIR_PURPLE=$(out)/share"
"PLUGIN_DIR_PURPLE=$(out)/lib/purple-2"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glibmm pidgin modemmanager ];
meta = with lib; {
homepage = "https://source.puri.sm/Librem5/purple-mm-sms";
description = "A libpurple plugin for sending and receiving SMS via Modemmanager";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ tomfitzhenry ];
};
}

6
pkgs/applications/version-management/pijul/default.nix
View File

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "1.0.0-alpha.48";
version = "1.0.0-alpha.50";
src = fetchCrate {
inherit version pname;
sha256 = "09sz5665nwj2jppx2695hbwdqr3ws6z6rg7mmc4ldb7hkp4yilig";
sha256 = "1hinnpbk83470sdif11v1wy1269jm7cpl0ycj2m89cxwk5g54cxg";
};
cargoSha256 = "1v5w5za7l3hy9anz136x0vgdmgg090f5sawzgrg5ylgxy2l9s2gn";
cargoSha256 = "0bc116nyykq8ddy7lnhxibx6hphn344d0fs7fbl2paax9ahbh2g0";
cargoBuildFlags = lib.optional gitImportSupport "--features=git";

14
pkgs/development/compilers/jsonnet/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, lib, fetchFromGitHub }:
{ stdenv, lib, jekyll, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "jsonnet";
version = "0.17.0";
outputs = ["out" "doc"];
src = fetchFromGitHub {
rev = "v${version}";
@ -11,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim";
};
nativeBuildInputs = [ jekyll ];
enableParallelBuilding = true;
makeFlags = [
@ -19,12 +22,19 @@ stdenv.mkDerivation rec {
"libjsonnet.so"
];
# Upstream writes documentation in html, not in markdown/rst, so no
# other output formats, sorry.
preBuild = ''
jekyll build --source ./doc --destination ./html
'';
installPhase = ''
mkdir -p $out/bin $out/lib $out/include
mkdir -p $out/bin $out/lib $out/include $out/share/doc/jsonnet
cp jsonnet $out/bin/
cp jsonnetfmt $out/bin/
cp libjsonnet*.so $out/lib/
cp -a include/*.h $out/include/
cp -r ./html $out/share/doc/jsonnet
'';
meta = {

4
pkgs/development/libraries/freenect/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "freenect";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "OpenKinect";
repo = "libfreenect";
rev = "v${version}";
sha256 = "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr";
sha256 = "sha256-/CR+r9/zMj+8gxhHeRGPCDhALeF5bLsea38KQ1lF6wo=";
};
buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ]

4
pkgs/development/libraries/intel-media-sdk/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-sdk";
version = "21.2.2";
version = "21.2.3";
src = fetchFromGitHub {
owner = "Intel-Media-SDK";
repo = "MediaSDK";
rev = "intel-mediasdk-${version}";
sha256 = "sha256-iSrr9g6C8YRcmu92sTyDCh76Cdu8wbDL3COwiVxox4Q=";
sha256 = "sha256-Id2/d6rRKiei6UQ0pywdcbNLfIQR8gEseiDgqeaT3p8=";
};
nativeBuildInputs = [ cmake pkg-config ];

11
pkgs/development/libraries/science/math/p4est-sc/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true
, mpi, openmpi, openssh, zlib
, mpi, openssh, zlib
}:
let
dbg = if debugEnable then "-dbg" else "";
debugEnable = p4est-sc-debugEnable;
mpiSupport = p4est-sc-mpiSupport;
isOpenmpi = mpiSupport && mpi.pname == "openmpi";
in
stdenv.mkDerivation {
pname = "p4est-sc${dbg}";
@ -24,7 +25,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ zlib ]
++ lib.optional mpiSupport mpi
++ lib.optional (mpiSupport && mpi == openmpi) openssh
++ lib.optional isOpenmpi openssh
;
inherit debugEnable mpiSupport;
@ -36,15 +37,17 @@ stdenv.mkDerivation {
${if mpiSupport then "unset CC" else ""}
'';
configureFlags = lib.optional debugEnable "--enable-debug"
configureFlags = [ "--enable-pthread=-pthread" ]
++ lib.optional debugEnable "--enable-debug"
++ lib.optional mpiSupport "--enable-mpi"
;
makeFlags = [ "V=0" ];
checkFlags = lib.optional isOpenmpi "-j1";
dontDisableStatic = true;
enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = !stdenv.isAarch64 && stdenv.hostPlatform == stdenv.buildPlatform;
meta = {
branch = "prev3-develop";

7
pkgs/development/libraries/science/math/p4est/default.nix
View File

@ -35,13 +35,12 @@ stdenv.mkDerivation {
${if mpiSupport then "unset CC" else ""}
'';
configureFlags = [ "--with-sc=${p4est-sc}" ]
configureFlags = p4est-sc.configureFlags
++ [ "--with-sc=${p4est-sc}" ]
++ lib.optional withMetis "--with-metis"
++ lib.optional debugEnable "--enable-debug"
++ lib.optional mpiSupport "--enable-mpi"
;
inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck;
inherit (p4est-sc) makeFlags checkFlags dontDisableStatic enableParallelBuilding doCheck;
meta = {
branch = "prev3-develop";

26
pkgs/development/mobile/checkra1n/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "checkra1n";
version = "0.12.4";
src = fetchurl {
url = "https://assets.checkra.in/downloads/linux/cli/x86_64/dac9968939ea6e6bfbdedeb41d7e2579c4711dc2c5083f91dced66ca397dc51d/checkra1n";
sha256 = "07f5glwwlrpdvj8ky265q8fp3i3r4mz1vd6yvvxnnvpa764rdjfs";
};
dontUnpack = true;
installPhase = ''
install -dm755 "$out/bin"
install -m755 $src $out/bin/${pname}
'';
meta = with lib; {
description = "Jailbreak for iPhone 5s though iPhone X, iOS 12.0 and up";
homepage = "https://checkra.in/";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ onny ];
platforms = platforms.linux;
};
}

1
pkgs/development/node-packages/node-packages.json
View File

@ -182,6 +182,7 @@
, "patch-package"
, "peerflix"
, "peerflix-server"
, "pkg"
, "pm2"
, "pnpm"
, "poor-mans-t-sql-formatter-cli"

1975
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

40
pkgs/development/python-modules/discogs-client/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, oauthlib
, python-dateutil
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "discogs-client";
version = "2.3.12";
src = fetchFromGitHub {
owner = "joalla";
repo = "discogs_client";
rev = "v${version}";
sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc";
};
propagatedBuildInputs = [
requests
oauthlib
python-dateutil
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "discogs_client" ];
meta = with lib; {
description = "Unofficial Python API client for Discogs";
homepage = "https://github.com/joalla/discogs_client";
license = licenses.bsd2;
maintainers = with maintainers; [ fab ];
};
}

19
pkgs/development/python-modules/discogs_client/default.nix
View File

@ -1,19 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }:
buildPythonPackage rec {
pname = "discogs-client";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "cc979fcbb5283f74d388c7111c8ed6bef920b01614a014d6b1c5d6fbb554bfc3";
};
propagatedBuildInputs = [ requests oauthlib ];
meta = with lib; {
description = "Official Python API client for Discogs";
license = licenses.bsd2;
homepage = "https://github.com/discogs/discogs_client";
};
}

8
pkgs/development/python-modules/libusb1/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libusb1";
version = "1.9.2";
version = "1.9.3";
src = fetchPypi {
inherit pname version;
sha256 = "17hqck808m59jv6m2g4hasnay44pycy3y0im01fq9jpr3ymcdbi7";
sha256 = "60e6ce37be064f6e51d02b25da44230ecc9c0b1fdb6f14568c71457d963c1749";
};
postPatch = ''
@ -20,9 +20,7 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
checkPhase = ''
# USBPollerThread is unreliable. Let's not test it.
# See: https://github.com/vpelletier/python-libusb1/issues/16
py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py
py.test usb1/testUSB1.py
'';
meta = with lib; {

4
pkgs/development/python-modules/mcstatus/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "6.1.2";
version = "6.2.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Dinnerbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RSxysVIP/niQh8WRSk6Z9TSz/W97PkPYIR0NXIZfAbQ=";
sha256 = "sha256-o5JVj4Tt5+VOjDC0TDlVuVbDUQPvZGX5Zeoz0vVxPJ8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/ytmusicapi/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "ytmusicapi";
version = "0.17.3";
version = "0.18.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-miScxT79ZAgDT0AamkN1JyqbM56Otk86LnE6HM0G1Vs=";
sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/cppcheck/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "2.4";
version = "2.5";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo=";
sha256 = "sha256-s+KJpA11A4bFOXgy2eVkRMYBFwwBjU7QZgSPZ0oVKxo=";
};
buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ];

6
pkgs/development/tools/ecpdap/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ecpdap";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "adamgreig";
repo = pname;
rev = "v${version}";
sha256 = "1va96hxm22a2lfy141x1sv5f5g8f6mp965an4jsff9qzi55kfv2g";
sha256 = "sha256-fdvpGmEy54i48H6YJ4E1LIuogimNEL8PJS5ScoW/6DM=";
};
cargoSha256 = "1dk6x2f36c546qr415kzmqr2r4550iwdmj4chrb46p3hr64jddhd";
cargoSha256 = "sha256-2YARNoHVDBwGr8FE/oRlNZMX/vCPIre7OnZbr04eF/M=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/tools/kustomize/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "kustomize";
version = "4.1.3";
version = "4.2.0";
# rev is the commit of the tag, mainly for kustomize version command output
rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245";
@ -17,7 +17,7 @@ buildGoModule rec {
owner = "kubernetes-sigs";
repo = pname;
rev = "kustomize/v${version}";
sha256 = "sha256-NPWKInDHOoelWqDrUn/AlRItI4e8J6dbBxgLW078ecs=";
sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o=";
};
# TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged.
@ -26,7 +26,7 @@ buildGoModule rec {
# avoid finding test and development commands
sourceRoot = "source/kustomize";
vendorSha256 = "sha256-6maEpEPEV436NrVnVlvWV1q6YywGVILXbxn8Z8Ku/hs=";
vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE=";
meta = with lib; {
description = "Customization of kubernetes YAML configurations";

4
pkgs/games/fheroes2/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
sha256 = "sha256-z+88tVsf4uyMFzNfZDKXo0cYqBCYn1ehX+A+e+aIfSg=";
sha256 = "sha256-fqV2u6vChzU8387aQGf3OKeiWX188GouYZr4ZUmXWxs=";
};
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

4
pkgs/games/warzone2100/default.nix
View File

@ -39,11 +39,11 @@ in
stdenv.mkDerivation rec {
inherit pname;
version = "4.0.1";
version = "4.1.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik";
sha256 = "sha256-HQlphogK2jjTXV7cQ8lFNWjHMBnpStyvT3wKYjlDQW0=";
};
buildInputs = [

1
pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
View File

@ -41,6 +41,7 @@ in stdenv.mkDerivation {
./patches/cnijfilter-4.00-4-ppd.patch
./patches/cnijfilter-4.00-5-abi_x86_32.patch
./patches/cnijfilter-4.00-6-headers.patch
./patches/cnijfilter-4.00-7-sysctl.patch
];
postPatch = ''

10
pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/cnijnpr/src/cnijnpr.c
+++ b/cnijnpr/src/cnijnpr.c
@@ -33,7 +33,6 @@
#include <signal.h>
#include <sys/ioctl.h>
#include <net/if.h>
-#include <sys/sysctl.h>
#include <sys/types.h>
#include <unistd.h>
#include <config.h>

4
pkgs/misc/lightspark/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "lightspark";
version = "0.8.4.1";
version = "0.8.5";
src = fetchFromGitHub {
owner = "lightspark";
repo = "lightspark";
rev = version;
sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4=";
sha256 = "sha256-F+zCwKTPWkp+VWYvYN5+VbBJeQAwspKy7+Uv+ZstowA=";
};
postPatch = ''

294
pkgs/misc/vim-plugins/generated.nix
View File

@ -65,12 +65,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-06-29";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "7862633d9d0e35157d54ad1487bd5a73c618fc7f";
sha256 = "0m7hh7h4jxfw9j5fq00a11qaz8khyrxcn4ka81qn73wzg28hdv11";
rev = "87e079a9b25ebf5818b8451874ce2a8bd614226f";
sha256 = "0hzss0yyj2g8bnqk2583y5llf6lclz3fgyjirw7wq22rscal6i4x";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-07-01";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "d66a7ec580c5e006bf44c5ffc0c17e39897b0c22";
sha256 = "0an89qwx70gj3dzlmx9j61vmsqfzsh9p4jhqysrg1n6hx56ak7yj";
rev = "9773669b0cc041d843d595160f51b46968b42e16";
sha256 = "0c2b5qhcjd3r107a0va313z3rah4ngb711rzsmqifyq63mfcapaf";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -666,24 +666,24 @@ final: prev:
compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine";
version = "2021-05-09";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
rev = "755e45c97d29d73400f8fba591ff06054d37127a";
sha256 = "0gsq2v0qpzw211fmss3c004pmqcfns9vy4fhki9a0c69zk1ggalp";
rev = "b8326e2acf3056e674925a360dedc33510285f0c";
sha256 = "00baf8nmldvd08nsj851bdai6jywpjhg1z1hhcxn7zagj0rl6rs0";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
compe-tmux = buildVimPluginFrom2Nix {
pname = "compe-tmux";
version = "2021-05-31";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "compe-tmux";
rev = "b199db008d07caf7f1d488ac3f171910416528a4";
sha256 = "1qiir95bz046ppp6pp8k6m00jrjcy2yp098s72lwfnsls6pqsgpf";
rev = "2d891bcece6676a4485b248ec9ee05c9acc76190";
sha256 = "11ghs6qgx8qwk4ms4f5y1n4clial0xv1q03wsfk8z20w35bm1kg8";
};
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
};
@ -714,12 +714,12 @@ final: prev:
completion-nvim = buildVimPluginFrom2Nix {
pname = "completion-nvim";
version = "2021-06-16";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "completion-nvim";
rev = "d62fff879b29fa1ce915887a75305af0fff57d32";
sha256 = "0hfsz06djyja8phj099fmbg2sa9jj89rqxvizwhwdxadshmr1f20";
rev = "22624f0aa5d1fdd0c84456300d2390b223c1a226";
sha256 = "133zmiblkh145abrv9xagzq3qw504g1nvm5v1vmxhxsa7rilr376";
};
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
};
@ -1026,12 +1026,12 @@ final: prev:
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
version = "2021-06-24";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
rev = "8e535d2c19b5307196de736ff9ceadcfe2de9a96";
sha256 = "09xfikgrj4krlqnf6j26yhaiiv7im0sm4h0q049m927sh248kxh7";
rev = "d95fde4d1e042a99f39ddb8c67875fb10d1ed1e8";
sha256 = "1wg1z85f816k60201hxrrdi4if9ci86cbg776k15pqdmcpzi0ibz";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@ -1304,12 +1304,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
version = "2021-06-28";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "451fdee6e4c0f32ccfde89081bc73bacf0ee05a0";
sha256 = "0zpkqdg1cd5a9lr0cqwf50x3jx55dkkbdv0sijfighrx9fxs7ixl";
rev = "1936824f5986c986befad5995e7bf87ba124d109";
sha256 = "16h82yn7g9jq2chdb4wjjvz6akb0r06wjjvqpj9xkp82rx55m4ix";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -1510,12 +1510,12 @@ final: prev:
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
version = "2021-05-23";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
rev = "5fe781e4a12101871bc778b977ce6b76685c1ab0";
sha256 = "1220sclgczaqww0d2zdgr0lfpjwrrjyscjn2j40k8h4j1axah9zi";
rev = "1b234d8ec0ffadf7fe3f4ddba13480dd4adeb7c7";
sha256 = "1prl720r82mp89jfciw50pd2cygp97v46w7vq30b1m4v3016lh15";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@ -1544,6 +1544,18 @@ final: prev:
meta.homepage = "https://github.com/bogado/file-line/";
};
FixCursorHold-nvim = buildVimPluginFrom2Nix {
pname = "FixCursorHold-nvim";
version = "2021-04-16";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "FixCursorHold.nvim";
rev = "b5158c93563ee6192ce8d903bfef839393bfeccd";
sha256 = "1y6hv7vl268zbf3bzd72l43jjgi0cq364p15z8ia9jlph1syk9zz";
};
meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/";
};
flake8-vim = buildVimPluginFrom2Nix {
pname = "flake8-vim";
version = "2020-10-20";
@ -1595,12 +1607,12 @@ final: prev:
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter-nvim";
version = "2021-06-07";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
rev = "fc5757d6c9099125edba64b86cb5c9afac9b833b";
sha256 = "170lcd7qwzckxib98clld0hgydkjvrr86md3b035q7higgad386m";
rev = "83cd5a303564867a08d38013e12824021088c63a";
sha256 = "1mr7pcqk582f5ccwb827s221xqr4p9bqabdb16fygdaxybhv169m";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@ -1727,12 +1739,12 @@ final: prev:
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
version = "2021-05-16";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
rev = "dec6adb151cc5514f8ea99b8568e7a4c94db6318";
sha256 = "14k0crk6lvj6qp1rpfmldmw5w9axy7336aacpvfsh7d4a93xdjzv";
rev = "a1a83a3385e0d67c9875492aaa9cbbab2322dbdc";
sha256 = "0agsajz53409zvzpwbw24cfny027ymlw32jrakqdizmgrl46zm45";
};
meta.homepage = "https://github.com/ndmitchell/ghcid/";
};
@ -1847,12 +1859,12 @@ final: prev:
glow-nvim = buildVimPluginFrom2Nix {
pname = "glow-nvim";
version = "2021-05-29";
version = "2021-07-01";
src = fetchFromGitHub {
owner = "npxbr";
repo = "glow.nvim";
rev = "d7f5eb0af3f2a51c2f493fec066015dc29184a4e";
sha256 = "1180g55d6adj9jzx9dxld3345hw80vjjj3r8n7snba1m3c8jd5xm";
rev = "c5cf6ca75af09046ea3ff51132732271a6e2dd6c";
sha256 = "187zm6vj8xbxs5flbqwjzzsv7vq7c6mw55phihd610bmn1wbxfnd";
};
meta.homepage = "https://github.com/npxbr/glow.nvim/";
};
@ -2147,24 +2159,24 @@ final: prev:
indent-blankline-nvim-lua = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim-lua";
version = "2021-06-23";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "f314659a68f936bf65502fe318222facbeb439a5";
sha256 = "0mzkkacdcbxdvaxjfwyiphlwa1z7f5809y03mhyl7656lan8vk90";
rev = "1a61a0bb0e67675b0a4cf9ffbfca100e498a1d04";
sha256 = "1d20rzl2bzg9v70cz30g0z2ickqw6986sv32xsnpzmlwxdxkg959";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
version = "2021-06-10";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "5d5d2f80ec48e3f5fe7237ec17cd1587f39d3be7";
sha256 = "005nv99jw9ricgy1xyxixl1ssyh7jai9kv7cx95g5igfvvpblz7k";
rev = "17a83ea765831cb0cc64f768b8c3f43479b90bbe";
sha256 = "155da638i4ff1wsy5600jgrqicykb27lxq9liag174nga6xazbn6";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@ -2328,12 +2340,12 @@ final: prev:
kotlin-vim = buildVimPluginFrom2Nix {
pname = "kotlin-vim";
version = "2021-04-20";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
rev = "e043f6a2ddcb0611e4afcb1871260a520e475c74";
sha256 = "0ygvicf8gcaskz33qkfl1yg1jiv0l9cyp8fn2rrnzdsb7amsss0v";
rev = "9122b2805499fbde06f27116f4b7a2a30d6996f5";
sha256 = "0xq156vqzwix87ndq8nfwqmvwp251fnp553zxjlqhccbbyr70pky";
};
meta.homepage = "https://github.com/udalov/kotlin-vim/";
};
@ -2412,12 +2424,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2021-06-24";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "3899965851a0b3e59998f2b42e716eeee6bcc473";
sha256 = "1w89nlkl35yzadbnhxv0c7qcwzynhvv1kqhvwpbj5h4x2gnb9x33";
rev = "64a941e317fb9a432d8924eb3a124627c71c0d18";
sha256 = "10d6fr2kasm13js7k85a9mm6q7ga6b3h6z9mys6wwaphzsm7vli1";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@ -2556,12 +2568,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed-nvim";
version = "2021-06-29";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
rev = "b93922421bd41e8349cf46640b5742feb5e0031a";
sha256 = "1sb0z6nrq9nmrqlv6p6xvk1plndc347s3ydsgq6n6p8c2xgfb1ch";
rev = "14ec41e3348d23c88235f038c7395a750e765e9d";
sha256 = "03chwwbwq7zgj899rl7827wqfx9ynyz0i1dhyqn1sk1mrddpr4mz";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@ -2628,12 +2640,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-06-29";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "ef20fad69270f4d3df356be3c01bd079739e72c4";
sha256 = "0whmqkz6k27hrsjmbw841bsdg8xkiv8gj01sw40cg99mcdyags70";
rev = "c0884fb3f45df3c10c972d5dc7bae22252de9831";
sha256 = "0r2vvhilxy826zs1xijvp5hlji0651y3j32pzlazb2fgklb6rlwf";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@ -2676,12 +2688,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-06-30";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "b94accc40260be439b6bfa120402ebd10bd60577";
sha256 = "19lz2l9dzq5a339rhp8xdzj1m0dxxnwm9w4kg4lizgxi1ck53dpq";
rev = "1ad9f925b1455ea92829a261bf7bd75f1a635f03";
sha256 = "1bd0ky19lh5vn2xlyrbn25h5c9kcc2wa2q0mjn4v9ckvahcwrxiz";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@ -3096,12 +3108,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-06-27";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "3b5fa08467a77c289027bbc01ce8f8341f8d911c";
sha256 = "1q1dz06msbw68wf7vs482y77nlmbz797hsdpqimfh65liz6bjh77";
rev = "c91d18fa8743860d4fe547faef4a3671d428b422";
sha256 = "16bjicmy9m10cq6gsxlzdsib5qwjj6w1k27wrr07zb01finhj658";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3144,12 +3156,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2021-07-01";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "vhyrro";
repo = "neorg";
rev = "7fe4530c9a71f81444ad9fee9d89c5e2f5bfbf8d";
sha256 = "1zyi32x8wfz3lqb2nqggrjlp8d0j4qpnkck4pfg15fgmkycrivf7";
rev = "d8aea4d54a0af773142c9be8a30944ae8e49b055";
sha256 = "1x2q4lhckb8ynzm9s25y877vvi691bw9sdd6764yqgdcznpdlma1";
};
meta.homepage = "https://github.com/vhyrro/neorg/";
};
@ -3204,12 +3216,12 @@ final: prev:
neovim-fuzzy = buildVimPluginFrom2Nix {
pname = "neovim-fuzzy";
version = "2021-06-17";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "cloudhead";
repo = "neovim-fuzzy";
rev = "0a65732a4a346384cb828a42014d2833dc301b99";
sha256 = "133l6qyzsddmcwxmphbv49a3b0ksnmrbrf6lwacyld5id663yjkj";
rev = "0bef4e1a81c65fc05d31380dd74454bd67733837";
sha256 = "02a8ipk341bs6y8mk7nixdkbk1c4jdddsjp1qvqgyyca0shaqsz8";
};
meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/";
};
@ -3372,12 +3384,12 @@ final: prev:
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
version = "2021-06-26";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
rev = "cb3682a8eaf25485efe0b377f0b9e8291f68ab59";
sha256 = "0n08mkxf4m0sz07wd893s63l17v3kvvgx5aj62nf5p7paw1zv91c";
rev = "3a0e624a67ecd2c7f990bc3c25a1044e85782b10";
sha256 = "03ifj5a3f02k00jrcjsdiy7a8wzq5k2b28hmrc7nkzm8gd4fmczb";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@ -3432,12 +3444,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-06-29";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "165114f65c267ee912018ef3565d70cba7183fc3";
sha256 = "07km6dn0mc60zzqbyymxmzgy2wjrw6q2a8lmzc55iqyflfhza8qn";
rev = "33ad2ec9f51941317df407f98c509817805fe03b";
sha256 = "1fnmbxvdxf4d2rnsk6mxm05g06dnv6x500mil6b2ay6am9w8yp7q";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@ -3468,12 +3480,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-07-01";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "a46dfe7d7fc8f7af5bb84006db45ba11fb7b786c";
sha256 = "161zrqvw5kpcphn747cpa4388x4c2flps5qwxkl5yxkn320937im";
rev = "077329e6bd1704d1acdff087ef1a73df23e92789";
sha256 = "0spnybax3zqcac1by0785v5zh4gl07lpgq6ivnnx1wyhfky87jx3";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -3492,12 +3504,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-06-25";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "e92ef2acc81b668c90b2dbf2e2a4412ea5975242";
sha256 = "0y27kaspmygv0lgvp6msyazhya7indqlii0rsxiahmp5sdg85qap";
rev = "0bbf969a3ba05b6b325b9358b6c8a40d26617d75";
sha256 = "0hmzi54znxsy08pvccpncrp6synfcbribxbd34gimw8g7j9z5hi3";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -3540,12 +3552,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2021-06-29";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "20ff07b00545daad1c3e90c6484d838b43cf3660";
sha256 = "1pb8v2yzrljqmgjhqzhv03zvdqwbqqyly6vkfdscbq7ra9afiw2j";
rev = "b1b6ff6b78dac7c00b70404892e0eabdacb7b223";
sha256 = "13icfnas86iki1x2xd2xcdh7ycp3if49zgnwpyx03djgi7ljkgjk";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -3576,12 +3588,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2021-06-29";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "018b013d5ee873dfaa9fa2d487d166c5f6dd3aee";
sha256 = "0liwxdfalm85i2ck9hx5pj4ih58ypil8fw3ricrc6r7czfv6gfmf";
rev = "846187eef85e39997c7b9f101e5169c5b57ec4a8";
sha256 = "183szh75a3ix715i1hjr7pbcxw6l75l476snjda17ia68fg6zj6r";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -3600,12 +3612,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-06-30";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "161ec66bda585fd7ba402cf7434bac87c927734f";
sha256 = "1d4qwxrkx9cbbrxddg2n9f7sszmp23jnx83g52yydsxhlxq8dj8l";
rev = "5fe1b132534041e889278f081ff10c02b09c096f";
sha256 = "0gmmj3id4mbkhnhgvx8kbqr94gi7p6s0717i6ib4yf3nqs5d7g9r";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3624,12 +3636,12 @@ final: prev:
nvim-nonicons = buildVimPluginFrom2Nix {
pname = "nvim-nonicons";
version = "2021-05-10";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "yamatsum";
repo = "nvim-nonicons";
rev = "5056aebb8d0ecc87b26a4f7fe9e9e520e5ea493f";
sha256 = "0z1j18hb5n3500b6sxm1dsya9yd9jnnywhhw9z3sbndb3irn2mny";
rev = "93450b02533516231e16ddc71f8ab1caf5005eaa";
sha256 = "1mfvi3mzid0fwhgwrg8w4bjy0x6hz78jij60h0ivblvlfai6w0qr";
};
meta.homepage = "https://github.com/yamatsum/nvim-nonicons/";
};
@ -3684,24 +3696,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-07-01";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "a01a33f9a8aea3eb19eb76601131c01e23d8e034";
sha256 = "1jsf6prmf1555kd87gfjdiydkvl15qk0lk6x04dwbrx6wxfvd77a";
rev = "589c36e26f99486e7ab5e2e6920636ffd5f3ae2a";
sha256 = "0s5ha981igqkmp13xzxy1rj4cw687qxs5301byx9vjl2n5gkyb6j";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-07-01";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "5fa8d5741dca82a15426db659f461244975678e6";
sha256 = "1xqq1m27w3vh1dd9g3k4kwva92hr8zf1xnlvqhy2jz1xazx4k2m1";
rev = "9bcf658ca427665445a67c4b01d71c64d6f7e165";
sha256 = "1n0w9rpw6dn573j8glp45a56j7skb5725yr1969k9p8whjdbmlna";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3900,12 +3912,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-06-28";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "78a42c3bc7b153a621b5f9d35623db88d6d0d0ee";
sha256 = "0awmwcj3a27m81180k52i5gvvbf6r115qkbfskpxbvrsc8h5qqx5";
rev = "a7ae69d007cbaddc636880ef451863b37f725a06";
sha256 = "1kcfh9xi9plfaandgdrv3yx2hcha3895nll0mc84rhmbjlnjyvcd";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -4008,12 +4020,12 @@ final: prev:
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
version = "2021-06-30";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "18da6621459032aa5608b760622f0bc8fdc0535c";
sha256 = "1z1n3jpxmz3672f8bd6s898mlqjf17pv11qqy15l2npfd9crh5sv";
rev = "ca51b6842cd8021f58dc45c89b3e8d7994e0bf8f";
sha256 = "071gdhrrbrhdmagai3q8c4yzc9kn794aa7kkacnknkm5kzswb8hg";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@ -4249,12 +4261,12 @@ final: prev:
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim";
version = "2021-07-01";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
rev = "fd21f094a460bb319a8f6eac18653a1a2122d41c";
sha256 = "0y5qga2x767blzbrlbfxidz73fpby81xpsw133wmfy3hnkg8xdam";
rev = "8ef3c3f4323834a5796f2e893cdc6d4bddffbf83";
sha256 = "164i5bbg1k3lqsgin8nb06al8nz5napxp0x10ajmj0b2mrwb3l8k";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@ -4984,12 +4996,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-07-01";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "5a53ec5c2fdab10ca8775d3979b1a85e63d57953";
sha256 = "1mr98irwsc5pmj63ssxd3cdwb3x31lalbkk1pyp79bswdfjmx0nl";
rev = "38907ce7d74f26d123bfbb8ecf55bc9616b5ece5";
sha256 = "1dhjpcc6y6vxrlx9333hnjb6w20zmgs536s4kz6yzvn3w9mgk1kq";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -5837,12 +5849,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-07-01";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "4402c9292c4495916b075e27dac88ad391c47ceb";
sha256 = "0hwap5z5727iq42zpl769m1w84qr41xgbg7rfjbk94qb3kkikb4m";
rev = "d49b6daa01b949237567bc683913f138bf07aa2b";
sha256 = "0s7fq4c2amjr23ky1ic03zwsi9fjxsz9l83jchmyhvs35dgiv952";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -6197,12 +6209,12 @@ final: prev:
vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
version = "2020-09-07";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
rev = "9c0dc32af9235d42715751b30cf04fa0584c1798";
sha256 = "1xl655mnhjn1mbqzvxblsbqyg3yq50ri2a7szvqmpywq8rr0ymq9";
rev = "ff3f5cdff71d7a9710a012f2ff11e1294f70c7a5";
sha256 = "0hxbwwml7qsjyjc88bmsl6ikc4bhpz17xh8qql9jsi3mkna66krh";
};
meta.homepage = "https://github.com/justinmk/vim-dirvish/";
};
@ -6377,24 +6389,24 @@ final: prev:
vim-erlang-compiler = buildVimPluginFrom2Nix {
pname = "vim-erlang-compiler";
version = "2021-01-16";
version = "2021-06-20";
src = fetchFromGitHub {
owner = "vim-erlang";
repo = "vim-erlang-compiler";
rev = "a99e75f792650c8dae86d9a44c7af2411ea2ead7";
sha256 = "13400kjf90sxlpx1pqs379ihdn65i3gpck3dwkjnf1xiv1p9rzvz";
rev = "b334e956026f61c0bf289ffdf37ce9b2aefe01e1";
sha256 = "1lhy5kdq3chr1zd0f67nfzmd81jiiw4hif11rx7pkwh019wyalxx";
};
meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/";
};
vim-erlang-omnicomplete = buildVimPluginFrom2Nix {
pname = "vim-erlang-omnicomplete";
version = "2021-01-16";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "vim-erlang";
repo = "vim-erlang-omnicomplete";
rev = "924a50ed0ad93141063d0f27c9f62b1bea991baf";
sha256 = "0zh730wsb0n9nk1x5qdbx78zgzhamd2a6fa5gxl4milvr5ddvdy9";
rev = "7337df845b90b51f24087716564789c70ae03dc3";
sha256 = "00k7vr5x32qqhgp61fhbcbd2rfjs42lpig3k5jd6008hhpm2gw4j";
};
meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/";
};
@ -6545,12 +6557,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-06-26";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "cb6ea20165aeb437d1bf16ca45275748b836c1ce";
sha256 = "1kv309fyf56vp0lglm8b93m4jk5yb8w0bm9gjr9wql4p32nlxkc1";
rev = "729f932a31c5cfa7dd43d25d1adfcf50feee2cc2";
sha256 = "1x4azjsc53191ylijagxpiidad0cgiaxyq7bpg1nx94yg8vcnp3y";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -6605,12 +6617,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-06-19";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "79e2bd381ad6e7f3d70ce4a8ec9f3f107b40f053";
sha256 = "0blgivpm1zbbm1pj77c1ks1w3aa9vid77h08146npa4xi6nnyzwf";
rev = "8e0a8abf08318f91f63da510087b3110f20e58bf";
sha256 = "0c0rld9r9d77lzbzv6hk83icbv2xvwcjkmqg2iyricbyhfpmbs5k";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -6653,12 +6665,12 @@ final: prev:
vim-git = buildVimPluginFrom2Nix {
pname = "vim-git";
version = "2021-05-26";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-git";
rev = "314fa6f289cec56d7d6e631f71b6d987832f0af4";
sha256 = "0ar095jxrnfcfbg5gzwb82mz93hpwsdsclzam80424m0iapgl4li";
rev = "71eba9bbba9c00337dbd132cbc12b1952daf0d29";
sha256 = "161a546b7gx22j42djxbxirs34pis0kgwz71glqqj6zr32rzapfm";
};
meta.homepage = "https://github.com/tpope/vim-git/";
};
@ -7255,12 +7267,12 @@ final: prev:
vim-kitty-navigator = buildVimPluginFrom2Nix {
pname = "vim-kitty-navigator";
version = "2021-04-28";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "knubie";
repo = "vim-kitty-navigator";
rev = "50b87c4287c791addc7364dfa377605d0837d326";
sha256 = "0z3hmgflpiv0czdrkvpc845ms7bjy9rs2a6mp7gyzlqyqrjvqzzy";
rev = "dedbd5358a5b3b519f1f2c9c032ea6e4ff41d6b4";
sha256 = "01jgblg1qfq9149fab5kcaa3q5fa7d8psxvgs8gkbs109nxkrjc4";
};
meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
};
@ -8576,12 +8588,12 @@ final: prev:
vim-sneak = buildVimPluginFrom2Nix {
pname = "vim-sneak";
version = "2020-09-01";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-sneak";
rev = "65e5e4668371152c6ef7a6269c6a6b960cef21b4";
sha256 = "0bfibshqqa17n9vbdd2g8kalnc78v1ag3hzws9pdacrcsxhsh0ry";
rev = "51c21ee1ffeea132104da619c9643e61e337e427";
sha256 = "1da9b5c15sm8cacfwkggg7kl61vxk94qsamanaaz776xlsj0b9z0";
};
meta.homepage = "https://github.com/justinmk/vim-sneak/";
};
@ -8684,12 +8696,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
version = "2021-06-28";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
rev = "3b8fcc0b21fd28eaabb5feac786462926e5a5069";
sha256 = "19aj7d24qwkpyfgk8adrr5nz30inblsrhm56vp6l3phai1c7rbn2";
rev = "d4cc839f4a7c8fc0b7fbf8ec6a11ef1c1be846e1";
sha256 = "05yz4cpxx7n6ggkm8n9s0q387syllbn8s8vn4fwchnml4jdqigfq";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@ -8816,12 +8828,12 @@ final: prev:
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
version = "2021-06-09";
version = "2021-07-02";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
rev = "814a21db89f742c3ea492c69c5a2bfecded1aeb3";
sha256 = "0acdq2m16mhm3g6n4saqf9fljz5qfdalw88h126z2f6mm731y6pi";
rev = "37590260914178e04b46d1248e444e718da519c6";
sha256 = "13cvpb2fkqsj4m8lz6b7znmgayaf1sadysn07z2x2fs7ca856hrg";
};
meta.homepage = "https://github.com/hashivim/vim-terraform/";
};
@ -9141,12 +9153,12 @@ final: prev:
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
version = "2021-06-22";
version = "2021-07-01";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
rev = "929703f069c7078e0c41efb5a260421347ce083a";
sha256 = "05ky5l3yadp3whbi2a2i38rq620m51r2xi86q80z11a99j5q6ff5";
rev = "f994695813ebaecc9e37c7ea216c65d9cd659767";
sha256 = "11n0g6d1yn38lrshlbzc28sfn1qghsjd2nmxzbp86vwm8dysxm5i";
};
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
};

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -24,6 +24,7 @@ andweeb/presence.nvim@main
andymass/vim-matchup
andys8/vim-elm-syntax
antoinemadec/coc-fzf
antoinemadec/FixCursorHold.nvim
ap/vim-css-color
arcticicestudio/nord-vim
arthurxavierx/vim-unicoder

11
pkgs/servers/http/trafficserver/default.nix
View File

@ -49,11 +49,11 @@
stdenv.mkDerivation rec {
pname = "trafficserver";
version = "9.0.1";
version = "9.0.2";
src = fetchurl {
url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
sha256 = "1q164pvfmbqh3gzy3bqy96lwd0fdbhz78r06pd92p7rmkqwx005z";
sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz";
};
patches = [
@ -63,13 +63,6 @@ stdenv.mkDerivation rec {
url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150";
})
# Fixes a bug in tspush which pushes incorrect contents to cache
# https://github.com/apache/trafficserver/pull/7696
(fetchpatch {
url = "https://github.com/apache/trafficserver/commit/b08215272872f452787915cd3a8e0b0ea0b88385.diff";
sha256 = "0axk8x1xvd8wvpgcxgyqqg7kgxyxwfgwmisq3xnk1da0cqv9cx9f";
})
];
# NOTE: The upstream README indicates that flex is needed for some features,

6
pkgs/servers/monitoring/prometheus/bird-exporter.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bird-exporter";
version = "1.2.5";
version = "1.2.6";
src = fetchFromGitHub {
owner = "czerwonk";
repo = "bird_exporter";
rev = version;
sha256 = "06rlmmvr79db3lh54938yxi0ixcfb8fni0vgcv3nafqnlr2zbs58";
sha256 = "sha256-zQKdO1E5VKZaQLNOfL3e/iCdugwNx3xFy7R7vun/Efs=";
};
vendorSha256 = "14bjdfqvxvb9gs1nm0nnlib52vd0dbvjll22x7d2cc721cbd0hj0";
vendorSha256 = "sha256-o/OVWALLOw7eNH3xsQlQ5ZNFV3l9iD8lhyckBt6Qn3E=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; };

4
pkgs/servers/sql/mariadb/default.nix
View File

@ -4,7 +4,7 @@
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
, fixDarwinDylibNames, cctools, CoreServices, less
, numactl # NUMA Support
, withStorageMroonga ? true, kytea, msgpack, zeromq
, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq
, withStorageRocks ? true
}:
@ -155,7 +155,7 @@ server = stdenv.mkDerivation (common // {
bzip2 lz4 lzo snappy xz zstd
libxml2 judy libevent cracklib
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
++ optionals withStorageMroonga [ kytea msgpack zeromq ]
++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]
++ optional stdenv.hostPlatform.isLinux linux-pam
++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv;

12
pkgs/servers/sql/materialize/default.nix
View File

@ -40,17 +40,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "materialize";
version = "0.8.0";
rev = "b2fe225f1afcfec4912976bdaa4a44caf3ca0842";
version = "0.8.1";
rev = "ef996c54db7c9504690b9f230a4a676ae1fb617f";
src = fetchFromGitHub {
owner = "MaterializeInc";
repo = pname;
inherit rev;
hash = "sha256:09q1bfgsp6j8l8wv2abgibndwfkg2w3nm4dif4qgdkd52fdg0kc5";
rev = "v${version}";
sha256 = "1lrv0q191rhdqk316557qk2a6b00vrf07j1g63ri6mp8ad1g8gk3";
};
cargoSha256 = "sha256:0y2r4980dyajf2ql9vb2jxcsn0a2q0gd3f8v932fgjqw13ysmi0s";
cargoSha256 = "0fx7m1ci4zak7sm71kdiaj2l29rlqax15hd424i9yn4aj1bd358b";
nativeBuildInputs = [ cmake perl pkg-config ]
# Provides the mig command used by the krb5-src build script
@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec {
'';
MZ_DEV_BUILD_SHA = rev;
cargoBuildFlags = [ "--package materialized" ];
cargoBuildFlags = [ "--bin materialized" ];
postInstall = ''
install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service

4
pkgs/tools/networking/stevenblack-blocklist/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
let
version = "3.7.11";
version = "3.7.12";
in
fetchFromGitHub {
name = "stevenblack-blocklist-${version}";
@ -9,7 +9,7 @@ fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
rev = version;
sha256 = "sha256-hoYh2FdZGY/4/QmrqZubJYHP3bBcnUQFR9C7dfVTnWE=";
sha256 = "sha256-hGaiIFHgsLb6oLJ4k4yfxqeDhK0W+diCAI5odo08Q0E=";
meta = with lib; {
description = "Unified hosts file with base extensions";

31
pkgs/tools/virtualization/cloud-init/default.nix
View File

@ -18,14 +18,14 @@
buildPythonApplication rec {
pname = "cloud-init";
version = "20.3";
version = "21.2";
namePrefix = "";
src = fetchFromGitHub {
owner = "canonical";
repo = "cloud-init";
rev = version;
sha256 = "1fmckxf4q4sxjqs758vw7ca0rnhl9hyq67cqpqzz2v3s1gqzjhm4";
sha256 = "0vhjkgs49ixfa3kkj5s3v3gcxvypm3cdvfk6adrk2bx3wv2cbhvz";
};
patches = [ ./0001-add-nixos-support.patch ];
@ -59,9 +59,7 @@ buildPythonApplication rec {
];
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [
dmidecode cloud-utils.guest
]}/bin"
"--prefix PATH : ${lib.makeBinPath [ dmidecode cloud-utils.guest ]}/bin"
];
disabledTests = [
@ -71,6 +69,27 @@ buildPythonApplication rec {
"test_path_env_gets_set_from_main"
# tries to read from /etc/ca-certificates.conf while inside the sandbox
"test_handler_ca_certs"
# Doesn't work in the sandbox
"TestEphemeralDhcpNoNetworkSetup"
"TestHasURLConnectivity"
"TestReadFileOrUrl"
"TestConsumeUserDataHttp"
# Chef Omnibus
"TestInstallChefOmnibus"
];
disabledTestPaths = [
# Oracle tests are not passing
"cloudinit/sources/tests/test_oracle.py"
# Disable the integration tests. pycloudlib would be required
"tests/unittests/test_datasource/test_aliyun.py"
"tests/unittests/test_datasource/test_azure.py"
"tests/unittests/test_datasource/test_ec2.py"
"tests/unittests/test_datasource/test_exoscale.py"
"tests/unittests/test_datasource/test_gce.py"
"tests/unittests/test_datasource/test_openstack.py"
"tests/unittests/test_datasource/test_scaleway.py"
"tests/unittests/test_ec2_util.py"
];
preCheck = ''
@ -78,6 +97,8 @@ buildPythonApplication rec {
export TMPDIR=/tmp
'';
pythonImportsCheck = [ "cloudinit" ];
meta = with lib; {
homepage = "https://cloudinit.readthedocs.org";
description = "Provides configuration and customization of cloud instance";

12
pkgs/top-level/all-packages.nix
View File

@ -4724,7 +4724,9 @@ in
flatpak = callPackage ../development/libraries/flatpak { };
flatpak-builder = callPackage ../development/tools/flatpak-builder { };
flatpak-builder = callPackage ../development/tools/flatpak-builder {
binutils = binutils-unwrapped;
};
fltrdr = callPackage ../tools/misc/fltrdr {
icu = icu63;
@ -13199,6 +13201,8 @@ in
cfr = callPackage ../development/tools/java/cfr { };
checkra1n = callPackage ../development/mobile/checkra1n { };
checkstyle = callPackage ../development/tools/analysis/checkstyle { };
chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; };
@ -26220,6 +26224,8 @@ in
pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
pianoteq = callPackage ../applications/audio/pianoteq { };
picard = callPackage ../applications/audio/picard { };
picocom = callPackage ../tools/misc/picocom {
@ -26268,6 +26274,8 @@ in
purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { };
purple-mm-sms = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms { };
purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { };
@ -31560,6 +31568,8 @@ in
urbit = callPackage ../misc/urbit { };
usb-reset = callPackage ../applications/misc/usb-reset { };
usql = callPackage ../applications/misc/usql { };
utf8cpp = callPackage ../development/libraries/utf8cpp { };

3
pkgs/top-level/python-aliases.nix
View File

@ -37,8 +37,9 @@ mapAliases ({
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
dateutil = python-dateutil; # added 2021-07-03
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
diff_cover = diff-cover; # added 2021-07-02
dftfit = throw "it's dependency lammps-cython no longer builds";
diff_cover = diff-cover; # added 2021-07-02
discogs_client = discogs-client; # added 2021-07-02
dns = dnspython; # Alias for compatibility, 2017-12-10
faulthandler = throw "faulthandler is built into ${python.executable}";
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14

2
pkgs/top-level/python-packages.nix
View File

@ -1937,7 +1937,7 @@ in {
discid = callPackage ../development/python-modules/discid { };
discogs_client = callPackage ../development/python-modules/discogs_client { };
discogs-client = callPackage ../development/python-modules/discogs-client { };
discordpy = callPackage ../development/python-modules/discordpy { };