Merge master into staging-next
This commit is contained in:
@@ -11,6 +11,10 @@ let
|
||||
|
||||
format = pkgs.formats.toml { };
|
||||
configFile = format.generate "continuwuity.toml" cfg.settings;
|
||||
|
||||
conduwuitWrapper = pkgs.writeShellScriptBin "conduwuit" ''
|
||||
exec ${lib.getExe cfg.package} --config ${configFile} "$@"
|
||||
'';
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
@@ -169,9 +173,22 @@ in
|
||||
for details on supported values.
|
||||
'';
|
||||
};
|
||||
|
||||
admin = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = cfg.enable;
|
||||
defaultText = lib.literalExpression "config.services.matrix-continuwuity.enable";
|
||||
description = "Add conduwuit command to PATH for administration";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment = lib.mkIf cfg.admin.enable {
|
||||
systemPackages = [ conduwuitWrapper ];
|
||||
};
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = !(cfg.settings ? global.unix_socket_path) || !(cfg.settings ? global.address);
|
||||
|
||||
@@ -20,8 +20,43 @@ let
|
||||
|
||||
mkDefaultAttrs = mapAttrs (n: v: mkDefault v);
|
||||
|
||||
libconfig = pkgs.formats.libconfig { };
|
||||
configFile = libconfig.generate "picom.conf" cfg.settings;
|
||||
# Basically a tinkered lib.generators.mkKeyValueDefault
|
||||
# It either serializes a top-level definition "key: { values };"
|
||||
# or an expression "key = { values };"
|
||||
mkAttrsString =
|
||||
top:
|
||||
mapAttrsToList (
|
||||
k: v:
|
||||
let
|
||||
sep = if (top && isAttrs v) then ":" else "=";
|
||||
in
|
||||
"${escape [ sep ] k}${sep}${mkValueString v};"
|
||||
);
|
||||
|
||||
# This serializes a Nix expression to the libconfig format.
|
||||
mkValueString =
|
||||
v:
|
||||
if types.bool.check v then
|
||||
boolToString v
|
||||
else if types.int.check v then
|
||||
toString v
|
||||
else if types.float.check v then
|
||||
toString v
|
||||
else if types.str.check v then
|
||||
"\"${escape [ "\"" ] v}\""
|
||||
else if builtins.isList v then
|
||||
"[ ${concatMapStringsSep " , " mkValueString v} ]"
|
||||
else if types.attrs.check v then
|
||||
"{ ${concatStringsSep " " (mkAttrsString false v)} }"
|
||||
else
|
||||
throw ''
|
||||
invalid expression used in option services.picom.settings:
|
||||
${v}
|
||||
'';
|
||||
|
||||
toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings);
|
||||
|
||||
configFile = pkgs.writeText "picom.conf" (toConf cfg.settings);
|
||||
|
||||
in
|
||||
{
|
||||
@@ -244,22 +279,56 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = libconfig.type;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
blur =
|
||||
{ method = "gaussian";
|
||||
size = 10;
|
||||
deviation = 5.0;
|
||||
settings =
|
||||
with types;
|
||||
let
|
||||
scalar =
|
||||
oneOf [
|
||||
bool
|
||||
int
|
||||
float
|
||||
str
|
||||
]
|
||||
// {
|
||||
description = "scalar types";
|
||||
};
|
||||
'';
|
||||
description = ''
|
||||
Picom settings. Use this option to configure Picom settings not exposed
|
||||
in a NixOS option or to bypass one. For the available options see the
|
||||
CONFIGURATION FILES section at {manpage}`picom(1)`.
|
||||
'';
|
||||
};
|
||||
|
||||
libConfig =
|
||||
oneOf [
|
||||
scalar
|
||||
(listOf libConfig)
|
||||
(attrsOf libConfig)
|
||||
]
|
||||
// {
|
||||
description = "libconfig type";
|
||||
};
|
||||
|
||||
topLevel = attrsOf libConfig // {
|
||||
description = ''
|
||||
libconfig configuration. The format consists of an attributes
|
||||
set (called a group) of settings. Each setting can be a scalar type
|
||||
(boolean, integer, floating point number or string), a list of
|
||||
scalars or a group itself
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
mkOption {
|
||||
type = topLevel;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
blur =
|
||||
{ method = "gaussian";
|
||||
size = 10;
|
||||
deviation = 5.0;
|
||||
};
|
||||
'';
|
||||
description = ''
|
||||
Picom settings. Use this option to configure Picom settings not exposed
|
||||
in a NixOS option or to bypass one. For the available options see the
|
||||
CONFIGURATION FILES section at {manpage}`picom(1)`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@@ -1008,6 +1008,9 @@ let
|
||||
# missing optional dependencies
|
||||
conda = addPackageRequires super.conda [ self.projectile ];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/483425
|
||||
consult = addPackageRequires super.consult [ self.flymake ];
|
||||
|
||||
# needs network during compilation, also native-ice
|
||||
consult-gh = ignoreCompilationError (
|
||||
super.consult-gh.overrideAttrs (old: {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2026-01-19";
|
||||
version = "0-unstable-2026-01-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "bf245b03076b97eed14abd54c79537a59ecc2bd9";
|
||||
hash = "sha256-2Tm/CQt+LwAIEWsBRtgm/rZngSHqEohx45UlkaTCHbA=";
|
||||
rev = "900e599dd26e4b292ff55738cc8881530eed46ce";
|
||||
hash = "sha256-9lr7RDSdQ/FN3mgoh8ZTsL1J8vXyab+TqhvM8yp7G7c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -113,7 +113,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postFixup = ''
|
||||
# Wrap the project so it can find runtime dependencies.
|
||||
wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out ''${pythonPath[*]}"
|
||||
cp ${launchScript} $out/share/inkscape/extensions/textext/launch.sh
|
||||
'';
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
|
||||
# so wrapPythonPrograms hook does not handle it automatically.
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/dupeguru" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -50,7 +50,7 @@ mkDerivation rec {
|
||||
pythonPath = with python3.pkgs; [ gpxpy ];
|
||||
|
||||
preInstall = ''
|
||||
buildPythonPath "$pythonPath"
|
||||
buildPythonPath "''${pythonPath[*]}"
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
|
||||
'';
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "148.0b4";
|
||||
version = "148.0b7";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "951da65733ab4226839cf23fa0f667d8bcdeeb8c2e729b6395d7ee39b10263a4409380eebde132156f8acc56ab5b4bf96eed1991a31820037b57214a1d22e520";
|
||||
sha512 = "459aece0fb83ed42471f2037896eb6fce806b1bab396df81c822cf418cde3baf7f23021f0efce4c3717c4fa1cbfd18a7ffc7ec6751bb2c52bd997c2342b534bf";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palemoon-bin";
|
||||
version = "34.0.0";
|
||||
version = "34.0.1";
|
||||
|
||||
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
|
||||
|
||||
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
gtk3 = fetchzip {
|
||||
urls = urlRegionVariants "gtk3";
|
||||
hash = "sha256-TC/Lmn/be2RR0De3DgIo9zWm0IumlOju+CuMCJ8Rggs=";
|
||||
hash = "sha256-kZ0MCMtAzSzGZomoB/dtNgSsPfFLZXitGSZ9aB1K/9g=";
|
||||
};
|
||||
gtk2 = fetchzip {
|
||||
urls = urlRegionVariants "gtk2";
|
||||
hash = "sha256-LGZP1sVS0LYZmHE9l68RPa/BOew5bgCDqyxXs0BYLjw=";
|
||||
hash = "sha256-yhnQuRtyl5nLn1ggG6zjUTXM0ym7510QXMe+jvwG9GM=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -194,8 +194,8 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.14.3";
|
||||
hash = "sha256-QPVKWtpm67z13hmPgM/YXm+CBOqiI8qZwttx2h6LboU=";
|
||||
version = "1.14.4";
|
||||
hash = "sha256-fEuIAKmR+shKHNldUlU6qvel9tjYFdKnc25JWtxRPHs=";
|
||||
vendorHash = "sha256-NDtBLa8vokrSRDCNX10lQyfMDzTrodoEj5zbDanL4bk=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pythonPath = with python3.pkgs; requiredPythonModules extraPythonPackages;
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH"
|
||||
)
|
||||
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
runHook preInstall
|
||||
dune install --prefix $out easycrypt
|
||||
rm $out/bin/ec-runtest
|
||||
wrapPythonProgramsIn "$out/lib/easycrypt/commands" "$pythonPath"
|
||||
wrapPythonProgramsIn "$out/lib/easycrypt/commands" "''${pythonPath[*]}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = ''
|
||||
patchShebangs $out/opt/sumorobot-manager/main.py
|
||||
wrapPythonProgramsIn "$out/opt" "$pythonPath"
|
||||
wrapPythonProgramsIn "$out/opt" "''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage {
|
||||
postFixup = ''
|
||||
addDriverRunpath "$out/bin/coolercontrold"
|
||||
|
||||
buildPythonPath "$pythonPath"
|
||||
buildPythonPath "''${pythonPath[*]}"
|
||||
wrapProgram "$out/bin/coolercontrold" \
|
||||
--prefix PATH : $program_PATH \
|
||||
--prefix PYTHONPATH : $program_PYTHONPATH
|
||||
|
||||
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
|
||||
mkdir -p "$out/share/man/man5"
|
||||
cp cgitrc.5 "$out/share/man/man5"
|
||||
|
||||
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out ''${pythonPath[*]}"
|
||||
|
||||
for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
|
||||
wrapProgram $script --prefix PATH : '${
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.30.1";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SffXgJWPPB+ZImknbYWU8AyypAfk2coXxyqWy6UCNMk=";
|
||||
hash = "sha256-SQO9wAU+OS4ct+Evny2ZZXP7AUU2IyNwwgR1AaEzTmA=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "3cpio";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdrung";
|
||||
repo = "3cpio";
|
||||
tag = version;
|
||||
hash = "sha256-4ERSH5Kz/e2MuIIgi3XQVnhW0csBPDIvdmEw05OdREA=";
|
||||
hash = "sha256-LZu+g5ISpG/9ZZimTedvTjUEofhAaYKJdpLTex3ehQE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ER1OQZHHtHBNPoEl4NJ5p5KYjzFgJnFR8nXcmCk2HTA=";
|
||||
cargoHash = "sha256-YP6fCmY9fQD4hmKV6gLoElvce/BlRc9vAqyli7aaBNI=";
|
||||
|
||||
# Tests attempt to access arbitrary filepaths
|
||||
doCheck = false;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2026-01-20";
|
||||
version = "0-unstable-2026-01-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "e1f6574e77386282cbb917b981c968648fbab601";
|
||||
hash = "sha256-TR+c6OACVrETAVAlza62JSIKBvKMrDg/G4xBdMkJJlk=";
|
||||
rev = "6c6ec8e27ccaf8da4544f30af8a65440e3cb8915";
|
||||
hash = "sha256-nDFaF1DqO0jTUY5+VbkQTADPk3jc224QVFarCJDrR/8=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication {
|
||||
mkdir -p "$libdir"
|
||||
cp scripts/* "$libdir"
|
||||
chmod +x "$libdir/main.py"
|
||||
wrapPythonProgramsIn "$libdir" "$pythonPath"
|
||||
wrapPythonProgramsIn "$libdir" "''${pythonPath[*]}"
|
||||
mkdir -p $out/bin
|
||||
ln -s "$libdir/main.py" $out/bin/arubaotp-seed-extractor
|
||||
'';
|
||||
|
||||
@@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -118,7 +118,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pythonImportsCheck = [ "bcc" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/bcc/tools" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -88,7 +88,7 @@ python3Packages.buildPythonApplication rec {
|
||||
doCheck = false;
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/better-control" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/better-control" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -7,19 +7,20 @@
|
||||
rust-jemalloc-sys,
|
||||
zlib,
|
||||
gitMinimal,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "biome";
|
||||
version = "2.3.12";
|
||||
version = "2.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "@biomejs/biome@${finalAttrs.version}";
|
||||
hash = "sha256-v/m7yS9bE3/WpfuqZoW+tgIEm1ARsXze/0PRUWi+mHA=";
|
||||
hash = "sha256-WvEY3YslLu0FdIG8OcL4pPpfB945coU+W+YGLLecTc0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ldxw6znHscxfgg91BpaexsEvy3Dw2UMjcvI72VLUKG0=";
|
||||
cargoHash = "sha256-iIKs6tzhMZ7f8tKh95Db+FdE21vqiw3ksT72xacpPf8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -57,6 +58,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
unset BIOME_VERSION
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Toolchain of the web";
|
||||
homepage = "https://biomejs.dev/";
|
||||
|
||||
@@ -345,7 +345,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
mv $out/Blender.app $out/Applications
|
||||
''
|
||||
+ ''
|
||||
buildPythonPath "$pythonPath"
|
||||
buildPythonPath "''${pythonPath[*]}"
|
||||
wrapProgram $blenderExecutable \
|
||||
--prefix PATH : $program_PATH \
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH" \
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp -r $src/share/doc $out/share
|
||||
cp -r $src/share/icons $out/share
|
||||
|
||||
buildPythonPath "$pythonPath"
|
||||
buildPythonPath "''${pythonPath[*]}"
|
||||
|
||||
makeWrapper ${blender}/bin/blender $out/bin/${finalAttrs.finalPackage.pname} \
|
||||
--prefix PATH : $program_PATH \
|
||||
|
||||
@@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
postFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
wrapPythonProgramsIn $out/lib "$out $pythonPath"
|
||||
wrapPythonProgramsIn $out/lib "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -89,8 +89,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
# This mimics ../../../development/interpreters/python/wrap.sh
|
||||
wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
|
||||
wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/share $out/bin
|
||||
cp -r . $out/share/botamusique
|
||||
chmod +x $out/share/botamusique/mumbleBot.py
|
||||
wrapPythonProgramsIn $out/share/botamusique "$out $pythonPath"
|
||||
wrapPythonProgramsIn $out/share/botamusique "$out ''${pythonPath[*]}"
|
||||
|
||||
# Convenience binary and wrap with ffmpeg dependency
|
||||
makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
patchPythonScript "$out/lib/budgie-desktop/plugins/budgie-media-player-applet/applet.py"
|
||||
'';
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postFixup = ''
|
||||
# Wrap a helper script in an unusual location.
|
||||
wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postFixup = ''
|
||||
# Also sets program_PYTHONPATH and program_PATH variables
|
||||
wrapPythonPrograms
|
||||
wrapPythonProgramsIn "$out/share/carla/resources" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/carla/resources" "$out ''${pythonPath[*]}"
|
||||
|
||||
find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
|
||||
patchPythonScript "$f"
|
||||
|
||||
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
|
||||
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/libexec $out $pythonPath
|
||||
wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
# NOTE: `postCheck` is intentionally not used here, as the entire checkPhase
|
||||
|
||||
@@ -42,6 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# provide correct pcre2-config for cross
|
||||
env.PCRE_CONFIG = lib.getExe' (lib.getDev pcre2) "pcre2-config";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"dev"
|
||||
"lib"
|
||||
];
|
||||
|
||||
meta = {
|
||||
mainProgram = "ccze";
|
||||
description = "Fast, modular log colorizer";
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk8s-cli";
|
||||
version = "2.203.18";
|
||||
version = "2.204.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk8s-team";
|
||||
repo = "cdk8s-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-P/I8e7FWC4HgqPUe5839oh8sRrIQoCJqCvlw6+Wz/aw=";
|
||||
hash = "sha256-2f9ddwSpNg+7ZMKlHw1Lu10Qp/MoJTqBOz++0yCrXH0=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-IefCjyrUlHAFC8563M5/UM7d+4Sx9zvW7QMLxW5pJgQ=";
|
||||
hash = "sha256-dO/h9ebnaH4KSASht8Nec/p/fq0LHJyL7fFgCYvsq6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
for yt_plugin in $out/lib/clapper-enhancers/plugins/yt-dlp/*.py; do
|
||||
patchPythonScript $yt_plugin
|
||||
done
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.8.14.17-lts";
|
||||
rev = "85bdcee459593cd55faef3154a5e487b60119ff4";
|
||||
hash = "sha256-Ydx46Y7uFHVUzsqY8dBExg2r78Y+PeJUkMSIVAn6eXQ=";
|
||||
version = "25.8.15.35-lts";
|
||||
rev = "7a0b36cf8934881236312e9fea094baaf5c709a4";
|
||||
hash = "sha256-zCMqZaw+QO/MAdJhgyrZYvdFPO8o11EXbuGHS5++dZw=";
|
||||
lts = true;
|
||||
}
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clojure";
|
||||
version = "1.12.4.1582";
|
||||
version = "1.12.4.1602";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/clojure/brew-install/releases
|
||||
url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-/Vhk8ivy7DAxH5zjyvPTF5ngTWU7ZX7NtPCDb+ly/yE=";
|
||||
hash = "sha256-B9ld7oGEVcoI/QJb/SBHGAhSI7E1vc1LXQA5scxvkqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "comma";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "comma";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dNek1a8Yt3icWc8ZpVe1NGuG+eSoTDOmAAJbkYmMocU=";
|
||||
};
|
||||
|
||||
@@ -67,4 +67,4 @@ rustPlatform.buildRustPackage rec {
|
||||
mainProgram = "comma";
|
||||
maintainers = with lib.maintainers; [ artturin ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -143,7 +143,7 @@ let
|
||||
# tests need writable $HOME
|
||||
HOME=$PWD/.home
|
||||
|
||||
wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$pythonPath"
|
||||
wrapPythonProgramsIn "$PWD/testing/overrides/bin" "''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/${python3.sitePackages}
|
||||
cp -r driver $out/${python3.sitePackages}
|
||||
|
||||
wrapPythonProgramsIn $out/bin "$out $pythonPath"
|
||||
wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath"
|
||||
wrapPythonProgramsIn $out/bin "$out ''${pythonPath[*]}"
|
||||
wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out ''${pythonPath[*]}"
|
||||
# Because fast-downward calls `python translate.py` we need to return wrapped scripts back.
|
||||
for i in $out/libexec/fast-downward/translate/.*-wrapped; do
|
||||
name="$(basename "$i")"
|
||||
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -221,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pythonPath = [ python3Packages.numpy ];
|
||||
postInstall = ''
|
||||
wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
|
||||
''
|
||||
+ lib.optionalString useJava ''
|
||||
cd $out/lib
|
||||
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
|
||||
'';
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# remove binaries for x-less install because xgps sconsflag is partially broken
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/bin "$out $pythonPath"
|
||||
wrapPythonProgramsIn $out/bin "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/libexec "$out $pythonPath"
|
||||
wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
libpulseaudio,
|
||||
gobject-introspection,
|
||||
callPackage,
|
||||
gtk3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hmcl";
|
||||
version = "3.9.2";
|
||||
@@ -153,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpulseaudio
|
||||
wayland
|
||||
alsa-lib
|
||||
gtk3
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -181,6 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postFixup = ''
|
||||
makeShellWrapper ${hmclJdk}/bin/java $out/bin/hmcl \
|
||||
--add-flags "-jar $out/lib/hmcl/hmcl-terracotta-patch.jar" \
|
||||
--add-flags "-Djdk.gtk.version=3" \
|
||||
--set LD_LIBRARY_PATH ${lib.makeLibraryPath finalAttrs.runtimeDeps} \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr)
|
||||
|
||||
@@ -306,7 +306,7 @@ python3Packages.buildPythonApplication {
|
||||
dontWrapGApps = true;
|
||||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
|
||||
for bin in $out/bin/*; do
|
||||
py=$(readlink -m $bin)
|
||||
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
|
||||
# yt-dlp is needed for mpv to play YouTube channels.
|
||||
wrapProgram $out/bin/hypnotix \
|
||||
|
||||
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
|
||||
wrapProgram "$out/bin/ingen" --set INGEN_UI_PATH "$out/share/ingen/ingen_gui.ui"
|
||||
'';
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
|
||||
pillow
|
||||
];
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kcc";
|
||||
version = "9.3.3";
|
||||
version = "9.4.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ciromattia";
|
||||
repo = "kcc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ftS5umfaj6EQV81CuR6xGDrijuBe6ZiFOvBrNtD1Nxk=";
|
||||
hash = "sha256-TBQ7v63zti+KgaFCFgoIOMIhYaLnU3JH1YU52+idIQQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -283,7 +283,7 @@ stdenv.mkDerivation rec {
|
||||
(concatStringsSep "\n" (flatten [
|
||||
"runHook preInstall"
|
||||
|
||||
(optionalString withScripting "buildPythonPath \"${base} $pythonPath\" \n")
|
||||
(optionalString withScripting ''buildPythonPath "${base} ''${pythonPath[*]}"'')
|
||||
|
||||
# wrap each of the directly usable tools
|
||||
(map (
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
buildGo124Module,
|
||||
nix-update-script,
|
||||
makeBinaryWrapper,
|
||||
autoSignDarwinBinariesHook,
|
||||
darwin,
|
||||
cairo,
|
||||
fetchpatch,
|
||||
}:
|
||||
@@ -117,7 +117,7 @@ buildPythonApplication rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
imagemagick
|
||||
libicns # For the png2icns tool.
|
||||
autoSignDarwinBinariesHook
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wayland-scanner
|
||||
|
||||
@@ -116,7 +116,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/bin" "$pythonPath"
|
||||
wrapPythonProgramsIn "$out/bin" "''${pythonPath[*]}"
|
||||
makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \
|
||||
--prefix PATH : ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs}
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/tools/cpanfile b/tools/cpanfile
|
||||
index e70c6e7..1fb5860 100644
|
||||
--- a/tools/cpanfile
|
||||
+++ b/tools/cpanfile
|
||||
@@ -33,7 +33,7 @@ requires 'Test::Harness', 3.42;
|
||||
requires 'Test::MockObject', 1.20200122;
|
||||
requires 'Test::Trap', 0.3.4;
|
||||
requires 'Test::Deep', 1.130;
|
||||
-requires 'Test::MockModule', 0.180;
|
||||
+requires 'Test::MockModule', 0.177;
|
||||
|
||||
# Mojo stuff
|
||||
requires 'Mojolicious', 9.39;
|
||||
@@ -3,21 +3,23 @@
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
makeBinaryWrapper,
|
||||
perl,
|
||||
ghostscript,
|
||||
vips,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lanraragi";
|
||||
version = "0.9.50";
|
||||
version = "0.9.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Difegue";
|
||||
repo = "LANraragi";
|
||||
tag = "v.${version}";
|
||||
hash = "sha256-WwAY74sFPFJNfrTcGfXEZE8svuOxoCXR70SFyHb2Y40=";
|
||||
hash = "sha256-ieYil/3n8iSWdfO6MQ1sW8q/TnQekpCx24n/BDfeLNg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -28,16 +30,23 @@ buildNpmPackage rec {
|
||||
# Skip running `npm ci` and unnecessary build-time checks
|
||||
./install.patch
|
||||
|
||||
# Lower the version requirement of Test::MockModule
|
||||
./lower-version-reqs.patch
|
||||
|
||||
# Don't assume that the cwd is $out/share/lanraragi
|
||||
# Put logs and temp files into the cwd by default, instead of into $out/share/lanraragi
|
||||
./fix-paths.patch
|
||||
|
||||
(replaceVars ./vips-lib-path.patch {
|
||||
vips_lib = "${lib.getLib vips}/lib";
|
||||
})
|
||||
|
||||
# Expose the password hashing logic that can be used by the NixOS module
|
||||
# to set the admin password
|
||||
./expose-password-hashing.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-+vS/uoEmJJM3G9jwdwQTlhV0VkjAhhVd60x+PcYyWSw=";
|
||||
npmDepsHash = "sha256-9SuimhLvEuruvFXuFm62DzgldngfiJneV6MDedGy6LY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
@@ -88,6 +97,7 @@ buildNpmPackage rec {
|
||||
CHI
|
||||
# CHI::Driver::FastMmap (part of CHI)
|
||||
CacheFastMmap
|
||||
FFIPlatypus
|
||||
]
|
||||
# deps listed in `tools/install.pm`:
|
||||
++ [
|
||||
@@ -116,6 +126,7 @@ buildNpmPackage rec {
|
||||
TestMockObject
|
||||
TestTrap
|
||||
TestDeep
|
||||
TestMockModule
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/lib/LANraragi/Utils/Vips.pm b/lib/LANraragi/Utils/Vips.pm
|
||||
index fba395e..0579bdc 100644
|
||||
--- a/lib/LANraragi/Utils/Vips.pm
|
||||
+++ b/lib/LANraragi/Utils/Vips.pm
|
||||
@@ -20,7 +20,7 @@ my $glib_ffi = undef;
|
||||
my $gobject_ffi = undef;
|
||||
|
||||
if (IS_UNIX) {
|
||||
- my @vips_libs = find_lib(lib => [ 'vips', 'vips-42' ]);
|
||||
+ my @vips_libs = find_lib(lib => [ 'vips', 'vips-42' ], libpath => '@vips_lib@');
|
||||
my $lib_path;
|
||||
|
||||
if (@vips_libs) {
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "2.2.0";
|
||||
version = "3.0.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "lavat";
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
owner = "AngelJumbo";
|
||||
repo = "lavat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SNRhel2RmaAPqoYpcq7F9e/FcbCJ0E3VJN/G9Ya4TeY=";
|
||||
hash = "sha256-yroJQzcg8a0dSZu1I4jcqgrjwhtd5065+9rwtU5/vpc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH"
|
||||
--prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ xapp-symbolic-icons ]}"
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.145.0";
|
||||
version = "1.146.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JFMxnp4//Q8t6LZf6L2jJxaShE51r4MY7eJvD9JhhVo=";
|
||||
hash = "sha256-XeDXXiGmY4Lsn5qNVvsBUdQYlTz40fuVVus7jRsUNW4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mcp-nixos";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utensils";
|
||||
repo = "mcp-nixos";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rnpIDY/sy/uV+1dsW+MrFwAFE/RHg5K/6aa5k7Yt1Dc=";
|
||||
hash = "sha256-ZScQ79z7SwjpI5ZnrwXhRNqOnYQTI9MayvPjv00hiyY=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.hatchling ];
|
||||
|
||||
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/bin" "$py $pythonPath"
|
||||
wrapPythonProgramsIn "$out/bin" "$py ''${pythonPath[*]}"
|
||||
wrapProgram "$out/bin/mnexec" \
|
||||
--prefix PATH : "${generatedPath}"
|
||||
wrapProgram "$out/bin/mn" \
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "12.02";
|
||||
version = "12.05";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-4/WKQJr9ZSFM7IiMGwwVAoyPxJegjlLqjyXOOc3KR2k=";
|
||||
hash = "sha256-QmowAu/v1jqDa3MvhGlviGFZQbk7ADROLPV/R7IpsHE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,26 +5,26 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "natscli";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "natscli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GaP1qC90agVJa7t8aAyB+t++URxbQzkrCJ+KAVFqoBA=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y68AnYHud7tUVwd7+3/XmuQcyzFWVrh3UlKQ7uvsDxE=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-8Kva9aMWzGctpq51jVOz6umVTNB9NaGHIGoKmw7gl3I=";
|
||||
vendorHash = "sha256-nPdLCRhTbj1gBm1oXOM3tUEYk5iwBS6lpzfY8fqoMBM=";
|
||||
|
||||
subPackages = [ "nats" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
@@ -40,7 +40,7 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "NATS Command Line Interface";
|
||||
homepage = "https://github.com/nats-io/natscli";
|
||||
changelog = "https://github.com/nats-io/natscli/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/nats-io/natscli/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
bengsparks
|
||||
@@ -48,4 +48,4 @@ buildGoModule rec {
|
||||
];
|
||||
mainProgram = "nats";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
wrapPythonProgramsIn "$out/lib/neard" "$pythonPath"
|
||||
wrapPythonProgramsIn "$out/lib/neard" "''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
{
|
||||
lib,
|
||||
fetchdarcs,
|
||||
python3Packages,
|
||||
ocamlPackages,
|
||||
makeBinaryWrapper,
|
||||
coreutils,
|
||||
nix-prefetch-darcs,
|
||||
nix-prefetch-git,
|
||||
nix-prefetch-pijul,
|
||||
testers,
|
||||
nixtamal,
|
||||
}:
|
||||
|
||||
ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
pname = "nixtamal";
|
||||
version = "0.1.1-beta";
|
||||
release_year = 2026;
|
||||
|
||||
minimalOCamlVersion = "5.3";
|
||||
|
||||
src = fetchdarcs {
|
||||
url = "https://darcs.toastal.in.th/nixtamal/stable/";
|
||||
mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8HrW7VH2LAcTyduGfToC3+oqU7apILdvgd76c8r8NIw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
# For manpages
|
||||
python3Packages.docutils
|
||||
python3Packages.pygments
|
||||
];
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
camomile
|
||||
cmdliner
|
||||
eio
|
||||
eio_main
|
||||
fmt
|
||||
jingoo
|
||||
(jsont.override {
|
||||
withBrr = false;
|
||||
withBytesrw = true;
|
||||
})
|
||||
kdl
|
||||
logs
|
||||
ppx_deriving
|
||||
ppx_deriving_qcheck
|
||||
saturn
|
||||
stdint
|
||||
uri
|
||||
];
|
||||
|
||||
checkInputs = with ocamlPackages; [
|
||||
alcotest
|
||||
qcheck
|
||||
qcheck-alcotest
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bin/main.ml --subst-var version
|
||||
substituteInPlace lib/lock_loader.ml --subst-var release_year
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/nixtamal" --prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
nix-prefetch-darcs
|
||||
nix-prefetch-git
|
||||
nix-prefetch-pijul
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = nixtamal;
|
||||
command = "${nixtamal.meta.mainProgram} --version";
|
||||
};
|
||||
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "nixtamal";
|
||||
homepage = "https://nixtamal.toast.al";
|
||||
changelog = "https://nixtamal.toast.al/changelog/";
|
||||
description = "Fulfilling, pure input pinning for Nix";
|
||||
longDescription = ''
|
||||
Nixtamal’s keys features
|
||||
|
||||
• Automate the manual work of input pinning, allowing to lock & refresh inputs
|
||||
• Declaritive KDL manifest file over imperative CLI flags
|
||||
• Host, forge, VCS-agnostic
|
||||
• Fetchers from Nixpkgs not supported by the builtins (currently Darcs, Pijul)
|
||||
• Supports mirrors
|
||||
• Override hash algorithm on a per-project & per-input basis — including BLAKE3 support
|
||||
• Custom freshness commands
|
||||
• No experimental Nix features required
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ toastal ];
|
||||
};
|
||||
})
|
||||
@@ -5,18 +5,18 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nuclei";
|
||||
version = "3.6.2";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cWfX1W9foaCmqH17RDNHq38SYbl9enzZmyYZKkHz36k=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MAOyMpcJsw4O+oC3IhEBF1XR6KSLBHhYZDnmNnwX4mo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yXXjYsLO3jQI0fS7f5LG/KTVpRg+ROc0DPUVYdNOW8I=";
|
||||
vendorHash = "sha256-XaRcVKFgsQnPngqmp7QIcx2jV7h51EafNlZjSd9lUIE=";
|
||||
|
||||
proxyVendor = true; # hash mismatch between Linux and Darwin
|
||||
|
||||
@@ -46,7 +46,7 @@ buildGoModule rec {
|
||||
CVEs across targets that are known and easily detectable.
|
||||
'';
|
||||
homepage = "https://github.com/projectdiscovery/nuclei";
|
||||
changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}";
|
||||
changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
fab
|
||||
@@ -54,4 +54,4 @@ buildGoModule rec {
|
||||
];
|
||||
mainProgram = "nuclei";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -49,7 +49,7 @@ python3Packages.buildPythonPackage rec {
|
||||
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/lib/open-fprintd" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
|
||||
wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
|
||||
wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
|
||||
wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
stdenvNoCC,
|
||||
bun,
|
||||
fetchFromGitHub,
|
||||
fzf,
|
||||
makeBinaryWrapper,
|
||||
models-dev,
|
||||
nix-update-script,
|
||||
ripgrep,
|
||||
sysctl,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
@@ -81,11 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# NOTE: Remove special and windows build targes
|
||||
./remove-special-and-windows-build-targets.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# NOTE: Relax Bun version check to be a warning instead of an error
|
||||
substituteInPlace packages/script/src/index.ts \
|
||||
@@ -105,16 +100,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
env.OPENCODE_VERSION = finalAttrs.version;
|
||||
env.OPENCODE_CHANNEL = "stable";
|
||||
|
||||
preBuild = ''
|
||||
chmod -R u+w ./packages/opencode/node_modules
|
||||
pushd ./packages/opencode/node_modules/@opentui/
|
||||
for pkg in ../../../../node_modules/.bun/@opentui+core-*; do
|
||||
linkName=$(basename "$pkg" | sed 's/@.*+\(.*\)@.*/\1/')
|
||||
ln -sf "$pkg/node_modules/@opentui/$linkName" "$linkName"
|
||||
done
|
||||
popd
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@@ -136,16 +121,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
|
||||
installShellCompletion --cmd opencode \
|
||||
--bash <($out/bin/opencode completion)
|
||||
--bash <($out/bin/opencode completion) \
|
||||
--zsh <(SHELL=/bin/zsh $out/bin/opencode completion)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/opencode \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
fzf
|
||||
ripgrep
|
||||
]
|
||||
lib.makeBinPath (
|
||||
[
|
||||
ripgrep
|
||||
]
|
||||
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
|
||||
sysctl
|
||||
]
|
||||
)
|
||||
}
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,100 +0,0 @@
|
||||
From 4d0a82e8f3cf8bf011e2592677db4aa31b6b290b Mon Sep 17 00:00:00 2001
|
||||
From: Thierry Delafontaine <delafthi@pm.me>
|
||||
Date: Sun, 4 Jan 2026 20:55:49 +0100
|
||||
Subject: [PATCH] Remove special and windows build targets
|
||||
|
||||
---
|
||||
packages/opencode/script/build.ts | 70 +++++++++++++++----------------
|
||||
1 file changed, 35 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts
|
||||
index f51cb2924..ee3c0e863 100755
|
||||
--- a/packages/opencode/script/build.ts
|
||||
+++ b/packages/opencode/script/build.ts
|
||||
@@ -33,27 +33,27 @@ const allTargets: {
|
||||
os: "linux",
|
||||
arch: "x64",
|
||||
},
|
||||
- {
|
||||
- os: "linux",
|
||||
- arch: "x64",
|
||||
- avx2: false,
|
||||
- },
|
||||
- {
|
||||
- os: "linux",
|
||||
- arch: "arm64",
|
||||
- abi: "musl",
|
||||
- },
|
||||
- {
|
||||
- os: "linux",
|
||||
- arch: "x64",
|
||||
- abi: "musl",
|
||||
- },
|
||||
- {
|
||||
- os: "linux",
|
||||
- arch: "x64",
|
||||
- abi: "musl",
|
||||
- avx2: false,
|
||||
- },
|
||||
+ // {
|
||||
+ // os: "linux",
|
||||
+ // arch: "x64",
|
||||
+ // avx2: false,
|
||||
+ // },
|
||||
+ // {
|
||||
+ // os: "linux",
|
||||
+ // arch: "arm64",
|
||||
+ // abi: "musl",
|
||||
+ // },
|
||||
+ // {
|
||||
+ // os: "linux",
|
||||
+ // arch: "x64",
|
||||
+ // abi: "musl",
|
||||
+ // },
|
||||
+ // {
|
||||
+ // os: "linux",
|
||||
+ // arch: "x64",
|
||||
+ // abi: "musl",
|
||||
+ // avx2: false,
|
||||
+ // },
|
||||
{
|
||||
os: "darwin",
|
||||
arch: "arm64",
|
||||
@@ -62,20 +62,20 @@ const allTargets: {
|
||||
os: "darwin",
|
||||
arch: "x64",
|
||||
},
|
||||
- {
|
||||
- os: "darwin",
|
||||
- arch: "x64",
|
||||
- avx2: false,
|
||||
- },
|
||||
- {
|
||||
- os: "win32",
|
||||
- arch: "x64",
|
||||
- },
|
||||
- {
|
||||
- os: "win32",
|
||||
- arch: "x64",
|
||||
- avx2: false,
|
||||
- },
|
||||
+ // {
|
||||
+ // os: "darwin",
|
||||
+ // arch: "x64",
|
||||
+ // avx2: false,
|
||||
+ // },
|
||||
+ // {
|
||||
+ // os: "win32",
|
||||
+ // arch: "x64",
|
||||
+ // },
|
||||
+ // {
|
||||
+ // os: "win32",
|
||||
+ // arch: "x64",
|
||||
+ // avx2: false,
|
||||
+ // },
|
||||
]
|
||||
|
||||
const targets = singleFlag
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/patchance/src" "$out ''${pythonPath[*]}"
|
||||
for file in $out/bin/*; do
|
||||
wrapQtApp "$file"
|
||||
done
|
||||
|
||||
@@ -164,7 +164,7 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/lib/pince" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/lib/pince" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/share/pokete "$pythonPath"
|
||||
wrapPythonProgramsIn $out/share/pokete "''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
||||
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/raysession/src" "$out ''${pythonPath[*]}"
|
||||
for file in $out/bin/*; do
|
||||
wrapQtApp "$file"
|
||||
done
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "redu";
|
||||
version = "0.2.14";
|
||||
version = "0.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drdo";
|
||||
repo = "redu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E5itus0l1eENVWaSXUQHumxfo0ZMfSsguJuVSw0Uauk=";
|
||||
hash = "sha256-ByXQ3tcvXbCUZwZ+e7WJVUUjvhMf0ivJJiswFlLap4I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZUA9zmWzPvyFmqQFW3ShnQRqG3TODN7K8Ex1jrOZxd0=";
|
||||
cargoHash = "sha256-JnjXe2CHO9Namp++UI/V6ND2Y0/WQtaVA2EcUyXUnjQ=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.12.0",
|
||||
"version": "1.12.1",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "1jax22azbc5v0dchw5hmv1kg3gb4aa9d886b2nlqirn96b60jayn"
|
||||
"sha256": "10p8q6pf3yh286xlfw54mdsnydafm7fvzn64i7h9gn6avxkh5zc6"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "1hbx1vzc8x13zwv94cx0922279hcafc8aq30pvr0xc91345m5xv2"
|
||||
"sha256": "096b2pzjww258xrdv5h2ni8p2jcal0y0n9j079pm7jlghsv1njw0"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "18p015h3v5ppcqdvh7vrkxnlyx9lbjdz27cmw0fypbdfc2p2gwqs"
|
||||
"sha256": "1g27vrm38nmn1pa6jc5b5a0r003cmsy2p99h891mihf92w0pplnw"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "0cymryl1vv1vn7jqcrsy6n98gj3393q3n6mk6nxspmx94zrwdhia"
|
||||
"sha256": "0vzl9l9xvf27h5c3320yg7rsab7cln8qjprjjwfba9qahl7jisjw"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
|
||||
'';
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sioyek";
|
||||
version = "2.0.0-unstable-2025-12-19";
|
||||
version = "2.0.0-unstable-2026-01-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = "sioyek";
|
||||
rev = "ed389b9c3b3b9ee2c777b021c7825416c460ed64";
|
||||
hash = "sha256-bavnyTRNGVSuoxNVsn94AJfbddHYg9skkW/4G/ExNeU=";
|
||||
rev = "70f998d013b418f34fbeb055b282730deeef2212";
|
||||
hash = "sha256-1dVIa2WVcR+PQ8xkEaps3YEWwMjnjcV7mBv0i2AzzAI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -5,23 +5,22 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sqlfluff";
|
||||
version = "3.5.0";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
tag = version;
|
||||
hash = "sha256-fO4a1DCDM5RCeaPUHtPPGgTtZPRHOl9nuxbipDJZy7A=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-hXiy3PGoBe6O9FaACN31Tss3xMBfiw4YuVLxbGi+/tA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "click" ];
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"click"
|
||||
];
|
||||
dependencies = with python3Packages; [
|
||||
appdirs
|
||||
cached-property
|
||||
@@ -47,6 +46,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
disabledTestPaths = [
|
||||
@@ -71,9 +71,9 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = {
|
||||
description = "SQL linter and auto-formatter";
|
||||
homepage = "https://www.sqlfluff.com/";
|
||||
changelog = "https://github.com/sqlfluff/sqlfluff/blob/${src.tag}/CHANGELOG.md";
|
||||
license = with lib.licenses; [ mit ];
|
||||
changelog = "https://github.com/sqlfluff/sqlfluff/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "sqlfluff";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,9 +4,11 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
openssl,
|
||||
unixtools,
|
||||
}:
|
||||
let
|
||||
version = "0.28.6";
|
||||
version = "0.29.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "step-cli";
|
||||
@@ -16,7 +18,7 @@ buildGoModule {
|
||||
owner = "smallstep";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9tw/d6n6tzhBhBqizDG1dGhj8se9GF2DtrfYwwhvsLs=";
|
||||
hash = "sha256-JUJeW9/m3fTaDfUublFDSQ3R5gT6Xvn97c5VokBvZ30=";
|
||||
# this file change depending on git branch status (via .gitattributes)
|
||||
# https://github.com/NixOS/nixpkgs/issues/84312
|
||||
postFetch = ''
|
||||
@@ -33,11 +35,17 @@ buildGoModule {
|
||||
preCheck = ''
|
||||
# Tries to connect to smallstep.com
|
||||
rm command/certificate/remote_test.go
|
||||
|
||||
patchShebangs integration/openssl-jwt.sh
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-+pHc2uBgQwMkJ7BTgHGHDPgfBpLlN0Yxf+6Enhb7cys=";
|
||||
vendorHash = "sha256-0ZnuqyB2/fgfADCvYHj2o4PFwf0Btn6+GouXCPqzKmk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeCheckInputs = [
|
||||
openssl
|
||||
unixtools.xxd
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd step \
|
||||
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
buildPythonPath "$out ''${pythonPath[*]}"
|
||||
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH"
|
||||
|
||||
@@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
|
||||
--replace "/usr/bin/env sh" "sh"
|
||||
'';
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/libexec "$out $pythonPath"
|
||||
wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vja";
|
||||
version = "4.10.1";
|
||||
version = "5.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ce72";
|
||||
repo = "vja";
|
||||
tag = version;
|
||||
hash = "sha256-J2GX0t7hPLqqI2n8H0kDboGfpRff3+lHM3026fTX5rs=";
|
||||
hash = "sha256-ny0ZKsAwjHgN/8XBewYRiKt3YK3XyKshmJVQsKJrwog=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/wike" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/wike" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -329,7 +329,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# We also need to wrap pygrub, which lies in $out/libexec/xen/bin.
|
||||
''
|
||||
wrapPythonPrograms
|
||||
wrapPythonProgramsIn "$out/libexec/xen/bin" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/libexec/xen/bin" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
chmod +x $out/share/dockbarx/xfce4-panel-plug
|
||||
wrapPythonProgramsIn "$out/share/dockbarx" "$out $pythonPath"
|
||||
wrapPythonProgramsIn "$out/share/dockbarx" "$out ''${pythonPath[*]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
|
||||
# This is necessary because the real xtf-runner should
|
||||
# be in the same directory as the tests/ directory.
|
||||
+ ''
|
||||
wrapPythonProgramsIn "''${!outputBin}/share/xtf" "''${!outputBin} $pythonPath"
|
||||
wrapPythonProgramsIn "''${!outputBin}/share/xtf" "''${!outputBin} ''${pythonPath[*]}"
|
||||
mkdir -p ''${!outputBin}/bin
|
||||
ln -s ''${!outputBin}/share/xtf/xtf-runner ''${!outputBin}/bin/xtf-runner
|
||||
'';
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
buildPythonPath "$pythonPath"
|
||||
buildPythonPath "''${pythonPath[*]}"
|
||||
patchPythonScript $out/lib/pluma/plugins/snippets/Snippet.py
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,6 +1,24 @@
|
||||
#!/bin/sh
|
||||
|
||||
buildcpath() {
|
||||
local path after
|
||||
while (( $# )); do
|
||||
case $1 in
|
||||
-isystem)
|
||||
shift
|
||||
path=$path${path:+':'}$1
|
||||
;;
|
||||
-idirafter)
|
||||
shift
|
||||
after=$after${after:+':'}$1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
echo $path${after:+':'}$after
|
||||
}
|
||||
|
||||
buildcpluspath() {
|
||||
local path after
|
||||
while (( $# )); do
|
||||
case $1 in
|
||||
@@ -29,12 +47,12 @@ for arg in "$@"; do
|
||||
done
|
||||
|
||||
if [ "$extendcpath" = true ]; then
|
||||
export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
|
||||
$(<@clang@/nix-support/libc-cflags))
|
||||
export C_INCLUDE_PATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
|
||||
$(<@clang@/nix-support/libc-cflags))
|
||||
|
||||
export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
|
||||
$(<@clang@/nix-support/libcxx-cxxflags) \
|
||||
$(<@clang@/nix-support/libc-cflags))
|
||||
export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpluspath ${NIX_CFLAGS_COMPILE} \
|
||||
$(<@clang@/nix-support/libcxx-cxxflags) \
|
||||
$(<@clang@/nix-support/libc-cflags))
|
||||
fi
|
||||
|
||||
@out@/bin/$(basename $0)-unwrapped "$@"
|
||||
|
||||
@@ -713,10 +713,14 @@ with haskellLib;
|
||||
hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s=";
|
||||
}) super.algebraic-graphs;
|
||||
|
||||
# Relies on DWARF <-> register mappings in GHC, not available for every arch & ABI
|
||||
# (check dwarfReturnRegNo in compiler/GHC/CmmToAsm/Dwarf/Constants.hs, that's where ppc64 elfv1 gives up)
|
||||
inspection-testing = overrideCabal (drv: {
|
||||
broken = with pkgs.stdenv.hostPlatform; !(isx86 || (isPower64 && isAbiElfv2) || isAarch64);
|
||||
broken =
|
||||
with pkgs.stdenv.hostPlatform;
|
||||
# Relies on DWARF <-> register mappings in GHC, not available for every arch & ABI
|
||||
# (check dwarfReturnRegNo in compiler/GHC/CmmToAsm/Dwarf/Constants.hs, that's where ppc64 elfv1 gives up)
|
||||
!(isx86 || (isPower64 && isAbiElfv2) || isAarch64)
|
||||
# We compile static with -fexternal-interpreter which is incompatible with plugins
|
||||
|| (isStatic && lib.versionAtLeast self.ghc.version "9.10");
|
||||
}) super.inspection-testing;
|
||||
|
||||
# Too strict bounds on filepath, hpsec, tasty, tasty-quickcheck, transformers
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{ callPackage, fetchurl, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (
|
||||
args
|
||||
// rec {
|
||||
version = "1.90.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.bz2"
|
||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] version
|
||||
}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_90_0.html
|
||||
sha256 = "49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305";
|
||||
};
|
||||
}
|
||||
)
|
||||
@@ -31,4 +31,5 @@ in
|
||||
boost187 = makeBoost ./1.87.nix;
|
||||
boost188 = makeBoost ./1.88.nix;
|
||||
boost189 = makeBoost ./1.89.nix;
|
||||
boost190 = makeBoost ./1.90.nix;
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
buildPecl {
|
||||
pname = "imagick";
|
||||
|
||||
version = "3.8.0";
|
||||
sha256 = "sha256-vaZ0YchU8g1hBXgrdpxST8NziLddRIHZUWRNIWf/7sY=";
|
||||
version = "3.8.1";
|
||||
sha256 = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4=";
|
||||
|
||||
configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
fastapi,
|
||||
natsort,
|
||||
|
||||
# test dependencies
|
||||
httpx,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fastapi-versionizer";
|
||||
version = "4.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexschimpf";
|
||||
repo = "fastapi-versionizer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Kj7tjy8TDV9MYhqJdVUBRohkIsYoqbQX5qnnkNBJPig=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
fastapi
|
||||
natsort
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fastapi_versionizer"
|
||||
"fastapi_versionizer.versionizer"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpx
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/alexschimpf/fastapi-versionizer/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "API versionizer for FastAPI web applications";
|
||||
downloadPage = "https://github.com/alexschimpf/fastapi-versionizer/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://github.com/alexschimpf/fastapi-versionizer";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
de11n
|
||||
despsyched
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -158,6 +158,9 @@ buildPythonPackage (finalAttrs: {
|
||||
# AssertionError: assert len(caplog.records) == 1
|
||||
"test_log"
|
||||
|
||||
# assert [TextContent(...e, meta=None)] == [TextContent(...e, meta=None)]
|
||||
"test_read_resource_tool_works"
|
||||
|
||||
# fastmcp.exceptions.ToolError: Unknown tool
|
||||
"test_multi_client_with_logging"
|
||||
"test_multi_client_with_elicitation"
|
||||
|
||||
@@ -11,15 +11,15 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "google-cloud-run";
|
||||
version = "0.13.0";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_run";
|
||||
inherit version;
|
||||
hash = "sha256-l1NK1206LCBH0STAoKKUpIIvzCQzHroPKUyt+xk8Sa0=";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-FY8mRkP5gr+k9PGPnijFbqAOqVwki8inRuFZtTivq1c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -41,8 +41,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Google Cloud Run API client library";
|
||||
homepage = "https://pypi.org/project/google-cloud-run/";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-run-v${version}/packages/google-cloud-run/CHANGELOG.md";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-run-v${finalAttrs.version}/packages/google-cloud-run/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202601271";
|
||||
version = "0.1.202601281";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bOnbWxSV3Aoukh403YS61SCkIsjp20cVpSOXcsQQj6U=";
|
||||
hash = "sha256-xixOMQC8/gZO7xfA740qd5j9hiRphpotfJdPVKjBIrA=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user