Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-11-24 06:05:25 +00:00
committed by GitHub
67 changed files with 1775 additions and 8637 deletions
+3 -3
View File
@@ -20,17 +20,17 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.5.208";
version = "1.5.220";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-VfF8bQP7pFaTezOJpda4N9KbCHr5ST/wCvdNRiojio0=";
hash = "sha256-XNLX5LDbL29Ko0zstgo+O5V0oe37dSChk8iJeVrYlLA=";
fetchSubmodules = true;
};
vendorHash = "sha256-PBwI3S8ZvmVD57/ICALe+HvgtbPQpJKNPfkWo+uUeSo=";
vendorHash = "sha256-tDQKU/1fKDPCrUHfFi79u4d2XwOqjvTuIlsUAB74e4c=";
buildInputs = [
alsa-lib
+2 -2
View File
@@ -23,13 +23,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
version = "0.4.4";
version = "0.5.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "aquamarine";
rev = "v${finalAttrs.version}";
hash = "sha256-6DQM7jT2CzfxYceyrtcBQSL9BOEGfuin8GAyMjCpAzc=";
hash = "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.28.1";
version = "0.30.0";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-nMOj/oMJsBB0bI2RzxEytvEr0v+VmGIMY0uiK7ALEHM=";
hash = "sha256-Fk46F1EBWSVFAUUDAtXcwq9iCSATW1CV/ul3NEa1YqA=";
};
cargoHash = "sha256-alOLdkgyrJQNg/JACredGmfs/dKxnOm9cSahvVBHzTM=";
cargoHash = "sha256-5yJ248BSp9w/r1chQqIucxzfvFGy+jumSquF9gVmSUM=";
nativeBuildInputs = [ installShellFiles ];
+59
View File
@@ -0,0 +1,59 @@
{
lib,
stdenv,
fetchzip,
dotnet-runtime,
zlib,
runtimeShell,
}:
stdenv.mkDerivation rec {
pname = "avdump3";
version = "8293_stable";
src = fetchzip {
url = "https://cdn.anidb.net/client/avdump3/avdump3_8293_stable.zip";
hash = "sha256-H9Sn3I4S9CmymKIMHVagDy+7svHs285S3EJgYQo+ks0=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/avdump3 $out/bin
mv * $out/share/avdump3
cat > $out/bin/avdump3 <<EOF
#!${runtimeShell}
export LD_LIBRARY_PATH="${lib.makeLibraryPath [ zlib ]}:\$LD_LIBRARY_PATH"
exec ${dotnet-runtime}/bin/dotnet $out/share/avdump3/AVDump3CL.dll "\$@"
EOF
chmod +x $out/bin/avdump3
runHook postInstall
'';
dontPatchELF = true;
meta = {
mainProgram = "avdump3";
description = "Tool for extracting audio/video metadata from media files and uploading it to AniDB";
longDescription = ''
AVDump is a tool to extract meta information from media files while at the
same time calculating multiple hashes. Based on that information reports
can be generated in multiple forms. Of particular interest is the ability
to send those reports back to AniDB and thereby quickly filling in missing
metadata for new files.
'';
homepage = "https://wiki.anidb.net/Avdump3";
sourceProvenance = with lib.sourceTypes; [
binaryNativeCode
binaryBytecode
];
# partial source code available under MIT license at https://github.com/DvdKhl/AVDump3
license = with lib.licenses; [
mit
unfree
];
maintainers = with lib.maintainers; [ kini ];
# NOTE: aarch64-linux may also work but hasn't been tested; co-maintainers welcome.
platforms = [ "x86_64-linux" ];
};
}
+3 -3
View File
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "azurite";
version = "3.31.0";
version = "3.33.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "Azurite";
rev = "v${version}";
hash = "sha256-WT1eprN6SBnsfITCopybEHCuxrHvKEhdmVs7xL3cUi0=";
hash = "sha256-aH9FAT49y4k87lzerQdgLqi+ZlucORQX4w1NBFtEfMw=";
};
npmDepsHash = "sha256-+ptjsz2MDIB/aqu4UxkBLCcehtamFdmswNUsHs23LuE=";
npmDepsHash = "sha256-jfa04iWz0aOiFD1YkXn5YEXqQcrY+rIDbVmmUaA5sYc=";
nativeBuildInputs = [ pkg-config python3 ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+20 -3
View File
@@ -104,6 +104,7 @@ name = "arm"
version = "0.0.0"
dependencies = [
"bitvec",
"config",
"debugvault",
"decoder",
"tokenizing",
@@ -381,7 +382,7 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
[[package]]
name = "bite"
version = "0.2.1"
version = "0.3.0"
dependencies = [
"commands",
"debugvault",
@@ -696,8 +697,6 @@ dependencies = [
"egui",
"log 0.0.0",
"once_cell",
"serde",
"serde_yaml",
"triple_accel",
]
@@ -710,6 +709,18 @@ dependencies = [
"crossbeam-utils",
]
[[package]]
name = "config"
version = "0.0.0"
dependencies = [
"dirs",
"egui",
"log 0.0.0",
"once_cell",
"serde",
"serde_yaml",
]
[[package]]
name = "copypasta"
version = "0.10.0"
@@ -867,6 +878,7 @@ version = "0.0.0"
dependencies = [
"binformat",
"bitflags 2.4.2",
"config",
"crossbeam-queue",
"dashmap",
"gimli",
@@ -1662,6 +1674,7 @@ dependencies = [
"bytemuck",
"cc",
"commands",
"config",
"copypasta",
"crossbeam-queue",
"debugvault",
@@ -2045,6 +2058,7 @@ dependencies = [
name = "mips"
version = "0.0.0"
dependencies = [
"config",
"debugvault",
"decoder",
"tokenizing",
@@ -2532,6 +2546,7 @@ dependencies = [
"arm",
"binformat",
"commands",
"config",
"debugvault",
"decoder",
"log 0.0.0",
@@ -2724,6 +2739,7 @@ dependencies = [
name = "riscv"
version = "0.0.0"
dependencies = [
"config",
"crc",
"debugvault",
"decoder",
@@ -4153,6 +4169,7 @@ checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
name = "x86_64"
version = "0.0.0"
dependencies = [
"config",
"debugvault",
"decoder",
"tokenizing",
+11 -13
View File
@@ -1,5 +1,6 @@
{
lib,
apple-sdk_15,
rustPlatform,
fetchFromGitHub,
pkg-config,
@@ -16,18 +17,17 @@
pango,
vulkan-loader,
stdenv,
darwin,
wayland,
}:
rustPlatform.buildRustPackage rec {
pname = "bite";
version = "0.2.1";
version = "0.3";
src = fetchFromGitHub {
owner = "WINSDK";
repo = "bite";
rev = "V${version}";
hash = "sha256-A5NII5pLnM4BBy2L+ylXU0anqw4DpKgXmc29fcTq2z8=";
hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
};
cargoLock = {
@@ -60,15 +60,11 @@ rustPlatform.buildRustPackage rec {
pango
vulkan-loader
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.CoreGraphics
darwin.apple_sdk.frameworks.Foundation
darwin.apple_sdk.frameworks.Metal
darwin.apple_sdk.frameworks.QuartzCore
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wayland
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_15
];
runtimeDependencies =
@@ -95,7 +91,10 @@ rustPlatform.buildRustPackage rec {
icon = "bite";
desktopName = "BiTE";
comment = meta.description;
categories = ["Development" "Utility"];
categories = [
"Development"
"Utility"
];
})
];
@@ -103,8 +102,7 @@ rustPlatform.buildRustPackage rec {
description = "Disassembler focused on comprehensive rust support";
homepage = "https://github.com/WINSDK/bite";
license = licenses.mit;
maintainers = with maintainers; [vinnymeller];
maintainers = with maintainers; [ vinnymeller ];
mainProgram = "bite";
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
};
}
+4 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "databricks-cli";
version = "0.229.0";
version = "0.234.0";
src = fetchFromGitHub {
owner = "databricks";
repo = "cli";
rev = "v${version}";
hash = "sha256-ap2IypBPFV4yJVXRS8zSXC0kW/QKpOvFS9Cod0pSlG0=";
hash = "sha256-I1S31a1JvXFXWw4EkS40efKEE9wsQlMdjVxEJDRTzA8=";
};
vendorHash = "sha256-yCwevuivIHZ0dns9QljiKvwws4cFknIydvfjs4Jib3s=";
vendorHash = "sha256-Zih5NftJMbtLYG0Sej1BaErJ8NnU25mwhl3pfqSOSxc=";
excludedPackages = [ "bundle/internal" ];
@@ -29,6 +29,7 @@ buildGoModule rec {
"-skip="
+ (lib.concatStringsSep "|" [
# Need network
"TestConsistentDatabricksSdkVersion"
"TestTerraformArchiveChecksums"
"TestExpandPipelineGlobPaths"
"TestRelativePathTranslationDefault"
+3 -3
View File
@@ -21,20 +21,20 @@
stdenv.mkDerivation rec {
pname = "delfin";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "avery42";
repo = "delfin";
rev = "v${version}";
hash = "sha256-F4ipIOqMS42nXHRSRpzIlTh61g2xjpog7Zmxn6D29nE=";
hash = "sha256-2ussvPXMX4wGE9N+Zh8KYIjbbqEKkPaNymN1Oqj8w8U=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-ciw178jBwz4I6I1x6iI45RJ2ITw0JfukLWNyBmE3FZg=";
hash = "sha256-JEHiLdEU9QkCxWPoTFVn2c6UDqnRbTG1WPetdsW/N8g=";
};
nativeBuildInputs = [
+18 -5
View File
@@ -9,6 +9,7 @@
, pkg-config
, pnpm_9
, python3
, rustPlatform
, stdenv
, darwin
, testers
@@ -17,6 +18,20 @@
}:
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "1.148.7";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
};
};
electron = electron_32;
pnpm = pnpm_9;
in
@@ -47,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
copyDesktopItems
];
buildInputs = [
deltachat-rpc-server
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
@@ -63,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
test \
$(yq -r '.catalogs.default."@deltachat/jsonrpc-client".version' pnpm-lock.yaml) \
= ${deltachat-rpc-server.version} \
= ${deltachat-rpc-server'.version} \
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
test \
@@ -83,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
pushd packages/target-electron/dist/*-unpacked/resources/app.asar.unpacked
rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server
ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-*
ln -s ${lib.getExe deltachat-rpc-server'} node_modules/@deltachat/stdio-rpc-server-*
popd
runHook postBuild
+20 -10
View File
@@ -32,13 +32,13 @@
}:
stdenv.mkDerivation rec {
pname = "deskflow";
version = "1.17.1";
version = "1.17.2";
src = fetchFromGitHub {
owner = "deskflow";
repo = "deskflow";
rev = "v${version}";
hash = "sha256-cEKG9MwENbZqrfRdwiZtRWmIfRndrWUoaZQ5O7YRpBs=";
rev = "refs/tags/v${version}";
hash = "sha256-CHlvL/MC9clFrMxlfIXaCFoTkcLS7QsYK7MXMFW0188=";
};
postPatch = ''
@@ -87,22 +87,32 @@ stdenv.mkDerivation rec {
lerc
];
postInstall = ''
substituteInPlace $out/share/applications/deskflow.desktop \
--replace-fail "Path=/usr/bin" "Path=$out/bin" \
--replace-fail "Exec=/usr/bin/deskflow" "Exec=deskflow"
'';
qtWrapperArgs = [
"--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt6.qtwayland}/${qt6.qtbase.qtPluginPrefix}/platforms"
];
doCheck = true;
checkPhase = ''
runHook preCheck
export QT_QPA_PLATFORM=offscreen
export HOME=$(mktemp -d)
./bin/unittests
./bin/integtests
runHook postCheck
'';
meta = {
homepage = "https://github.com/deskflow/deskflow";
description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux";
mainProgram = "deskflow";
maintainers = with lib.maintainers; [ aucub ];
license = lib.licenses.gpl2Plus;
license = with lib; [
licenses.gpl2Plus
licenses.openssl
];
platforms = lib.platforms.linux;
};
}
-8
View File
@@ -1,6 +1,5 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
darwin,
@@ -19,13 +18,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-0T5zvd78l3ghop/KoIgXYoGssVV9F+ppJV2pWyLnwxo=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
SystemConfiguration
]
);
checkFlags = [
# Tests failing due to networking errors in Nix build environment
"--skip=local_generic_tiles"
File diff suppressed because it is too large Load Diff
@@ -1,32 +1,33 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
{
lib,
buildNpmPackage,
fetchFromGitHub,
}:
buildNpmPackage rec {
pname = "emmet-language-server";
version = "2.2.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "olrtg";
repo = "emmet-language-server";
rev = "v${version}";
hash = "sha256-53FbZ0hC2s9o6yXPYAy0vqe4tLcYMHLqeBMNuNI8Nd0=";
hash = "sha256-R20twrmfLz9FP87qkjgz1R/n+Nhzwn22l9t/2fyuVeM=";
};
npmDepsHash = "sha256-luE8iYfTsSrBVcv0sE1yYnAksE2+icx9K4yNzjUV7U4=";
npmDepsHash = "sha256-yv+5/wBif75AaAsbJrwLNtlui9SHws2mu3jYOR1Z55M=";
# Upstream doesn't have a lockfile
postPatch = ''
cp ${./package-lock.json} ./package-lock.json
'';
meta = with lib; {
meta = {
description = "Language server for emmet.io";
homepage = "https://github.com/olrtg/emmet-language-server";
changelog = "https://github.com/olrtg/emmet-language-server/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ stnley ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ stnley ];
mainProgram = "emmet-language-server";
};
}
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "endless-sky";
version = "0.10.8";
version = "0.10.10";
src = fetchFromGitHub {
owner = "endless-sky";
repo = "endless-sky";
rev = "v${version}";
sha256 = "sha256-bqhltxkoqDdmddOBZ1f3I29AxGm5buUXpjjFwefemEM=";
sha256 = "sha256-FjQluOFU+fPr4/3WveScRRabDjD/bq8YmXvCU9w9yo8=";
};
patches = [
+16 -8
View File
@@ -1,28 +1,36 @@
{ lib, fetchFromGitHub, buildGoModule }:
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "f2";
version = "1.9.1";
version = "2.0.1";
src = fetchFromGitHub {
owner = "ayoisaiah";
repo = "f2";
rev = "v${version}";
sha256 = "sha256-vpyI6WtK/0UpPiB8y+HpPd0IsKKkMHa/eIreYo32iAA=";
sha256 = "sha256-z2w+1dAwd3108J+ApHn2rj9duW9qObd3AZJXyt0811c=";
};
vendorHash = "sha256-Bz3Igjcyq4rkMkgv1J3+JiAqroAjxyAvHw4d4eZJgAM=";
vendorHash = "sha256-xKw9shfAtRjD0f4BGALM5VPjGOaYz1IqXWcctHcV/p8=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
ldflags = [
"-s"
"-w"
"-X=main.Version=${version}"
];
# has no tests
doCheck = false;
meta = with lib; {
meta = {
description = "Command-line batch renaming tool";
homepage = "https://github.com/ayoisaiah/f2";
license = licenses.mit;
maintainers = with maintainers; [ zendo ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ zendo ];
mainProgram = "f2";
};
}
-2
View File
@@ -19,7 +19,6 @@
, libintl
, libpng
, librsvg
, libstroke
, libxslt
, perl
, pkg-config
@@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
libintl
libpng
librsvg
libstroke
libxslt
perl
python3Packages.python
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
version = "1.6.3";
version = "1.7.1";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
sha256 = "sha256-fL63e0URUiGkVLyLvNeXjIFYEjWF6Xd4FXFXrpqcduQ=";
sha256 = "sha256-5elUUZxhKZArtToEDfjYam7GS6m30GpbBLlUNy6dIyo=";
};
vendorHash = "sha256-8n0kAowtBSCavHI6y3I7ozJg74tA8bF80WVwe+znHhc=";
vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec=";
doCheck = false;
+3 -3
View File
@@ -10,16 +10,16 @@
buildGo123Module rec {
pname = "git-spice";
version = "0.7.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
rev = "refs/tags/v${version}";
hash = "sha256-ap0ZGRDdHQMVYSk9J8vsZNpvaAwpHFmPT5REiCxYepQ=";
hash = "sha256-n/ETHsM0BjviDVbcQ67l9cBEzzZXm86jlnmc8EdjxF4=";
};
vendorHash = "sha256-YJ8OxmonnxNu4W17tD1Z7K625LCINlh6ZgoxOpmtNC0=";
vendorHash = "sha256-/qLknJ8cs7t5eZ0t+3kLwByxuTKWvnm9h9tuf5ueNds=";
subPackages = [ "." ];
+3 -3
View File
@@ -10,18 +10,18 @@
stdenv.mkDerivation rec {
pname = "gitnuro";
version = "1.3.1";
version = "1.4.2";
src = fetchurl (
if stdenv.hostPlatform.system == "x86_64-linux" then
{
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar";
hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw=";
hash = "sha256-1lwuLPR6b1+I2SWaYaVrZkMcYVRAf1R7j/AwjQf03UM=";
}
else if stdenv.hostPlatform.system == "aarch64-linux" then
{
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-arm_aarch64-${version}.jar";
hash = "sha256-6TRQfIhaKBjNPn3tEVWoUF92JAmwlHUtQZE8gKEZ/ZI=";
hash = "sha256-wnHW1YK4FKi5EDF/E0S+yr0tugtv3qVlCbT3+x9bM8s=";
}
else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"
);
+2 -2
View File
@@ -28,12 +28,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glamoroustoolkit";
version = "1.1.4";
version = "1.1.7";
src = fetchzip {
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
stripRoot = false;
hash = "sha256-/p/oCE1fmlPjy1Xg36rsczZ74L0M7qWsdcFm6cHPVVY=";
hash = "sha256-ji77uc7UnfiDVCERWwDpMnBiSJjDrr84yYrobLhKWlE=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "go-task";
version = "3.39.2";
version = "3.40.0";
src = fetchFromGitHub {
owner = "go-task";
repo = "task";
rev = "refs/tags/v${version}";
hash = "sha256-B5o3oAey7zJg5JBf4GO69cLmVbnkKedkjWP108XRGR8=";
hash = "sha256-SOXtzesS+luil8Q0iKlhWv4hqPyRU2V+Um6S/uzChas=";
};
vendorHash = "sha256-P9J69WJ2C2xgdU9xydiaY8iSKB7ZfexLNYi7dyHDTIk=";
vendorHash = "sha256-5AABVG+MHvw8f8tcphUqQFid/mzXeWjbsD9mHJfyxDw=";
doCheck = false;
+5 -5
View File
@@ -13,13 +13,13 @@
buildGoModule rec {
pname = "goldwarden";
version = "0.3.4";
version = "0.3.6";
src = fetchFromGitHub {
owner = "quexten";
repo = "goldwarden";
rev = "v${version}";
hash = "sha256-LAnhCQmyubWeZtTVaW8IoNmfipvMIlAnY4pKwrURPDs=";
hash = "sha256-wAQFx0DKLLKztETAz1eM+eBFiAkSCgd8qqRtLV1Kz9g=";
};
postPatch = ''
@@ -38,7 +38,7 @@ buildGoModule rec {
--replace-fail "@PATH@" "$out/bin/goldwarden"
'';
vendorHash = "sha256-rMs7FP515aClzt9sjgIQHiYo5SYa2tDHrVRhtT+I8aM=";
vendorHash = "sha256-zWACjW/WZC0ZLmRV1VwcRROG218PCZ6aCPOreCG/5sE=";
ldflags = [ "-s" "-w" ];
@@ -69,10 +69,10 @@ buildGoModule rec {
mkdir -p $out/share/goldwarden
cp -r gui/* $out/share/goldwarden/
ln -s $out/share/goldwarden/goldwarden_ui_main.py $out/bin/goldwarden-gui
rm $out/share/goldwarden/{com.quexten.Goldwarden.desktop,com.quexten.Goldwarden.metainfo.xml,goldwarden.svg,python3-requirements.json,requirements.txt}
rm $out/share/goldwarden/{com.quexten.Goldwarden.desktop,com.quexten.Goldwarden.metainfo.xml,com.quexten.Goldwarden.svg,python3-requirements.json,requirements.txt}
install -D gui/com.quexten.Goldwarden.desktop -t $out/share/applications
install -D gui/goldwarden.svg -t $out/share/icons/hicolor/scalable/apps
install -D gui/com.quexten.Goldwarden.svg -t $out/share/icons/hicolor/scalable/apps
install -Dm644 gui/com.quexten.Goldwarden.metainfo.xml -t $out/share/metainfo
install -Dm644 cli/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions
+5 -5
View File
@@ -1,7 +1,7 @@
{
"branch": "main",
"commit_hash": "a425fbebe4cf4238e48a42f724ef2208959d66cf",
"commit_message": "version: bump to 0.45.0",
"date": "2024-11-09",
"tag": "v0.45.0"
"branch": "v0.45.2-b",
"commit_hash": "12f9a0d0b93f691d4d9923716557154d74777b0a",
"commit_message": "[gha] Nix: update inputs",
"date": "2024-11-19",
"tag": "v0.45.2"
}
+2 -2
View File
@@ -82,14 +82,14 @@ assert assertMsg (!hidpiXWayland)
customStdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + optionalString debug "-debug";
version = "0.45.0";
version = "0.45.2";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland";
fetchSubmodules = true;
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA=";
hash = "sha256-1pNsLGNStCFjXiBc2zMUxKzKk45CePTf+GwKlzTmrCY=";
};
postPatch = ''
+5 -3
View File
@@ -6,21 +6,22 @@
glib,
pango,
gtk4,
gtk4-layer-shell,
wrapGAppsHook4,
}:
rustPlatform.buildRustPackage rec {
pname = "hyprlauncher";
version = "0.1.2";
version = "0.2.2";
src = fetchFromGitHub {
owner = "hyprutils";
repo = "hyprlauncher";
rev = "refs/tags/v${version}";
hash = "sha256-SxsCfEHrJpFSi2BEFFqmJLGJIVzkluDU6ogKkTRT9e8=";
hash = "sha256-E6/V9p5YIjg3/Svw70GwY1jibkg2xnzdAvmphc0xbQQ=";
};
cargoHash = "sha256-MENreS+DXdJIurWUqHbeb0cCJlRnjjW1bmGdg0QoxlQ=";
cargoHash = "sha256-gkBpBlBR9Y2dkuqK7X/sxKdS9staFsbHv3Slg9UvP3A=";
strictDeps = true;
@@ -32,6 +33,7 @@ rustPlatform.buildRustPackage rec {
glib
pango
gtk4
gtk4-layer-shell
];
meta = {
+3 -3
View File
@@ -5,7 +5,7 @@
}:
let
version = "0.2.5";
version = "0.2.6";
in
rustPlatform.buildRustPackage {
inherit version;
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage {
owner = "sectordistrict";
repo = "intentrace";
rev = "refs/tags/v${version}";
hash = "sha256-3Pbx/ZA9DYwNzsszSzodJub+G8uKuYuNZhlTDsvL0t4=";
hash = "sha256-e47hauVg5Ncp0C5y6RkfKfxMHbBvpKrVoUq3aJxTf2E=";
};
cargoHash = "sha256-RZMhmqETPdcG0ofLPQdynaOFQuIx3H8j0mKR+SbOQ6s=";
cargoHash = "sha256-MAbOEJdMkt6efTGdmimMpYAx39JnQlnOlbIHIGICgp8=";
meta = {
description = "Prettified Linux syscall tracing tool (like strace)";
+26 -23
View File
@@ -1,25 +1,26 @@
{ lib
, python3
, fetchFromGitLab
, meson
, ninja
, pkg-config
, gobject-introspection
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
, glib
, gtk4
, librsvg
, libsecret
, libadwaita
, gtksourceview5
, webkitgtk_6_0
{
lib,
python3,
fetchFromGitLab,
meson,
ninja,
pkg-config,
gobject-introspection,
wrapGAppsHook4,
appstream-glib,
desktop-file-utils,
glib,
gtk4,
librsvg,
libsecret,
libadwaita,
gtksourceview5,
webkitgtk_6_0,
}:
python3.pkgs.buildPythonApplication rec {
pname = "iotas";
version = "0.2.10";
version = "0.9.5";
pyproject = false;
src = fetchFromGitLab {
@@ -27,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "World";
repo = "iotas";
rev = version;
hash = "sha256-aITt+TJb/LrVOyb/mAC7U6/NJ4stHD76jjBFC7Pt7fU=";
hash = "sha256-SDapnAGPTi7tnzl3zeNJw2CABhVVAXMyn1bllg8fChw=";
};
nativeBuildInputs = [
@@ -58,6 +59,8 @@ python3.pkgs.buildPythonApplication rec {
linkify-it-py
mdit-py-plugins
pypandoc
strenum
packaging
];
# prevent double wrapping
@@ -66,12 +69,12 @@ python3.pkgs.buildPythonApplication rec {
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
meta = {
description = "Simple note taking with mobile-first design and Nextcloud sync";
homepage = "https://gitlab.gnome.org/World/iotas";
license = licenses.gpl3Plus;
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
mainProgram = "iotas";
maintainers = with maintainers; [ zendo ];
maintainers = with lib.maintainers; [ zendo ];
};
}
+3 -3
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.32.5";
version = "0.32.6";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
hash = "sha256-H0PimkPXs2/iirOpN82az3Bge71k1RZOhMtr0UmGOy8=";
hash = "sha256-jJHlFrnyvGZ0/ykmZRbSAFwzvN0j2dqddLEQoiv3oys=";
};
ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
proxyVendor = true;
vendorHash = "sha256-U/tIsYpoog3S8V2yQGGqaQ+Av7TfvCYt3zn74qWuQKs=";
vendorHash = "sha256-/DVQghwfiPKLO0LFPFmHFO5jfActoEnlMuQP2i60R9o=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
+4 -3
View File
@@ -7,18 +7,19 @@
rustPlatform.buildRustPackage rec {
pname = "klog-rs";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "tobifroe";
repo = "klog";
rev = version;
hash = "sha256-MAHLTNKN0t0rUXd4f238/jcaUlcTdC3IvaviMRu6gKg=";
hash = "sha256-GbYkTCo+MUKBz0AtfDSjOOe8j+v6gxRkbq1Dj1E2jl0=";
};
cargoHash = "sha256-u+kctG+38Z2xYTA9h0OY4L1zzKyAT2Wlwf08zSqxV0I=";
cargoHash = "sha256-h68NEAPLlgzDTSerL+0DrvSSfB85RHtBvuoUhrxLDWU=";
checkFlags = [
# this integration test depends on a running kubernetes cluster
"--skip=k8s::tests::test_get_pod_list"
"--skip=k8s::tests::test_get_pod_list_for_resource"
];
meta = {
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.148.7";
version = "1.150.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=";
hash = "sha256-lVMXW2fnpoa/iiypLhHl7WXLqouHfrRapEbXL37X7B8=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
hash = "sha256-nzAQEaTHkKjDmKDmwZEznpvVh1KfxTM83/82hjV/Cpw=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -21,20 +21,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libkrun";
version = "1.9.6";
version = "1.9.8";
src = fetchFromGitHub {
owner = "containers";
repo = "libkrun";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-bseyOHgteLEUz93gL5G2zR0ssijMd86zmlvm02a7FSY=";
hash = "sha256-a5ot5ad8boANK3achn6PJ52k/xmxawbTM0/hEEC/fss=";
};
outputs = [ "out" "dev" ];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
hash = "sha256-OerD2SEJquv7bHEZw4jdxmrQn8SuIUJiYPu9E1u439o=";
hash = "sha256-oa3M/HL0hWoXlqY0Wxy9jf6hIvMqevtpuYiTCrS1Q74=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -5,12 +5,12 @@
}:
let
version = "2.0.12";
version = "2.0.13";
pname = "lunatask";
src = fetchurl {
url = "https://lunatask.app/download/Lunatask-${version}.AppImage";
hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs=";
hash = "sha256-/OIIyl43oItg0XEbhEnB+rPBcY3XuQlurL5Ad+0T3aM=";
};
appimageContents = appimageTools.extract {
+3 -3
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "metacubexd";
version = "1.168.0";
version = "1.171.0";
src = fetchFromGitHub {
owner = "MetaCubeX";
repo = "metacubexd";
rev = "v${finalAttrs.version}";
hash = "sha256-HTHqf4R3eD+LlI9qmSz4id0SPVgid8Qp4P9JZzXGKlk=";
hash = "sha256-9ST7MwvEMCa2bORffWvhSXSHKU1V3b5oFZ3ExZ2kZnk=";
};
nativeBuildInputs = [
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-OFcXsAFMwY6BnyEVK9Px1g17CHCQWyPpr1My7u3XPpU=";
hash = "sha256-ta5H1sNROP8nyLNno6C7p6NyXRFuD32tnN7B0nlLdOM=";
};
buildPhase = ''
+6 -12
View File
@@ -1,25 +1,24 @@
{
lib,
stdenv,
fetchFromGitHub,
python3Packages,
versionCheckHook,
}:
python3Packages.buildPythonApplication rec {
pname = "mud";
version = "1.0.1";
version = "1.0.10";
pyproject = true;
src = fetchFromGitHub {
owner = "jasursadikov";
repo = "mud";
rev = "refs/tags/v${version}";
hash = "sha256-pW4B4+RN7hKtG2enJ33OHBeGsLj8w20ylvjcOL6owAk=";
hash = "sha256-UPlAA63iANuChpqWLUDHQrcRjYkHvLcwXW/lVrAfY20=";
};
build-system = with python3Packages; [
hatchling
setuptools-scm
];
dependencies = with python3Packages; [
@@ -28,14 +27,9 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "mud" ];
# Version checking fails on darwin with:
# PermissionError: [Errno 1] Operation not permitted: '/var/empty/.mudsettings'
# despite adding `export HOME=$(mktemp -d)` in the `preVersionCheck` phase.
# The tool
nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
# Removed versionCheckHook due to conflict with the new release,
# a mud config file is required to run the version check command.
# Mud can only be initialized in a directory containing git repos.
meta = {
description = "multi-directory git runner which allows you to run git commands in a multiple repositories";
+3 -3
View File
@@ -14,16 +14,16 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.8.5";
version = "1.8.6";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
rev = "v${version}";
hash = "sha256-sZGKM6Dxz0bZkHIITujojSsKtRD4E+q1uReWRg5EfC8=";
hash = "sha256-yJCUWRAntye3Dx2a+s/gNVa+XuCQak24TnFjSY+/3zc=";
};
vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o=";
vendorHash = "sha256-MHdEY2nlUGTKybMPran5mTXlAlTFilfrY5K2sMlPe5U=";
ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ];
postConfigure = ''
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "ox";
version = "0.6.10";
version = "0.7.1";
src = fetchFromGitHub {
owner = "curlpipe";
repo = pname;
rev = version;
hash = "sha256-7PaAcVatm/gqeZRuzCjoF6ZGDP6mIjDTuhmJQ5wt7x8=";
hash = "sha256-7rP/h3MlrMZl9yd655uRrnv1aUB57LzdyKs66wHp33Y=";
};
cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0=";
cargoHash = "sha256-z9pyMnYQZfCCVdVEakj3q27SFLahMDWRuAopYye6RIY=";
passthru = {
tests.version = testers.testVersion {
+33
View File
@@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
nix-update-script,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "passepartui";
version = "0.1.4";
src = fetchFromGitHub {
owner = "kardwen";
repo = "passepartui";
rev = "refs/tags/v${version}";
hash = "sha256-ydX+Rjpfhi0K6f8pzjqWGF0O22gBco6Iot8fXSFNG5c=";
};
cargoHash = "sha256-/lgEQ6PmHagt8TlGUV2A95MbV8IQzUwyQ/UkoaGIVHE=";
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "TUI for pass, the standard unix password manager";
homepage = "https://github.com/kardwen/passepartui";
changelog = "https://github.com/kardwen/passepartui/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "passepartui";
};
}
+733 -903
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -5,13 +5,13 @@
rustPlatform.buildRustPackage rec {
pname = "polarity";
version = "0-unstable-2024-06-28";
version = "0-unstable-2024-11-15";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "59bd7a2c3c3d0a61b25d3bb85b9d21f7b3fef343";
hash = "sha256-85uo2GAGxWAWwN2vyhUqwz28Ofb+2eOSuetzovAle+A=";
rev = "2f6ce455ec512f3b0cfff0f3ca9c5016e6a4e9de";
hash = "sha256-viJGqtUsoAZznhfDN3PnPG+LJ5ppVL11eyhuEiTG+IQ=";
};
cargoLock = {
+2 -2
View File
@@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.85.2";
version = "1.86.0";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-pmzoRZ0EMEA0kU37skGuEDu6ggBuUdFYCLRpZty5kgs=";
hash = "sha256-UvMPRLCaGgunpVwoF0Nbz+7Gma7zQP+nMMh5Cvqn0MA=";
};
dontPatch = true;
+3 -3
View File
@@ -7,20 +7,20 @@
rustPlatform.buildRustPackage rec {
pname = "rcp";
version = "0.13.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "wykurz";
repo = "rcp";
rev = "v${version}";
hash = "sha256-INLXVruiaK5yv5old0NOWFcg9y13M6Dm7bBMmcPFY1I=";
hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM=";
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
IOKit
]);
cargoHash = "sha256-JXDM97uGuGh3qHK3Gh8Nd/YSZq/Kcj81PpufJJMqQQI=";
cargoHash = "sha256-loS55mQUVbIm+5VcQnPf6olERNTm3dbnQu5SPXe6a8I=";
RUSTFLAGS = "--cfg tokio_unstable";
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
repo = "StreamController";
owner = "StreamController";
rev = version;
hash = "sha256-UBcsA9pAo7fONhk4vYXQU4EgSVKm1D7/7nvL9BaNIgo=";
hash = "sha256-w2ElVus0dgA375lv58q3H8ZmQ+8iBxC4vxtJSlKssoM=";
};
# The installation method documented upstream
+3 -3
View File
@@ -17,16 +17,16 @@ let
tctl-next = buildGoModule rec {
pname = "tctl-next";
version = "1.0.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "temporalio";
repo = "cli";
rev = "v${version}";
hash = "sha256-y0C2z2iMMQSG5+xGngZ98+ixIgbvaQxPdAWuPbEbBAY=";
hash = "sha256-KDJtCqx9Yp/zhutSElFveWYAKwJCckiM9k3FOtYTlLo=";
};
vendorHash = "sha256-zhGqDHdVGg7eGnw5L3eSyXKBTjp85ir5zrtf7HbXmC0=";
vendorHash = "sha256-Vur3e6olkC0Ewz/RDZe2AIpcIs5GqeVgJa+KO9g8X7o=";
inherit overrideModAttrs;
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "tex-fmt";
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "WGUNDERWOOD";
repo = "tex-fmt";
rev = "refs/tags/v${version}";
hash = "sha256-Ii/z9ZmsWCHxxqUbkcu7HRBuN2LiLCxzUvqRexwQ/Co=";
hash = "sha256-jVrd3yZ07+ppsdt+8sNKX1rdmU+UiRCyx80EMXdoK54=";
};
cargoHash = "sha256-2vPxsXKInH18h/AoOWfl0VteUBmxWDzZa6AtpKfY5Hs=";
cargoHash = "sha256-XQ1oEF+axp8pC6OkLlab1qI7RJeAyeSb58oChgaaS1s=";
meta = {
description = "LaTeX formatter written in Rust";
+1 -1
View File
@@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation {
dontInstall = true;
outputHashAlgo = "sha256";
outputHash = "sha256-5f9lKRD6vc2FOnUeSxK/zlu/tshS1+RCSB0slGSO/Rc=";
outputHash = "sha256-1poTBB9cm0EHeIvXhan6/kaxr22LXvhHD4Y+JBocioE=";
outputHashMode = "recursive";
};
+2 -2
View File
@@ -5,13 +5,13 @@ let args = rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
version = "0.33.17";
version = "0.33.21";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = "tilt";
rev = "v${version}";
hash = "sha256-GzWnTq3X615A/jRjYhBriRYaH4tjv+yg2/zHIJuKXPE=";
hash = "sha256-3LFsTaz47QAIDGId/Tl3G7xP5b9gc25X+ZeMaVhXf8w=";
};
};
@@ -1,20 +0,0 @@
diff --git a/ufetch-nixos b/ufetch-nixos
index 2ca8f9d..5102cd7 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -9,9 +9,14 @@ host="$(hostname)"
os="$(nixos-version)"
kernel="$(uname -sr)"
uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
-packages="$(ls -d -1 /nix/store/*/ | wc -l)"
shell="$(basename "${SHELL}")"
+for profile in $NIX_PROFILES; do
+ if [ -d "$profile" ]; then
+ packages="$((packages + $( (nix-store -q --requisites "$profile" 2>/dev/null || true) | wc -l)))"
+ fi
+done
+
## UI DETECTION
parse_rcs() {
+2 -4
View File
@@ -9,17 +9,15 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "ufetch";
version = "0.3";
version = "0.4";
src = fetchFromGitLab {
owner = "jschx";
repo = "ufetch";
rev = "v${finalAttrs.version}";
hash = "sha256-1LtVCJrkdI2AUdF5d/OBCoSqjlbZI810cxtcuOs/YWs=";
hash = "sha256-icrf7OjDageBRSBD40wX2ZzCvB6T5n0jgd5aRROGqCA=";
};
patches = [ ./0001-optimize-packages-command.patch ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/licenses/${finalAttrs.pname}
+3 -3
View File
@@ -13,14 +13,14 @@
python3Packages.buildPythonApplication rec {
pname = "varia";
version = "2024.5.7";
version = "2024.11.7-1";
pyproject = false;
src = fetchFromGitHub {
owner = "giantpinkrobots";
repo = "varia";
rev = "v${version}";
hash = "sha256-axBBJYIFCt3J0aCY8tMYehho0QN1eIcUMPhWb5g5uDc=";
rev = "refs/tags/v${version}";
hash = "sha256-Xx3rd+FwelE7yjW4dXTAEzCMVa25ojXuhOLjqc6H57c=";
};
postPatch = ''
@@ -1,5 +1,5 @@
{
"version": "1.1.2",
"rev": "f680b7d08f56183391b581077d4baf589e1cc8bd",
"hash": "sha256-JoGGnlu2aioO6XbeUZDe23AHSBxciLSEKBWRedPuXjI="
"version": "1.1.3",
"rev": "19864453f7d0ed095256d848b46e7b8630989bac",
"hash": "sha256-Inaawm6mAy1CPCPfGO5LNBgaF/QcZOTAjm1aGjrJp6w="
}
@@ -13,16 +13,18 @@
pytest-timeout,
importlib-metadata,
psutil,
untangle,
django,
requests,
flask,
gevent,
numpy,
flask,
requests,
typing-extensions,
}:
buildPythonPackage rec {
pname = "debugpy";
version = "1.8.8";
version = "1.8.9";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -31,7 +33,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "debugpy";
rev = "refs/tags/v${version}";
hash = "sha256-zkNV+tFRAxTdl+lCPD4XYI1Oz0dVyX4GGuNdfzy2sJU=";
hash = "sha256-JgYGdCGzzktigjEKMPbkcSJlFPYSEFEJvmIFfR0qSZM=";
};
patches =
@@ -104,6 +106,7 @@ buildPythonPackage rec {
## Used by test helpers:
importlib-metadata
psutil
untangle
## Used in Python code that is run/debugged by the tests:
django
@@ -111,6 +114,7 @@ buildPythonPackage rec {
gevent
numpy
requests
typing-extensions
];
preCheck =
@@ -1,5 +1,5 @@
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
index a1a852a0..0bb91807 100644
index 2e328f61..ba7221fe 100644
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
@@ -412,7 +412,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
@@ -1,5 +1,5 @@
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
index 0bb91807..8026a5ad 100644
index ba7221fe..24efc1ed 100644
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
@@ -503,7 +503,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
@@ -1,5 +1,5 @@
diff --git a/setup.py b/setup.py
index 1bfba237..414bb4d5 100644
index d16a27c5..a7e407e1 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,6 @@ import sys
@@ -27,7 +27,7 @@ index 1bfba237..414bb4d5 100644
long_description=long_description,
long_description_content_type="text/markdown",
diff --git a/src/debugpy/public_api.py b/src/debugpy/public_api.py
index 9d0f705a..ee0b26ca 100644
index c61a2607..f26f8272 100644
--- a/src/debugpy/public_api.py
+++ b/src/debugpy/public_api.py
@@ -7,8 +7,6 @@ from __future__ import annotations
@@ -39,7 +39,7 @@ index 9d0f705a..ee0b26ca 100644
# Expose debugpy.server API from subpackage, but do not actually import it unless
# and until a member is invoked - we don't want the server package loaded in the
@@ -191,4 +189,4 @@ def trace_this_thread(__should_trace: bool):
@@ -192,4 +190,4 @@ def trace_this_thread(__should_trace: bool):
"""
@@ -1,5 +1,5 @@
diff --git a/tests/debug/runners.py b/tests/debug/runners.py
index dc60d0ae..cf4a06a3 100644
index cac4fbf5..079bb743 100644
--- a/tests/debug/runners.py
+++ b/tests/debug/runners.py
@@ -163,7 +163,7 @@ def _attach_common_config(session, target, cwd):
@@ -12,10 +12,10 @@ index dc60d0ae..cf4a06a3 100644
log.info("Attaching {0} to {1} by PID.", session, target)
diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py
index 017d7f59..63e86328 100644
index 78453bfe..458716af 100644
--- a/tests/debugpy/test_attach.py
+++ b/tests/debugpy/test_attach.py
@@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run):
@@ -153,8 +153,7 @@ def test_reattach(pyfile, target, run):
@pytest.mark.parametrize("pid_type", ["int", "str"])
@@ -24,4 +24,4 @@ index 017d7f59..63e86328 100644
+@pytest.mark.skip(
reason="https://github.com/microsoft/debugpy/issues/311",
)
def test_attach_pid_client(pyfile, target, pid_type):
@pytest.mark.flaky(retries=2, delay=1)
+1 -1
View File
@@ -15,7 +15,7 @@ let
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
# the version of infisical
version = "0.31.2";
version = "0.31.8";
# the platform-specific, statically linked binary
src =
+4 -4
View File
@@ -1,6 +1,6 @@
{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
, "x86_64-linux": "sha256-vNA6bhbgfzWRSlIitA9VJVOxe+LF3ra6q6lJY1NW13w="
, "x86_64-darwin": "sha256-p+iis192d77vRWbPtWiFWZSgzdNY3K7VeDmmc7AbBtg="
, "aarch64-linux": "sha256-IeCyJT8KF3Kh4XXfKmsKAewZWW3C9Gz3GQseMd0WMUw="
, "aarch64-darwin": "sha256-vXS8YbLb2tCqaGEJSmS147b0m1OMZTFZ5Ou2vtegFWo="
, "x86_64-linux": "sha256-SkWcRnbmvKWFX0dvAfj71uHNRbVZ0LYLzyPogiSaMnw="
, "x86_64-darwin": "sha256-h6VoI+Xd7ZDiVEUqSMRMIpc7f9s/HZilfwzXFgPWAV8="
, "aarch64-linux": "sha256-7TWuNTgrccSn634qje46AuSWr9fg6zlrTpz4iB9tzE0="
, "aarch64-darwin": "sha256-o39uHZd1MjbEszpDwIAbhUS/w8LEiRVVvJjaX+SQmww="
}
@@ -62,6 +62,8 @@ rec {
settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk=";
persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs=";
patchesOpen = [ fbdev_linux_611_patch ];
broken = kernel.kernelAtLeast "6.12";
});
beta = selectHighestVersion latest (generic {
@@ -77,14 +79,16 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "550.40.79";
version = "550.40.80";
persistencedVersion = "550.54.14";
settingsVersion = "550.54.14";
sha256_64bit = "sha256-t/i/MeAkw03evuil0lbQnDiOVQmc8xAZqGo5P+BnUt8=";
openSha256 = "sha256-mWoI6j/OqAPrGrw6QwdOT9kFPzg3PSNSZW5JDlRTB+s=";
sha256_64bit = "sha256-fuI9G9KHCCddtPNDz+8FAkporSB7G97UU/pw4KGGZOE=";
openSha256 = "sha256-+soDdbklk8wr/G5cj4BzZ8ql0zeHSswJ2OkOv59uMp0=";
settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4=";
persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
broken = kernel.kernelAtLeast "6.12";
};
# data center driver compatible with current default cudaPackages
+42 -2
View File
@@ -32,6 +32,8 @@
{ lib
, stdenv
, runCommandLocal
, patchutils
, callPackage
, pkgs
, pkgsi686Linux
@@ -68,6 +70,29 @@ assert useFabricmanager -> fabricmanagerSha256 != null;
assert useFabricmanager -> !useSettings;
let
# Rewrites patches meant for the kernel/* folder structure to kernel-open/*
rewritePatch =
{ from, to }:
patch:
runCommandLocal (builtins.baseNameOf patch)
{
inherit patch;
nativeBuildInputs = [ patchutils ];
}
''
lsdiff \
-p1 -i ${from}/'*' \
"$patch" \
| sort -u | sed -e 's/[*?]/\\&/g' \
| xargs -I{} \
filterdiff \
--include={} \
--strip=2 \
--addoldprefix=a/${to}/ \
--addnewprefix=b/${to}/ \
--clean "$patch" > "$out"
'';
nameSuffix = lib.optionalString (!libsOnly) "-${kernel.version}";
pkgSuffix = lib.optionalString (lib.versionOlder version "304") "-pkg0";
i686bundled = lib.versionAtLeast version "391" && !disable32Bit;
@@ -144,7 +169,17 @@ let
}
else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
patches = if libsOnly then null else patches;
patches =
if libsOnly then
null
else
(
patches
++ (builtins.map (rewritePatch {
from = "kernel-open";
to = "kernel";
}) patchesOpen)
);
inherit prePatch postPatch patchFlags;
inherit preInstall postInstall;
inherit version useGLVND useProfiles;
@@ -202,7 +237,12 @@ let
(hash: callPackage ./open.nix {
inherit hash;
nvidia_x11 = self;
patches = patchesOpen;
patches =
(builtins.map (rewritePatch {
from = "kernel";
to = "kernel-open";
}) patches)
++ patchesOpen;
broken = brokenOpen;
})
openSha256;
+1 -1
View File
@@ -31,7 +31,7 @@ buildNpmPackage {
prisma
];
npmDepsHash = "sha256-RedMH3zWXTNOu/15UDeATP+gWBfDvt4vhKVahL/sEKM=";
npmDepsHash = "sha256-IeryDlBFG+fu0FyqlNujkF+O+YwfQm0hoMMvp/vN0IQ=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
+2 -2
View File
@@ -5,12 +5,12 @@
}:
let
version = "1.2.4";
version = "1.4.0";
src = fetchFromGitHub {
owner = "stonith404";
repo = "pingvin-share";
rev = "v${version}";
hash = "sha256-hGM7xTgB+XTytnNdGNKQYd7YLAIMbBczxsrcNE3EXkc=";
hash = "sha256-5tu81kB9UDui2/n5KJLRug4IHeDihuv8+HWeo0saqAM=";
};
in
+1 -1
View File
@@ -23,7 +23,7 @@ buildNpmPackage {
buildInputs = [ vips ];
nativeBuildInputs = [ pkg-config ];
npmDepsHash = "sha256-aTarzVt+9Sn0xvAfPyoXFoHqPVjKDGv/OfLO8/RdkQw=";
npmDepsHash = "sha256-G9UzA/laXEiU101ehFwhi0i6PAeErNWqmb1fu4W+cII=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
+4 -4
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "nu_plugin_skim";
version = "0.8.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "idanarye";
repo = pname;
rev = "v${version}";
hash = "sha256-3q2qt35lZ07N8E3p4/BoYX1H4B8qcKXJWnZhdJhgpJE=";
hash = "sha256-cPM4Z1o2ED8Q5u9AcnwBv+SOvuE2C4NO9xC7PfX+ntk=";
};
cargoHash = "sha256-+RYrQsB8LVjxZsQ7dVDK6GT6nXSM4b+qpILOe0Q2SjA=";
cargoHash = "sha256-93GSnw/3Ms83bYEyRRc2sguUpR7BIWz8hgqzXdU5CF4=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -50,6 +50,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/idanarye/nu_plugin_skim";
license = licenses.mit;
maintainers = with maintainers; [ aftix ];
platforms = with platforms; all;
platforms = platforms.all;
};
}
+4 -4
View File
@@ -14,14 +14,14 @@ let
}.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-EzMkl/XTtieAj/pg1L4BLTEuWNnQ5m18WYu/sqRZx/I=";
aarch64-linux = "sha256-D5FpJBRzvbsgrQmopJQpJZTIm9TroaGB6fkYX2UAaHM=";
armv7l-linux = "sha256-PQl/ZQxxkzQ4iTUPBO9tbCsswOnEQuupdzxul0/vKG4=";
x86_64-linux = "sha256-oga8WQYxFeJlXhkJRpgb08QSV1vA7rfbVzwxxdl8xUw=";
aarch64-linux = "sha256-Xa7CGpv35fZDZjYmR3y3NUriOt1/I85556P32eP9UjQ=";
armv7l-linux = "sha256-k3FGn5pZX5Iqzh0J/nclQC4+n6CMrr+JPt2/rabnWvo=";
}.${system} or throwSystem;
in
stdenv.mkDerivation (finalAttrs: {
pname = "zrok";
version = "0.4.39";
version = "0.4.44";
src = fetchzip {
url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";
+2 -2
View File
@@ -5,9 +5,9 @@
},
"osquery": {
"fetchSubmodules": true,
"hash": "sha256-ZgIYPPfLNXuCVcz+9lmFnDAnpmlLBolt6mLsfGR8rvs=",
"hash": "sha256-Zi1lCV7i+UmaG1/32mg82BH5vjb9291fnEXLha26zQ0=",
"owner": "osquery",
"repo": "osquery",
"rev": "5.13.1"
"rev": "5.14.1"
}
}