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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-28 06:01:44 +00:00 committed by GitHub
commit cfa04cbd2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 3113 additions and 2459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/virtualisation/vmware-guest.nix
View File

@ -34,6 +34,8 @@ in
systemd.services.vmware =
{ description = "VMWare Guest Service";
wantedBy = [ "multi-user.target" ];
after = [ "display-manager.service" ];
unitConfig.ConditionVirtualization = "vmware";
serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
};
@ -42,8 +44,7 @@ in
{
description = "VMware vmblock fuse mount";
documentation = [ "https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt" ];
before = [ "vmware.service" ];
wants = [ "vmware.service" ];
unitConfig.ConditionVirtualization = "vmware";
what = "${open-vm-tools}/bin/vmware-vmblock-fuse";
where = "/run/vmblock-fuse";
type = "fuse";

29
pkgs/applications/audio/losslessaudiochecker/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, stdenv, fetchurl, autoPatchelfHook }:
stdenv.mkDerivation {
pname = "losslessaudiochecker";
version = "2.0.5";
src = fetchurl {
url = "https://web.archive.org/web/20211119122205/https://losslessaudiochecker.com/dl/LAC-Linux-64bit.tar.gz";
sha256 = "1i1zbl7sqwxwmhw89lgz922l5k85in3y76zb06h8j3zd0lb20wkq";
};
nativeBuildInputs = [ autoPatchelfHook ];
setSourceRoot = "sourceRoot=$PWD";
dontBuild = true;
installPhase = ''
install LAC -D -t $out/bin
'';
meta = {
description = "Utility to check whether audio is truly lossless or not";
homepage = "https://losslessaudiochecker.com";
license = lib.licenses.unfree;
platforms = lib.platforms.x86_64;
maintainers = with lib.maintainers; [ p-h ];
};
}

4
pkgs/applications/misc/anytype/default.nix
View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.21.1";
version = "0.21.9";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-5QsbB48g11TyfWCbR7Sz2AETEwdyG+bSJQNGRHrIueE=";
sha256 = "sha256-By9rNvCY4voiePvYf47DMwPogUPTd5JdaINEE0ei1Is=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

8
pkgs/applications/misc/gallery-dl/default.nix
View File

@ -1,15 +1,15 @@
{ lib, buildPythonApplication, fetchPypi, requests, youtube-dl, pytestCheckHook }:
{ lib, buildPythonApplication, fetchPypi, requests, yt-dlp, pytestCheckHook }:
buildPythonApplication rec {
pname = "gallery_dl";
version = "1.19.2";
version = "1.19.3";
src = fetchPypi {
inherit pname version;
sha256 = "7fec9ac69582dbd9922666e6ece3142ae52dc9679a2c4a613f6ee94ad09e5f68";
sha256 = "db3973a17f1074e4f4cb99b635b94c1926bdd549263e1df909498f3c6aa93484";
};
propagatedBuildInputs = [ requests youtube-dl ];
propagatedBuildInputs = [ requests yt-dlp ];
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [

4
pkgs/applications/networking/flexget/default.nix
View File

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.1.153";
version = "3.2.1";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "sha256-xGGSm6IXTh89wSt0/DNgbe1mFBNuG9x3YLerJcBYMmI=";
sha256 = "sha256-EOE72zpQj2yxxqDL9gqmu1NQ1B/lY1fh3EUwqpxf2xg=";
};
postPatch = ''

14
pkgs/applications/science/math/geogebra/geogebra6.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:
{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }:
let
pname = "geogebra";
version = "6-0-644-0";
version = "6-0-676-0";
srcIcon = geogebra.srcIcon;
desktopItem = geogebra.desktopItem;
@ -18,9 +18,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20210604132845/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20211123222708/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
];
sha256 = "bbe9e1a35abacfd560c0b7aa1ab975853e6adac08608bb70cd80261179e3f922";
sha256 = "0wn90n2nd476rkf83gk9vvcpbjflkrvyri50pnmv52j76n023hmm";
};
dontConfigure = true;
@ -38,7 +38,7 @@ let
installPhase = ''
mkdir -p $out/libexec/geogebra/ $out/bin
cp -r GeoGebra-linux-x64/{resources,locales} "$out/"
makeWrapper ${lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app"
makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app"
install -Dm644 "${desktopItem}/share/applications/"* \
-t $out/share/applications/
@ -53,9 +53,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20210406084052/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20211124143625/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
];
sha256 = "0fa680yyz4nry1xvb9v6qqh1mib6grff5d3p7d90nyjlv101p262";
sha256 = "1dwv2f94a1c2y10lmy0i66cafynalp7dkqgnpk4f0mk6pir2fdgj";
};
dontUnpack = true;

