mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
Merge master into staging-next
This commit is contained in:
commit
9af472e5c9
@ -1222,8 +1222,8 @@ let
|
|||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "prettier-vscode";
|
name = "prettier-vscode";
|
||||||
publisher = "esbenp";
|
publisher = "esbenp";
|
||||||
version = "9.14.0";
|
version = "9.16.0";
|
||||||
sha256 = "sha256-0eb3W9SErsqPofjR1DaChDghvWOQFSYIMnnWbu8GiHY=";
|
sha256 = "sha256-MF+mPhX4Q6wi7FxfaWG6fNJHY6EsTWOX+9UmN0iIZGU=";
|
||||||
};
|
};
|
||||||
meta = {
|
meta = {
|
||||||
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
, enableQt ? true, qtbase, qtmultimedia, wrapQtAppsHook
|
, enableQt ? true, qtbase, qtmultimedia, wrapQtAppsHook
|
||||||
, enableQtTranslation ? enableQt, qttools
|
, enableQtTranslation ? enableQt, qttools
|
||||||
, enableWebService ? true
|
, enableWebService ? true
|
||||||
, enableCubeb ? true, libpulseaudio
|
, enableCubeb ? true, cubeb
|
||||||
, enableFfmpegAudioDecoder ? true
|
, enableFfmpegAudioDecoder ? true
|
||||||
, enableFfmpegVideoDumper ? true
|
, enableFfmpegVideoDumper ? true
|
||||||
, ffmpeg_4
|
, ffmpeg_4
|
||||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||||||
] ++ lib.optionals enableQt [ qtbase qtmultimedia ]
|
] ++ lib.optionals enableQt [ qtbase qtmultimedia ]
|
||||||
++ lib.optional enableSdl2 SDL2
|
++ lib.optional enableSdl2 SDL2
|
||||||
++ lib.optional enableQtTranslation qttools
|
++ lib.optional enableQtTranslation qttools
|
||||||
++ lib.optional enableCubeb libpulseaudio
|
++ lib.optionals enableCubeb cubeb.passthru.backendLibs
|
||||||
++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
|
++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
|
||||||
++ lib.optional useDiscordRichPresence rapidjson
|
++ lib.optional useDiscordRichPresence rapidjson
|
||||||
++ lib.optional enableFdk fdk_aac;
|
++ lib.optional enableFdk fdk_aac;
|
||||||
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||||||
# Fixes https://github.com/NixOS/nixpkgs/issues/171173
|
# Fixes https://github.com/NixOS/nixpkgs/issues/171173
|
||||||
postInstall = lib.optionalString (enableCubeb && enableSdl2) ''
|
postInstall = lib.optionalString (enableCubeb && enableSdl2) ''
|
||||||
wrapProgram "$out/bin/citra" \
|
wrapProgram "$out/bin/citra" \
|
||||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]}
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
, SDL2
|
, SDL2
|
||||||
, cmake
|
, cmake
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
|
, cubeb
|
||||||
, curl
|
, curl
|
||||||
, extra-cmake-modules
|
, extra-cmake-modules
|
||||||
, libXrandr
|
, libXrandr
|
||||||
, libpulseaudio
|
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, mesa # for libgbm
|
, mesa # for libgbm
|
||||||
, ninja
|
, ninja
|
||||||
@ -48,7 +48,6 @@ stdenv.mkDerivation {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL2
|
SDL2
|
||||||
curl
|
curl
|
||||||
libpulseaudio
|
|
||||||
libXrandr
|
libXrandr
|
||||||
mesa
|
mesa
|
||||||
qtbase
|
qtbase
|
||||||
@ -58,7 +57,8 @@ stdenv.mkDerivation {
|
|||||||
++ lib.optionals enableWayland [
|
++ lib.optionals enableWayland [
|
||||||
qtwayland
|
qtwayland
|
||||||
wayland
|
wayland
|
||||||
];
|
]
|
||||||
|
++ cubeb.passthru.backendLibs;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DUSE_DRMKMS=ON"
|
"-DUSE_DRMKMS=ON"
|
||||||
@ -100,7 +100,7 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
qtWrapperArgs = [
|
qtWrapperArgs = [
|
||||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}"
|
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ vulkan-loader ] ++ cubeb.passthru.backendLibs)}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
|
, cubeb
|
||||||
, curl
|
, curl
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
, fmt
|
, fmt
|
||||||
@ -10,7 +11,6 @@
|
|||||||
, libaio
|
, libaio
|
||||||
, libbacktrace
|
, libbacktrace
|
||||||
, libpcap
|
, libpcap
|
||||||
, libpulseaudio
|
|
||||||
, libsamplerate
|
, libsamplerate
|
||||||
, libXrandr
|
, libXrandr
|
||||||
, libzip
|
, libzip
|
||||||
@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
|
|||||||
libaio
|
libaio
|
||||||
libbacktrace
|
libbacktrace
|
||||||
libpcap
|
libpcap
|
||||||
libpulseaudio
|
|
||||||
libsamplerate
|
libsamplerate
|
||||||
libXrandr
|
libXrandr
|
||||||
libzip
|
libzip
|
||||||
@ -85,7 +84,8 @@ stdenv.mkDerivation rec {
|
|||||||
vulkan-loader
|
vulkan-loader
|
||||||
wayland
|
wayland
|
||||||
xz
|
xz
|
||||||
];
|
]
|
||||||
|
++ cubeb.passthru.backendLibs;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
@ -98,11 +98,10 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
qtWrapperArgs = [
|
qtWrapperArgs = [
|
||||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([
|
||||||
ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
|
ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
|
||||||
libpulseaudio
|
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
]}"
|
] ++ cubeb.passthru.backendLibs)}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -2,9 +2,8 @@
|
|||||||
, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
|
, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
|
||||||
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
|
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
|
||||||
, sdl2Support ? true, SDL2
|
, sdl2Support ? true, SDL2
|
||||||
, pulseaudioSupport ? true, libpulseaudio
|
, cubebSupport ? true, cubeb
|
||||||
, waylandSupport ? true, wayland
|
, waylandSupport ? true, wayland
|
||||||
, alsaSupport ? true, alsa-lib
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -66,8 +65,7 @@ stdenv.mkDerivation {
|
|||||||
qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
|
qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
|
||||||
libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers
|
libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers
|
||||||
] ++ lib.optional sdl2Support SDL2
|
] ++ lib.optional sdl2Support SDL2
|
||||||
++ lib.optional pulseaudioSupport libpulseaudio
|
++ lib.optionals cubebSupport cubeb.passthru.backendLibs
|
||||||
++ lib.optional alsaSupport alsa-lib
|
|
||||||
++ lib.optional waylandSupport wayland;
|
++ lib.optional waylandSupport wayland;
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -16,11 +16,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "confy";
|
pname = "confy";
|
||||||
version = "0.6.4";
|
version = "0.6.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
|
url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
|
||||||
sha256 = "0v74pdyihj7r9gb3k2rkvbphan27ajlvycscd8xzrnsv74lcmbpm";
|
sha256 = "sha256-zfuwOZBSGQzJUc36M6C5wSHarLbPFqayQVFo+WbVo7k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
|||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "process-compose";
|
pname = "process-compose";
|
||||||
version = "0.51.0";
|
version = "0.51.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "F1bonacc1";
|
owner = "F1bonacc1";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-WPggJ86rWL8OIVXsDBT6P2AslT8rhDY4IIZdSPz6waE=";
|
hash = "sha256-eR8uYeScV6bxntc2bEwJC/VSH1bXendJ1FNJB0bC2i0=";
|
||||||
# populate values that require us to use git. By doing this in postFetch we
|
# populate values that require us to use git. By doing this in postFetch we
|
||||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
@ -43,7 +43,7 @@ buildGoModule rec {
|
|||||||
installShellFiles
|
installShellFiles
|
||||||
];
|
];
|
||||||
|
|
||||||
vendorHash = "sha256-9RvVBup07FHCjfV/Q6ryU28inqydL/pMGVUfbo2OG5s=";
|
vendorHash = "sha256-dlTqBKyI2t3twxQ+mnn+LTWzM2+CnEa4X0K2yDAZsQA=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -17,13 +17,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "lagrange";
|
pname = "lagrange";
|
||||||
version = "1.16.4";
|
version = "1.16.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "skyjake";
|
owner = "skyjake";
|
||||||
repo = "lagrange";
|
repo = "lagrange";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-crOUuCQwqB1Eaesx7jXUd3/ti1LGMOjjESiOJjg/iZo=";
|
hash = "sha256-OLKUw0qimt0WgcW26T4IWVK16nDGSmqHSuSJ8tHhbsE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||||
|
@ -2,17 +2,17 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "argocd";
|
pname = "argocd";
|
||||||
version = "2.7.4";
|
version = "2.7.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "argoproj";
|
owner = "argoproj";
|
||||||
repo = "argo-cd";
|
repo = "argo-cd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9S30m4iA5qrcXFWk3QiDSuhHebhWYOpVfKSE6mz0mig=";
|
sha256 = "sha256-YEQ5vLE13FzcE0dt/RRxuM2qRuvuHrTgGlF+3D4aox4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
proxyVendor = true; # darwin/linux hash mismatch
|
proxyVendor = true; # darwin/linux hash mismatch
|
||||||
vendorHash = "sha256-Ec2v9BehSvbx3phA1JrZnsZ4BObFTTOs2Ee+5pKsAGs=";
|
vendorHash = "sha256-PQys3jXpwBsBQAMLW6WUUsIc+l1knSAvUicQug9fCmU=";
|
||||||
|
|
||||||
# Set target as ./cmd per cli-local
|
# Set target as ./cmd per cli-local
|
||||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
||||||
|
@ -9,6 +9,7 @@ args@
|
|||||||
, autoAddOpenGLRunpathHook
|
, autoAddOpenGLRunpathHook
|
||||||
, addOpenGLRunpath
|
, addOpenGLRunpath
|
||||||
, alsa-lib
|
, alsa-lib
|
||||||
|
, curlMinimal
|
||||||
, expat
|
, expat
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fontconfig
|
, fontconfig
|
||||||
@ -16,6 +17,7 @@ args@
|
|||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, glib
|
, glib
|
||||||
, glibc
|
, glibc
|
||||||
|
, gst_all_1
|
||||||
, gtk2
|
, gtk2
|
||||||
, lib
|
, lib
|
||||||
, libxkbcommon
|
, libxkbcommon
|
||||||
@ -129,7 +131,22 @@ backendStdenv.mkDerivation rec {
|
|||||||
ucx
|
ucx
|
||||||
xorg.libxshmfence
|
xorg.libxshmfence
|
||||||
xorg.libxkbfile
|
xorg.libxkbfile
|
||||||
];
|
] ++ lib.optionals (lib.versionAtLeast version "12.1") (map lib.getLib [
|
||||||
|
# Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
|
||||||
|
# - `libcurl.so.4`
|
||||||
|
curlMinimal
|
||||||
|
|
||||||
|
# Used by `/target-linux-x64/libQt6Multimedia.so.6` for:
|
||||||
|
# - `libgstaudio-1.0.so.0`
|
||||||
|
# - `libgstvideo-1.0.so.0`
|
||||||
|
# - `libgstpbutils-1.0.so.0`
|
||||||
|
# - `libgstallocators-1.0.so.0`
|
||||||
|
# - `libgstapp-1.0.so.0`
|
||||||
|
# - `libgstbase-1.0.so.0`
|
||||||
|
# - `libgstreamer-1.0.so.0`
|
||||||
|
gst_all_1.gstreamer
|
||||||
|
gst_all_1.gst-plugins-base
|
||||||
|
]);
|
||||||
|
|
||||||
# Prepended to runpaths by autoPatchelf.
|
# Prepended to runpaths by autoPatchelf.
|
||||||
# The order inherited from older rpath preFixup code
|
# The order inherited from older rpath preFixup code
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "azure-mgmt-containerservice";
|
pname = "azure-mgmt-containerservice";
|
||||||
version = "23.0.0";
|
version = "24.0.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
extension = "zip";
|
extension = "zip";
|
||||||
hash = "sha256-V8IUTQvbUSOpsqkGfBqLo4DVIB7fryYMVx6WpfWzOnc=";
|
hash = "sha256-sUp3LDVsc1DmVf4HdaXGSDeEvmAE2weSHHTxL/BwRk8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -11,12 +11,12 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "azure-mgmt-redis";
|
pname = "azure-mgmt-redis";
|
||||||
version = "14.1.0";
|
version = "14.2.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
extension = "zip";
|
extension = "zip";
|
||||||
hash = "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig=";
|
hash = "sha256-u6PG1mx3iiiLssoLzOj5kxI2L3uvQMnWrEQY6MBJOtA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "flake8-bugbear";
|
pname = "flake8-bugbear";
|
||||||
version = "23.5.9";
|
version = "23.6.5";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||||||
owner = "PyCQA";
|
owner = "PyCQA";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-qjR6WbgewVdmxubtEK6BdZv6zXgp0B9bQLxana3o+WU=";
|
hash = "sha256-tjjluiyFkhWstcZBfNPAIAonxs1k0mwWmXOAujMC9tI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -12,14 +12,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-vision";
|
pname = "google-cloud-vision";
|
||||||
version = "3.4.2";
|
version = "3.4.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-uLKI2lY094rCMXPdXV69hrorN85cTLrbVkyqeBiOBRg=";
|
hash = "sha256-RSe/saqfidAn20INQN6fquSCS2QGyANzpt2CfnmJwJ4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "gsd";
|
pname = "gsd";
|
||||||
version = "2.8.1";
|
version = "3.0.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||||||
owner = "glotzerlab";
|
owner = "glotzerlab";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-6Ixy62hHbSjArlDzBICdk0e8DDKxaHShamHpHEKOqqU=";
|
hash = "sha256-jfik8Rz4gqBNQn8cb20VcSUodupS/FNgpQJtW/DMzPY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -12,14 +12,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pathy";
|
pname = "pathy";
|
||||||
version = "0.10.1";
|
version = "0.10.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-TNbnG0zV/4dc+7lJrZ+lUZ2NHb5p1fwdGyOqPLBJYYs=";
|
hash = "sha256-ecVyq3/thNxGg3NG7a5YVlmS0Ed6eJzUaRpB2Oq5kX0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "psd-tools";
|
pname = "psd-tools";
|
||||||
version = "1.9.24";
|
version = "1.9.26";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||||||
owner = "psd-tools";
|
owner = "psd-tools";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI=";
|
hash = "sha256-fwUFBqr397l6vLBc4xF78EdnXzc83Gqn5nu/9M19ZW8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -131,7 +131,10 @@ buildDotnetModule rec {
|
|||||||
|
|
||||||
# Fully qualified name of disabled tests
|
# Fully qualified name of disabled tests
|
||||||
disabledTests =
|
disabledTests =
|
||||||
[ "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" ]
|
[
|
||||||
|
"GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync"
|
||||||
|
"GitHub.Runner.Common.Tests.ProcessInvokerL0.OomScoreAdjIsInherited"
|
||||||
|
]
|
||||||
++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [
|
++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [
|
||||||
"Cancel_CloneHashTask_WhenNotNeeded"
|
"Cancel_CloneHashTask_WhenNotNeeded"
|
||||||
"CloneHash_RuntimeAndExternals"
|
"CloneHash_RuntimeAndExternals"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kustomize";
|
pname = "kustomize";
|
||||||
version = "5.0.3";
|
version = "5.1.0";
|
||||||
|
|
||||||
ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
|
ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
|
||||||
[
|
[
|
||||||
@ -15,13 +15,13 @@ buildGoModule rec {
|
|||||||
owner = "kubernetes-sigs";
|
owner = "kubernetes-sigs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "kustomize/v${version}";
|
rev = "kustomize/v${version}";
|
||||||
hash = "sha256-VKDLutzt5mFY7M9zmtEKvBjRD8+ea1Yil/NupvWBoVU=";
|
hash = "sha256-nYndDoaCMyIvMlhHawgcv8WCCa3HYgAcF+3QxyYxub4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# avoid finding test and development commands
|
# avoid finding test and development commands
|
||||||
modRoot = "kustomize";
|
modRoot = "kustomize";
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
vendorHash = "sha256-FvxkQqC4LuYcgOw6HUSIbdJcYpJoJQN7TQHGquZRlZA=";
|
vendorHash = "sha256-/XyxZHhlxD0CpaDAuJbLkOHysLXo1+ThTcexqtNdVIs=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
1491
pkgs/development/tools/wasmi/Cargo.lock
generated
Normal file
1491
pkgs/development/tools/wasmi/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
34
pkgs/development/tools/wasmi/default.nix
Normal file
34
pkgs/development/tools/wasmi/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "wasmi";
|
||||||
|
version = "0.30.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "paritytech";
|
||||||
|
repo = "wasmi";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-0G/K61JP4SehhP+wD9uwCU1GRjzJdz4fkePv+IiqUY4=";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoLock = {
|
||||||
|
lockFile = ./Cargo.lock;
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
ln -s ${./Cargo.lock} Cargo.lock
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "An efficient WebAssembly interpreter";
|
||||||
|
homepage = "https://github.com/paritytech/wasmi";
|
||||||
|
changelog = "https://github.com/paritytech/wasmi/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
license = with licenses; [ asl20 mit ];
|
||||||
|
mainProgram = "wasmi_cli";
|
||||||
|
maintainers = with maintainers; [ dit7ya ];
|
||||||
|
};
|
||||||
|
}
|
@ -1,48 +1,16 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, libjpeg, fetchpatch }:
|
{ lib, stdenv, fetchFromGitHub, libjpeg }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jhead";
|
pname = "jhead";
|
||||||
version = "3.06.0.1";
|
version = "3.08";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Matthias-Wandel";
|
owner = "Matthias-Wandel";
|
||||||
repo = "jhead";
|
repo = "jhead";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0zgh36486cpcnf7xg6dwf7rhz2h4gpayqvdk8hmrx6y418b2pfyf";
|
hash = "sha256-d1cuy4kkwY/21UcpNN6judrFxGVyEH+b+0TaZw9hP2E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Just a spelling/whitespace change, but makes it easier to apply the rest.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Matthias-Wandel/jhead/commit/8384c6fd2ebfb8eb8bd96616343e73af0e575131.patch";
|
|
||||||
sha256 = "sha256-f3FOIqgFr5QPAsBjvUVAOf1CAqw8pNAVx+pZZuMjq3c=";
|
|
||||||
includes = [ "jhead.c" ];
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Matthias-Wandel/jhead/commit/63aff8e9bd8c970fedf87f0ec3a1f3368bf2421e.patch";
|
|
||||||
sha256 = "sha256-jyhGdWuwd/eP5uuS8uLYiTJZJdxxLYdsvl0jnQC+Y5c=";
|
|
||||||
includes = [ "jhead.c" ];
|
|
||||||
})
|
|
||||||
|
|
||||||
# Fixes around CVE-2022-41751
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Matthias-Wandel/jhead/commit/6985da52c9ad4f5f6c247269cb5508fae34a971c.patch";
|
|
||||||
sha256 = "sha256-8Uw0Udr9aZEMrD/0zS498MVw+rJqpFukvjb7FgzjgT4=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Matthias-Wandel/jhead/commit/3fe905cf674f8dbac8a89e58cee1b4850abf9530.patch";
|
|
||||||
sha256 = "sha256-5995EV/pOktZc45c7fLl+oQqyutRDQJl3eNutR1JGJo=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/joachim-reichel/jhead/commit/ec67262b8e5a4b05d8ad6898a09f1dc3fc032062.patch";
|
|
||||||
sha256 = "sha256-a3KogIV45cRNthJSPygIRw1m2KBJZJSIGSWfsr7FWs4=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/joachim-reichel/jhead/commit/65de38cb68747c6f8397608b56b58ce15271a1fe.patch";
|
|
||||||
sha256 = "sha256-xf0d2hxW4rVZwffrYJVVFQ3cDMOcPoGbCdrrQKxf16M=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [ libjpeg ];
|
buildInputs = [ libjpeg ];
|
||||||
|
|
||||||
makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ];
|
makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ];
|
||||||
@ -59,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://www.sentex.net/~mwandel/jhead/";
|
homepage = "https://www.sentex.net/~mwandel/jhead/";
|
||||||
description = "Exif Jpeg header manipulation tool";
|
description = "Exif Jpeg header manipulation tool";
|
||||||
license = licenses.publicDomain;
|
license = licenses.publicDomain;
|
||||||
maintainers = with maintainers; [ rycee ];
|
maintainers = with maintainers; [ rycee ];
|
||||||
|
@ -19,11 +19,11 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ugs";
|
pname = "ugs";
|
||||||
version = "2.0.17";
|
version = "2.0.18";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";
|
url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";
|
||||||
hash = "sha256-m4oD0ibrlVwP8ZS1pjnu/QaWmQMQlAWtZV2MGhB9X1A=";
|
hash = "sha256-NaEDG3dmpPRwfVvwYJQXqpCcAkRPeQ1EcKoa0xKeDFA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchFromGitHub
|
||||||
, perl
|
, perl
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, libpcap
|
, libpcap
|
||||||
@ -8,11 +8,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dhcpdump";
|
pname = "dhcpdump";
|
||||||
version = "1.8";
|
version = "1.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "http://www.mavetju.org/download/dhcpdump-${version}.tar.gz";
|
owner = "bbonev";
|
||||||
hash = "sha256-bV65QYFi+3OLxW5MFoLOf3OS3ZblaMyZbkTCjef3cZA=";
|
repo = pname;
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
hash = "sha256-ck6DLsLQ00unNqPLBKkxaJLDCaPFjTFJcQjTbKSq0U8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
@ -26,8 +28,6 @@ stdenv.mkDerivation rec {
|
|||||||
libpcap
|
libpcap
|
||||||
];
|
];
|
||||||
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
|
|
||||||
@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
|
description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
|
||||||
homepage = "http://www.mavetju.org/unix/dhcpdump-man.php";
|
homepage = "https://github.com/bbonev/dhcpdump";
|
||||||
|
changelog = "https://github.com/bbonev/dhcpdump/releases/tag/v${version}";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ nickcao ];
|
maintainers = with maintainers; [ nickcao ];
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
|
@ -13,13 +13,13 @@
|
|||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cosign";
|
pname = "cosign";
|
||||||
version = "2.0.2";
|
version = "2.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sigstore";
|
owner = "sigstore";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-jJHLCN9hEQy4ijFm6g2E9WvTT43kvPhdRW1aczvEcFs=";
|
hash = "sha256-fZIkRmQAnLTllA0UBOIlbYCfjvEQ9LTXymGJ480gtb0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||||
|
|
||||||
vendorHash = "sha256-X5CY8U3IgxWD3zpb1f9R9Xk/25x1zxfYXkvXbelFBQc=";
|
vendorHash = "sha256-CYDhr9E8xg/mn8yUP6xy5gFl15tNEcUfGUTpmHyDGaY=";
|
||||||
|
|
||||||
subPackages = [
|
subPackages = [
|
||||||
"cmd/cosign"
|
"cmd/cosign"
|
||||||
|
@ -13827,6 +13827,8 @@ with pkgs;
|
|||||||
inherit (darwin.apple_sdk_11_0.frameworks) Foundation;
|
inherit (darwin.apple_sdk_11_0.frameworks) Foundation;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
wasmi = callPackage ../development/tools/wasmi { };
|
||||||
|
|
||||||
welkin = callPackage ../tools/graphics/welkin { };
|
welkin = callPackage ../tools/graphics/welkin { };
|
||||||
|
|
||||||
wemux = callPackage ../tools/misc/wemux { };
|
wemux = callPackage ../tools/misc/wemux { };
|
||||||
|
Loading…
Reference in New Issue
Block a user