Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-31 02:05:27 +00:00 committed by GitHub
commit be7141706d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 106 additions and 93 deletions

View File

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn";
};
configureFlags = [ "--enable-dependency-tracking" ];
configureFlags = [ "--enable-dependency-tracking" ]
++ lib.optional stdenv.isDarwin "--disable-sdltest";
nativeBuildInputs = [ autoreconfHook python ];

View File

@ -107,6 +107,7 @@ let
'')
+ ''
rm $out/bin/nvim
touch $out/rplugin.vim
makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr}
'';

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.10.1";
version = "0.13.1";
src = fetchCrate {
inherit pname version;
sha256 = "17x514pwbkzkkrd47a66a4iz3bxrxvm8hk5hphsfbhgzqfnf9iy7";
sha256 = "1aanw0l8b4ak0kikkixmb817qw48ypviq9dxdivzwc29rjvgp152";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "03y2fk174rdjvw8wdzwc0hhj0zqwpap7qcga51yhq877rgyxbxir";
cargoSha256 = "16iaj1pqvqwi0rq4k3lmqwd8skbjf55133ri69hj26gz88k4q43w";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

View File

@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.0.6";
version = "3.0.7";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-QD5V6Bz/wfbyNPoXizjhPGyHN7ieotsYbwLTz2ADfcY=";
sha256 = "sha256-lZTSUNtmJZKONt0Bv42dBAc+87L14HaPxvPxhFe8nyc=";
};
vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg=";

View File

@ -4,13 +4,13 @@ let
arch = if stdenv.is64bit then "amd64" else "x86";
in stdenv.mkDerivation rec {
pname = "teamspeak-server";
version = "3.13.3";
version = "3.13.5";
src = fetchurl {
url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2";
sha256 = if stdenv.is64bit
then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw="
else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c=";
then "sha256-2tSX/ET2lZsi0mVB3KnbnBXMSTRsneGUA8w6mZ6TmlY="
else "sha256-RdxG4nGXTTSY+P5oZu4uP5l7gKcU9C6uIILyNldSK50=";
};
buildInputs = [ stdenv.cc.cc postgresql.lib ];
@ -18,6 +18,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ autoPatchelfHook ];
installPhase = ''
runHook preInstall
# Install files.
mkdir -p $out/lib/teamspeak
mv * $out/lib/teamspeak/
@ -26,18 +28,20 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin/
ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server
ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver
runHook postInstall
'';
passthru.updateScript = writeScript "update-teampeak-server" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused
#!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused jq pup
set -eu -o pipefail
version=$( \
curl -s "https://www.teamspeak.de/download/teamspeak-3-amd64-server-linux/" \
| grep softwareVersion \
| sed -E -e 's/^.*<span itemprop="softwareVersion">([^<]+)<\/span>.*$/\1/' \
curl https://www.teamspeak.com/en/downloads/ \
| pup "#server .linux .version json{}" \
| jq -r ".[0].text"
)
versionOld=$(nix-instantiate --eval --strict -A "teamspeak_server.version")

View File

@ -1,10 +1,12 @@
{ stdenv, lib, fetchFromGitHub, installShellFiles, libiconv, ruby ? null }:
{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused
, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby
}:
stdenv.mkDerivation rec {
pname = "mblaze";
version = "1.1";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles makeWrapper ];
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
src = fetchFromGitHub {
@ -22,6 +24,24 @@ stdenv.mkDerivation rec {
installShellCompletion contrib/_mblaze
'' + lib.optionalString (ruby != null) ''
install -Dt $out/bin contrib/msuck contrib/mblow
# The following wrappings are used to preserve the executable
# names (the value of $0 in a script). The script mcom is
# designed to be run directly or via symlinks such as mrep. Using
# symlinks changes the value of $0 in the script, and makes it
# behave differently. When using the wrapProgram tool, the resulting
# wrapper breaks this behaviour. The following wrappers preserve it.
mkdir -p $out/wrapped
for x in mcom mbnc mfwd mrep; do
mv $out/bin/$x $out/wrapped
makeWrapper $out/wrapped/$x $out/bin/$x \
--argv0 $out/bin/$x \
--prefix PATH : $out/bin \
--prefix PATH : ${lib.makeBinPath [
coreutils file gawk gnugrep gnused
]}
done
'';
meta = with lib; {

View File

@ -16,9 +16,6 @@ stdenv.mkDerivation rec {
./undefined_behavior.patch
];
# patch needs to updated due to version bump
#CXXFLAGS = "-Werror=return-type";
preConfigure =
# Fix F77LD to workaround for a following build error:
#
@ -48,8 +45,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc";
NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc";

View File

@ -15,11 +15,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
version = "3.7.3";
version = "3.7.4";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
sha256 = "sha256-ZmfriHXStm1zUE9AyVa0KxNRdE9IjRZCBDdiFdiF2lw=";
sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ=";
};
goPackagePath = "github.com/sylabs/singularity";

View File

@ -63,7 +63,7 @@ let
};
elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix {
inherit erlang;
erlang = pkgs.beam.interpreters.erlangR23;
debugInfo = true;
};
@ -83,7 +83,6 @@ let
# without helper functions buildRebar3 and buildMix.
hex = callPackage ./hex { };
webdriver = callPackage ./webdriver { };
relxExe = callPackage ../tools/erlang/relx-exe { };
};
in
makeExtensible packages

