BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-04-19 12:06:26 +00:00 committed by GitHub
commit 96df3c3794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 179 additions and 235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/labeler.yml vendored
View file

@ -5,6 +5,10 @@
- pkgs/development/libraries/agda/**/*
- pkgs/top-level/agda-packages.nix
"6.topic: bsd":
- pkgs/os-specific/bsd/**/*
- pkgs/stdenv/freebsd/**/*
"6.topic: cinnamon":
- pkgs/desktops/cinnamon/**/*

5
nixos/doc/manual/release-notes/rl-2105.xml
View file

@ -675,6 +675,11 @@ environment.systemPackages = [
Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements.
</para>
</listitem>
<listitem>
<para>
All CUDA toolkit versions prior to CUDA 10 have been removed.
</para>
</listitem>
</itemizedlist>
</section>

37
pkgs/applications/audio/sublime-music/default.nix
View file

@ -1,4 +1,12 @@
{ fetchFromGitLab, lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook
{ fetchFromGitLab
, fetchpatch
, lib
, python3Packages
, gobject-introspection
, gtk3
, pango
, wrapGAppsHook
, xvfb_run
, chromecastSupport ? false
, serverSupport ? false
, keyringSupport ? true
@ -8,18 +16,29 @@
python3Packages.buildPythonApplication rec {
pname = "sublime-music";
version = "0.11.10";
version = "0.11.11";
format = "pyproject";
src = fetchFromGitLab {
owner = "sublime-music";
repo = pname;
rev = "v${version}";
sha256 = "1g78gmiywg07kaywfc9q0yab2bzxs936vb3157ni1z0flbmcwrry";
sha256 = "sha256-r4Tn/7CGDny8Aa4kF4PM5ZKMYthMJ7801X3zPdvXh4Q=";
};
patches = [
# Switch to poetry-core:
# https://gitlab.com/sublime-music/sublime-music/-/merge_requests/60
(fetchpatch {
name = "use-poetry-core.patch";
url = "https://gitlab.com/sublime-music/sublime-music/-/commit/9b0af19dbdfdcc5a0fa23e73bb34c7135a8c2855.patch";
sha256 = "sha256-cXG0RvrnBpme6yKWM0nfqMqoK0qPT6spflJ9AaaslVg=";
})
];
nativeBuildInputs = [
gobject-introspection
python3Packages.setuptools
python3Packages.poetry-core
wrapGAppsHook
];
@ -53,8 +72,14 @@ python3Packages.buildPythonApplication rec {
# https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
# no tests
doCheck = false;
# Use the test suite provided by the upstream project.
checkInputs = with python3Packages; [
pytest
pytest-cov
];
checkPhase = "${xvfb_run}/bin/xvfb-run pytest";
# Also run the python import check for sanity
pythonImportsCheck = [ "sublime_music" ];
postInstall = ''

12
pkgs/applications/video/jellyfin-media-player/default.nix
View file

@ -26,18 +26,18 @@
mkDerivation rec {
pname = "jellyfin-media-player";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "iwalton3";
owner = "jellyfin";
repo = "jellyfin-media-player";
rev = "v${version}";
sha256 = "sha256-rXW6vC0Ow8xFblXjGYaDExAZM8RgqLkDHiX7R8vAWjI=";
sha256 = "sha256-zNEjhBya2loqFYS8Rjs8CMCfvie2/UbxreF8CUwDWWk=";
};
jmpDist = fetchzip {
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2/dist.zip";
sha256 = "sha256-EpNAN4nzINiwMrmg0e4x3uJRTy5ovx4ZkmP83Kbn4S0=";
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-1/dist.zip";
sha256 = "sha256-oTZyIh2m9z55sNIeKtHxVijBMcTtJgpojG5HUToMYoA=";
};
patches = [
@ -99,7 +99,7 @@ mkDerivation rec {
'';
meta = with lib; {
homepage = "https://github.com/iwalton3/jellyfin-media-player";
homepage = "https://github.com/jellyfin/jellyfin-media-player";
description = "Jellyfin Desktop Client based on Plex Media Player";
license = with licenses; [ gpl2Plus mit ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];

13
pkgs/applications/virtualization/spice-vdagent/default.nix
View file

@ -2,15 +2,12 @@
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm,
systemd}:
stdenv.mkDerivation rec {
name = "spice-vdagent-0.20.0";
pname = "spice-vdagent";
version = "0.21.0";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf";
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
sha256 = "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
patchFlags = [ "-uNp1" ];
# included in the next release.
patches = [ ./timeout.diff ];
postPatch = ''
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
'';
@ -29,7 +26,7 @@ stdenv.mkDerivation rec {
* Multiple displays
'';
homepage = "https://www.spice-space.org/";
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.aboseley ];
platforms = lib.platforms.linux;
};

84
pkgs/applications/virtualization/spice-vdagent/timeout.diff
View file

@ -1,84 +0,0 @@
diff --git a/src/udscs.c b/src/udscs.c
index 4de75f8..7c99eed 100644
--- a/src/udscs.c
+++ b/src/udscs.c
@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new(
server->read_callback = read_callback;
server->error_cb = error_cb;
server->service = g_socket_service_new();
+ g_socket_service_stop(server->service);
g_signal_connect(server->service, "incoming",
G_CALLBACK(udscs_server_accept_cb), server);
@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server,
g_object_unref(sock_addr);
}
+void udscs_server_start(struct udscs_server *server)
+{
+ g_socket_service_start(server->service);
+}
+
void udscs_server_destroy_connection(struct udscs_server *server,
UdscsConnection *conn)
{
diff --git a/src/udscs.h b/src/udscs.h
index 45ebd3f..4f7ea36 100644
--- a/src/udscs.h
+++ b/src/udscs.h
@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server,
const gchar *addr,
GError **err);
+void udscs_server_start(struct udscs_server *server);
+
void udscs_server_destroy_connection(struct udscs_server *server,
UdscsConnection *conn);
diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
index cfd0a51..753c9bf 100644
--- a/src/vdagentd/vdagentd.c
+++ b/src/vdagentd/vdagentd.c
@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[])
uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE);
}
- g_unix_signal_add(SIGINT, signal_handler, NULL);
- g_unix_signal_add(SIGHUP, signal_handler, NULL);
- g_unix_signal_add(SIGTERM, signal_handler, NULL);
-
openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER);
/* Setup communication with vdagent process(es) */
@@ -1228,9 +1224,6 @@ int main(int argc, char *argv[])
}
}
- if (do_daemonize)
- daemonize();
-
#ifdef WITH_STATIC_UINPUT
uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0,
debug > 1, uinput_fake);
@@ -1240,6 +1233,13 @@ int main(int argc, char *argv[])
}
#endif
+ if (do_daemonize)
+ daemonize();
+
+ g_unix_signal_add(SIGINT, signal_handler, NULL);
+ g_unix_signal_add(SIGHUP, signal_handler, NULL);
+ g_unix_signal_add(SIGTERM, signal_handler, NULL);
+
if (want_session_info)
session_info = session_info_create(debug);
if (session_info) {
@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[])
active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal);
+ udscs_server_start(server);
loop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(loop);