6
pkgs/applications/version-management/git-and-tools/delta/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.10.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-aiWVaqwJGjLyv/ZJU4g1KuBC9zbnBEc/vdNADGPKgxo=";
sha256 = "sha256-rQsicAUKlQYxA/DH8691jp6Pk97rer2X2CXUfXKHLDE=";
};
cargoSha256 = "sha256-lp9XzZQZJpjhsanZMky3RwkjM7ICq7dSb4PHdstwMxQ=";
cargoSha256 = "sha256-NjyiGr7mwsHlggMQEKcCvOCfGabRJDBdrYW8ohU02mk=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/video/streamlink/default.nix
View File

@ -6,11 +6,11 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "3.0.1";
version = "3.0.3";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-GDbUlu5tRL5mdT7KrIdmxCbeAtYL1xvZXyZFwiuvKXo=";
sha256 = "sha256-oEK9p6OuqGSm2JdgfnJ+N0sJtRq6wCoVCGcU0GNEMLI=";
};
checkInputs = with python3Packages; [

10
pkgs/development/libraries/libAfterImage/default.nix
View File

@ -44,6 +44,16 @@ stdenv.mkDerivation {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-makefile.in.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4";
sha256 = "1n6fniz6dldms615046yhc4mlg9gb53y4yfia8wfz6szgq5zicj4";
})
# Fix build failure against binutils-2.36:
# https://sourceforge.net/p/afterstep/bugs/5/
(fetchpatch {
name = "binutils-2.36.patch";
url = "https://sourceforge.net/p/afterstep/bugs/5/attachment/libafterimage-binutils-2.36-support.patch";
sha256 = "1cfgm2ffwlsmhvvfmrxlglddaigr99k88d5xqva9pkl3mmzy3jym";
# workaround '-p0' patchflags below.
stripLen = 1;
})
];
patchFlags = [ "-p0" ];

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

@ -129,6 +129,7 @@
, "@gitbeaker/cli"
, "gitmoji-cli"
, "glob"
, "gramma"
, "graphql-cli"
, "graphqurl"
, "grunt-cli"

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

File diff suppressed because it is too large Load Diff