View File

@ -22,12 +22,12 @@ let
in stdenv.mkDerivation rec {
pname = "arrow-cpp";
version = "4.0.0";
version = "4.0.1";
src = fetchurl {
url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa";
sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m";
};
sourceRoot = "apache-arrow-${version}/cpp";
@ -146,11 +146,11 @@ in stdenv.mkDerivation rec {
--exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$'
'';
meta = {
meta = with lib; {
description = "A cross-language development platform for in-memory data";
homepage = "https://arrow.apache.org/";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ tobim veprbl ];
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ tobim veprbl ];
};
}

View File

@ -3,18 +3,17 @@
, fetchFromGitHub
, pyjwt
, djangorestframework
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "drf-jwt";
version = "1.19.0";
version = "1.19.1";
src = fetchFromGitHub {
owner = "Styria-Digital";
repo = "django-rest-framework-jwt";
rev = version;
sha256 = "012rmm25w5gvkzi4lyyhn47y1n6g68q9gasga2mkv9i6mn8n4kp7";
sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g=";
};
propagatedBuildInputs = [

View File

@ -1,22 +1,19 @@
{ lib, buildPythonPackage, fetchFromGitHub
, nose
, six
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "purl";
version = "1.5";
version = "1.6";
src = fetchFromGitHub {
owner = "codeinthehole";
repo = "purl";
rev = version;
sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g";
sha256 = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc=";
};
propagatedBuildInputs = [ six ];
checkInputs = [ nose ];
checkInputs = [ pytestCheckHook];
meta = with lib; {
description = "Immutable URL class for easy URL-building and manipulation";

View File

@ -276,6 +276,7 @@ let
jqr = [ pkgs.jq.dev ];
KFKSDS = [ pkgs.gsl_1 ];
kza = [ pkgs.fftw.dev ];
lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ];
magick = [ pkgs.imagemagick.dev ];
ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
mvabund = [ pkgs.gsl_1 ];
@ -406,6 +407,7 @@ let
gdtools = [ pkgs.pkg-config ];
jqr = [ pkgs.jq.lib ];
kza = [ pkgs.pkg-config ];
lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ];
magick = [ pkgs.pkg-config ];
mwaved = [ pkgs.pkg-config ];
odbc = [ pkgs.pkg-config ];

View File

@ -1,19 +0,0 @@
{ fetchHex, fetchRebar3Deps, rebar3Relx }:
rebar3Relx rec {
name = "relx-exe";
version = "3.32.1";
releaseType = "escript";
src = fetchHex {
pkg = "relx";
sha256 = "0693k8ac7hvpm9jd3ysbdn8bk97d68ini22p1fsqdsi9qv9f7nq7";
inherit version;
};
checkouts = fetchRebar3Deps {
inherit name version;
src = "${src}/rebar.lock";
sha256 = "0l7r3x7zwcz49013zv8z5v2i06p7wqkgzdyzrl8jk0hglscvhpf6";
};
}

View File

@ -87,6 +87,18 @@ let
};
};
B4dM4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "nixpkgs-fmt";
publisher = "B4dM4n";
version = "0.0.1";
sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
};
meta = with lib; {
license = licenses.mit;
};
};
baccata.scaladex-search = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "scaladex-search";
@ -516,7 +528,7 @@ let
};
};
hashicorp.terraform = callPackage ./terraform {};
hashicorp.terraform = callPackage ./terraform { };
hookyqr.beautify = buildVscodeMarketplaceExtension {
mktplcRef = {
@ -698,15 +710,16 @@ let
};
};
ms-vscode.cpptools = callPackage ./cpptools {};
ms-vscode.cpptools = callPackage ./cpptools { };
ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};
ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { };
ms-python.python = let
raw-package = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
in
ms-python.python =
let
raw-package = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
in
buildEnv {
name = "vscode-extension-ms-python-python-full";
paths = [ raw-package self.ms-toolsai.jupyter ];
@ -786,7 +799,7 @@ let
};
};
matklad.rust-analyzer = callPackage ./rust-analyzer {};
matklad.rust-analyzer = callPackage ./rust-analyzer { };
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
meta = with lib; {
@ -1029,7 +1042,7 @@ let
};
};
ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {};
ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { };
vscodevim.vim = buildVscodeMarketplaceExtension {
mktplcRef = {
@ -1094,7 +1107,7 @@ let
llvm-org.lldb-vscode = llvmPackages_8.lldb;
WakaTime.vscode-wakatime = callPackage ./wakatime {};
WakaTime.vscode-wakatime = callPackage ./wakatime { };
wholroyd.jinja = buildVscodeMarketplaceExtension {
mktplcRef = {
@ -1109,17 +1122,17 @@ let
};
};
aliases = self: super: {
# aliases
ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; };
};
aliases = self: super: {
# aliases
ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; };
};
# TODO: add overrides overlay, so that we can have a generated.nix
# then apply extension specific modifcations to packages.
# TODO: add overrides overlay, so that we can have a generated.nix
# then apply extension specific modifcations to packages.
# overlays will be applied left to right, overrides should come after aliases.
overlays = lib.optionals (config.allowAliases or true) [ aliases ];
# overlays will be applied left to right, overrides should come after aliases.
overlays = lib.optionals (config.allowAliases or true) [ aliases ];
toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
in
lib.fix toFix
lib.fix toFix