4
pkgs/desktops/gnome-3/extensions/unite/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
version = "50";
version = "51";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
sha256 = "14n9lrjbxcmvcjnh6zbwlc1paqfhbg81lj0y2d35sh1c2fbsb7d9";
sha256 = "0mic7h5l19ly79l02inm33992ffkxsh618d6zbr39gvn4405g6wk";
};
uuid = "unite@hardpixel.eu";

2
pkgs/development/beam-modules/default.nix
View file

@ -63,6 +63,8 @@ let
debugInfo = true;
};
elixir_ls = callPackage ./elixir_ls.nix { inherit elixir fetchMixDeps mixRelease; };
# Remove old versions of elixir, when the supports fades out:
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html

71
pkgs/development/beam-modules/elixir_ls.nix Normal file
View file

@ -0,0 +1,71 @@
{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }:
# Based on the work of Hauleth
# None of this would have happened without him
mixRelease rec {
pname = "elixir-ls";
version = "0.7.0";
src = fetchFromGitHub {
owner = "elixir-lsp";
repo = "elixir-ls";
rev = "v{version}";
sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s";
fetchSubmodules = true;
};
mixDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version;
sha256 = "0r9x223imq4j9pn9niskyaybvk7jmq8dxcyzk7kwfsi128qig1a1";
};
# elixir_ls is an umbrella app
# override configurePhase to not skip umbrella children
configurePhase = ''
runHook preConfigure
mix deps.compile --no-deps-check
runHook postConfigure
'';
# elixir_ls require a special step for release
# compile and release need to be performed together because
# of the no-deps-check requirement
buildPhase = ''
runHook preBuild
mix do compile --no-deps-check, elixir_ls.release
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -Rv release $out/lib
# Prepare the wrapper script
substitute release/language_server.sh $out/bin/elixir-ls \
--replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh"
chmod +x $out/bin/elixir-ls
# prepare the launcher
substituteInPlace $out/lib/launch.sh \
--replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \
"ERL_LIBS=$out/lib:\$ERL_LIBS" \
--replace "exec elixir" "exec ${elixir}/bin/elixir"
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/elixir-lsp/elixir-ls";
description = ''
A frontend-independent IDE "smartness" server for Elixir.
Implements the "Language Server Protocol" standard and provides debugger support via the "Debug Adapter Protocol"
'';
longDescription = ''
The Elixir Language Server provides a server that runs in the background, providing IDEs, editors, and other tools with information about Elixir Mix projects.
It adheres to the Language Server Protocol, a standard for frontend-independent IDE support.
Debugger integration is accomplished through the similar VS Code Debug Protocol.
'';
license = licenses.asl20;
platforms = platforms.unix;
maintainers = teams.beam.members;
};
}