23
pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, jupyterhub
, tornado
, bash
@ -10,9 +10,14 @@ buildPythonPackage rec {
pname = "jupyterhub-systemdspawner";
version = "0.15.0";
src = fetchPypi {
inherit pname version;
sha256 = "b6e2d981657aa5d3794abb89b1650d056524158a3d0f0f706007cae9b6dbeb2b";
src = fetchFromGitHub {
owner = "jupyterhub";
repo = "systemdspawner";
# Corresponds to 0.15.0
# Upstream didn't tag the latest release:
# https://github.com/jupyterhub/systemdspawner/issues/89
rev = "7d7cf42db76d9cfa5a4bc42fff14943877ac570b";
sha256 = "sha256-EUCA+CKCeYr+cLVrqTqe3Q32JkbqeALL6tfOnlVHk8Q=";
};
propagatedBuildInputs = [
@ -20,6 +25,8 @@ buildPythonPackage rec {
tornado
];
buildInputs = [ bash ];
postPatch = ''
substituteInPlace systemdspawner/systemd.py \
--replace "/bin/bash" "${bash}/bin/bash"
@ -31,10 +38,16 @@ buildPythonPackage rec {
# no tests
doCheck = false;
postInstall = ''
mkdir -p $out/bin
cp check-kernel.bash $out/bin/
patchShebangs $out/bin
'';
meta = with lib; {
description = "JupyterHub Spawner using systemd for resource isolation";
homepage = "https://github.com/jupyterhub/systemdspawner";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc erictapen ];
};
}

4
pkgs/development/python-modules/tensorflow/bin.nix
View File

@ -22,6 +22,7 @@
, cudaSupport ? false
, cudatoolkit
, cudnn
, patchelfUnstable
, zlib
, python
, keras-applications
@ -78,7 +79,8 @@ in buildPythonPackage {
] ++ lib.optional (!isPy3k) mock
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport addOpenGLRunpath;
# remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default
nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport [ addOpenGLRunpath patchelfUnstable ];
preConfigure = ''
unset SOURCE_DATE_EPOCH

5
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
, addOpenGLRunpath, fetchpatch
, addOpenGLRunpath, fetchpatch, patchelfUnstable
# Python deps
, buildPythonPackage, pythonOlder, python
# Python libraries
@ -465,7 +465,8 @@ in buildPythonPackage {
tensorflow-tensorboard
];
nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
# remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default
nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath patchelfUnstable ];
postFixup = lib.optionalString cudaSupport ''
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do

6
pkgs/development/tools/misc/patchelf/unstable.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "patchelf-${version}";
version = "2020-07-11";
version = "2021-11-16";
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "126372b636733b160e693c9913e871f6755c02e";
sha256 = "07cn40ypys5pyc3jfgxvqj7qk5v6m2rr5brnpmxdsl1557ryx226";
rev = "a174cf3006baf31e0e9eaa62bc9adead93af63f7";
sha256 = "sha256-cKZ4DE70R5XiIqfnIVAl2s7a1bJxaaPpuCmxs3pxFRU=";
};
# Drop test that fails on musl (?)

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

@ -40,17 +40,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "materialize";
version = "0.9.4";
rev = "29d003cae5e9d46f8b11b2102ff0b9abf6608c2f";
version = "0.10.0";
MZ_DEV_BUILD_SHA = "c14633f59e842fbdd62c7239ffd8c2a16704386e";
src = fetchFromGitHub {
owner = "MaterializeInc";
repo = pname;
rev = "v${version}";
sha256 = "021n05csyvza9ifq09qaxypgmlbp3a7xn6r1m4jn8d4rnz38wag6";
sha256 = "06290l2xrryx7bc9g1ffyfjm18a34pa2k410qk9w2p0psqiw2v8d";
};
cargoSha256 = "12fysxzmqnx7y7yg6fjcv1952s77d46pwi32vnsv62icgqfpw0j4";
cargoSha256 = "1bxfp6pidiziiq938ah49pa3qr1dhnfnbihp7jxind9qsb3q9gp0";
nativeBuildInputs = [ cmake perl pkg-config ]
# Provides the mig command used by the krb5-src build script
@ -67,8 +67,10 @@ rustPlatform.buildRustPackage rec {
"--exact"
"--skip test_client"
"--skip test_client_errors"
"--skip test_client_all_subjects"
"--skip test_no_block"
"--skip test_safe_mode"
"--skip test_tls"
];
postPatch = ''
@ -78,7 +80,6 @@ rustPlatform.buildRustPackage rec {
--replace _Materialize root
'';
MZ_DEV_BUILD_SHA = rev;
cargoBuildFlags = [ "--bin materialized" ];
postInstall = ''

11
pkgs/tools/networking/httping/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gettext, libintl, ncurses, openssl
{ lib, stdenv, fetchurl, fetchpatch, gettext, libintl, ncurses, openssl
, fftw ? null }:
stdenv.mkDerivation rec {
@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
};
patches = [
# Upstream fix for ncurses-6.3.
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/folkertvanheusden/HTTPing/commit/4ea9d5b78540c972e3fe1bf44db9f7b3f87c0ad0.patch";
sha256 = "0w3kdkq6c6hz1d9jjnw0ldvd6dy39yamj8haf0hvcyb1sb67qjmp";
})
];
buildInputs = [ fftw libintl ncurses openssl ];
nativeBuildInputs = [ gettext ];