View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.23.0.4482-62106842a";
version = "1.23.1.4602-280ab6053";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v";
sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq";
sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli";
};
outputs = [ "out" "basedb" ];

View File

@ -12099,8 +12099,7 @@ in
inherit (beam.packages.erlang)
erlang-ls
rebar rebar3 rebar3WithPlugins
fetchHex beamPackages
relxExe;
fetchHex beamPackages;
inherit (beam.packages.erlangR21) lfe lfe_1_3;
@ -14438,7 +14437,9 @@ in
chromaprint = callPackage ../development/libraries/chromaprint { };
cl = callPackage ../development/libraries/cl { };
cl = callPackage ../development/libraries/cl {
erlang = erlangR23;
};
clanlib = callPackage ../development/libraries/clanlib { };
@ -19688,7 +19689,7 @@ in
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
elixir = beam_nox.interpreters.elixir_1_8;
erlang = erlang_nox;
erlang = beam_nox.interpreters.erlangR23;
};
radicale1 = callPackage ../servers/radicale/1.x.nix { };

View File

@ -6,11 +6,11 @@ rec {
# Each
interpreters = rec {
# R23 is the default version.
erlang = erlangR23; # The main switch to change default Erlang version.
erlang_odbc = erlangR23_odbc;
erlang_javac = erlangR23_javac;
erlang_odbc_javac = erlangR23_odbc_javac;
# R24 is the default version.
erlang = erlangR24; # The main switch to change default Erlang version.
erlang_odbc = erlangR24_odbc;
erlang_javac = erlangR24_javac;
erlang_odbc_javac = erlangR24_odbc_javac;
# Standard Erlang versions, using the generic builder.

View File

@ -11,7 +11,7 @@
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
, officialRelease ? false
# The platforms for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]
, limitedSupportedSystems ? [ "i686-linux" ]
# Strip most of attributes when evaluating to spare memory usage
, scrubJobs ? true