63
pkgs/development/compilers/cudatoolkit/default.nix
View file

@ -1,8 +1,6 @@
{ lib
, callPackage
, fetchurl
, gcc48
, gcc6
, gcc7
, gcc9
}:
@ -10,67 +8,6 @@
let
common = callPackage ./common.nix;
in rec {
cudatoolkit_9_0 = common {
version = "9.0.176.1";
url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run";
sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln";
runPatches = [
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/1/cuda_9.0.176.1_linux-run";
sha256 = "1vbqg97pq9z9c8nqvckiwmq3ljm88m7gaizikzxbvz01izh67gx4";
})
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/2/cuda_9.0.176.2_linux-run";
sha256 = "1sz5dijbx9yf7drfipdxav5a5g6sxy4w6vi9xav0lb6m2xnmyd7c";
})
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/3/cuda_9.0.176.3_linux-run";
sha256 = "1jm83bxpscpjhzs5q3qijdgjm0r8qrdlgkj7y08fq8c0v8q2r7j2";
})
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/4/cuda_9.0.176.4_linux-run";
sha256 = "0pymg3mymsa2n48y0njz3spzlkm15lvjzw8fms1q83zslz4x0lwk";
})
];
gcc = gcc6;
};
cudatoolkit_9_1 = common {
version = "9.1.85.3";
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4";
runPatches = [
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux";
sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g";
})
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux";
sha256 = "16g0w09h3bqmas4hy1m0y6j5ffyharslw52fn25gql57bfihg7ym";
})
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux";
sha256 = "12mcv6f8z33z8y41ja8bv5p5iqhv2vx91mv3b5z6fcj7iqv98422";
})
];
gcc = gcc6;
};
cudatoolkit_9_2 = common {
version = "9.2.148.1";
url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux";
sha256 = "04c6v9b50l4awsf9w9zj5vnxvmc0hk0ypcfjksbh4vnzrz14wigm";
runPatches = [
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_linux";
sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw";
})
];
gcc = gcc7;
};
cudatoolkit_9 = cudatoolkit_9_2;
cudatoolkit_10_0 = common {
version = "10.0.130";
url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux";

12
pkgs/development/libraries/mbedtls/default.nix
View file

@ -11,13 +11,17 @@
stdenv.mkDerivation rec {
pname = "mbedtls";
version = "2.16.9"; # nixpkgs-update: no auto update
# Auto updates are disabled due to repology listing dev releases as release
# versions. See
# * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428
# * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d
version = "2.26.0"; # nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "ARMmbed";
repo = "mbedtls";
rev = "${pname}-${version}";
sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf";
sha256 = "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m";
};
nativeBuildInputs = [ cmake ninja perl python3 ];
@ -30,6 +34,10 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];
NIX_CFLAGS_COMPILE = [
"-Wno-error=format"
"-Wno-error=format-truncation"
];
meta = with lib; {
homepage = "https://tls.mbed.org/";

10
pkgs/development/libraries/openssl/default.nix
View file

@ -72,14 +72,18 @@ let
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"
else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64
then "./Configure BSD-x86_64"
else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32
then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf"
else if stdenv.hostPlatform.isBSD
then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
else if stdenv.hostPlatform.isMinGW
then "./Configure mingw${optionalString
(stdenv.hostPlatform.parsed.cpu.bits != 32)
(toString stdenv.hostPlatform.parsed.cpu.bits)}"
else if stdenv.hostPlatform.isLinux
then (if stdenv.hostPlatform.isx86_64
then "./Configure linux-x86_64"
else "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}")
then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
else if stdenv.hostPlatform.isiOS
then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross"
else

