mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-12 03:56:17 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a3b43106c9
@ -252,6 +252,11 @@ in
|
||||
let realDevice' = escapeSystemdPath sw.realDevice;
|
||||
in nameValuePair "mkswap-${sw.deviceName}"
|
||||
{ description = "Initialisation of swap device ${sw.device}";
|
||||
# The mkswap service fails for file-backed swap devices if the
|
||||
# loop module has not been loaded before the service runs.
|
||||
# We add an ordering constraint to run after systemd-modules-load to
|
||||
# avoid this race condition.
|
||||
after = [ "systemd-modules-load.service" ];
|
||||
wantedBy = [ "${realDevice'}.swap" ];
|
||||
before = [ "${realDevice'}.swap" ];
|
||||
path = [ pkgs.util-linux pkgs.e2fsprogs ]
|
||||
|
||||
@ -147,7 +147,7 @@ foreach my $g (@{$spec->{groups}}) {
|
||||
if (defined $existing) {
|
||||
$g->{gid} = $existing->{gid} if !defined $g->{gid};
|
||||
if ($g->{gid} != $existing->{gid}) {
|
||||
dry_print("warning: not applying", "warning: would not apply", "GID change of group ‘$name’ ($existing->{gid} -> $g->{gid})");
|
||||
dry_print("warning: not applying", "warning: would not apply", "GID change of group ‘$name’ ($existing->{gid} -> $g->{gid}) in /etc/group");
|
||||
$g->{gid} = $existing->{gid};
|
||||
}
|
||||
$g->{password} = $existing->{password}; # do we want this?
|
||||
@ -209,7 +209,7 @@ foreach my $u (@{$spec->{users}}) {
|
||||
if (defined $existing) {
|
||||
$u->{uid} = $existing->{uid} if !defined $u->{uid};
|
||||
if ($u->{uid} != $existing->{uid}) {
|
||||
dry_print("warning: not applying", "warning: would not apply", "UID change of user ‘$name’ ($existing->{uid} -> $u->{uid})");
|
||||
dry_print("warning: not applying", "warning: would not apply", "UID change of user ‘$name’ ($existing->{uid} -> $u->{uid}) in /etc/passwd");
|
||||
$u->{uid} = $existing->{uid};
|
||||
}
|
||||
} else {
|
||||
|
||||
25
pkgs/applications/audio/bolliedelayxt.lv2/default.nix
Normal file
25
pkgs/applications/audio/bolliedelayxt.lv2/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, stdenv, fetchFromGitHub, lv2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bolliedelayxt.lv2";
|
||||
version = "unstable-2017-11-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrBollie";
|
||||
repo = pname;
|
||||
rev = "49c488523c8fb71cb2222d41f9f66ee0cb6b6d82";
|
||||
sha256 = "sha256-7GM3YccN22JQdQ5ng9HFs9R6Ex/d+XP/khTQsgbGcAw=";
|
||||
};
|
||||
|
||||
buildInputs = [ lv2 ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A flexible LV2 delay plugin";
|
||||
homepage = "https://github.com/MrBollie/bolliedelayxt.lv2";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
|
||||
, alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr
|
||||
, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, soxr
|
||||
, IOKit, AudioToolbox
|
||||
, aixlog, popl
|
||||
, pulseaudioSupport ? false, libpulseaudio
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
# snapcast also supports building against tremor but as we have libogg, that's
|
||||
# not needed
|
||||
buildInputs = [
|
||||
boost17x
|
||||
boost179
|
||||
asio avahi flac libogg libvorbis
|
||||
aixlog popl soxr
|
||||
] ++ lib.optional pulseaudioSupport libpulseaudio
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "ebuild-mode";
|
||||
version = "1.64";
|
||||
version = "1.65";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ewn8pFuuXrNzkh7UKWa71Tc3hGM11iqjU9AVNOKSHKA=";
|
||||
sha256 = "sha256-vJ+UlPMIuZ02da9R67wIq2dVaWElu/sYmWx2KgBQ9B8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost17x
|
||||
, boost179
|
||||
, pkg-config
|
||||
, libusb1
|
||||
, zstd
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals enableQt [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
boost17x
|
||||
boost179
|
||||
libusb1
|
||||
] ++ lib.optionals enableQt [ qtbase qtmultimedia ]
|
||||
++ lib.optional enableSdl2 SDL2
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
, qhull
|
||||
, cmake
|
||||
, cgal_5
|
||||
, boost17x
|
||||
, boost179
|
||||
, mpfr
|
||||
, xercesc
|
||||
}:
|
||||
@ -46,7 +46,7 @@ mkDerivation rec {
|
||||
levmar
|
||||
qhull
|
||||
cgal_5
|
||||
boost17x
|
||||
boost179
|
||||
mpfr
|
||||
xercesc
|
||||
];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, cmake
|
||||
, asciidoc
|
||||
, pkg-config
|
||||
, boost17x
|
||||
, boost179
|
||||
, cmark
|
||||
, coeurl
|
||||
, curl
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost17x
|
||||
boost179
|
||||
cmark
|
||||
coeurl
|
||||
curl
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, git
|
||||
, python3
|
||||
, swig4
|
||||
, boost17x
|
||||
, boost179
|
||||
, cbc # for clp
|
||||
, cimg
|
||||
, clp # for or-tools
|
||||
@ -55,7 +55,7 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost17x
|
||||
boost179
|
||||
cbc
|
||||
cimg
|
||||
clp
|
||||
|
||||
@ -15,7 +15,7 @@ assert withThread -> libpthreadstubs != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pari";
|
||||
version = "2.15.3";
|
||||
version = "2.15.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@ -23,19 +23,9 @@ stdenv.mkDerivation rec {
|
||||
# old versions are at the url below
|
||||
"https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-rfWlhjjNr9cqi0i8n0RJcrIzKcjVRaHT7Ru+sbZWkmg=";
|
||||
hash = "sha256-w1Rb/uDG37QLd/tLurr5mdguYAabn20ovLbPAEyMXA8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2466
|
||||
(fetchpatch {
|
||||
name = "incorrect-result-from-qfbclassno.patch";
|
||||
url = "https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=commitdiff_plain;h=7ca0c2eae87def89fa7253c60e4791a8ef26629d";
|
||||
excludes = [ "src/test/32/quadclassunit" "CHANGES" ];
|
||||
hash = "sha256-CQRkIYDFMrWHCoSWGsIydPjGk3w09zzghajlNuq29Jk=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
libX11
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen,
|
||||
{ mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen,
|
||||
freeimage, glog, libGLU, glew, qtbase,
|
||||
cudaSupport ? false, cudaPackages }:
|
||||
|
||||
assert cudaSupport -> cudaPackages != { };
|
||||
|
||||
let
|
||||
boost_static = boost17x.override { enableStatic = true; };
|
||||
boost_static = boost179.override { enableStatic = true; };
|
||||
|
||||
# TODO: migrate to redist packages
|
||||
inherit (cudaPackages) cudatoolkit;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit pname version;
|
||||
@ -15,10 +15,10 @@ buildGoModule rec {
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y3oTGFZ3AXlNVt3NDfjM3audxZ4/zqt1SME+2g8nut8=";
|
||||
hash = "sha256-YVnf+ieYnvNQkw6W2gPBFiZLknaBknptv4ltvGKdw04=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xeOWbfKy+LeInxcRM9evE/kmqlWlKy0mcHopWpc/DO0=";
|
||||
vendorHash = "sha256-QKprfszbWqegvIJ2J+f3gxLpkpZgfuLP5HjoMwyCi5M=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
#name = "frigate-${version}-source";
|
||||
owner = "blakeblackshear";
|
||||
repo = "frigate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kJ0MnmWThiFbXvrN+zL5pZHq+Ig3DhCc8wPlWX2+nP8=";
|
||||
hash = "sha256-kNvYsHoObi6b9KT/LYhTGK4uJ/uAHnYhyoQkiXIA/s8=";
|
||||
};
|
||||
|
||||
frigate-web = callPackage ./web.nix {
|
||||
|
||||
@ -24,24 +24,24 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-zeFKWPiZJR8wz87YcFVib0SEV4Blnr6NUMvExnsxmXw=";
|
||||
sha256 = "4c2d799f442d7fe718827b19da2bacb72ea041b9ce55f24eee7b1313f57c4383";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
|
||||
hash = "sha256-tkPM0+Kllg985wVSQ3Q9Cjm63aOXS849d4Yd02O63RA=";
|
||||
sha256 = "682397f8895149f0e283f0b27bffc6694033bdfb19f9366c80f6efdf3685f27c";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz";
|
||||
hash = "sha256-STaN2u9ON+1gaAimyli6DxpEUaJ7ggGu1NnXskwnaBc=";
|
||||
sha256 = "a2e8eb31a89b26e4a99349303aeff8e8ee780144bbdb1f7eda6f41024d42cadb";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz";
|
||||
hash = "sha256-nj4CymVGUT3OJlN5q+lXyytbDM9AZiGUhtoOuHLdzrw=";
|
||||
sha256 = "77c71ff8cb1fcdb84097e86a9fb579a8b34d8e7fd8e24d43107042e0fb988b76";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, which
|
||||
, python3
|
||||
, gfortran
|
||||
@ -14,21 +13,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
hash = "sha256-oTznFrY9PkbZEIOV4f/Iod5xLmqEimA6xZK88IDqATk=";
|
||||
hash = "sha256-hwY9TC6kHHNqoujLvHwvGgYuIjlVFX+EBFU87XZJE80=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patches/1.8/0002-skip-failing-and-flaky-tests.patch
|
||||
# https://github.com/JuliaLang/julia/issues/46530
|
||||
(fetchpatch {
|
||||
url = "https://github.com/JuliaLang/julia/commit/b9b60fcde61ff18d77cb548421b3f71a369b4e02.patch";
|
||||
revert = true;
|
||||
hash = "sha256-XXn4U8aWkWwZYwpvIx+Gk5E16prjeXooF9AafK0aEfg=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
@ -56,8 +49,6 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"USE_BINARYBUILDER=0"
|
||||
# workaround for https://github.com/JuliaLang/julia/issues/47989
|
||||
"USE_INTEL_JITEVENTS=0"
|
||||
] ++ lib.optionals stdenv.isx86_64 [
|
||||
# https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py
|
||||
"JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitterentropy";
|
||||
version = "3.3.1";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smuellerDD";
|
||||
repo = "jitterentropy-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM=";
|
||||
hash = "sha256-GSGlupTN1o8BbTN287beqYSRFDaXOk6SlIRvtjpvmhQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
hardeningDisable = [ "fortify" ]; # avoid warnings
|
||||
|
||||
# prevent jitterentropy from builtin strip to allow controlling this from the derivation's
|
||||
# settings. Also fixes a strange issue, where this strip may fail when cross-compiling.
|
||||
installFlags = [
|
||||
"INSTALL_STRIP=install"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, clang-tools
|
||||
, llvmPackages
|
||||
, boost17x
|
||||
, boost179
|
||||
, protobuf
|
||||
, python3Support ? false
|
||||
, python3
|
||||
@ -40,7 +40,7 @@ let
|
||||
# Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails
|
||||
clangTools = clang-tools.override { inherit stdenv llvmPackages; };
|
||||
# If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper
|
||||
boost = if python3Support then boost17x.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost17x;
|
||||
boost = if python3Support then boost179.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost179;
|
||||
defaultOptionals = [ boost protobuf ]
|
||||
++ lib.optional python3Support python3
|
||||
++ lib.optional snappySupport snappy.dev
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
|
||||
@ -25,41 +24,30 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# See FIRMWARE_PACKAGE_VERSION in src/plugins/intel_myriad/myriad_dependencies.cmake
|
||||
myriad_firmware_version = "20221129_35";
|
||||
myriad_usb_firmware = fetchurl {
|
||||
url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_${myriad_firmware_version}.zip";
|
||||
hash = "sha256-HKNWbSlMjSafOgrS9WmenbsmeaJKRVssw0NhIwPYZ70=";
|
||||
};
|
||||
myriad_pcie_firmware = fetchurl {
|
||||
url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_${myriad_firmware_version}.zip";
|
||||
hash = "sha256-VmfrAoKQ++ySIgAxWQul+Hd0p7Y4sTF44Nz4RHpO6Mo=";
|
||||
};
|
||||
|
||||
# See GNA_VERSION in cmake/dependencies.cmake
|
||||
gna_version = "03.00.00.1910";
|
||||
gna_version = "03.05.00.1906";
|
||||
gna = fetchurl {
|
||||
url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip";
|
||||
hash = "sha256-iU3bwK40WfBFE7hTsMq8MokN1Oo3IooCK2oyEBvbt/g=";
|
||||
hash = "sha256-SlvobZwCaw4Qr6wqV/x8mddisw49UGq7OjOA+8/icm4=";
|
||||
};
|
||||
|
||||
tbbbind_version = "2_5";
|
||||
tbbbind = fetchurl {
|
||||
url = "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v2.tgz";
|
||||
hash = "sha256-hl54lMWEAiM8rw0bKIBW4OarK/fJ0AydxgVhxIS8kPQ=";
|
||||
url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v3.tgz";
|
||||
hash = "sha256-053rJiwGmBteLS48WT6fyb5izk/rkd1OZI6SdTZZprM=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvino";
|
||||
version = "2022.3.0";
|
||||
version = "2023.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openvinotoolkit";
|
||||
repo = "openvino";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Ie58zTNatiYZZQJ8kJh/+HlSetQjhAtf2Us83z1jGv4=";
|
||||
hash = "sha256-z88SgAZ0UX9X7BhBA7/NU/UhVLltb6ANKolruU8YiZQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -90,14 +78,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p temp/vpu/firmware/{pcie,usb}-ma2x8x
|
||||
pushd temp/vpu/firmware
|
||||
bsdtar -xf ${myriad_pcie_firmware} -C pcie-ma2x8x
|
||||
echo "${myriad_pcie_firmware.url}" > pcie-ma2x8x/ie_dependency.info
|
||||
bsdtar -xf ${myriad_usb_firmware} -C usb-ma2x8x
|
||||
echo "${myriad_usb_firmware.url}" > usb-ma2x8x/ie_dependency.info
|
||||
popd
|
||||
|
||||
mkdir -p temp/gna_${gna_version}
|
||||
pushd temp/
|
||||
bsdtar -xf ${gna}
|
||||
@ -184,7 +164,8 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://docs.openvinotoolkit.org/";
|
||||
license = with licenses; [ asl20 ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # Cannot find macos sdk
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) # requires scons, then fails with *** Source directory cannot be under variant directory.
|
||||
|| stdenv.isDarwin; # Cannot find macos sdk
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, pythonOlder
|
||||
|
||||
# build time
|
||||
, pdm-pep517
|
||||
, pdm-backend
|
||||
|
||||
# runtime
|
||||
, packaging
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
pname = "findpython";
|
||||
version = "0.2.5";
|
||||
version = "0.3.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -25,11 +25,11 @@ buildPythonPackage {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4P1HO0Jl5+DnhD7Hb+rIwMRBuGlXH0Zb7+nmlZSQaf4=";
|
||||
hash = "sha256-5sbWxIznz9aVnM3OEtYSHVds/zlfST/UZmfn1amqJHQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pdm-pep517
|
||||
pdm-backend
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xN+zMNUKy/zeBnY9TAdllCV6E9UG6ke+jaXkOZ59HFI=";
|
||||
hash = "sha256-mGvoB05GJCoqkGJRpc85eAChU7LDW1w2FTHa6oIbz5k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, gcc10
|
||||
, cmake
|
||||
, boost17x
|
||||
, boost179
|
||||
, icu
|
||||
, swig
|
||||
, pcre
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
nativeBuildInputs = [ gcc10 cmake ];
|
||||
|
||||
buildInputs = [
|
||||
boost17x
|
||||
boost179
|
||||
icu
|
||||
pcre
|
||||
libxml2
|
||||
|
||||
@ -2,38 +2,62 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, cookiecutter
|
||||
# propagated build inputs
|
||||
, filelock
|
||||
, huggingface-hub
|
||||
, importlib-metadata
|
||||
, numpy
|
||||
, protobuf
|
||||
, packaging
|
||||
, pyyaml
|
||||
, regex
|
||||
, requests
|
||||
, numpy
|
||||
, packaging
|
||||
, tensorflow
|
||||
, sagemaker
|
||||
, ftfy
|
||||
, protobuf
|
||||
, scikit-learn
|
||||
, pillow
|
||||
, pyyaml
|
||||
, torch
|
||||
, tokenizers
|
||||
, safetensors
|
||||
, tqdm
|
||||
# optional dependencies
|
||||
, scikit-learn
|
||||
, tensorflow
|
||||
, torch
|
||||
, accelerate
|
||||
, faiss
|
||||
, datasets
|
||||
, jax
|
||||
, jaxlib
|
||||
, flax
|
||||
, optax
|
||||
, ftfy
|
||||
, onnxruntime
|
||||
, cookiecutter
|
||||
, sagemaker
|
||||
, fairscale
|
||||
, optuna
|
||||
, ray
|
||||
, pydantic
|
||||
, uvicorn
|
||||
, fastapi
|
||||
, starlette
|
||||
, librosa
|
||||
, phonemizer
|
||||
, torchaudio
|
||||
, pillow
|
||||
, timm
|
||||
, torchvision
|
||||
, av
|
||||
, sentencepiece
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.28.1";
|
||||
version = "4.30.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FmiuWfoFZjZf1/GbE6PmSkeshWWh+6nDj2u2PMSeDk0=";
|
||||
hash = "sha256-S1jQsBObKGZY9tlbcNcgchwUs/eeaohYxOtbN1cPa2Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -46,12 +70,21 @@ buildPythonPackage rec {
|
||||
regex
|
||||
requests
|
||||
tokenizers
|
||||
safetensors
|
||||
tqdm
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
passthru.optional-dependencies =
|
||||
let
|
||||
audio = [
|
||||
librosa
|
||||
# pyctcdecode
|
||||
phonemizer
|
||||
# kenlm
|
||||
];
|
||||
vision = [ pillow ];
|
||||
in
|
||||
{
|
||||
ja = [
|
||||
# fugashi
|
||||
# ipadic
|
||||
@ -65,27 +98,63 @@ buildPythonPackage rec {
|
||||
tensorflow
|
||||
# onnxconverter-common
|
||||
# tf2onnx
|
||||
# tensorflow-text
|
||||
# keras-nlp
|
||||
];
|
||||
torch = [
|
||||
torch
|
||||
accelerate
|
||||
];
|
||||
retrieval = [ faiss datasets ];
|
||||
flax = [ jax jaxlib flax optax ];
|
||||
tokenizers = [
|
||||
tokenizers
|
||||
];
|
||||
ftfy = [ ftfy ];
|
||||
onnxruntime = [
|
||||
onnxruntime
|
||||
# onnxruntime-tools
|
||||
];
|
||||
onnx = [
|
||||
# onnxconverter-common
|
||||
# tf2onnx
|
||||
onnxruntime
|
||||
];
|
||||
modelcreation = [
|
||||
cookiecutter
|
||||
];
|
||||
sagemaker = [
|
||||
sagemaker
|
||||
];
|
||||
ftfy = [ ftfy ];
|
||||
onnx = [
|
||||
# onnxconverter-common
|
||||
# tf2onnx
|
||||
deepspeed = [
|
||||
# deepspeed
|
||||
accelerate
|
||||
];
|
||||
vision = [
|
||||
pillow
|
||||
fairscale = [ fairscale ];
|
||||
optuna = [ optuna ];
|
||||
ray = [ ray ] ++ ray.optional-dependencies.tune-deps;
|
||||
# sigopt = [ sigopt ];
|
||||
# integrations = ray ++ optuna ++ sigopt;
|
||||
serving = [
|
||||
pydantic
|
||||
uvicorn
|
||||
fastapi
|
||||
starlette
|
||||
];
|
||||
audio = audio;
|
||||
speech = [ torchaudio ] ++ audio;
|
||||
torch-speech = [ torchaudio ] ++ audio;
|
||||
tf-speech = audio;
|
||||
flax-speech = audio;
|
||||
timm = [ timm ];
|
||||
torch-vision = [ torchvision ] ++ vision;
|
||||
# natten = [ natten ];
|
||||
# codecarbon = [ codecarbon ];
|
||||
video = [
|
||||
# decord
|
||||
av
|
||||
];
|
||||
sentencepiece = [ sentencepiece protobuf ];
|
||||
};
|
||||
|
||||
|
||||
@ -102,6 +171,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pashashocky ];
|
||||
maintainers = with maintainers; [ pashashocky happysalada ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, libusb1
|
||||
, libftdi1
|
||||
, pkg-config
|
||||
, DarwinTools
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-embed";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-Z8PoM1zlbTYH1oF9nHzu3QykHQ+IXewrXAOieLguFuQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xL1QbeOLnAJVcBdp2NIMlT5LMxkNwA99VzCHV9NjwUo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
||||
buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
buildFeatures = [ "ftdi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cargo extension for working with microcontrollers";
|
||||
homepage = "https://probe.rs/";
|
||||
changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-embed/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ fooker newam ];
|
||||
};
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, libusb1
|
||||
, pkg-config
|
||||
, DarwinTools
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-flash";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-RCcl0cZhGOKdwlNY7wuCBP0AgoNSU3c/LfCM2pPjsoo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NGwWmqP4D5LdXTwo+B+cj+i66Ec9fB723h2kggugLgg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cargo extension for working with microcontrollers";
|
||||
homepage = "https://probe.rs/";
|
||||
changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-flash/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ fooker newam ];
|
||||
};
|
||||
}
|
||||
@ -10,15 +10,17 @@
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-rs-cli";
|
||||
version = "0.18.0";
|
||||
pname = "probe-rs";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-5p3SxroztyJnBN/lzFagbpmAAIQmR9iwWHDMxuighDA=";
|
||||
hash = "sha256-SPfCZil56UMr1Gy9pPZyngT0sHMQJrcE4KcjLvTD4js=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0osWLXrpz6/CnCK1mfwnwqk+OsZLxO2JxbgRnqMhLeE=";
|
||||
cargoHash = "sha256-QEOlsKnCMpm4L2Y1Byqntxjgg3zQFYCGkkwFRqmqx0I=";
|
||||
|
||||
cargoBuildFlags = [ "--features=cli" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
||||
@ -18,11 +18,11 @@ let
|
||||
availableBinaries = {
|
||||
x86_64-linux = {
|
||||
platform = "linux-x64";
|
||||
checksum = "sha256-TbdOAi1lEA0iU3qrl7O67fV4Pe1Nn21BLmfZmiFexcg=";
|
||||
checksum = "sha256-wzdtFHsSzXl8TCtTBVAwwsvzUd4DakCAPRVHtwoGLB0=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
platform = "linux-arm64";
|
||||
checksum = "sha256-UxceWQ/eIGPFXNFIPSzBe431qqp54GwDbs9p7cqLosA=";
|
||||
checksum = "sha256-aW3cUZqAdiOLzOC9BQM/bTkDVyw24Dx9nBSXgbiKe4c=";
|
||||
};
|
||||
};
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
@ -30,7 +30,7 @@ let
|
||||
inherit (binary) platform checksum;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cypress";
|
||||
version = "12.16.0";
|
||||
version = "12.17.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, doxygen
|
||||
, graphviz
|
||||
, makeWrapper
|
||||
, boost17x
|
||||
, boost179
|
||||
, SDL2
|
||||
, python3
|
||||
, freetype
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
(boost17x.override { enablePython = true; python = python3; })
|
||||
(boost179.override { enablePython = true; python = python3; })
|
||||
(python3.withPackages (p: with p; [ pycodestyle ]))
|
||||
SDL2
|
||||
freetype
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ appimageTools, lib, fetchurl }:
|
||||
let
|
||||
pname = "uhk-agent";
|
||||
version = "2.1.2";
|
||||
version = "3.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-G/UT1ec7rWl8xONZnT+dpHAFOQh6/s0Vq7MTqAcmJSA=";
|
||||
sha256 = "sha256-oRdV2pbUlXHqBED51ThLdS4kyLuSAXxFmeSLoCbCGUI=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@ -1,138 +0,0 @@
|
||||
From e01014a745b7f4dbdde2ee0e293c25c4e5eeaabb Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 10 Sep 2022 15:18:05 +0200
|
||||
Subject: [PATCH] Setup: remove custom dbuser creation behavior
|
||||
|
||||
Both PostgreSQL and MySQL can be authenticated against from Nextcloud by
|
||||
supplying a database password. Now, during setup the following things
|
||||
happen:
|
||||
|
||||
* When using postgres and the db user has elevated permissions, a new
|
||||
unprivileged db user is created and the settings `dbuser`/`dbpass` are
|
||||
altered in `config.php`.
|
||||
|
||||
* When using MySQL, the password is **always** regenerated since
|
||||
24.0.5/23.0.9[1].
|
||||
|
||||
I consider both cases problematic: the reason why people do configuration
|
||||
management is to have it as single source of truth! So, IMHO any
|
||||
application that silently alters config and thus causes deployed
|
||||
nodes to diverge from the configuration is harmful for that.
|
||||
|
||||
I guess it was sheer luck that it worked for so long in NixOS because
|
||||
nobody has apparently used password authentication with a privileged
|
||||
user to operate Nextcloud (which is a good thing in fact).
|
||||
|
||||
[1] https://github.com/nextcloud/server/pull/33513
|
||||
---
|
||||
lib/private/Setup/MySQL.php | 56 --------------------------------
|
||||
lib/private/Setup/PostgreSQL.php | 26 ---------------
|
||||
2 files changed, 82 deletions(-)
|
||||
|
||||
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
|
||||
index fbce31b0f57..9b2265091f0 100644
|
||||
--- a/lib/private/Setup/MySQL.php
|
||||
+++ b/lib/private/Setup/MySQL.php
|
||||
@@ -142,62 +142,6 @@ class MySQL extends AbstractDatabase {
|
||||
$rootUser = $this->dbUser;
|
||||
$rootPassword = $this->dbPassword;
|
||||
|
||||
- //create a random password so we don't need to store the admin password in the config file
|
||||
- $saveSymbols = str_replace(['\"', '\\', '\'', '`'], '', ISecureRandom::CHAR_SYMBOLS);
|
||||
- $password = $this->random->generate(22, ISecureRandom::CHAR_ALPHANUMERIC . $saveSymbols)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_UPPER)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_LOWER)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_DIGITS)
|
||||
- . $this->random->generate(2, $saveSymbols)
|
||||
- ;
|
||||
- $this->dbPassword = str_shuffle($password);
|
||||
-
|
||||
- try {
|
||||
- //user already specified in config
|
||||
- $oldUser = $this->config->getValue('dbuser', false);
|
||||
-
|
||||
- //we don't have a dbuser specified in config
|
||||
- if ($this->dbUser !== $oldUser) {
|
||||
- //add prefix to the admin username to prevent collisions
|
||||
- $adminUser = substr('oc_' . $username, 0, 16);
|
||||
-
|
||||
- $i = 1;
|
||||
- while (true) {
|
||||
- //this should be enough to check for admin rights in mysql
|
||||
- $query = 'SELECT user FROM mysql.user WHERE user=?';
|
||||
- $result = $connection->executeQuery($query, [$adminUser]);
|
||||
-
|
||||
- //current dbuser has admin rights
|
||||
- $data = $result->fetchAll();
|
||||
- $result->closeCursor();
|
||||
- //new dbuser does not exist
|
||||
- if (count($data) === 0) {
|
||||
- //use the admin login data for the new database user
|
||||
- $this->dbUser = $adminUser;
|
||||
- $this->createDBUser($connection);
|
||||
-
|
||||
- break;
|
||||
- } else {
|
||||
- //repeat with different username
|
||||
- $length = strlen((string)$i);
|
||||
- $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i;
|
||||
- $i++;
|
||||
- }
|
||||
- }
|
||||
- } else {
|
||||
- // Reuse existing password if a database config is already present
|
||||
- $this->dbPassword = $rootPassword;
|
||||
- }
|
||||
- } catch (\Exception $ex) {
|
||||
- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [
|
||||
- 'exception' => $ex,
|
||||
- 'app' => 'mysql.setup',
|
||||
- ]);
|
||||
- // Restore the original credentials
|
||||
- $this->dbUser = $rootUser;
|
||||
- $this->dbPassword = $rootPassword;
|
||||
- }
|
||||
-
|
||||
$this->config->setValues([
|
||||
'dbuser' => $this->dbUser,
|
||||
'dbpassword' => $this->dbPassword,
|
||||
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
|
||||
index bc24909dc3d..e49e5508e15 100644
|
||||
--- a/lib/private/Setup/PostgreSQL.php
|
||||
+++ b/lib/private/Setup/PostgreSQL.php
|
||||
@@ -45,32 +45,6 @@ class PostgreSQL extends AbstractDatabase {
|
||||
$connection = $this->connect([
|
||||
'dbname' => 'postgres'
|
||||
]);
|
||||
- //check for roles creation rights in postgresql
|
||||
- $builder = $connection->getQueryBuilder();
|
||||
- $builder->automaticTablePrefix(false);
|
||||
- $query = $builder
|
||||
- ->select('rolname')
|
||||
- ->from('pg_roles')
|
||||
- ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE')))
|
||||
- ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
|
||||
-
|
||||
- try {
|
||||
- $result = $query->execute();
|
||||
- $canCreateRoles = $result->rowCount() > 0;
|
||||
- } catch (DatabaseException $e) {
|
||||
- $canCreateRoles = false;
|
||||
- }
|
||||
-
|
||||
- if ($canCreateRoles) {
|
||||
- //use the admin login data for the new database user
|
||||
-
|
||||
- //add prefix to the postgresql user name to prevent collisions
|
||||
- $this->dbUser = 'oc_' . strtolower($username);
|
||||
- //create a new password so we don't need to store the admin config in the config file
|
||||
- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC);
|
||||
-
|
||||
- $this->createDBUser($connection);
|
||||
- }
|
||||
|
||||
$this->config->setValues([
|
||||
'dbuser' => $this->dbUser,
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipcalc";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ipcalc";
|
||||
repo = "ipcalc";
|
||||
rev = version;
|
||||
hash = "sha256-HlAGAjNUjfr/Ysjiml54vph/S5pS6fTMWYJwLFr1NSI=";
|
||||
hash = "sha256-9eaR1zG8tjSGlkpyY1zTHAVgN5ypuyRfeRq6ct6zsLU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gitlab.com/ipcalc/ipcalc";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -55,7 +55,17 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = "patchShebangs tests/*.sh";
|
||||
preCheck = ''
|
||||
patchShebangs tests/*.sh
|
||||
export RNGD_JITTER_TIMEOUT=10
|
||||
'';
|
||||
# After updating to jitterentropy 3.4.1 jitterentropy initialization seams
|
||||
# to have increased. On some system rng-tools fail therefore to initialize the
|
||||
# jitterentropy entropy source. You can increase the init timeout with a command-line
|
||||
# option (-O jitter:timeout:SECONDS). The environment variable above only has effect
|
||||
# for the test cases.
|
||||
# Patching the timeout to a larger value was declined upstream,
|
||||
# see (https://github.com/nhorman/rng-tools/pull/178).
|
||||
nativeCheckInputs = [ psmisc ]; # rngtestjitter.sh needs killall
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@ -163,6 +163,8 @@ mapAliases ({
|
||||
boost172 = throw "boost172 has been deprecated in favor of the latest version"; # Added 2023-06-08
|
||||
boost173 = throw "boost173 has been deprecated in favor of the latest version"; # Added 2023-06-08
|
||||
boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08
|
||||
boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13
|
||||
boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13
|
||||
botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15
|
||||
bpftool = bpftools; # Added 2021-05-03
|
||||
bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16
|
||||
@ -208,6 +210,8 @@ mapAliases ({
|
||||
cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22
|
||||
cask = emacs.pkgs.cask; # Added 2022-11-12
|
||||
cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11
|
||||
cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03
|
||||
cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03
|
||||
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20
|
||||
carnix = throw "carnix has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22
|
||||
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken";
|
||||
@ -1393,6 +1397,7 @@ mapAliases ({
|
||||
pinentry_qt5 = pinentry-qt; # Added 2020-02-11
|
||||
prboom = throw "prboom was removed because it was abandoned by upstream, use prboom-plus instead"; # Added 2022-04-24
|
||||
privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18
|
||||
probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03
|
||||
processing3 = processing; # Added 2019-08-16
|
||||
procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22
|
||||
proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30
|
||||
|
||||
@ -634,7 +634,7 @@ with pkgs;
|
||||
|
||||
buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;
|
||||
|
||||
probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli {
|
||||
probe-rs = callPackage ../development/tools/rust/probe-rs {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
@ -3306,6 +3306,8 @@ with pkgs;
|
||||
|
||||
bmap-tools = callPackage ../tools/misc/bmap-tools { };
|
||||
|
||||
bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { };
|
||||
|
||||
bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
|
||||
|
||||
bonnie = callPackage ../tools/filesystems/bonnie {
|
||||
@ -8914,7 +8916,7 @@ with pkgs;
|
||||
inherit (callPackages ../tools/filesystems/irods rec {
|
||||
stdenv = llvmPackages.libcxxStdenv;
|
||||
libcxx = llvmPackages.libcxx;
|
||||
boost = boost17x.override { inherit stdenv; };
|
||||
boost = boost179.override { inherit stdenv; };
|
||||
fmt = fmt_8.override { inherit stdenv; };
|
||||
nanodbc_llvm = nanodbc.override { inherit stdenv; };
|
||||
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
|
||||
@ -11227,7 +11229,7 @@ with pkgs;
|
||||
oshka = callPackage ../development/tools/oshka { };
|
||||
|
||||
osl = libsForQt5.callPackage ../development/compilers/osl {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
};
|
||||
|
||||
osqp = callPackage ../development/libraries/science/math/osqp { };
|
||||
@ -14499,7 +14501,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
xtreemfs = callPackage ../tools/filesystems/xtreemfs {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
};
|
||||
|
||||
xurls = callPackage ../tools/text/xurls { };
|
||||
@ -16796,18 +16798,10 @@ with pkgs;
|
||||
cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { };
|
||||
cargo-diet = callPackage ../development/tools/rust/cargo-diet { };
|
||||
cargo-dist = callPackage ../development/tools/rust/cargo-dist { };
|
||||
cargo-embed = callPackage ../development/tools/rust/cargo-embed {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { };
|
||||
cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
|
||||
cargo-hakari = callPackage ../development/tools/rust/cargo-hakari { };
|
||||
cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
|
||||
cargo-flash = callPackage ../development/tools/rust/cargo-flash {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
@ -20256,9 +20250,7 @@ with pkgs;
|
||||
boost182
|
||||
;
|
||||
|
||||
boost17x = boost179;
|
||||
boost18x = boost182;
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
|
||||
boost_process = callPackage ../development/libraries/boost-process { };
|
||||
|
||||
@ -21567,8 +21559,8 @@ with pkgs;
|
||||
hpp-fcl = callPackage ../development/libraries/hpp-fcl { };
|
||||
|
||||
hpx = callPackage ../development/libraries/hpx {
|
||||
boost = boost17x;
|
||||
asio = asio.override { boost = boost17x; };
|
||||
boost = boost179;
|
||||
asio = asio.override { boost = boost179; };
|
||||
};
|
||||
|
||||
hspell = callPackage ../development/libraries/hspell { };
|
||||
@ -26405,14 +26397,14 @@ with pkgs;
|
||||
|
||||
mongodb-4_4 = callPackage ../servers/nosql/mongodb/4.4.nix {
|
||||
sasl = cyrus_sasl;
|
||||
boost = boost17x.override { enableShared = false; };
|
||||
boost = boost179.override { enableShared = false; };
|
||||
inherit (darwin) cctools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix {
|
||||
sasl = cyrus_sasl;
|
||||
boost = boost17x.override { enableShared = false; };
|
||||
boost = boost179.override { enableShared = false; };
|
||||
inherit (darwin) cctools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
@ -36343,19 +36335,19 @@ with pkgs;
|
||||
|
||||
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = true;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
bitcoind = callPackage ../applications/blockchains/bitcoin {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = false;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = false;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
@ -36377,11 +36369,11 @@ with pkgs;
|
||||
besu = callPackage ../applications/blockchains/besu { };
|
||||
|
||||
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = true;
|
||||
};
|
||||
bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
mkDerivation = stdenv.mkDerivation;
|
||||
withGui = false;
|
||||
};
|
||||
@ -36408,11 +36400,11 @@ with pkgs;
|
||||
dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
|
||||
|
||||
dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = true;
|
||||
};
|
||||
dogecoind = callPackage ../applications/blockchains/dogecoin {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
@ -36459,13 +36451,13 @@ with pkgs;
|
||||
|
||||
groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin {
|
||||
stdenv = darwin.apple_sdk_11_0.stdenv;
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = true;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
groestlcoind = callPackage ../applications/blockchains/groestlcoin {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
@ -36502,11 +36494,11 @@ with pkgs;
|
||||
};
|
||||
|
||||
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
};
|
||||
|
||||
oxen = callPackage ../applications/blockchains/oxen
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost17x; };
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost179; };
|
||||
|
||||
masari = callPackage ../applications/blockchains/masari { };
|
||||
|
||||
@ -36535,7 +36527,7 @@ with pkgs;
|
||||
stellar-core = callPackage ../applications/blockchains/stellar-core { };
|
||||
|
||||
sumokoin = callPackage ../applications/blockchains/sumokoin {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
};
|
||||
|
||||
solana-cli = callPackage ../applications/blockchains/solana { };
|
||||
@ -36561,11 +36553,11 @@ with pkgs;
|
||||
torq = callPackage ../applications/blockchains/torq { };
|
||||
|
||||
vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = true;
|
||||
};
|
||||
vertcoind = callPackage ../applications/blockchains/vertcoin {
|
||||
boost = boost17x;
|
||||
boost = boost179;
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user