16
pkgs/tools/text/xml/jing-trang/default.nix
View File

@ -1,20 +1,25 @@
{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "jing-trang";
version = "20151127";
version = "20181222";
src = fetchFromGitHub {
owner = "relaxng";
repo = "jing-trang";
rev = "47a0cbdaec2d48824b78a1c19879ac7875509598"; # needed to compile with jdk8
sha256 = "1hhn52z9mv1x9nyvyqnmzg5yrs2lzm9xac7i15izppv02wp32qha";
rev = "V${version}";
sha256 = "sha256-Krupa3MGk5UaaQsaNpPMZuIUzHJytDiksz9ysCPkFS4=";
fetchSubmodules = true;
};
buildInputs = [ jdk ant saxon ];
CLASSPATH = "lib/saxon.jar";
patches = [
./no-git-during-build.patch
];
preBuild = "ant";
installPhase = ''
@ -32,6 +37,9 @@ stdenv.mkDerivation {
chmod +x "$out"/bin/*
'';
doCheck = true;
checkPhase = "ant test";
meta = with lib; {
description = "A RELAX NG validator in Java";
# The homepage is www.thaiopensource.com, but it links to googlecode.com

47
pkgs/tools/text/xml/jing-trang/no-git-during-build.patch Normal file
View File

@ -0,0 +1,47 @@
From db0ed6267f1a85f0785c81b8ee396f74795c77c0 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 27 Nov 2021 10:24:07 +0100
Subject: [PATCH] Do not rely on Git during the build
---
build.xml | 6 ------
build.xsl | 6 ------
2 files changed, 12 deletions(-)
diff --git a/build.xml b/build.xml
index e8ebaed8..2d26c72f 100644
--- a/build.xml
+++ b/build.xml
@@ -431,12 +431,6 @@
<target name="clean"
description="Remove almost all files created during the build process">
<delete dir="${build.dir}"/>
- <exec executable="git">
- <arg value="clean"/>
- <arg value="-d"/>
- <arg value="--force"/>
- <arg value="${doc.dir}"/>
- </exec>
</target>
<target name="realclean" depends="clean"
diff --git a/build.xsl b/build.xsl
index fb9f3fef..fa384a27 100644
--- a/build.xsl
+++ b/build.xsl
@@ -23,12 +23,6 @@
<target name="dummy"/>
<target name="init">
<mkdir dir="{$build}"/>
- <exec executable="git">
- <arg value="submodule"/>
- <arg value="update"/>
- <arg value="--init"/>
- <arg value="--recursive"/>
- </exec>
<copy todir="{$doc}">
<fileset dir="relaxng.org/jclark" includes="**"/>
</copy>
--
2.34.1

2
pkgs/tools/typesetting/docbookrx/Gemfile
View File

@ -1,2 +1,2 @@
source 'https://rubygems.org'
gem 'nokogiri', '~> 1.8.0'
gem 'nokogiri', '~> 1.11.7'

33
pkgs/tools/typesetting/docbookrx/Gemfile.lock
View File

@ -1,15 +1,38 @@
PATH
remote: .
specs:
docbookrx (1.0.0.dev)
nokogiri (~> 1.11.7)
GEM
remote: https://rubygems.org/
specs:
mini_portile2 (2.3.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
diff-lcs (1.4.4)
nokogiri (1.11.7-x86_64-linux)
racc (~> 1.4)
racc (1.6.0)
rake (13.0.6)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
PLATFORMS
ruby
DEPENDENCIES
nokogiri (~> 1.8.0)
docbookrx!
rake (~> 13.0.0)
rspec (~> 3.9.0)
BUNDLED WITH
2.1.4
2.2.24

11
pkgs/tools/typesetting/docbookrx/default.nix
View File

@ -3,7 +3,6 @@
, stdenv
, ruby
, bundlerEnv
# , libxml2
}:
let
@ -13,10 +12,6 @@ let
inherit ruby;
# buildInputs = [
# libxml2
# ];
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
@ -25,15 +20,15 @@ let
in stdenv.mkDerivation {
pname = "docbookrx";
version = "unstable-2018-05-02";
version = "unstable-2018-05-18";
buildInputs = [ env.wrappedRuby ];
src = fetchFromGitHub {
owner = "asciidoctor";
repo = "docbookrx";
rev = "682d8c2f7a9e1e6f546c5f7d0067353621c68a7a";
sha256 = "07jilh17gj8xx4ps4ln787izmhv8xwwwv6fkqqg3pwjni5qikx7w";
rev = "83d1d1235e3bb44506123eda337780a912581cd0";
sha256 = "sha256-OdPRh7ZIhgM7hs5qPiuxLEUuMEtaXcgZ83M6i6CV6AY=";
};
# TODO: I don't know ruby packaging but this does the trick for now

98
pkgs/tools/typesetting/docbookrx/gemset.nix
View File

@ -1,23 +1,107 @@
{
mini_portile2 = {
groups = ["default"];
diff-lcs = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
type = "gem";
};
version = "2.3.0";
version = "1.4.4";
};
docbookrx = {
dependencies = ["nokogiri"];
groups = ["default"];
platforms = [];
source = {
path = ./.;
type = "path";
};
version = "1.0.0.dev";
};
nokogiri = {
dependencies = ["mini_portile2"];
dependencies = ["racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
sha256 = "4976a9c9e796527d51dc6c311b9bd93a0233f6a7962a0f569aa5c782461836ef";
type = "gem";
};
version = "1.8.5";
version = "1.11.7";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
type = "gem";
};
version = "1.6.0";
};
rake = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
version = "13.0.6";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h";
type = "gem";
};
version = "3.9.0";
};
rspec-core = {
dependencies = ["rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b8891149l4rdlaz58k1dprc09rhpvq98bblk4qpd3dvcvqklkvh";
type = "gem";
};
version = "3.9.3";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gjqa3h4r8jna8dh22al4f6ks4x6l4knshx2b8jygkd1gk68n92q";
type = "gem";
};
version = "3.9.4";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr";
type = "gem";
};
version = "3.9.1";
};
rspec-support = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ig6wk1ln6wy0d6fjlbfwxibps1nidc6111fcnm0jfa1z5nkqczl";
type = "gem";
};
version = "3.9.4";
};
}

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

@ -25527,6 +25527,8 @@ with pkgs;
lollypop = callPackage ../applications/audio/lollypop { };
losslessaudiochecker = callPackage ../applications/audio/losslessaudiochecker { };
m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
manim = python3Packages.callPackage ../applications/video/manim {
@ -31847,7 +31849,9 @@ with pkgs;
gap-full = lowPrio (gap.override { packageSet = "full"; });
geogebra = callPackage ../applications/science/math/geogebra { };
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { };
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix {
electron = electron_12;
};
maxima = callPackage ../applications/science/math/maxima {
ecl = null;

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

@ -9234,15 +9234,15 @@ in {
tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
cudatoolkit = pkgs.cudatoolkit_11_0;
cudnn = pkgs.cudnn_cudatoolkit_11_0;
cudatoolkit = pkgs.cudatoolkit_11_2;
cudnn = pkgs.cudnn_cudatoolkit_11_2;
};
tensorflow-build = callPackage ../development/python-modules/tensorflow {
inherit (pkgs.darwin) cctools;
cudaSupport = pkgs.config.cudaSupport or false;
cudatoolkit = pkgs.cudatoolkit_11_0;
cudnn = pkgs.cudnn_cudatoolkit_11_0;
cudatoolkit = pkgs.cudatoolkit_11_2;
cudnn = pkgs.cudnn_cudatoolkit_11_2;
nccl = pkgs.nccl_cudatoolkit_11;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
flatbuffers-core = pkgs.flatbuffers;