2
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file

@ -236,6 +236,8 @@ qtModule {
sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake
'';
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; {
description = "A web engine based on the Chromium web browser";
maintainers = with maintainers; [ matthewbauer ];

25
pkgs/development/libraries/science/math/cudnn/default.nix
View file

@ -1,4 +1,4 @@
{ callPackage, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }:
{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -6,29 +6,6 @@ let
};
in rec {
cudnn_cudatoolkit_9_0 = generic rec {
version = "7.3.0";
cudatoolkit = cudatoolkit_9_0;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.0.29.tgz";
sha256 = "16z4vgbcmbayk4hppz0xshgs3g07blkp4j25cxcjqyrczx1r0gs0";
};
cudnn_cudatoolkit_9_1 = generic rec {
version = "7.1.3";
cudatoolkit = cudatoolkit_9_1;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.1.tgz";
sha256 = "0a0237gpr0p63s92njai0xvxmkbailzgfsvh7n9fnz0njhvnsqfx";
};
cudnn_cudatoolkit_9_2 = generic rec {
version = "7.2.1";
cudatoolkit = cudatoolkit_9_2;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.2.1.38.tgz";
sha256 = "1sf215wm6zgr17gs6sxfhw61b7a0qmcxiwhgy1b4nqdyxpqgay1y";
};
cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2;
cudnn_cudatoolkit_10_0 = generic rec {
version = "7.4.2";
cudatoolkit = cudatoolkit_10_0;

2
pkgs/development/libraries/webkitgtk/default.nix
View file

@ -177,6 +177,8 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
requiredSystemFeatures = [ "big-parallel" ];
meta = {
description = "Web content rendering engine, GTK port";
homepage = "https://webkitgtk.org/";

8
pkgs/test/cuda/cuda-samples/default.nix
View file

@ -1,17 +1,9 @@
{ callPackage
, cudatoolkit_9_2
, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
}:
rec {
cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix {
cudatoolkit = cudatoolkit_9_2;
sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6";
};
cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2;
##
cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix {

2
pkgs/test/cuda/default.nix
View file

@ -3,8 +3,6 @@
rec {
cuda-samplesPackages = callPackage ./cuda-samples { };
inherit (cuda-samplesPackages)
cuda-samples_cudatoolkit_9
cuda-samples_cudatoolkit_9_2
cuda-samples_cudatoolkit_10
cuda-samples_cudatoolkit_10_0
cuda-samples_cudatoolkit_10_1

6
pkgs/tools/audio/beets/default.nix
View file

@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec {
# unstable does not require bs1770gain[2].
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
# [2]: https://github.com/NixOS/nixpkgs/pull/90504
version = "unstable-2021-03-24";
version = "unstable-2021-04-17";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "854b4ab48324afe8884fcd11fa47bd6258d2f4f7";
sha256 = "sha256-y5EWVNF4bd9fNvU6VkucMpenyFZuqdPkrqQDgG9ZPJY=";
rev = "50163b373f527d1b1f8b2442240ca547e846744e";
sha256 = "sha256-l7drav4Qx2JCF+F5OA0s641idcKM3S4Yx2lM2evJQWE=";
};
propagatedBuildInputs = [

12
pkgs/tools/audio/beets/plugins/alternatives.nix
View file

@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
pname = "beets-alternatives";
version = "0.10.2";
version = "unstable-2021-02-01";
src = fetchFromGitHub {
repo = "beets-alternatives";
owner = "geigerzaehler";
rev = "v${version}";
sha256 = "1dsz94fb29wra1f9580w20bz2f1bgkj4xnsjgwgbv14flbfw4bp0";
rev = "288299e3aa9a1602717b04c28696fce5ce4259bf";
sha256 = "sha256-Xl7AHr33hXQqQDuFbWuj8HrIugeipJFPmvNXpCkU/mI=";
};
postPatch = ''
@ -23,10 +23,10 @@ pythonPackages.buildPythonApplication rec {
mock
];
meta = {
meta = with lib; {
description = "Beets plugin to manage external files";
homepage = "https://github.com/geigerzaehler/beets-alternatives";
maintainers = [ lib.maintainers.aszlig ];
license = lib.licenses.mit;
maintainers = with maintainers; [ aszlig lovesegfault ];
license = licenses.mit;
};
}

9
pkgs/tools/audio/beets/plugins/copyartifacts.nix
View file

@ -1,13 +1,14 @@
{ lib, fetchFromGitHub, beets, pythonPackages, glibcLocales }:
pythonPackages.buildPythonApplication {
name = "beets-copyartifacts";
pname = "beets-copyartifacts";
version = "unstable-2020-02-15";
src = fetchFromGitHub {
repo = "beets-copyartifacts";
owner = "sbarakat";
rev = "d0bb75c8fc8fe125e8191d73de7ade6212aec0fd";
sha256 = "19b4lqq1p45n348ssmql60jylw2fw7vfj9j22nly5qj5qx51j3g5";
owner = "adammillerio";
rev = "85eefaebf893cb673fa98bfde48406ec99fd1e4b";
sha256 = "sha256-bkT2BZZ2gdcacgvyrVe2vMrOMV8iMAm8Q5xyrZzyqU0=";
};
postPatch = ''

8
pkgs/tools/audio/beets/plugins/extrafiles.nix
View file

@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
pname = "beets-extrafiles";
version = "0.0.7";
version = "unstable-2020-12-13";
src = fetchFromGitHub {
repo = "beets-extrafiles";
owner = "Holzhaus";
rev = "v${version}";
sha256 = "0ah7mgax9zrhvvd5scf2z0v0bhd6xmmv5sdb6av840ixpl6vlvm6";
rev = "a1d6ef9a9682b6bf7af9483541e56a3ff12247b8";
sha256 = "sha256-ajuEbieWjTCNjdRZuGUwvStZwjx260jmY0m+ZqNd7ec=";
};
postPatch = ''
@ -18,6 +18,8 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ beets ];
propagatedBuildInputs = with pythonPackages; [ mediafile ];
preCheck = ''
HOME=$TEMPDIR
'';

8
pkgs/top-level/aliases.nix
View file

@ -130,10 +130,18 @@ mapAliases ({
cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14
cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14
cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18
cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18
cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18
cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18
cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14
cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14
cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18
cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18
cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18
cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";

13
pkgs/top-level/all-packages.nix
View file

@ -3644,10 +3644,6 @@ in
cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {});
inherit (cudaPackages)
cudatoolkit_9
cudatoolkit_9_0
cudatoolkit_9_1
cudatoolkit_9_2
cudatoolkit_10
cudatoolkit_10_0
cudatoolkit_10_1
@ -3661,10 +3657,6 @@ in
cudnnPackages = callPackages ../development/libraries/science/math/cudnn { };
inherit (cudnnPackages)
cudnn_cudatoolkit_9
cudnn_cudatoolkit_9_0
cudnn_cudatoolkit_9_1
cudnn_cudatoolkit_9_2
cudnn_cudatoolkit_10
cudnn_cudatoolkit_10_0
cudnn_cudatoolkit_10_1
@ -10925,7 +10917,7 @@ in
knightos-z80e = callPackage ../development/tools/knightos/z80e { };
koka = haskellPackages.callPackage ../development/compilers/koka { };
koka = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/koka { });
kotlin = callPackage ../development/compilers/kotlin { };
@ -11664,7 +11656,8 @@ in
inherit (beam.interpreters)
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
elixir elixir_1_11 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
elixir_ls;
erlang_nox = beam_nox.interpreters.erlang;

2
pkgs/top-level/beam-packages.nix
View file

@ -111,7 +111,7 @@ rec {
# access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR23.elixir`.
inherit (packages.erlang)
elixir elixir_1_11 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 elixir_ls;
inherit (packages.erlang) lfe lfe_1_2 lfe_1_3;
};