mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
commit
85c7278348
7 changed files with 20 additions and 1593 deletions
|
|
@ -4,18 +4,18 @@
|
|||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "apftool-rs";
|
||||
version = "0-unstable-2024-01-05";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suyulin";
|
||||
repo = "apftool-rs";
|
||||
rev = "92d8a1b88cb79a53f9e4a70fecee481710d3565b";
|
||||
hash = "sha256-0+eKxaLKZBRLdydXxUbifFfFncAbthUn7AB8QieWaXM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bcXZIY0CDyWE3vh04IU3kXRxi/uUm5TD8ifA0jq47rc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IJEEnNIW44kItB19U1lNGi1cHpVGaGHQZt2kgAJFkjU=";
|
||||
cargoHash = "sha256-Ufe82fJALRlMjRSQ7Y2wFTOzXKtuwQyrWfxZjdEtuc0=";
|
||||
|
||||
meta = {
|
||||
description = "About Tools for Rockchip image unpack tool";
|
||||
|
|
@ -25,4 +25,4 @@ rustPlatform.buildRustPackage {
|
|||
maintainers = with lib.maintainers; [ colemickens ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "0.1.0-alpha.5";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "gobang";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tako8ki";
|
||||
repo = "gobang";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RinfQhG7iCp0Xcs9kLs3I2/wjkJEgCjFYe3mS+FY9Ak=";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./update-sqlx.patch ];
|
||||
|
||||
cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ=";
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform TUI database management tool written in Rust";
|
||||
homepage = "https://github.com/tako8ki/gobang";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -7,12 +7,12 @@
|
|||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "26.1.7";
|
||||
version = "26.1.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RI5+uAg3iGMmWREWYn+ChnEB9WyPa2tImB35Vuhoe7Q=";
|
||||
sha256 = "sha256-/puIAMeUASG50U35RTRVIOlfD4NY3HZUZ6BKJzEh/s4=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
|
|
|||
|
|
@ -46,6 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
++ [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ];
|
||||
|
||||
# On Darwin (and Windows), upstream's CMakeLists.txt forcibly overrides
|
||||
# CMAKE_INSTALL_LIBDIR to "lib", ignoring the value passed by the cmake
|
||||
# setup hook, so the libraries end up in $out/lib instead of $lib/lib.
|
||||
# Move them into the lib output manually.
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $lib/lib
|
||||
mv $out/lib/libwiiuse* $lib/lib/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Feature complete cross-platform Wii Remote access library";
|
||||
mainProgram = "wiiuseexample";
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nsjail";
|
||||
version = "3.4";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "nsjail";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-/K+qJV5Dq+my45Cpw6czdsWLtO9lnJwZTsOIRt4Iijk=";
|
||||
hash = "sha256-4fFXPwfPErve5CkVBtjPd1In8eEDby/RhuyW952YW7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -893,6 +893,7 @@ mapAliases {
|
|||
go-thumbnailer = throw "'go-thumbnailer' has been renamed to/replaced by 'thud'"; # Converted to throw 2025-10-27
|
||||
go-upower-notify = throw "'go-upower-notify' has been renamed to/replaced by 'upower-notify'"; # Converted to throw 2025-10-27
|
||||
go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
|
||||
gobang = throw "'gobang' has been removed as it is unmaintained upstream. Consider using `lazysql` or `rainfrog` instead."; # added
|
||||
godot-export-templates = throw "'godot-export-templates' has been renamed to/replaced by 'godot-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
godot_4-export-templates = throw "'godot_4-export-templates' has been renamed to/replaced by 'godot_4-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue