mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 02:42:59 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
0a9bd58ae0
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texstudio";
|
||||
version = "4.8.1";
|
||||
version = "4.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "texstudio-org";
|
||||
repo = "texstudio";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-gW7LXfXeZ0nXyWchVRyVDDJi725xa4tgYWYnSIhi5Bo=";
|
||||
hash = "sha256-q6dy9CS8zxMlLC4M76t4RjYlMJyUG55Cb0KREyDfM78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
spell checking and support of any compilation chain.
|
||||
'';
|
||||
homepage = "https://texstudio.org";
|
||||
changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/CHANGELOG.txt";
|
||||
changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/source/CHANGELOG.md";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ajs124 cfouche ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-mapkubeapis";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm-mapkubeapis";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SYNCzVGGeuRj0PoOKU+1zydvAXVg4gUpIsqBTGChOgE=";
|
||||
hash = "sha256-0DIBdSi/WIHVF8O7OtJOaFnIfpObsUXzgpj25kJuS6E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G3Q8XCwKLgHeWLF46C5lWfvuynr/cJbkq7xdydfTHZ4=";
|
||||
|
||||
@ -2,52 +2,52 @@
|
||||
let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.66";
|
||||
ptb = "0.0.101";
|
||||
canary = "0.0.479";
|
||||
development = "0.0.25";
|
||||
stable = "0.0.67";
|
||||
ptb = "0.0.103";
|
||||
canary = "0.0.483";
|
||||
development = "0.0.27";
|
||||
} else {
|
||||
stable = "0.0.317";
|
||||
ptb = "0.0.131";
|
||||
canary = "0.0.587";
|
||||
development = "0.0.47";
|
||||
stable = "0.0.318";
|
||||
ptb = "0.0.133";
|
||||
canary = "0.0.591";
|
||||
development = "0.0.49";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = rec {
|
||||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-tbpo1+fbziJk2JdaMyAW5Ynb0wuWkLdcDnzQbiZJ47A=";
|
||||
hash = "sha256-L8COdPP4SFRO+1mipjn4tjLR+xShcJbT/72yhNHdSWg=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
hash = "sha256-JesxPoYybVLVwTrDwG2kO6Pikq7qvn7CO8j+24dwjBc=";
|
||||
hash = "sha256-BYzISVHSlKqVN0Egkw5su1wJnrGjQYbxYV840bDCakM=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-mirioiRpwQB07sL1avGYk2+Cnmdw7PW808AAA6p2Y0U=";
|
||||
hash = "sha256-AWYRQxD0FPqRo1TXUR9wWhZTUr34MRFaBTXzhNcwGKI=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
hash = "sha256-9dwZ89YOs2iNOeoVrGfNHwr4mvfXmPk1SrJYoteYakY=";
|
||||
hash = "sha256-0AfATkHqw5gfbQ27DvM+QoLZgspYWKG09jWWNWERnmQ=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
|
||||
hash = "sha256-SX6a2qPSFURL00dMLrHSI4+964Xc76ada4PUMlG1V9U=";
|
||||
hash = "sha256-Ot6IM6EAg4MQPp0JqvUOZNAor6Nr6luc6pGY+722GMo=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-/wuYPjGh/RJZSDeo8r78YEbCYj+qZWTaIDIfKuSH+r0=";
|
||||
hash = "sha256-FFp6CRgD/kpCVxJ4+es0DaOGaW5v2Aa+lzJdG2Zu8eY=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-6m6wmGzVOEY2oVAHsSMsAtgQK5zqC0D7U3s28pcH0ss=";
|
||||
hash = "sha256-TIXe8cy6feME0900R5aWyItZfUrUA8zXo0pqwQ79yAM=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
hash = "sha256-mgVCuTE2zYFRUW6Ukw7mUmPnOR4g/QUFYlWI3bux0es=";
|
||||
hash = "sha256-kfHnS1NHuPD7UR7XvMdtY2LPsDRJVQHk7/Nm+cR/KGc=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
|
||||
@ -156,11 +156,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wavebox";
|
||||
version = "10.127.10-2";
|
||||
version = "10.128.5-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-x095V2UhRJfPmmG+4/i7I9AnCU4WVrw0b71nEu73uew=";
|
||||
hash = "sha256-eIiFiRlmnARtyd8YHUHrjDaaF8kQYvcOa2AwT3071Ho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,7 +19,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
name = "SpiderOakONE-${version}-slack_tar_x64.tgz";
|
||||
url = "https://spideroak.com/release/spideroak/slack_tar_x64";
|
||||
url = "https://spideroak-releases.s3.us-east-2.amazonaws.com/SpiderOakONE-${version}-slack_tar_x64.tgz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "colima";
|
||||
version = "0.7.0";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abiosoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fl1QtGbcaUwHDz4Jg+UgK27GPTHyJUyK76LXyaYj4Fo=";
|
||||
hash = "sha256-WInmoTUaEm2kQ7esZgPj3YIHmHbBrlBTWcLPC9/2MdY=";
|
||||
# We need the git revision
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
@ -35,7 +35,7 @@ buildGoModule rec {
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ];
|
||||
|
||||
vendorHash = "sha256-OXK6ZHKghKxgETjY3mg1R2yp8pPpy5yV8M4K+Hh9Fjw=";
|
||||
vendorHash = "sha256-niuBo2YUUYKH0eSApOByNLrcHqr9m5VKGoiGp1fKklg=";
|
||||
|
||||
# disable flaky Test_extractZones
|
||||
# https://hydra.nixos.org/build/212378003/log
|
||||
|
||||
@ -41,12 +41,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "phosh";
|
||||
version = "0.41.0";
|
||||
version = "0.41.1";
|
||||
|
||||
src = fetchurl {
|
||||
# Release tarball which includes subprojects gvc and libcall-ui
|
||||
url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-HXuD9YC7gqGqAq2YmhXI3WRGsvyBc6PgSW3YSYTOdI4=";
|
||||
hash = "sha256-Oc6Dltjj+2D3LWZz1eYArqEKEJYYqJPSrScEkxyNhX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlas";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QSm8KfpygHkXulwBrTG18l3pVEB32xj3HwezjZzJFl8=";
|
||||
hash = "sha256-av2WKuEzDhjvqGHIAlNR/Tt8AhqkjLhgcZIpJEKgEVA=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-9K4zsly00dis3pYR++vXy0E8buKR6uOAmqw8IVYGXGM=";
|
||||
vendorHash = "sha256-wu2WONeL5LNGjn/xaRDPtBBVcvLOxSeelj7a6xxMHTY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -18,34 +18,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brainflow";
|
||||
version = "5.12.1";
|
||||
version = "5.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainflow-dev";
|
||||
repo = "brainflow";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-haQO03nkvLoXtFVe+C+yi+MwM0CFh6rLcLvU8fQ4k/w=";
|
||||
hash = "sha256-1SP0X1KcnVB/HQkbYBZqSmLS3LZYvylPOP4pWm7oFu4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# All of these are PRs that were merged into the upstream repository and will be included in the next release
|
||||
# These should be removed once the next version is released
|
||||
(fetchpatch {
|
||||
# Fixes a major issue that prevented the build from working at all (why was this not backported???)
|
||||
url = "https://github.com/brainflow-dev/brainflow/commit/883b0cd08acb99d7b6e241e92fba2e9a363d17b1.patch";
|
||||
hash = "sha256-QQd+BI3I65gfaNS/SKLjCoqbCwPCiTh+nh0tJAZM6hQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Bumps the version of a python dependency that had a backwards-incompatible change
|
||||
url = "https://github.com/brainflow-dev/brainflow/commit/ea23a6f0483ce4d6fdd7a82bace865356ee78d7f.patch";
|
||||
hash = "sha256-dvMpxxRrnJQ9ADGagB1JhuoB9SNwn755wbHzW/3ECeo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Fixes an incorrect use of an environment variable during the build
|
||||
url = "https://github.com/brainflow-dev/brainflow/commit/053b8c1253b686cbec49ab4adb47c9ee02d3f99a.patch";
|
||||
hash = "sha256-Pfhe1ZvMagfVAGZqeWn1uHXgwlTtkOm+gyWuvC5/Sro=";
|
||||
})
|
||||
];
|
||||
patches = [ ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_LIBFTDI" useLibFTDI)
|
||||
|
||||
42
pkgs/by-name/gi/giza/package.nix
Normal file
42
pkgs/by-name/gi/giza/package.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
gfortran,
|
||||
cairo,
|
||||
freetype,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "giza";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danieljprice";
|
||||
repo = "giza";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-spb46IoySf6DM454adcWmqqLlzNA2HK9z29TzOCECJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
gfortran
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
freetype
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Scientific plotting library for C/Fortran";
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
changelog = "${finalAttrs.src.meta.homepage}/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@ -1,13 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, fetchpatch, argp-standalone }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
autoreconfHook,
|
||||
fetchpatch,
|
||||
argp-standalone,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iucode-tool";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "iucode-tool";
|
||||
repo = "iucode-tool";
|
||||
rev = "v${version}";
|
||||
owner = "iucode-tool";
|
||||
repo = "iucode-tool";
|
||||
rev = "v${version}";
|
||||
sha256 = "04dlisw87dd3q3hhmkqc5dd58cp22fzx3rzah7pvcyij135yjc3a";
|
||||
};
|
||||
|
||||
@ -31,6 +38,9 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gitlab.com/iucode-tool/iucode-tool";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,9 @@
|
||||
{ lib, stdenv, linux-firmware, libarchive }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
linux-firmware,
|
||||
libarchive,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "amd-ucode";
|
||||
@ -26,6 +31,9 @@ stdenv.mkDerivation {
|
||||
description = "AMD Processor microcode patch";
|
||||
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
platforms = platforms.linux;
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libarchive, iucode-tool }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libarchive,
|
||||
iucode-tool,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microcode-intel";
|
||||
@ -11,7 +17,10 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-O2UWa04MnU9ndzvWy8fruOTm85PexEd+i1McQNz6uFE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ iucode-tool libarchive ];
|
||||
nativeBuildInputs = [
|
||||
iucode-tool
|
||||
libarchive
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -29,7 +38,10 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}";
|
||||
description = "Microcode for Intel processors";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
platforms = platforms.linux;
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
maintainers = with maintainers; [ felixsinger ];
|
||||
};
|
||||
}
|
||||
@ -6,10 +6,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "remnote";
|
||||
version = "1.16.107";
|
||||
version = "1.16.111";
|
||||
src = fetchurl {
|
||||
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
|
||||
hash = "sha256-U3m8daxJzM5lp6AAPOgNdaxWaHvhkt7KRCisHQghY9Y=";
|
||||
hash = "sha256-aelkdrILxe7Wf1BZmSIQ5XMJsyxHM9oW8h6DDzeA0uQ=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
56
pkgs/by-name/sp/splash/package.nix
Normal file
56
pkgs/by-name/sp/splash/package.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gfortran,
|
||||
giza,
|
||||
hdf5,
|
||||
cairo,
|
||||
freetype,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "splash";
|
||||
version = "3.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danieljprice";
|
||||
repo = "splash";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5ieJHUWZDGgsNj7U9tbdhtDIsN+wgbs03IxVd1xM+hw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
giza
|
||||
cairo
|
||||
freetype
|
||||
hdf5
|
||||
];
|
||||
makeFlags = [
|
||||
"SYSTEM=gfortran"
|
||||
"GIZA_DIR=${giza}"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
# Upstream's simplistic makefile doesn't even `mkdir $(PREFIX)`, so we help
|
||||
# it:
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
'';
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "An interactive visualisation and plotting tool using kernel interpolation, mainly used for Smoothed Particle Hydrodynamics simulations";
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stackit-cli";
|
||||
version = "0.11.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ioV5ki2Jkbo/Ax9XDp/gm9NFTFS9604VAwOgs8wkoKU=";
|
||||
hash = "sha256-AUr/2360mhn3MFj6hCH6CGajYOtVKu84Cu5ShOvyEC4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1MM4P4eLBZvYgmdYjaihe30qnCvTuY7ZHnAZei3dHhQ=";
|
||||
vendorHash = "sha256-QKUTUJguSg/wLEvqK+R8vdsEBiaXgie9Hv4kBxK6fbc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
17
pkgs/by-name/uv/uv/Cargo.lock
generated
17
pkgs/by-name/uv/uv/Cargo.lock
generated
@ -968,17 +968,6 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
|
||||
|
||||
[[package]]
|
||||
name = "derivative"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "diff"
|
||||
version = "0.1.13"
|
||||
@ -4452,7 +4441,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
|
||||
|
||||
[[package]]
|
||||
name = "uv"
|
||||
version = "0.4.6"
|
||||
version = "0.4.7"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anyhow",
|
||||
@ -4812,6 +4801,7 @@ dependencies = [
|
||||
"uv-types",
|
||||
"uv-warnings",
|
||||
"uv-workspace",
|
||||
"walkdir",
|
||||
"zip",
|
||||
]
|
||||
|
||||
@ -5047,7 +5037,6 @@ dependencies = [
|
||||
"cache-key",
|
||||
"clap",
|
||||
"dashmap",
|
||||
"derivative",
|
||||
"distribution-filename",
|
||||
"distribution-types",
|
||||
"either",
|
||||
@ -5205,7 +5194,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uv-version"
|
||||
version = "0.4.6"
|
||||
version = "0.4.7"
|
||||
|
||||
[[package]]
|
||||
name = "uv-virtualenv"
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "uv";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TBAnKVlv6SpPy6DUdq9AQE9qrCNuRiixuy4fMzDi9Yg=";
|
||||
hash = "sha256-81fxSvYRr0aSUlxYklA44emfa5E4SQBENkYAKoHAStc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
||||
5912
pkgs/by-name/ve/vencord/package-lock.json
generated
5912
pkgs/by-name/ve/vencord/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,65 +1,103 @@
|
||||
{ buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, esbuild
|
||||
, buildWebExtension ? false
|
||||
{
|
||||
curl,
|
||||
esbuild,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
jq,
|
||||
lib,
|
||||
nix-update,
|
||||
nodejs,
|
||||
pnpm,
|
||||
stdenv,
|
||||
writeShellScript,
|
||||
buildWebExtension ? false,
|
||||
}:
|
||||
let
|
||||
version = "1.9.5";
|
||||
gitHash = "5bd10c8";
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vencord";
|
||||
inherit version;
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7eJkdcZX4D6PUnnpY+iucWWZx9/ned8z/zA0M5TRcaY=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fYLTaxNeixaHP19dS+BPVJwv/xXEV5hmmE2ob7jzS/A=";
|
||||
};
|
||||
|
||||
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
|
||||
version = "0.15.18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
}));
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname src;
|
||||
|
||||
# Supresses an error about esbuild's version.
|
||||
npmRebuildFlags = [ "|| true" ];
|
||||
hash = "sha256-bosCE9gBFCcM3Ww6sJmhps/cl4lovXKMieYpkqAMst8=";
|
||||
};
|
||||
|
||||
makeCacheWritable = true;
|
||||
npmDepsHash = "sha256-GTjL6cjYPoa1ohtqslxDskCN9tKuu1OP1ZWIWtFx+E0=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
|
||||
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
cp ${./package-lock.json} ./package-lock.json
|
||||
chmod +w ./package-lock.json
|
||||
env = {
|
||||
ESBUILD_BINARY_PATH = lib.getExe (
|
||||
esbuild.overrideAttrs (
|
||||
final: _: {
|
||||
version = "0.15.18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
}
|
||||
)
|
||||
);
|
||||
VENCORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
|
||||
# TODO: somehow update this automatically
|
||||
VENCORD_HASH = "deadbeef";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm run ${if buildWebExtension then "buildWeb" else "build"} \
|
||||
-- --standalone --disable-updater
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
VENCORD_HASH = gitHash;
|
||||
VENCORD_REMOTE = "${src.owner}/${src.repo}";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installPhase =
|
||||
if buildWebExtension then ''
|
||||
cp -r dist/chromium-unpacked/ $out
|
||||
'' else ''
|
||||
cp -r dist/ $out
|
||||
'';
|
||||
cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# We need to fetch the latest *tag* ourselves, as nix-update can only fetch the latest *releases* from GitHub
|
||||
# Vencord had a single "devbuild" release that we do not care about
|
||||
passthru.updateScript = writeShellScript "update-vencord" ''
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
curl
|
||||
jq
|
||||
nix-update
|
||||
]
|
||||
}:$PATH"
|
||||
ghTags=$(curl ''${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags")
|
||||
latestTag=$(echo "$ghTags" | jq -r .[0].name)
|
||||
|
||||
echo "Latest tag: $latestTag"
|
||||
|
||||
exec nix-update --version "$latestTag" "$@"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vencord web extension";
|
||||
homepage = "https://github.com/Vendicated/Vencord";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ FlafyDev NotAShelf Scrumplex ];
|
||||
maintainers = with maintainers; [
|
||||
FlafyDev
|
||||
NotAShelf
|
||||
Scrumplex
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs
|
||||
set -eou pipefail
|
||||
|
||||
pkgDir="$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
tempDir=$(mktemp -d)
|
||||
|
||||
ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags")
|
||||
latestTag=$(echo "$ghTags" | jq -r .[0].name)
|
||||
gitHash=$(echo "$ghTags" | jq -r .[0].commit.sha)
|
||||
|
||||
pushd "$tempDir"
|
||||
curl "https://raw.githubusercontent.com/Vendicated/Vencord/$latestTag/package.json" -o package.json
|
||||
npm install --legacy-peer-deps -f
|
||||
|
||||
npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
|
||||
popd
|
||||
|
||||
update-source-version vencord "${latestTag#v}"
|
||||
|
||||
sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i "$pkgDir/package.nix"
|
||||
sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$pkgDir/package.nix"
|
||||
cp "$tempDir/package-lock.json" "$pkgDir/package-lock.json"
|
||||
@ -1,18 +1,19 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libndtypes
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libndtypes,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libxnd";
|
||||
version = "unstable-2019-08-01";
|
||||
version = "0.2.0-unstable-2023-11-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xnd-project";
|
||||
repo = "xnd";
|
||||
rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc";
|
||||
sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y";
|
||||
repo = "libxnd";
|
||||
rev = "e1a06d9f6175f4f4e1da369b7e907ad6b2952c00";
|
||||
hash = "sha256-RWt2Nx0tfMghQES2SM+0jbAU7IunuuTORhBe2tvqVTY=";
|
||||
};
|
||||
|
||||
buildInputs = [ libndtypes ];
|
||||
@ -20,12 +21,12 @@ stdenv.mkDerivation {
|
||||
# Override linker with cc (symlink to either gcc or clang)
|
||||
# Library expects to use cc for linking
|
||||
configureFlags = [
|
||||
# Override linker with cc (symlink to either gcc or clang)
|
||||
# Library expects to use cc for linking
|
||||
"LD=${stdenv.cc.targetPrefix}cc"
|
||||
# needed for tests
|
||||
"--with-includes=${libndtypes}/include"
|
||||
"--with-libs=${libndtypes}/lib"
|
||||
# Override linker with cc (symlink to either gcc or clang)
|
||||
# Library expects to use cc for linking
|
||||
"LD=${stdenv.cc.targetPrefix}cc"
|
||||
# needed for tests
|
||||
"--with-includes=${libndtypes}/include"
|
||||
"--with-libs=${libndtypes}/lib"
|
||||
];
|
||||
|
||||
# other packages which depend on libxnd seem to expect overflow.h, but
|
||||
|
||||
@ -28,19 +28,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdal";
|
||||
version = "2.7.2";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDAL";
|
||||
repo = "PDAL";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps=";
|
||||
hash = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./pdal.pc.in.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in
|
||||
index 6885221cacc8..a07ee82cea68 100644
|
||||
--- a/apps/pdal.pc.in
|
||||
+++ b/apps/pdal.pc.in
|
||||
@@ -1,6 +1,6 @@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
|
||||
-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
|
||||
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
includedir=@CMAKE_INSTALL_PREFIX@/include
|
||||
|
||||
Name: PDAL
|
||||
@ -5,12 +5,13 @@
|
||||
fetchFromGitHub,
|
||||
future,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asn1";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
version = "2.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -18,10 +19,12 @@ buildPythonPackage rec {
|
||||
owner = "andrivet";
|
||||
repo = "python-asn1";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pXLG2Mkrv6EeJn6Dk+SefzNtrPdQ6of95LbVTKjTADQ=";
|
||||
hash = "sha256-xdkSJIe7qmz0Zu5IZ3Rl/h4v2j3YFrm1gz7lsNQ0ORs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ future ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cvss";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,10 +19,10 @@ buildPythonPackage rec {
|
||||
owner = "RedHatProductSecurity";
|
||||
repo = "cvss";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-e/zwOfbt3YLlRiLFObjps3tFFk6BAWBKdanio6sus8c=";
|
||||
hash = "sha256-r4IWaOEZUX+3wW47rX8+lsixIjr14zAaXfFIFcbLVMM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
jsonschema
|
||||
@ -37,10 +37,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for CVSS2/3/4";
|
||||
mainProgram = "cvss_calculator";
|
||||
homepage = "https://github.com/RedHatProductSecurity/cvss";
|
||||
changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}";
|
||||
license = with licenses; [ lgpl3Plus ];
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "cvss_calculator";
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,6 +29,8 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [ "django" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cron-descriptor
|
||||
python-crontab
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
substituteAll,
|
||||
|
||||
@ -44,7 +43,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django";
|
||||
version = "5.0.8";
|
||||
version = "5.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -53,7 +52,7 @@ buildPythonPackage rec {
|
||||
owner = "django";
|
||||
repo = "django";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mH8o1f3UMuKEHwfXK2ck1GVj/T50F+7IgTsnXJn7aHU=";
|
||||
hash = "sha256-4w5MSu3xdF9Pl0iRcD6bOgUF0tLMiZdCWt3JKsx/Rqc=";
|
||||
};
|
||||
|
||||
patches =
|
||||
@ -76,17 +75,13 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace tests/utils_tests/test_autoreload.py \
|
||||
--replace "/usr/bin/python" "${python.interpreter}"
|
||||
''
|
||||
+ lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") ''
|
||||
# Test regression after xz was reverted from 5.6.0 to 5.4.6
|
||||
# https://hydra.nixos.org/build/254532197
|
||||
substituteInPlace tests/view_tests/tests/test_debug.py \
|
||||
--replace-fail "test_files" "dont_test_files"
|
||||
'';
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools>=61.0.0,<69.3.0" setuptools
|
||||
|
||||
substituteInPlace tests/utils_tests/test_autoreload.py \
|
||||
--replace-fail "/usr/bin/python" "${python.interpreter}"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -125,8 +120,13 @@ buildPythonPackage rec {
|
||||
# make sure the installed library gets imported
|
||||
rm -rf django
|
||||
|
||||
# fails to import github_links from docs/_ext/github_links.py
|
||||
rm tests/sphinx/test_github_links.py
|
||||
|
||||
# provide timezone data, works only on linux
|
||||
export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo
|
||||
|
||||
export PYTHONPATH=$PWD/docs/_ext:$PYTHONPATH
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -9,16 +9,17 @@
|
||||
pandas,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
python-snappy,
|
||||
cramjam,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
zlib-ng,
|
||||
zstandard,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastavro";
|
||||
version = "1.9.5";
|
||||
format = "setuptools";
|
||||
version = "1.9.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -26,22 +27,25 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rw0kTSROCFthjo8SrLevBiACNaKpKWcZfIYoc89Q3eM=";
|
||||
hash = "sha256-hKhwQqNJ+QvYf4x9FesNOPg36m8zC6D6dmlhANXCcsk=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
export FASTAVRO_USE_CYTHON=1
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
build-system = [
|
||||
cython
|
||||
setuptools
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
codecs = [
|
||||
cramjam
|
||||
lz4
|
||||
python-snappy
|
||||
zstandard
|
||||
];
|
||||
snappy = [ python-snappy ];
|
||||
snappy = [ cramjam ];
|
||||
zstandard = [ zstandard ];
|
||||
lz4 = [ lz4 ];
|
||||
};
|
||||
@ -52,7 +56,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
python-dateutil
|
||||
zlib-ng
|
||||
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
# Fails with "AttributeError: module 'fastavro._read_py' has no attribute
|
||||
# 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676.
|
||||
|
||||
@ -37,11 +37,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "numpy_groupies" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/ml31415/numpy-groupies";
|
||||
changelog = "https://github.com/ml31415/numpy-groupies/releases/tag/v${version}";
|
||||
description = "Optimised tools for group-indexing operations: aggregated sum and more";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.berquist ];
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ berquist ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,31 +2,28 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
ply,
|
||||
jinja2,
|
||||
requests,
|
||||
|
||||
# tests
|
||||
ply,
|
||||
poetry-core,
|
||||
pysmi,
|
||||
pysnmp,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
pname = "pysmi";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lextudio";
|
||||
repo = "pysmi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9ArKo1UT4g+H8Z51NZ6rHlOhyz2grAc1V8Xl+ztfYic=";
|
||||
hash = "sha256-9yAsseMI50RhVeyFvuTo/pN9ftrvvUWYCacy2v3VVT8=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@ -37,14 +34,14 @@ buildPythonPackage rec {
|
||||
requests
|
||||
];
|
||||
|
||||
# Tests require pysnmp, which in turn requires pysmi => infinite recursion
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pysnmp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests require pysnmp, which in turn requires pysmi => infinite recursion
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pysmi" ];
|
||||
|
||||
passthru.tests.pytest = pysmi.overridePythonAttrs { doCheck = true; };
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
|
||||
# dependneices
|
||||
numpy,
|
||||
libusb-compat-0_1,
|
||||
|
||||
# optional-dependenices
|
||||
pyusb,
|
||||
@ -29,17 +30,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "seabreeze";
|
||||
version = "2.6.0";
|
||||
version = "2.9.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ap--";
|
||||
repo = "python-seabreeze";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ead9G4i8/mFwPqL2PGsndtmX93Njld3nvTTr6ROJTac=";
|
||||
hash = "sha256-NzZ+ZRfJ97Ufp6hmqN6ziBFfdvJXpmWwh9A66od/8Hc=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
# pkgconfig cant find libusb, doing it manually
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail 'pkgconfig.parse("libusb")' \
|
||||
"{'include_dirs': ['${libusb-compat-0_1}/include'], 'library_dirs': ['${libusb-compat-0_1}/lib'], 'libraries': ['usb']}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
git
|
||||
@ -48,7 +58,10 @@ buildPythonPackage rec {
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
libusb-compat-0_1
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
pyseabreeze = [ pyusb ];
|
||||
@ -66,6 +79,8 @@ buildPythonPackage rec {
|
||||
zipp
|
||||
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
|
||||
disabledTests = [ "TestHardware" ];
|
||||
|
||||
setupPyBuildFlags = [ "--without-cseabreeze" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -20,15 +20,6 @@ buildPythonPackage {
|
||||
|
||||
buildInputs = [ libndtypes ];
|
||||
|
||||
patches = [
|
||||
# python311 fixes which are on main. remove on update
|
||||
(fetchpatch {
|
||||
name = "python311.patch";
|
||||
url = "https://github.com/xnd-project/xnd/commit/e1a06d9f6175f4f4e1da369b7e907ad6b2952c00.patch";
|
||||
hash = "sha256-xzrap+FL5be13bVdsJ3zeV7t57ZC4iyhuZhuLsOzHyE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rune-languageserver";
|
||||
version = "0.12.4";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-KVNof5s3hiCabsoypwS22FMyJIPF9aU8HNqVKPNo7Fk=";
|
||||
hash = "sha256-Kw6Qh/9eQPMj4V689+7AxuJB+aCciK3FZTfcdhyZXGY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HiydWqOHz4LJJwJTclRlQfOphE1W03HTMjCtqr1XnJs=";
|
||||
cargoHash = "sha256-GlzT7lN9iCNiPFIjhL/UfqohgtOwDaIeTVEWOyaeicM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -1,24 +1,33 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
darwin,
|
||||
cmake,
|
||||
pkg-config,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-pack";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustwasm";
|
||||
repo = "wasm-pack";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L4mCgUPG4cgTUpCoaIUOTONBOggXn5vMyPKj48B3MMk=";
|
||||
hash = "sha256-NEujk4ZPQ2xHWBCVjBCD7H6f58P4KrwCNoDHKa0d5JE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mqQRQXaUW6mreE7UUEA0zhhaaGGKLRUngH9QLxcaIdY=";
|
||||
cargoHash = "sha256-pFKGQcWW1/GaIIWMyWBzts4w1hMu27hTG/uUMjkfDMo=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security ++ [ zstd ];
|
||||
|
||||
# Most tests rely on external resources and build artifacts.
|
||||
# Disabling check here to work with build sandboxing.
|
||||
@ -28,7 +37,10 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Utility that builds rust-generated WebAssembly package";
|
||||
mainProgram = "wasm-pack";
|
||||
homepage = "https://github.com/rustwasm/wasm-pack";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
license = with licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = [ maintainers.dhkl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,24 +1,17 @@
|
||||
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }:
|
||||
{ fetchurl, lib, stdenv, pkg-config, gettext, glew, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }:
|
||||
|
||||
let
|
||||
version = "0.16.1";
|
||||
version = "1.0";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "freedroidrpg";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz";
|
||||
sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2";
|
||||
hash = "sha256-eZW3C1lCSOoU0bTvWVOXpgGDAxyZFjsBwainDM7zu88=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for -fno-common tolchains.
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761.patch";
|
||||
sha256 = "1s7sw4dkc7b6i72j6x47driq6v0k3wss48l9ivd4fw40n3iaxjb1";
|
||||
})
|
||||
|
||||
# Do not embed build flags in the binary to reduce closure size.
|
||||
./drop-build-deps.patch
|
||||
];
|
||||
@ -26,9 +19,11 @@ in stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ pkg-config gettext python3 ];
|
||||
|
||||
buildInputs = [
|
||||
SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib
|
||||
glew SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib
|
||||
] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Isometric 3D RPG similar to game Diablo";
|
||||
mainProgram = "freedroidRPG";
|
||||
|
||||
@ -2,10 +2,10 @@ Do not embed paths to build-only depends (-I...SDL2-dev and friends)
|
||||
into savefile lua comments.
|
||||
--- a/src/savestruct_internal.c
|
||||
+++ b/src/savestruct_internal.c
|
||||
@@ -486,8 +486,8 @@ void save_game_data(struct auto_string *strout)
|
||||
@@ -571,8 +571,8 @@ void save_game_data(struct auto_string *strout)
|
||||
autostr_append(strout,
|
||||
"SAVEGAME: %s %s %s;sizeof(tux_t)=%d;sizeof(enemy)=%d;sizeof(bullet)=%d;MAXBULLETS=%d\n",
|
||||
SAVEGAME_VERSION, SAVEGAME_REVISION, VERSION, (int)sizeof(tux_t), (int)sizeof(enemy), (int)sizeof(bullet), (int)MAXBULLETS);
|
||||
"SAVEGAME: %s %s %s;sizeof(tux_t)=%d;sizeof(enemy)=%d;sizeof(bullet)=%d\n",
|
||||
SAVEGAME_VERSION, SAVEGAME_REVISION, VERSION, (int)sizeof(tux_t), (int)sizeof(enemy), (int)sizeof(bullet));
|
||||
- autostr_append(strout, "BUILD_CFLAGS: %s\n", BUILD_CFLAGS);
|
||||
- autostr_append(strout, "BUILD_LDFLAGS: %s\n", BUILD_LDFLAGS);
|
||||
+ autostr_append(strout, "BUILD_CFLAGS: %s\n", "<hidden>");
|
||||
|
||||
@ -3,26 +3,27 @@
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, appimageTools
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "osu-lazer-bin";
|
||||
version = "2024.817.0";
|
||||
version = "2024.906.2";
|
||||
|
||||
src = {
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
|
||||
hash = "sha256-ssyKy9CDN5LcyaQE7o56VoXoYYVU1zksMT3GxdMu2lA=";
|
||||
hash = "sha256-KyvC8gEqZvXMATxS2513X0WdlR7nF8tHS4R/TPFrHao=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
|
||||
hash = "sha256-6yGMZ+rMnzuu0NNBD0BBSV5YvuGibIkhBL3HQWqudzo=";
|
||||
hash = "sha256-ToxDZHL59YPmybvB9tsiOnFEd+FJJE4mNMfaK6btYKo=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
||||
hash = "sha256-AruD0XoJJm3+LQ+WH2CqKb+7S/VjG6YmdWhsH5l3/uM=";
|
||||
hash = "sha256-zQnR3KwlE1gTWH8f+GDRBsc7Whfn9XpT1D/NLg5TtrU=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
|
||||
@ -64,10 +65,13 @@ else appimageTools.wrapType2 {
|
||||
contents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
''
|
||||
mv -v $out/bin/${pname} $out/bin/osu\!
|
||||
install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
|
||||
. ${makeWrapper}/nix-support/setup-hook
|
||||
mv -v $out/bin/${pname} $out/bin/osu!
|
||||
wrapProgram $out/bin/osu! \
|
||||
--set OSU_EXTERNAL_UPDATE_PROVIDER 1
|
||||
install -m 444 -D ${contents}/osu!.desktop -t $out/share/applications
|
||||
for i in 16 32 48 64 96 128 256 512 1024; do
|
||||
install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
|
||||
install -D ${contents}/osu!.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png
|
||||
done
|
||||
'';
|
||||
}
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, dotnetCorePackages
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, makeWrapper
|
||||
, ffmpeg
|
||||
, alsa-lib
|
||||
, SDL2
|
||||
@ -17,13 +18,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2024.817.0";
|
||||
version = "2024.906.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
hash = "sha256-X6YaNHwNtHSqjV4oKQmYUd1aadbHSmr3EZDoq6epAkE=";
|
||||
hash = "sha256-ykCO+q28IUJumt3nra1BUlwuXqLS1FYOqcDe2LPPGVY=";
|
||||
};
|
||||
|
||||
projectFile = "osu.Desktop/osu.Desktop.csproj";
|
||||
@ -32,7 +33,10 @@ buildDotnetModule rec {
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
ffmpeg
|
||||
@ -59,8 +63,11 @@ buildDotnetModule rec {
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
wrapProgram $out/bin/osu! \
|
||||
--set OSU_EXTERNAL_UPDATE_PROVIDER 1
|
||||
|
||||
for i in 16 32 48 64 96 128 256 512 1024; do
|
||||
install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
|
||||
install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png
|
||||
done
|
||||
|
||||
ln -sft $out/lib/${pname} ${SDL2}/lib/libSDL2${stdenvNoCC.hostPlatform.extensions.sharedLibrary}
|
||||
|
||||
19
pkgs/games/osu-lazer/deps.nix
generated
19
pkgs/games/osu-lazer/deps.nix
generated
@ -3,7 +3,6 @@
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; hash = "sha256-a3wCSaOXl+5RKWNi1ddRbNWkOzfodFAUokqPyQiVHGg="; })
|
||||
(fetchNuGet { pname = "Clowd.Squirrel"; version = "2.11.1"; hash = "sha256-oNqHp7FwK7/gxCi0XhOqzdmGlWfp1D7gYuHfQBnICmk="; })
|
||||
(fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; hash = "sha256-+BoA4FdDUfeREdc42xbnonh3IBLOjzyrrBosaswbSg4="; })
|
||||
(fetchNuGet { pname = "DiffPlex"; version = "1.7.2"; hash = "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="; })
|
||||
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; hash = "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="; })
|
||||
@ -63,7 +62,7 @@
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; hash = "sha256-N3D1z5aoGwAZ6+ZxrWMtXgacvQcgDG+aLrQQI9uysmM="; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; })
|
||||
(fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2023.3.3"; hash = "sha256-Nn3imJvnqLe02gR1GyUHYH4+XkrNnhLy9dyCjJCkB7M="; })
|
||||
(fetchNuGet { pname = "managed-midi"; version = "1.10.0"; hash = "sha256-eNcYo4O0hnuYN6wk/WcR5z6/yT9SNAPEsEaSiXBEMOY="; })
|
||||
(fetchNuGet { pname = "managed-midi"; version = "1.10.1"; hash = "sha256-iuqpyp8vM7ZjtcM9KNqx9se/UhQHsYrQ+lxL4EntyXU="; })
|
||||
(fetchNuGet { pname = "Markdig"; version = "0.23.0"; hash = "sha256-4Kjeb54eyas0pCMbTHGPK13vW9zEnFyZ5VStwwtClq8="; })
|
||||
(fetchNuGet { pname = "MessagePack"; version = "2.5.140"; hash = "sha256-qcqLsxV9RO5/YLWh3gE6vJFgiWg+94GcP2MtptimOBI="; })
|
||||
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.140"; hash = "sha256-im4hZAocYWEn5AS2ACreP3mQTEzkW1MiuUJTycIqHUY="; })
|
||||
@ -88,11 +87,13 @@
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; hash = "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; hash = "sha256-itpwRYzmJZUt2kYJrrcq2IOwqqOskdbE3HMmD8GV/jY="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.15"; hash = "sha256-EnqalFuhuEsdm/4Op2K+yAdvWzad3L7hKcnwFwahypE="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; hash = "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; hash = "sha256-xNqhEqOm7tI3nxdlbAJ9NSm5/WbkRSUCrdDM+syJ9EQ="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; hash = "sha256-uI5Mo+e+8x7mhDcFyDEW2Nwg+LTpw+0R38LZ/ognHz4="; })
|
||||
@ -123,6 +124,7 @@
|
||||
(fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.11.0"; hash = "sha256-Bdwsy96KpU44Dr6JVKPOhOmiZYZ/uMKQ0Ug2nKZiDcQ="; })
|
||||
(fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; hash = "sha256-q11PcqNtfTKavfr1SPtmJTEx3qwHrXW+MrCw6Y3aNxA="; })
|
||||
(fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; hash = "sha256-eBfn91Kr7Vv+js8kvKrnai2W3ZN7dY+7u9ivHGwoIxA="; })
|
||||
(fetchNuGet { pname = "NuGet.Versioning"; version = "6.10.1"; hash = "sha256-jOh27AORk0TIhVePDVAgVhh6FuUo2v3oh/Xapcw7UVI="; })
|
||||
(fetchNuGet { pname = "NUnit"; version = "3.14.0"; hash = "sha256-CuP/q5HovPWfAW3Cty/QxRi7VpjykJ3TDLq5TENI6KY="; })
|
||||
(fetchNuGet { pname = "NVika"; version = "3.0.0"; hash = "sha256-zgg8aUuIFQ4EZHScy+YHmkwDE9K5vzUJF8s9aiJNFuw="; })
|
||||
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; hash = "sha256-tTk8ezYrMs/Kj+snMvWq9Ae7WLU4pq5NpFHEZV8WjJM="; })
|
||||
@ -136,17 +138,17 @@
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; })
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; })
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.809.2"; hash = "sha256-Q8AmtVjauwe0mJMkvY6SXTF0WsycjRyInQv8/Uo2iQs="; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.907.1"; hash = "sha256-h9wQPX7EP4b6+a7D/qU3qvSi05yp2rOj52nBmko1Y2o="; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.809.1-nativelibs"; hash = "sha256-F7xd66bCEDgEjYgqmx21lYde+ebCsX/E2fuqWXH4xyU="; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; })
|
||||
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.810.0"; hash = "sha256-p8aegRGVYUTKhV9qdIlvFxISMpFL761Q6RdbpT8gWWY="; })
|
||||
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.904.0"; hash = "sha256-x3et2Rnr90bdlFzR852Pt1EkW69/eQxlXciPNtFrN44="; })
|
||||
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; })
|
||||
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; })
|
||||
(fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.807.1"; hash = "sha256-9ppVYCkc43NIsfe9iKWlxd8elgECZqP+pRPT9ybxiAU="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.58-gfe61932a71"; hash = "sha256-+fZB3EJpXQPolB13mRNglznpUXgCh82MqymkCjteTPg="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-BejLZdoBRcqCgoiHWi/vSr2apyxnpZ95tYjN9hj9ox4="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-f1a/pHOWs0S5sWsiTRW1KUdqEpA1WVO+d96bdagt0eA="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g0c0fcee30c"; hash = "sha256-e5CtTT8/66xCtAf3oTuyoHvnWh6zegZYD3A9pHQE7Sc="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.62-gca0239da6b"; hash = "sha256-mGlMQbp2/ewA7PzamEeMA1pbboC73iAIARhK4MPrwO4="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-8jkbU2QV4HV8RU1vnSNtP8kNEhDWbTb3Dr2cl8w/T6A="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-I81to2x5D4LlIJN80d5DbqcU0jPTVSPoc0tvL15YG6I="; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gfbb03d21c2"; hash = "sha256-rnl6+U4E3BJVYTWtEjOx7fDVcJJNBP8MOisoGVLT7vA="; })
|
||||
(fetchNuGet { pname = "ppy.Vk"; version = "1.0.26"; hash = "sha256-YA+U8RhOrGdtw3tlluiv1+M7FIMB0zQMnPVY8ynOxvE="; })
|
||||
(fetchNuGet { pname = "Realm"; version = "11.5.0"; hash = "sha256-ykC2fyOh4XeRJyLoO3jQQC4sZcFhSms7wswSO6Iu8mQ="; })
|
||||
(fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; hash = "sha256-6QUO6jQC3VwxKsNY24WSgLNtOwcaGjQDtP0S4DSt670="; })
|
||||
@ -319,6 +321,7 @@
|
||||
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
|
||||
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
|
||||
(fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; hash = "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="; })
|
||||
(fetchNuGet { pname = "Velopack"; version = "0.0.598-g933b2ab"; hash = "sha256-i1VR1tZ+rNl8F4EL8x5OAdnqfIRuHmviTp19uPFi14A="; })
|
||||
(fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.4.2"; hash = "sha256-LXdgts8lKbTU67c1W001XRbq5nenzf8XcYCRxc75jR8="; })
|
||||
(fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.4.2"; hash = "sha256-hU4qzLKhv4QxiP2c9s4IZUGgeQxsOjRhgurrlXXq/qM="; })
|
||||
(fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; hash = "sha256-LOIxdET0ynaJz70fakVwDYU0qm+1P0SfD1+I9P320oc="; })
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, dpkg, fetchurl, zip, nixosTests }:
|
||||
|
||||
let
|
||||
generic = { version, sha256, suffix ? "", ... } @ args:
|
||||
generic = { version, sha256, suffix ? "", knownVulnerabilities ? [ ], ... } @ args:
|
||||
stdenv.mkDerivation (args // {
|
||||
pname = "unifi-controller";
|
||||
|
||||
@ -39,6 +39,7 @@ let
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ globin patryk27 ];
|
||||
inherit knownVulnerabilities;
|
||||
};
|
||||
});
|
||||
|
||||
@ -49,6 +50,7 @@ in rec {
|
||||
version = "7.5.187";
|
||||
suffix = "-f57f5bf7ab";
|
||||
sha256 = "sha256-a5kl8gZbRnhS/p1imPl7soM0/QSFHdM0+2bNmDfc1mY=";
|
||||
knownVulnerabilities = [ "CVE-2024-42025" ];
|
||||
};
|
||||
|
||||
unifi8 = generic {
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.40.0";
|
||||
version = "1.40.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-LKRCsYQOSSLYLYi2IntJuPiLR+l4oUtyVRUoGs/NWeI=";
|
||||
hash = "sha256-R2pRLprKJY4EgVBfoxMRuRImDGHgFzEQIlUly1fKxT4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ufmNe1dVqtDirn1/VydNedns5V8y0oR8fuVi6E86JFs=";
|
||||
npmDepsHash = "sha256-S62EBkI0FBlRjG4LqN6oA5aA805nvPHhOJBvUirByKk=";
|
||||
|
||||
buildInputs = lib.optionals withSystemd [
|
||||
systemdMinimal
|
||||
|
||||
@ -10,17 +10,17 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-include";
|
||||
version = "1.3.3";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DCsunset";
|
||||
repo = "pandoc-include";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8eTK7jTwxgSjlxEzjFlL5mzt4tBolmS6fSRnbXDWYJc=";
|
||||
hash = "sha256-rhA+mPjwMoWwX0VIoSZ3aRmlgUy88eGyjSuM3BhyAAQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aardvark-dns";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x8cfLn8b9h6+rpAVXZHdaVTzkzlDSfyGWveDX9usIPE=";
|
||||
hash = "sha256-1fYJ0G75sbg97HiN6HNWwlG82jqENqVTC/sXgH+oXWA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eGA3oTDk3tGzYDeGJwe6+Tpum+ue534qXv79SotDy/o=";
|
||||
cargoHash = "sha256-COZmd5sqaewK0La78/1J9bGJdsPNyeT18wV2qr/b6cM=";
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
|
||||
3989
pkgs/tools/security/ripasso/Cargo.lock
generated
3989
pkgs/tools/security/ripasso/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -16,31 +16,22 @@
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.6.4";
|
||||
version = "0.7.0";
|
||||
pname = "ripasso-cursive";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cortex";
|
||||
repo = "ripasso";
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-9wBaFq2KVfLTd1j8ZPoUlmZJDW2UhvGBAaCGX+qg92s=";
|
||||
hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dP8H4OOgtQEBEJxpbaR3KnXFtgBdX4r+dCpBJjBK1MM=";
|
||||
|
||||
patches = [
|
||||
./fix-tests.patch
|
||||
];
|
||||
|
||||
cargoPatches = [
|
||||
./fix-build.patch
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"qml-0.0.9" = "sha256-ILqvUaH7nSu2JtEs8ox7KroOzYnU5ai44k1HE4Bz5gg=";
|
||||
};
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "-p ripasso-cursive" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 8464bf70..659e66c0 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2702,7 +2702,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64 0.21.0",
|
||||
@@ -2730,7 +2730,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso-cursive"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"cli-clipboard",
|
||||
@@ -2753,7 +2753,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso-gtk"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"clipboard",
|
||||
"gdk",
|
||||
@@ -2765,7 +2765,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso-qt"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"clipboard",
|
||||
"qml",
|
||||
@ -970,6 +970,8 @@ mapAliases ({
|
||||
mdt = md-tui; # Added 2024-09-03
|
||||
meme = meme-image-generator; # Added 2021-04-21
|
||||
mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10
|
||||
microcodeAmd = microcode-amd; # Added 2024-09-08
|
||||
microcodeIntel = microcode-intel; # Added 2024-09-08
|
||||
microsoft_gsl = microsoft-gsl; # Added 2023-05-26
|
||||
MIDIVisualizer = midivisualizer; # Added 2024-06-12
|
||||
migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08
|
||||
|
||||
@ -4005,7 +4005,9 @@ with pkgs;
|
||||
|
||||
atftp = callPackage ../tools/networking/atftp { };
|
||||
|
||||
atlas = callPackage ../development/tools/database/atlas { };
|
||||
atlas = callPackage ../by-name/at/atlas/package.nix {
|
||||
buildGoModule = buildGo123Module;
|
||||
};
|
||||
|
||||
authoscope = callPackage ../tools/security/authoscope {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@ -20294,7 +20296,10 @@ with pkgs;
|
||||
else if name == "relibc" then targetPackages.relibc or relibc
|
||||
else throw "Unknown libc ${name}";
|
||||
|
||||
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;
|
||||
libcCross =
|
||||
if stdenv.targetPlatform == stdenv.buildPlatform
|
||||
then null
|
||||
else libcCrossChooser stdenv.targetPlatform.libc;
|
||||
|
||||
threadsCross =
|
||||
lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) {
|
||||
@ -25989,12 +25994,6 @@ with pkgs;
|
||||
|
||||
mlxbf-bootimages = callPackage ../misc/mlxbf-bootimages { };
|
||||
|
||||
microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { };
|
||||
|
||||
microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
|
||||
|
||||
iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { };
|
||||
|
||||
inherit (callPackages ../os-specific/linux/apparmor { })
|
||||
libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
|
||||
apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure;
|
||||
|
||||
@ -10635,6 +10635,8 @@ self: super: with self; {
|
||||
psychrolib = callPackage ../development/python-modules/psychrolib { };
|
||||
|
||||
psycopg = callPackage ../development/python-modules/psycopg { };
|
||||
psycopg-pool = psycopg.pool;
|
||||
psycopg-c = psycopg.c;
|
||||
|
||||
psycopg2 = callPackage ../development/python-modules/psycopg2 { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user