Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -24,7 +24,7 @@ trap 'rm -rf "$tmp"' exit
|
||||
|
||||
declare -A users=()
|
||||
while read -r handle && [[ -n "$handle" ]]; do
|
||||
users[$handle]=
|
||||
users[${handle,,}]=
|
||||
done
|
||||
|
||||
# Cannot request a review from the author
|
||||
|
||||
@@ -197,6 +197,7 @@ with lib.maintainers;
|
||||
siraben
|
||||
vbgl
|
||||
alizter
|
||||
stepbrobd
|
||||
];
|
||||
scope = "Maintain the Coq theorem prover and related packages.";
|
||||
shortName = "Coq";
|
||||
|
||||
@@ -45,6 +45,12 @@ in
|
||||
description = "Port to run Navidrome on.";
|
||||
type = port;
|
||||
};
|
||||
|
||||
EnableInsightsCollector = mkOption {
|
||||
default = false;
|
||||
description = "Enable anonymous usage data collection, see <https://www.navidrome.org/docs/getting-started/insights/> for details.";
|
||||
type = bool;
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, pkg-config
|
||||
, libtool
|
||||
, bzip2Support ? true, bzip2
|
||||
@@ -51,22 +50,15 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-40";
|
||||
version = "7.1.1-43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NrTIx1OvwPIeVlA39hGkXZ2Atk4FCsU3/55SZeSc40E=";
|
||||
hash = "sha256-4JzCBKtXiKGLsZ29+7z5U+3aN3ppusQ7mz+sOZYpXGY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/ImageMagick/ImageMagick/commit/bf5650f0dd41b500102a129d6867cb568f4edee4.patch";
|
||||
hash = "sha256-nxvSTyNZ35DqjR41nM5uidWwRFWzd1e/LFE0n3fpbb8=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
outputMan = "out"; # it's tiny
|
||||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
undmg,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "betterdisplay";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg";
|
||||
hash = "sha256-UQLVRCeUznTqT6qDR6sZRZ5xMVgs0Th2iRRpnF0pqVI=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
buildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = ".";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
mv BetterDisplay.app $out/Applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more";
|
||||
homepage = "https://betterdisplay.pro/";
|
||||
changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}";
|
||||
license = [ lib.licenses.unfree ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ DimitarNestorov ];
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -9,13 +9,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "7.8.5";
|
||||
version = "7.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8uxl8h7EAhLo4BMLPbtQdxK5kNe9fv1PbViBELJZXKY=";
|
||||
sha256 = "sha256-rrYB8W1Zq9rCRgVyAPFZ5i37uEKXvV83hpkLaB7N9zQ=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "comrak";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kivikakk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sRYyInQ2jvtipmGkTL8P7ed0YHLnAQObaMX6N87bFHU=";
|
||||
sha256 = "sha256-VN8f5r25kfUqekt9q28oMmkzQUE+Ko8DYhRZjpbbDfM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4Tl9MEZn8RAklqc32bLeWg+muVcjqMKRWSrt8BIq9n4=";
|
||||
cargoHash = "sha256-Hdjit5dpZXT7ENamUX0ygTy+XAyCkcqq94wAJUPd8DY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nodejs_20,
|
||||
jre_headless,
|
||||
protobuf,
|
||||
cyclonedx-cli,
|
||||
@@ -17,6 +18,9 @@ let
|
||||
pname = "dependency-track-frontend";
|
||||
inherit version;
|
||||
|
||||
# TODO: pinned due to build error on node 22
|
||||
nodejs = nodejs_20;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DependencyTrack";
|
||||
repo = "frontend";
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.31.2";
|
||||
version = "1.31.4";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-It/etwQGBok805FVTneOR+LU7QkHUHWXpUWtKLq6xe0=";
|
||||
sha256 = "sha256-gqwVZg37pZA+XjT3FpTMYkrOIT1KKUN6upg7e1vh1t0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatus";
|
||||
version = "5.14.0";
|
||||
version = "5.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TwiN";
|
||||
repo = "gatus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WYD456l1XdyqhBzsMvruvn24DYspCYt9m7rzqd3dSK4=";
|
||||
hash = "sha256-etML4syyN1fEFewWk0L0p76TTeCMwFG4ifZKPS18CTc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UeKQwqDHj1DFjlnGAl8asW7OpmClGi9aB/IbMzR9WvU=";
|
||||
vendorHash = "sha256-o6G4XLgEHI+ey/49+H+F9zTBq6L2shjkrJNnDLYFM+Q=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -10,19 +10,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "godns";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimothyYe";
|
||||
repo = "godns";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qkyEQs96E5l1R5JTGefnTeiThr4P7PtUjpNmiylQj4c=";
|
||||
hash = "sha256-E5xJiODTOaBGojFd7W+id59tKLPpHpkAFHiETOYqCSg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zz33xHIZ2jhD2s3v2vum0ELG7GTqe5SsADUrO5yqumw=";
|
||||
vendorHash = "sha256-cR+hlIGRPffP21lqDZmqBF4unS6ZyEvEvRlTrswg+js=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/web";
|
||||
hash = "sha256-Y35CcUubO3QmbEwWBFXoWKLgvE8dp/mFE/szRigJvLo=";
|
||||
hash = "sha256-lchAfi97a97TPs22ML3sMrlSZdvWMMC+wBrGbvke5rg=";
|
||||
};
|
||||
|
||||
npmRoot = "web";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iterm2";
|
||||
version = "3.5.10";
|
||||
version = "3.5.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://iterm2.com/downloads/stable/iTerm2-${
|
||||
lib.replaceStrings [ "." ] [ "_" ] version
|
||||
}.zip";
|
||||
hash = "sha256-tvHAuHitB5Du8hqaBXmWzplrmaLF6QxV8SNsRyfCUfM=";
|
||||
hash = "sha256-vcZL74U9RNjhpIQRUUn6WueYhE/LfLqpb/JgWunY5dI=";
|
||||
};
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
udev,
|
||||
xorg,
|
||||
libgbm,
|
||||
darwin,
|
||||
coreutils,
|
||||
}:
|
||||
|
||||
@@ -78,22 +77,17 @@ stdenv.mkDerivation {
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
udev
|
||||
xorg.libX11
|
||||
xorg.libXrandr
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXt
|
||||
xorg.libXxf86vm
|
||||
xorg.libXrender
|
||||
libgbm
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.AppKit
|
||||
darwin.apple_sdk_11_0.frameworks.Cocoa
|
||||
];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
udev
|
||||
xorg.libX11
|
||||
xorg.libXrandr
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXt
|
||||
xorg.libXxf86vm
|
||||
xorg.libXrender
|
||||
libgbm
|
||||
];
|
||||
|
||||
env = {
|
||||
SOURCE_LEVEL = "1.8";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "kazumi";
|
||||
version = "1.4.8";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
tag = version;
|
||||
hash = "sha256-E1JOBdOfb2WyTDU0nOu1SCFSfv5O4VKj+9Go8wcMips=";
|
||||
hash = "sha256-YYg8DpW/O517R9YZ9jpikNIy2MfLQdiLsdhO3uhCusc=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -226,6 +226,16 @@
|
||||
"source": "hosted",
|
||||
"version": "0.2.5"
|
||||
},
|
||||
"card_settings_ui": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "card_settings_ui",
|
||||
"sha256": "36bd1bb8e3d18612e2654e722da0f1ed9bc7a412339b906205107ece72b8e14b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"characters": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "memray";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloomberg";
|
||||
repo = "memray";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-U9JR60rSxPYXbZaKR7vVNhGT78AXnqcoqvVC6/1OW/E=";
|
||||
hash = "sha256-SgkJm+vtIid8RR1Qy98PkpvIQX4LxyAPlS+4UlYlZws=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pytest-textual-snapshot
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.12") [ greenlet ];
|
||||
++ lib.optionals (pythonOlder "3.14") [ greenlet ];
|
||||
|
||||
pythonImportsCheck = [ "memray" ];
|
||||
|
||||
@@ -58,15 +58,6 @@ python3Packages.buildPythonApplication rec {
|
||||
# Import issue
|
||||
"test_header_allocator"
|
||||
"test_hybrid_stack_of_allocations_inside_ceval"
|
||||
|
||||
# snapshot-based tests are too fragile
|
||||
# see https://github.com/bloomberg/memray/issues/654
|
||||
"TestTUILooks"
|
||||
"test_tui_basic"
|
||||
"test_tui_pause"
|
||||
"test_tui_gradient"
|
||||
"test_merge_threads"
|
||||
"test_unmerge_threads"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "memtester";
|
||||
version = "4.7.0";
|
||||
version = "4.7.1";
|
||||
|
||||
preConfigure = ''
|
||||
echo "$CC" > conf-cc
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
|
||||
sha256 = "sha256-MycYBfiqMMEZ+79exOeimOn0wrydLZMCAio+0wHrcCg=";
|
||||
sha256 = "sha256-5CfeZj970i0evuivElBqhSwBC9T8vKHg5rApctKYtbs=";
|
||||
};
|
||||
|
||||
installFlags = [ "INSTALLPATH=$(out)" ];
|
||||
|
||||
@@ -18,23 +18,23 @@
|
||||
|
||||
buildGo123Module rec {
|
||||
pname = "navidrome";
|
||||
version = "0.53.3";
|
||||
version = "0.54.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "navidrome";
|
||||
repo = "navidrome";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RLmGjkeBHuvVdxXaGvlIFPI+6beAdtSLukVmwe6Hnag=";
|
||||
hash = "sha256-mOJSgX+1id8tZU8KVjWbf2LycrzdudhUV/9pxKa4yHw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XjiRMRfsmcw/4RLZXN36BbzbCKu98BgD3cn89e/vra4=";
|
||||
vendorHash = "sha256-LpSmSbReQ3yHFvHhN/LERWQjf72/ELTjk4qhO4lyzW0=";
|
||||
|
||||
npmRoot = "ui";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/ui";
|
||||
hash = "sha256-0vHInRly5xirjfV7tcYVNVLaMk4YtJeB7Ky0mrDDDnY=";
|
||||
hash = "sha256-PaE1xcZX9wZRcKeqQCXbdhi4cIBWBL8ZQdww6AOB7sQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -61,10 +61,18 @@ buildGo123Module rec {
|
||||
|
||||
CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ui/bin/update-workbox.sh
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
make buildjs
|
||||
'';
|
||||
|
||||
tags = [
|
||||
"netgo"
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString ffmpegSupport ''
|
||||
wrapProgram $out/bin/navidrome \
|
||||
--prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
yarnInstallHook,
|
||||
fetchYarnDeps,
|
||||
nodejs,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nezha-theme-nazhua";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hi2shark";
|
||||
repo = "nazhua";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5XEdfUCwQSa+PWu4SHJCg3rCtblyD5x41lKe0SvFrU8=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-Wy4xtLjDNkBLeESJCbfq9GhT0mSTAfGBN0A3oHX5BuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
yarnInstallHook
|
||||
# Needed for executing package.json scripts
|
||||
nodejs
|
||||
];
|
||||
|
||||
# Copied from .github/workflows/release.yml
|
||||
env = {
|
||||
VITE_NEZHA_VERSION = "v1";
|
||||
VITE_SARASA_TERM_SC_USE_CDN = "1";
|
||||
VITE_USE_CDN = "1";
|
||||
VITE_CDN_LIB_TYPE = "jsdelivr";
|
||||
};
|
||||
|
||||
dontNpmInstall = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Nezha monitoring theme called Nazhua";
|
||||
changelog = "https://github.com/hi2shark/nazhua/releases/tag/v${finalAttrs.version}";
|
||||
homepage = "https://github.com/hi2shark/nazhua";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ moraxyc ];
|
||||
};
|
||||
})
|
||||
+5969
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "nezha-theme-user";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hamster1963";
|
||||
repo = "nezha-dash-v1";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vd242bYWT7AgpKDyYEb+Kc+8o1qtuTusmxqLnWGo5pE=";
|
||||
};
|
||||
|
||||
# TODO: Switch to the bun build function once available in nixpkgs
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
# We cannot directly get the git commit hash from the tarball
|
||||
substituteInPlace vite.config.ts \
|
||||
--replace-fail 'git rev-parse --short HEAD' 'echo refs/tags/v${version}'
|
||||
substituteInPlace src/components/Footer.tsx \
|
||||
--replace-fail '/commit/' '/tree/'
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-jWCgeT3IvTZZTh/kKq+mRc0tAVoptl3rrlwcbUSs5uc=";
|
||||
|
||||
npmPackFlags = [ "--ignore-scripts" ];
|
||||
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
dontNpmInstall = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Nezha monitoring user frontend based on next.js";
|
||||
changelog = "https://github.com/hamster1963/nezha-dash-v1/releases/tag/v${version}";
|
||||
homepage = "https://github.com/hamster1963/nezha-dash-v1";
|
||||
license = lib.licenses.apsl20;
|
||||
maintainers = with lib.maintainers; [ moraxyc ];
|
||||
};
|
||||
}
|
||||
@@ -4,22 +4,23 @@
|
||||
installShellFiles,
|
||||
makeBinaryWrapper,
|
||||
nix,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-forecast";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getchoo";
|
||||
repo = "nix-forecast";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jfS7DXEIVHihC0/kH9W8ZJDOjoWuxdRvLMfzknElvrg=";
|
||||
hash = "sha256-kNSH2QbryNAfZXILQzMk9MHDzX4420KyQJOKW0Xrl7c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EHqHdcMI1K7DqhmFfr0ipfAsyM7cP9/22bMs4uIV2To=";
|
||||
cargoHash = "sha256-C5KPOwGD8jFqRuN6h1G6yO4lkl7t+RMzAE45r5d5lI0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -44,10 +45,14 @@ rustPlatform.buildRustPackage rec {
|
||||
COMPLETION_DIR = "completions";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Check the forecast for today's Nix builds";
|
||||
homepage = "https://github.com/getchoo/nix-forecast";
|
||||
changelog = "https://github.com/getchoo/nix-forecast/releases/tag/${version}";
|
||||
changelog = "https://github.com/getchoo/nix-forecast/releases/tag/v${version}";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
mainProgram = "nix-forecast";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
let
|
||||
self = python3Packages.buildPythonApplication {
|
||||
pname = "nix-update";
|
||||
version = "1.7.0";
|
||||
version = "1.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nix-update";
|
||||
tag = self.version;
|
||||
hash = "sha256-5KhS3RxeVDHKjsxT3hHtl0hHcwlSHl2fYFYLonobpLg=";
|
||||
hash = "sha256-I9p2CLvzu9DMUCQynQAYski6kwo/NZHdIxCXLpgzOac=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
@@ -47,8 +47,8 @@ let
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Mic92/nix-update/";
|
||||
description = "Swiss-knife for updating nix packages";
|
||||
homepage = "https://github.com/Mic92/nix-update/";
|
||||
changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nixpkgs-review";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nixpkgs-review";
|
||||
tag = version;
|
||||
hash = "sha256-C2JAlCgH5OCMAZr/Rvi0H7xAwesnkVCJ3kZyyVYaLg4=";
|
||||
hash = "sha256-G47bfu3IVsKx5Yhfe6H6w5qRcxF2sjd48xVGSeljv/I=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -76,7 +76,7 @@ python3Packages.buildPythonApplication rec {
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
|
||||
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
|
||||
homepage = "https://github.com/Mic92/nixpkgs-review";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -54,7 +54,7 @@ let
|
||||
{
|
||||
inherit version;
|
||||
src = src.override {
|
||||
rev = "refs/tags/${version}";
|
||||
tag = version;
|
||||
hash = "sha256-GvYdExkNuySrg8ERnWOJxucFe5HVdPAcHfRNeqiVS7M=";
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "radvd";
|
||||
version = "2.20_rc1";
|
||||
version = "2.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radvd-project";
|
||||
repo = "radvd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+cZn4pE4hBZDckfcQJzYdZxHkexWl/AmufCN5BiwWwA=";
|
||||
hash = "sha256-s9KP6F6rSumuNDOV4rtE7I+o742al4hc3/dgNkpCCyQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"numpy"
|
||||
"pillow"
|
||||
"rawpy"
|
||||
"torch"
|
||||
|
||||
@@ -49,6 +49,14 @@ stdenv.mkDerivation {
|
||||
makeWrapper "${sage-with-env}/bin/sage" "$out/bin/sage"
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# prevent warnings about assigning LC_* to "C" resulting in broken tests
|
||||
# when run in darwin sandbox
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
};
|
||||
|
||||
# allow singular tests to pass in darwin sandbox
|
||||
__darwinAllowLocalNetworking = true;
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
export HOME="$TMPDIR/sage-home"
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
sage-src,
|
||||
env-locations,
|
||||
python,
|
||||
@@ -118,6 +120,13 @@ buildPythonPackage rec {
|
||||
readline
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
# code tries to assign a unsigned long to an int in an initialized list
|
||||
# leading to this error.
|
||||
# https://github.com/sagemath/sage/pull/39249
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing-const-reference";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# native dependencies (TODO: determine which ones need to be propagated)
|
||||
blas
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
libunwind,
|
||||
libusb1,
|
||||
magic-enum,
|
||||
libgbm,
|
||||
mesa,
|
||||
pkg-config,
|
||||
pugixml,
|
||||
qt6,
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shadps4";
|
||||
version = "0.4.0-unstable-2024-12-23";
|
||||
version = "0.5.0-unstable-2025-01-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shadps4-emu";
|
||||
repo = "shadPS4";
|
||||
rev = "c2e9c877dd82e9bf79c8ede7bc8cffb591a31c76";
|
||||
hash = "sha256-6LmNLH5Fy+9AYDXLh/YFThs3EUgA6gnmUEvBltkUQig=";
|
||||
rev = "596f4cdf0e66a97c9d2d4272091d8c0167a5b8e1";
|
||||
hash = "sha256-apwAl8TCzSKchqYGHV0UsMSGErF4GgiwhlwmOPWpeLs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
magic-enum
|
||||
libgbm
|
||||
mesa
|
||||
pugixml
|
||||
qt6.qtbase
|
||||
qt6.qtdeclarative
|
||||
@@ -113,15 +113,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
patchelf --add-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
vulkan-loader
|
||||
xorg.libXi
|
||||
]
|
||||
} \
|
||||
$out/bin/shadps4
|
||||
'';
|
||||
runtimeDependencies = [
|
||||
vulkan-loader
|
||||
xorg.libXi
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests.openorbis-example = nixosTests.shadps4;
|
||||
@@ -135,7 +130,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Early in development PS4 emulator";
|
||||
homepage = "https://github.com/shadps4-emu/shadPS4";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ ryand56 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
ryand56
|
||||
liberodark
|
||||
];
|
||||
mainProgram = "shadps4";
|
||||
platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64;
|
||||
};
|
||||
|
||||
@@ -3,18 +3,19 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "slackdump";
|
||||
version = "2.6.1";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rusq";
|
||||
repo = "slackdump";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-szo5n1sVv9PZUW77k/1qLuU0URl0FNB4cO5vqokoZ2c=";
|
||||
hash = "sha256-gnZbBY1XMYSGgsVG5MqR2y3o574hOwapcLZf5F21AJg=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
|
||||
@@ -24,13 +25,18 @@ buildGoModule rec {
|
||||
skippedTests = [
|
||||
"TestSession_saveUserCache"
|
||||
"TestSession_GetUsers"
|
||||
"Test_exportV3" # This was skipped on upstream's CI. It is seemed that some file are missed
|
||||
];
|
||||
in
|
||||
[
|
||||
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-aDLeYi4nsMKxtE59au6I3mSEY0/6Vo0ujWFbLca+0wQ=";
|
||||
vendorHash = "sha256-GUPBrSgwxVXA3vEVbY36IZQfd2jEhvgk0OlFdP/2DU0=";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rusq/slackdump";
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sqlboiler";
|
||||
version = "4.17.1";
|
||||
version = "4.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "volatiletech";
|
||||
repo = "sqlboiler";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hb8aMaK2iDDCEJXoNn9BLELP0J7LcJzsQdSYZe1tcjQ=";
|
||||
hash = "sha256-gpRegyW6LrKj45MDl+eOKrTqTo1wn7JOd4zPDexOB6M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZGGoTWSbGtsmrEQcZI40z6QF6qh4t3LN17Sox4KHQMA=";
|
||||
vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA=";
|
||||
|
||||
tags = [
|
||||
"mysql"
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tenv";
|
||||
version = "4.0.3";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tofuutils";
|
||||
repo = "tenv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DqKgoobzaAGoT7ODA9d5Zgs1dnlAishNJ0E23Nqbp8Y=";
|
||||
hash = "sha256-6Em/cauhHuK0RN8Jp1JkPFBHFBwu65QxVHTAu0rh+Vo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JrAzjnXqZSlsukLRXqHReiKPuOyWQS85/F2EnXf043U=";
|
||||
|
||||
@@ -1,23 +1,16 @@
|
||||
{
|
||||
alsa-lib,
|
||||
AppKit,
|
||||
CoreAudio,
|
||||
CoreGraphics,
|
||||
dbus,
|
||||
Foundation,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
glib,
|
||||
gst_all_1,
|
||||
IOKit,
|
||||
lib,
|
||||
MediaPlayer,
|
||||
mpv-unwrapped,
|
||||
openssl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
rustPlatform,
|
||||
Security,
|
||||
sqlite,
|
||||
stdenv,
|
||||
}:
|
||||
@@ -76,15 +69,6 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
AppKit
|
||||
CoreAudio
|
||||
CoreGraphics
|
||||
Foundation
|
||||
IOKit
|
||||
MediaPlayer
|
||||
Security
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
];
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "timg";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hzeller";
|
||||
repo = "timg";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rTqToWgCPQeRYnMUmhPd/lJPX6L9PstFs1NczyecaB0=";
|
||||
hash = "sha256-D5pQozxy5eSKVaV5qhoneG/b2yKcPQWD8OHs8MsGL1w=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,48 +1,70 @@
|
||||
{ stdenvNoCC, lib, fetchFromGitHub, installShellFiles }:
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "zinit";
|
||||
version = "3.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zdharma-continuum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fnBV0LmC/wJm0pOITJ1mhiBqsg2F8AQJWvn0p/Bgo5Q=";
|
||||
};
|
||||
# adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
|
||||
dontBuild = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
outdir="$out/share/$pname"
|
||||
runHook preInstall
|
||||
|
||||
cd "$src"
|
||||
# Source files
|
||||
mkdir -p $out/share/zinit
|
||||
install -m0644 zinit{,-side,-install,-autoload}.zsh _zinit $out/share/zinit
|
||||
install -m0755 share/git-process-output.zsh $out/share/zinit
|
||||
|
||||
# Zplugin's source files
|
||||
install -dm0755 "$outdir"
|
||||
# Installing backward compatibility layer
|
||||
install -m0644 zinit{,-side,-install,-autoload}.zsh "$outdir"
|
||||
install -m0755 share/git-process-output.zsh "$outdir"
|
||||
|
||||
installManPage doc/zinit.1
|
||||
|
||||
# Zplugin autocompletion
|
||||
# Autocompletion
|
||||
installShellCompletion --zsh _zinit
|
||||
|
||||
#TODO:Zplugin-module files
|
||||
# find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \;
|
||||
# find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \;
|
||||
|
||||
'';
|
||||
postInstall = ''
|
||||
# Manpage
|
||||
mkdir -p ${placeholder "man"}/share/man/man{1..9}
|
||||
installManPage doc/zinit.1
|
||||
'';
|
||||
#TODO:doc output
|
||||
|
||||
meta = with lib; {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/share/zinit/zinit.zsh \
|
||||
--replace-fail zinit.1 zinit.1.gz \
|
||||
--replace-fail "\''${ZINIT[BIN_DIR]}/doc" ${placeholder "man"}/share/man/man1 \
|
||||
--replace-fail "ZINIT[MAN_DIR]:=\''${ZPFX}/man" "ZINIT[MAN_DIR]:=${placeholder "man"}/share/man"
|
||||
'';
|
||||
|
||||
#TODO: output doc through zshelldoc
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/zdharma-continuum/zinit";
|
||||
description = "Flexible zsh plugin manager";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pasqui23 sei40kr ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
pasqui23
|
||||
sei40kr
|
||||
moraxyc
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-picker";
|
||||
version = "6.0.1";
|
||||
version = "6.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vChSlP+lGufurvLkYbljAhc8qqqbc1bxQ2UIROreK2o=";
|
||||
hash = "sha256-FCFRBhInmqKap1pms8TJrUJmbF8RgiXSTCUy8G1IlAg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -46,12 +46,12 @@ stdenv.mkDerivation rec {
|
||||
"DOCDIR=${placeholder "out"}/share/dman/deepin-picker"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Color picker application";
|
||||
mainProgram = "deepin-picker";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-picker";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-sdk";
|
||||
version = "0.38.0";
|
||||
version = "0.40.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "databricks-sdk-py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-g00NRo0FSHujN2mCLZCc1hKGsBFiN7ztEneUMziuQpk=";
|
||||
hash = "sha256-x8CbjWdholuIGVr3TxbFjEszu0owjSIm7+G3Sh+cHEk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -82,7 +82,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Databricks SDK for Python";
|
||||
homepage = "https://github.com/databricks/databricks-sdk-py";
|
||||
changelog = "https://github.com/databricks/databricks-sdk-py/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/databricks/databricks-sdk-py/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
||||
@@ -88,6 +88,28 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
|
||||
"test_miff_cmyk16"
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/205
|
||||
"test_miff_cmyk8"
|
||||
"test_miff_rgb8"
|
||||
"test_tiff_ccitt_lsb_m2l_white"
|
||||
"test_tiff_ccitt_msb_l2m_white"
|
||||
"test_tiff_ccitt_msb_m2l_white"
|
||||
"test_tiff_ccitt_nometa1"
|
||||
"test_tiff_ccitt_nometa2"
|
||||
"test_tiff_cmyk8"
|
||||
"test_tiff_cmyk16"
|
||||
"test_tiff_float"
|
||||
"test_tiff_gray1"
|
||||
"test_tiff_gray2"
|
||||
"test_tiff_gray4"
|
||||
"test_tiff_gray8"
|
||||
"test_tiff_gray16"
|
||||
"test_tiff_multipage"
|
||||
"test_tiff_palette8"
|
||||
"test_tiff_rgb8"
|
||||
"test_tiff_rgb12"
|
||||
"test_tiff_rgb14"
|
||||
"test_tiff_rgb16"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "img2pdf" ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mariadb";
|
||||
version = "1.1.10";
|
||||
version = "1.1.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "mariadb-corporation";
|
||||
repo = "mariadb-connector-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YpA65J8ozKJfpOc4hZLdgCcT3j/lqRiNeX7k8U/aYkE=";
|
||||
hash = "sha256-f3WeVtsjxm/HVPv0cbpPkmklcNFWJaFqI2LxDElcCFw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker-core";
|
||||
version = "1.0.11";
|
||||
version = "1.0.17";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6r8roHMJ4s/+mGiPeMVZ9wagdXNJQ3+tUFZ/7T+NQBc=";
|
||||
hash = "sha256-zRdY0LWIOMY6fBqLje6WFYci46WlcxliI8PFAipiIuw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -40,6 +40,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"boto3"
|
||||
"importlib-metadata"
|
||||
"mock"
|
||||
];
|
||||
@@ -75,7 +76,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python SDK designed to provide an object-oriented interface for interacting with Amazon SageMaker resources";
|
||||
homepage = "https://github.com/aws/sagemaker-core";
|
||||
changelog = "https://github.com/aws/sagemaker-core/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/aws/sagemaker-core/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
||||
@@ -11,10 +11,12 @@
|
||||
boto3,
|
||||
cloudpickle,
|
||||
docker,
|
||||
fastapi,
|
||||
google-pasta,
|
||||
importlib-metadata,
|
||||
jsonschema,
|
||||
numpy,
|
||||
omegaconf,
|
||||
packaging,
|
||||
pandas,
|
||||
pathos,
|
||||
@@ -24,12 +26,12 @@
|
||||
pyyaml,
|
||||
requests,
|
||||
sagemaker-core,
|
||||
sagemaker-mlflow,
|
||||
schema,
|
||||
smdebug-rulesconfig,
|
||||
tblib,
|
||||
tqdm,
|
||||
urllib3,
|
||||
uvicorn,
|
||||
|
||||
# optional-dependencies
|
||||
scipy,
|
||||
@@ -38,14 +40,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.232.3";
|
||||
version = "2.237.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6kGxmgkR/1ih2V49C9aEUBBCJS6s1Jbev80FDnJtHFg=";
|
||||
hash = "sha256-cNBPuXoViHy03ZMBrF3+xeMSUpovi1lloXizBvgNJmw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -57,6 +59,8 @@ buildPythonPackage rec {
|
||||
"boto3"
|
||||
"cloudpickle"
|
||||
"importlib-metadata"
|
||||
"numpy"
|
||||
"omegaconf"
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
@@ -65,10 +69,12 @@ buildPythonPackage rec {
|
||||
boto3
|
||||
cloudpickle
|
||||
docker
|
||||
fastapi
|
||||
google-pasta
|
||||
importlib-metadata
|
||||
jsonschema
|
||||
numpy
|
||||
omegaconf
|
||||
packaging
|
||||
pandas
|
||||
pathos
|
||||
@@ -78,12 +84,12 @@ buildPythonPackage rec {
|
||||
pyyaml
|
||||
requests
|
||||
sagemaker-core
|
||||
sagemaker-mlflow
|
||||
schema
|
||||
smdebug-rulesconfig
|
||||
tblib
|
||||
tqdm
|
||||
urllib3
|
||||
uvicorn
|
||||
];
|
||||
|
||||
doCheck = false; # many test dependencies are not available in nixpkgs
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual-fastdatatable";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "tconbeer";
|
||||
repo = "textual-fastdatatable";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-r1evN69etFn21TkXPLuAh1OxIsurDDyPyYOKQR5uUos=";
|
||||
hash = "sha256-Jz0ujO/nAnn15t8/OFOzZTpVBXNYsfVhxmYdGC39PpM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual-textarea";
|
||||
version = "0.14.4";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "tconbeer";
|
||||
repo = "textual-textarea";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tmbSCU1VgxR9aXG22UVpweD71dVmhKSRBTDm1Gf33jM=";
|
||||
hash = "sha256-aaeXgD6RMQ3tlK5H/2lk3ueTyA3yYjHrYL51w/1tvSI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
pytest-aiohttp,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
rich,
|
||||
syrupy,
|
||||
@@ -20,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual";
|
||||
version = "0.86.1";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -29,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "Textualize";
|
||||
repo = "textual";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5msCFv79nAmoaP9gZxV3DXMLTyVlSFb+qyA5jHWwc50=";
|
||||
hash = "sha256-3pNUDkkq9X3W9DdWp4M4h4ddHN+GzUxLCFNJJdAtRJM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -65,14 +66,24 @@ buildPythonPackage rec {
|
||||
"tests/snapshot_tests/test_snapshots.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Assertion issues
|
||||
"test_textual_env_var"
|
||||
disabledTests =
|
||||
[
|
||||
# Assertion issues
|
||||
"test_textual_env_var"
|
||||
|
||||
# Requirements for tests are not quite ready
|
||||
"test_register_language"
|
||||
"test_language_binary_missing"
|
||||
];
|
||||
# Requirements for tests are not quite ready
|
||||
"test_register_language"
|
||||
|
||||
# Requires python bindings for tree-sitter languages
|
||||
# https://github.com/Textualize/textual/issues/5449
|
||||
"test_setting_unknown_language"
|
||||
"test_update_highlight_query"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [
|
||||
# https://github.com/Textualize/textual/issues/5327
|
||||
"test_cursor_page_up"
|
||||
"test_cursor_page_down"
|
||||
];
|
||||
|
||||
# Some tests in groups require state from previous tests
|
||||
# See https://github.com/Textualize/textual/issues/4924#issuecomment-2304889067
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "zephyr-python-api";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "zephyr_python_api";
|
||||
@@ -17,9 +17,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-YupGiybfhwb+I4ofr6RNBzS6LQfx5BQD/SU5nYrnqFk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
dependencies = [ requests ];
|
||||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
diff --git a/master/buildbot/util/git.py b/master/buildbot/util/git.py
|
||||
index 0ed9ac3037f..49ef359537c 100644
|
||||
--- a/master/buildbot/util/git.py
|
||||
+++ b/master/buildbot/util/git.py
|
||||
@@ -67,8 +67,8 @@ def getSshCommand(keyPath, knownHostsPath):
|
||||
|
||||
|
||||
def scp_style_to_url_syntax(address, port=22, scheme='ssh'):
|
||||
- if any(['://' in address, ':\\' in address, ':' not in address]):
|
||||
- # the address already has a URL syntax or is a local path
|
||||
+ if not isinstance(address, str) or any(['://' in address, ':\\' in address, ':' not in address]):
|
||||
+ # the address already has a URL syntax or is a local path or is a renderable
|
||||
return address
|
||||
host, path = address.split(':')
|
||||
return f'{scheme}://{host}:{port}/{path}'
|
||||
@@ -43,7 +43,6 @@
|
||||
unidiff,
|
||||
glibcLocales,
|
||||
nixosTests,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -77,7 +76,7 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "buildbot";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -86,7 +85,7 @@ buildPythonApplication rec {
|
||||
owner = "buildbot";
|
||||
repo = "buildbot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RPg4eXqpm/F1SSoB4MVo61DgZv/iE2R4VtCkUU69iA8=";
|
||||
hash = "sha256-eraNF2J5x04qQESkned/2Io9gb2ZL9XzUfWHwSGErNY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -141,14 +140,12 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-uses-of-twisted-python-constants.patch";
|
||||
url = "https://github.com/buildbot/buildbot/commit/ac46c0aa77be46eaa64e09bef03da6f8dbaacfa7.patch";
|
||||
hash = "sha256-XoODSKY0GzFh2H5gWxiXm/QxngGN2MM0yId5D1RQflQ=";
|
||||
})
|
||||
# This patch disables the test that tries to read /etc/os-release which
|
||||
# is not accessible in sandboxed builds.
|
||||
./skip_test_linux_distro.patch
|
||||
|
||||
# https://github.com/buildbot/buildbot/issues/8274
|
||||
./allow_git_urls_to_be_renderable_again.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-+ZiOkTZLdwqsZfApW6aQxoNkbcFCaB4BHEjMTZIl+Rg=";
|
||||
hash = "sha256-pd6ZzrFHKB/acffuM7TxUtXRsZTMIyoUWVqIiilJH/s=";
|
||||
};
|
||||
|
||||
# Remove unnecessary circular dependency on buildbot
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-IgG/afjU//zrcHuTXMBLlz1gCmB31fWaECIm+UqaMgA=";
|
||||
hash = "sha256-XfELWX6d4Lat5ByNcsdw9qJd7FjUGL8GRqJkWHKjoTI=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -70,7 +70,7 @@
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-E0yFY3PtTZ8XtJGDMh0aRljhTNsWHqHQzcBORTgrCIA=";
|
||||
hash = "sha256-1osf0WefIjogFk3BqRsX/pjVIzvd18W/NG8LyuFMI/U=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -92,7 +92,7 @@
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-KR4M7RSULCM1aS7vYjWuMXIHGpO+xFjfhC8+YncAmlE=";
|
||||
hash = "sha256-3BqQTTj6WPbmHr6bzR4PcVnl8WcTKokY1YHLuwHYqLw=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -114,7 +114,7 @@
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-L7DayDddqrwOyBwgy4w1waCL+49GMtdrCdZNpcLrFXk=";
|
||||
hash = "sha256-tZBsyaBhewXs0PWxJMtPJ3yv8Z3dS1wESmJI0beMG28=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -136,7 +136,7 @@
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-CnRTSnwhSj6cjrATUuVerGrqt7XxJZYgC5XjUC4+Xrs=";
|
||||
hash = "sha256-oQ+exQ4eiF+y9JiYPXbJf9azJVgFZgbBby4MRcBLZgQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-lambda";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O4yJ+6Uk4dHjCDp28JbUtL/B+v9JJEGkinZ4MsIpjUk=";
|
||||
hash = "sha256-21p9bo+kfqVrRAxVSuZ24XaHDU7XkIIhGXjHLUsGQOg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vK37S5hLuHYimTljo0i6iRq2kt/r0kZ6Uqw2wQMhSGc=";
|
||||
cargoHash = "sha256-5AzeqJjs8Ee6ltXnXMZU47fXt1THsSERxCaT22zjK6g=";
|
||||
|
||||
nativeCheckInputs = [ cacert ];
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ let
|
||||
{
|
||||
inherit version;
|
||||
src = src.override {
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1091,10 +1091,6 @@ with pkgs;
|
||||
|
||||
tailwindcss = callPackage ../development/tools/tailwindcss { };
|
||||
|
||||
termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
|
||||
};
|
||||
|
||||
ufolint = with python3Packages; toPythonApplication ufolint;
|
||||
|
||||
valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };
|
||||
@@ -3836,10 +3832,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
jogl = callPackage ../by-name/jo/jogl/package.nix {
|
||||
stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv;
|
||||
};
|
||||
|
||||
joplin = nodePackages.joplin;
|
||||
|
||||
jpylyzer = with python3Packages; toPythonApplication jpylyzer;
|
||||
|
||||
Reference in New Issue
Block a user