Merge branch 'staging' into staging-next
This commit is contained in:
Vladimír Čunát
commit
a67b6cd4fd
@ -1315,9 +1315,6 @@ we can do:
|
||||
|
||||
```nix
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
pythonRelaxDeps = [
|
||||
"pkg1"
|
||||
"pkg3"
|
||||
@ -1340,7 +1337,6 @@ example:
|
||||
|
||||
```nix
|
||||
{
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
pythonRelaxDeps = true;
|
||||
}
|
||||
```
|
||||
@ -1362,8 +1358,11 @@ instead of a dev dependency).
|
||||
Keep in mind that while the examples above are done with `requirements.txt`,
|
||||
`pythonRelaxDepsHook` works by modifying the resulting wheel file, so it should
|
||||
work with any of the [existing hooks](#setup-hooks).
|
||||
It indicates that `pythonRelaxDepsHook` has no effect on build time dependencies, such as in `build-system`.
|
||||
If a package requires incompatible build time dependencies, they should be removed in `postPatch` with `substituteInPlace` or something similar.
|
||||
|
||||
The `pythonRelaxDepsHook` has no effect on build time dependencies, such as
|
||||
those specified in `build-system`. If a package requires incompatible build
|
||||
time dependencies, they should be removed in `postPatch` through
|
||||
`substituteInPlace` or similar.
|
||||
|
||||
#### Using unittestCheckHook {#using-unittestcheckhook}
|
||||
|
||||
|
||||
@ -83,12 +83,13 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c
|
||||
```nix
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
src = texlive.pkgs.iwona;
|
||||
dontUnpack = true;
|
||||
|
||||
inherit (src) pname version;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype
|
||||
install -Dm644 $src/fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1515,6 +1515,10 @@ This flag can break dynamic shared object loading. For instance, the module syst
|
||||
intel_drv.so: undefined symbol: vgaHWFreeHWRec
|
||||
```
|
||||
|
||||
#### `zerocallusedregs` {#zerocallusedregs}
|
||||
|
||||
Adds the `-fzero-call-used-regs=used-gpr` compiler option. This causes the general-purpose registers that an architecture's calling convention considers "call-used" to be zeroed on return from the function. This can make it harder for attackers to construct useful ROP gadgets and also reduces the chance of data leakage from a function call.
|
||||
|
||||
### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default}
|
||||
|
||||
The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services.
|
||||
@ -1528,16 +1532,22 @@ Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Execut
|
||||
Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option.
|
||||
If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`.
|
||||
|
||||
#### `zerocallusedregs` {#zerocallusedregs}
|
||||
|
||||
Adds the `-fzero-call-used-regs=used-gpr` compiler option. This causes the general-purpose registers that an architecture's calling convention considers "call-used" to be zeroed on return from the function. This can make it harder for attackers to construct useful ROP gadgets and also reduces the chance of data leakage from a function call.
|
||||
|
||||
#### `trivialautovarinit` {#trivialautovarinit}
|
||||
|
||||
Adds the `-ftrivial-auto-var-init=pattern` compiler option. This causes "trivially-initializable" uninitialized stack variables to be forcibly initialized with a nonzero value that is likely to cause a crash (and therefore be noticed). Uninitialized variables generally take on their values based on fragments of previous program state, and attackers can carefully manipulate that state to craft malicious initial values for these variables.
|
||||
|
||||
Use of this flag is controversial as it can prevent tools that detect uninitialized variable use (such as valgrind) from operating correctly.
|
||||
|
||||
This should be turned off or fixed for build errors such as:
|
||||
|
||||
```
|
||||
sorry, unimplemented: __builtin_clear_padding not supported for variable length aggregates
|
||||
```
|
||||
|
||||
#### `stackclashprotection` {#stackclashprotection}
|
||||
|
||||
This flag adds the `-fstack-clash-protection` compiler option, which causes growth of a program's stack to access each successive page in order. This should force the guard page to be accessed and cause an attempt to "jump over" this guard page to crash.
|
||||
|
||||
[^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation.
|
||||
[^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`.
|
||||
[^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like [setup hooks](#ssec-setup-hooks) also are run as if it were a propagated dependency.
|
||||
|
||||
@ -97,7 +97,7 @@ lua-utils.nvim,,,,,,mrcjkb
|
||||
lua-yajl,,,,,,pstn
|
||||
lua-iconv,,,,7.0.0,,
|
||||
luuid,,,,20120509-2,,
|
||||
luv,,,,1.44.2-1,,
|
||||
luv,,,,1.48.0-2,,
|
||||
lush.nvim,,,https://luarocks.org/dev,,,teto
|
||||
lyaml,,,,,,lblasc
|
||||
lz.n,,,,,,mrcjkb
|
||||
|
||||
|
@ -123,6 +123,10 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- The `zerocallusedregs` hardening flag is enabled by default on compilers that support it.
|
||||
|
||||
- The `stackclashprotection` hardening flag has been added, though disabled by default.
|
||||
|
||||
- `hareHook` has been added as the language framework for Hare. From now on, it,
|
||||
not the `hare` package, should be added to `nativeBuildInputs` when building
|
||||
Hare programs.
|
||||
|
||||
@ -18,6 +18,6 @@ with lib;
|
||||
};
|
||||
|
||||
config = mkIf config.fonts.enableGhostscriptFonts {
|
||||
fonts.packages = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
|
||||
fonts.packages = [ pkgs.ghostscript.fonts ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -47,6 +47,9 @@ in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // {
|
||||
passthru = {
|
||||
inherit testsForLinuxPackages;
|
||||
|
||||
# Useful for development testing of all Kernel configs without building full Kernel
|
||||
configfiles = mapAttrs (_: lP: lP.kernel.configfile) kernels;
|
||||
|
||||
testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel);
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,6 @@ python3.pkgs.buildPythonPackage rec {
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
aiohttp
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, libGL
|
||||
, libGLU
|
||||
, glew
|
||||
, freeglut
|
||||
, libglut
|
||||
, libv4l
|
||||
, libX11
|
||||
, file
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
libGL
|
||||
libGLU
|
||||
glew
|
||||
freeglut
|
||||
libglut
|
||||
libv4l
|
||||
libX11
|
||||
];
|
||||
|
||||
@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.pythonRelaxDepsHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu
|
||||
{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, mesa, libGLU, libX11, libXmu
|
||||
, libXext, libXi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./pthread.patch ];
|
||||
|
||||
buildInputs = [
|
||||
freeglut
|
||||
libglut
|
||||
alsa-lib
|
||||
mesa
|
||||
libGLU
|
||||
|
||||
@ -40,7 +40,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
||||
@ -92,8 +92,5 @@ rustPlatform.buildRustPackage rec {
|
||||
maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ];
|
||||
# See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta.
|
||||
platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86);
|
||||
# See comment about wasm32-unknown-unknown in rustc.nix.
|
||||
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
|
||||
!stdenv.hostPlatform.gcc.thumb or true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -79,7 +79,8 @@ in {
|
||||
lib.nameValuePair ename (
|
||||
self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs:
|
||||
melpaBuild {
|
||||
inherit pname ename commit;
|
||||
inherit pname ename;
|
||||
inherit (sourceArgs) commit;
|
||||
version = lib.optionalString (version != null)
|
||||
(lib.concatStringsSep "." (map toString
|
||||
# Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413
|
||||
|
||||
@ -104,10 +104,10 @@ in
|
||||
|
||||
emacs29 = import ./make-emacs.nix (mkArgs {
|
||||
pname = "emacs";
|
||||
version = "29.3";
|
||||
version = "29.4";
|
||||
variant = "mainline";
|
||||
rev = "29.3";
|
||||
hash = "sha256-4yN81djeKb9Hlr6MvaDdXqf4XOl0oolXEYGqkA+KUO0=";
|
||||
rev = "29.4";
|
||||
hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s=";
|
||||
});
|
||||
|
||||
emacs28-macport = import ./make-emacs.nix (mkArgs {
|
||||
|
||||
@ -43,6 +43,14 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
nvim-with-luasnip = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig {
|
||||
plugins = [ {
|
||||
plugin = vimPlugins.luasnip;
|
||||
|
||||
}
|
||||
];
|
||||
});
|
||||
|
||||
nvimAutoDisableWrap = makeNeovimConfig { };
|
||||
|
||||
wrapNeovim2 = suffix: config:
|
||||
@ -281,4 +289,16 @@ rec {
|
||||
export HOME=$TMPDIR
|
||||
${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e
|
||||
'';
|
||||
|
||||
inherit nvim-with-luasnip;
|
||||
|
||||
# check that bringing in one plugin with lua deps makes those deps visible from wrapper
|
||||
# for instance luasnip has a dependency on jsregexp
|
||||
can_require_transitive_deps =
|
||||
runTest nvim-with-luasnip ''
|
||||
export HOME=$TMPDIR
|
||||
cat ${nvim-with-luasnip}/bin/nvim
|
||||
${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e
|
||||
'';
|
||||
|
||||
})
|
||||
|
||||
@ -229,12 +229,36 @@ let
|
||||
ln -s ${grammar}/parser $out/parser/${name}.so
|
||||
'');
|
||||
|
||||
/*
|
||||
Fork of vimUtils.packDir that additionnally generates a propagated-build-inputs-file that
|
||||
can be used by the lua hooks to generate a proper LUA_PATH
|
||||
|
||||
Generates a packpath folder as expected by vim
|
||||
Example:
|
||||
packDir ( {myVimPackage = { start = [ vimPlugins.vim-fugitive ]; opt = []; }; })
|
||||
=> "/nix/store/xxxxx-pack-dir"
|
||||
*/
|
||||
packDir = packages:
|
||||
let
|
||||
rawPackDir = vimUtils.packDir packages;
|
||||
|
||||
in
|
||||
rawPackDir.override ({
|
||||
postBuild = ''
|
||||
mkdir $out/nix-support
|
||||
for i in $(find -L $out -name propagated-build-inputs ); do
|
||||
cat "$i" >> $out/nix-support/propagated-build-inputs
|
||||
done
|
||||
'';});
|
||||
|
||||
|
||||
in
|
||||
{
|
||||
inherit makeNeovimConfig;
|
||||
inherit generateProviderRc;
|
||||
inherit legacyWrapper;
|
||||
inherit grammarToPlugin;
|
||||
inherit packDir;
|
||||
|
||||
inherit buildNeovimPlugin;
|
||||
buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin;
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
neovim-unwrapped:
|
||||
|
||||
let
|
||||
# inherit interpreter from neovim
|
||||
lua = neovim-unwrapped.lua;
|
||||
|
||||
wrapper = {
|
||||
extraName ? ""
|
||||
# should contain all args but the binary. Can be either a string or list
|
||||
@ -24,6 +27,8 @@ let
|
||||
, withNodeJs ? false
|
||||
, withPerl ? false
|
||||
, rubyEnv ? null
|
||||
|
||||
# wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim
|
||||
, vimAlias ? false
|
||||
, viAlias ? false
|
||||
|
||||
@ -45,6 +50,8 @@ let
|
||||
stdenv.mkDerivation (finalAttrs:
|
||||
let
|
||||
|
||||
finalPackdir = neovimUtils.packDir packpathDirs;
|
||||
|
||||
rcContent = ''
|
||||
${luaRcContent}
|
||||
'' + lib.optionalString (!isNull neovimRcContent) ''
|
||||
@ -57,10 +64,10 @@ let
|
||||
# vim accepts a limited number of commands so we join them all
|
||||
[
|
||||
"--add-flags" ''--cmd "lua ${providerLuaRc}"''
|
||||
# (lib.intersperse "|" hostProviderViml)
|
||||
] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [
|
||||
"--add-flags" ''--cmd "set packpath^=${vimUtils.packDir packpathDirs}"''
|
||||
"--add-flags" ''--cmd "set rtp^=${vimUtils.packDir packpathDirs}"''
|
||||
]
|
||||
++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [
|
||||
"--add-flags" ''--cmd "set packpath^=${finalPackdir}"''
|
||||
"--add-flags" ''--cmd "set rtp^=${finalPackdir}"''
|
||||
]
|
||||
;
|
||||
|
||||
@ -160,7 +167,17 @@ let
|
||||
+ ''
|
||||
rm $out/bin/nvim
|
||||
touch $out/rplugin.vim
|
||||
makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr}
|
||||
|
||||
echo "Looking for lua dependencies..."
|
||||
source ${lua}/nix-support/utils.sh
|
||||
|
||||
_addToLuaPath "${finalPackdir}"
|
||||
|
||||
echo "LUA_PATH towards the end of packdir: $LUA_PATH"
|
||||
|
||||
makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} \
|
||||
--prefix LUA_PATH ';' "$LUA_PATH" \
|
||||
--prefix LUA_CPATH ';' "$LUA_CPATH"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "9.1.0412";
|
||||
version = "9.1.0509";
|
||||
|
||||
outputs = [ "out" "xxd" ];
|
||||
|
||||
@ -8,7 +8,7 @@ rec {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI=";
|
||||
hash = "sha256-CATjUalRjvVjEfWT5evFAk//Oj4iB1fDBsRU5MhDyn4=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -176,7 +176,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; }
|
||||
|
||||
# https://bugs.winehq.org/show_bug.cgi?id=43530
|
||||
# https://github.com/NixOS/nixpkgs/issues/31989
|
||||
hardeningDisable = [ "bindnow" ]
|
||||
hardeningDisable = [ "bindnow" "stackclashprotection" ]
|
||||
++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"
|
||||
++ lib.optional (supportFlags.mingwSupport) "format";
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
|
||||
, freeglut ? null, openal ? null, SDL2 ? null }:
|
||||
, libglut ? null, openal ? null, SDL2 ? null }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "yabause";
|
||||
@ -11,7 +11,7 @@ mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ];
|
||||
buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL libglut openal SDL2 ];
|
||||
|
||||
patches = [
|
||||
./linkage-rwx-linux-elf.patch
|
||||
|
||||
@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
hatchling
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.withFeatureAs (arch != null) "gcc-arch" arch)
|
||||
(lib.withFeature librsvgSupport "rsvg")
|
||||
(lib.withFeature liblqr1Support "lqr")
|
||||
(lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts")
|
||||
(lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
|
||||
(lib.withFeature ghostscriptSupport "gslib")
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||
# due to libxml2 being without DLLs ATM
|
||||
|
||||
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.withFeature librsvgSupport "pango")
|
||||
(lib.withFeature liblqr1Support "lqr")
|
||||
(lib.withFeature libjxlSupport "jxl")
|
||||
(lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts")
|
||||
(lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
|
||||
(lib.withFeature ghostscriptSupport "gslib")
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||
# due to libxml2 being without DLLs ATM
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitLab
|
||||
, alsa-lib
|
||||
, fftw
|
||||
, freeglut
|
||||
, libglut
|
||||
, freetype
|
||||
, glew
|
||||
, libjack2
|
||||
@ -33,17 +33,17 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
fftw
|
||||
freeglut.dev
|
||||
libglut
|
||||
freetype
|
||||
glew
|
||||
libjack2
|
||||
libjpeg.dev
|
||||
libjpeg
|
||||
liblo
|
||||
libsndfile.dev
|
||||
libtiff.dev
|
||||
libsndfile
|
||||
libtiff
|
||||
ode
|
||||
openal
|
||||
openssl.dev
|
||||
openssl
|
||||
racket_7_9
|
||||
];
|
||||
nativeBuildInputs = [ scons ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, libjpeg
|
||||
, libGLU
|
||||
, libGL
|
||||
, freeglut
|
||||
, libglut
|
||||
, zlib
|
||||
, cmake
|
||||
, libX11
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ];
|
||||
buildInputs = [ libjpeg libGLU libGL libglut zlib libX11 libxml2 libpng libXxf86vm ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/GECKO/d' CMakeLists.txt
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ boost
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, libglut
|
||||
, freetype
|
||||
, glew
|
||||
, libjpeg
|
||||
@ -93,7 +93,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
freeglut
|
||||
libglut
|
||||
freetype
|
||||
glew
|
||||
libjpeg
|
||||
|
||||
@ -32,7 +32,6 @@ buildPythonApplication rec {
|
||||
hash = "sha256-ns1Y0DqqnTAQMEt+oBJ/P2gqKqPsX9P3/Z4561qzuns";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
|
||||
@ -341,10 +341,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
tests = {
|
||||
render = runCommand "${finalAttrs.pname}-test" { } ''
|
||||
render = runCommand "${finalAttrs.pname}-test" {
|
||||
nativeBuildInputs = [ mesa.llvmpipeHook ];
|
||||
} ''
|
||||
set -euo pipefail
|
||||
export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri
|
||||
export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json
|
||||
cat <<'PYTHON' > scene-config.py
|
||||
import bpy
|
||||
bpy.context.scene.eevee.taa_render_samples = 32
|
||||
|
||||
@ -30,7 +30,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
build-system = with python.pkgs; [ setuptools ];
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
with python.pkgs;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM
|
||||
{ stdenv, lib, fetchzip, libglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM
|
||||
, libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper
|
||||
}:
|
||||
let
|
||||
lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ];
|
||||
lpath = lib.makeLibraryPath [ libXmu libXi libX11 libglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iceSL";
|
||||
|
||||
@ -62,7 +62,7 @@ in buildFHSEnv {
|
||||
fontconfig SDL2_ttf
|
||||
|
||||
# Mednafen
|
||||
freeglut mesa_glu
|
||||
libglut mesa_glu
|
||||
|
||||
# MESS
|
||||
expat
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, jbig2dec, libjpeg , darwin
|
||||
, enableX11 ? true, libX11, libXext, libXi, libXrandr
|
||||
, enableCurl ? true, curl, openssl
|
||||
, enableGL ? true, freeglut, libGLU
|
||||
, enableGL ? true, libglut, libGLU
|
||||
}:
|
||||
|
||||
let
|
||||
@ -33,14 +33,14 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
|
||||
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg libglut libGLU ]
|
||||
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
|
||||
++ lib.optionals enableCurl [ curl openssl ]
|
||||
++ lib.optionals enableGL (
|
||||
if stdenv.isDarwin then
|
||||
with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
|
||||
else
|
||||
[ freeglut libGLU ])
|
||||
[ libglut libGLU ])
|
||||
;
|
||||
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, gzip
|
||||
, nodejs
|
||||
, rustc
|
||||
, stdenv
|
||||
, wasm-bindgen-cli
|
||||
, wasm-pack
|
||||
}:
|
||||
@ -121,9 +120,6 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
platforms = platforms.unix;
|
||||
# See comment about wasm32-unknown-unknown in rustc.nix.
|
||||
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
|
||||
!stdenv.hostPlatform.gcc.thumb or true;
|
||||
mainProgram = "pagefind";
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -56,7 +56,6 @@ rustPlatform.buildRustPackage rec {
|
||||
xorg.libXi
|
||||
xorg.libxcb
|
||||
libGL
|
||||
libGL.dev
|
||||
];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
@ -25,10 +25,6 @@ buildPythonPackage rec {
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
colorama
|
||||
openai
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pythonRelaxDepsHook
|
||||
, python3
|
||||
, snagboot
|
||||
, testers
|
||||
@ -21,7 +20,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, zxing-cpp
|
||||
, pillow
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
|
||||
, src
|
||||
, version
|
||||
@ -21,7 +20,6 @@ buildPythonApplication {
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -199,7 +199,7 @@ let
|
||||
pciutils protobuf speechd libXdamage at-spi2-core
|
||||
pipewire
|
||||
libva
|
||||
libdrm wayland mesa.drivers libxkbcommon
|
||||
libdrm wayland libxkbcommon
|
||||
curl
|
||||
libepoxy
|
||||
libffi
|
||||
@ -227,7 +227,7 @@ let
|
||||
pciutils protobuf speechd libXdamage at-spi2-core
|
||||
pipewire
|
||||
libva
|
||||
libdrm wayland mesa.drivers libxkbcommon
|
||||
libdrm wayland libxkbcommon
|
||||
curl
|
||||
libepoxy
|
||||
libffi
|
||||
|
||||
@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
makeWrapper
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
daemonocle
|
||||
|
||||
@ -16,10 +16,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-BmHChLWWnrtg0p4WH8bANwpo+p4RTwjYbXfyPnz6mp8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec {
|
||||
installShellFiles
|
||||
] ++ (with python3Packages; [
|
||||
setuptools
|
||||
pythonRelaxDepsHook
|
||||
]);
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
|
||||
libnotify
|
||||
libpulseaudio
|
||||
libxkbcommon
|
||||
mesa.drivers
|
||||
nss
|
||||
xorg.libX11
|
||||
xorg.libXScrnSaver
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, python3
|
||||
, python311
|
||||
, fetchFromGitHub
|
||||
, file
|
||||
, gnupg
|
||||
@ -9,7 +9,7 @@
|
||||
, withManpage ? false
|
||||
}:
|
||||
|
||||
with python3.pkgs; buildPythonApplication rec {
|
||||
with python311.pkgs; buildPythonApplication rec {
|
||||
pname = "alot";
|
||||
version = "0.10";
|
||||
|
||||
|
||||
@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, lib
|
||||
, pam
|
||||
, python3
|
||||
, python311
|
||||
, libxslt
|
||||
, perl
|
||||
, perlPackages
|
||||
@ -244,6 +245,11 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
# - the remaining tests have notes in the patch
|
||||
# FIXME: get rid of this ASAP
|
||||
./skip-broken-tests.patch
|
||||
(fetchpatch2 {
|
||||
name = "icu74-compat.patch";
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
|
||||
hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
|
||||
})
|
||||
] ++ lib.optionals (variant == "still") [
|
||||
# Remove build config to reduce the amount of `-dev` outputs in the
|
||||
# runtime closure. This behavior was introduced by upstream in commit
|
||||
@ -372,7 +378,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
perl
|
||||
poppler
|
||||
postgresql
|
||||
python3
|
||||
python311
|
||||
sane-backends
|
||||
unixODBC
|
||||
unzip
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, freeglut, gtk2, gtkglext
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libglut, gtk2, gtkglext
|
||||
, libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook
|
||||
}:
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [
|
||||
freeglut gtk2 gtkglext lua perl
|
||||
libglut gtk2 gtkglext lua perl
|
||||
libjpeg_turbo libtheora libXmu libGLU libGL
|
||||
];
|
||||
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ lib, python3, fetchpatch, fetchPypi }:
|
||||
{ lib, python311, fetchpatch, fetchPypi }:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
# pin python311 because macs2 does not support python 3.12
|
||||
# https://github.com/macs3-project/MACS/issues/598#issuecomment-1812622572
|
||||
python311.pkgs.buildPythonPackage rec {
|
||||
pname = "macs2";
|
||||
version = "2.2.9.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = lib.toUpper pname;
|
||||
@ -20,20 +22,19 @@ python3.pkgs.buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
build-system = with python311.pkgs; [
|
||||
cython_0
|
||||
numpy
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python311.pkgs; [
|
||||
numpy
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with python311.pkgs; [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, libX11
|
||||
, libGL
|
||||
, libGLU
|
||||
, freeglut }:
|
||||
, libglut }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "antiprism";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ];
|
||||
buildInputs = [ libX11 libGLU libGL libglut ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.antiprism.com";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, makeWrapper
|
||||
, libGLU
|
||||
, libGL
|
||||
, freeglut
|
||||
, libglut
|
||||
, mpfr
|
||||
, gmp
|
||||
, pkgsHostTarget
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
freeglut
|
||||
libglut
|
||||
libGL
|
||||
libGLU
|
||||
mpfr
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, perl
|
||||
, pkg-config
|
||||
, sage-setup
|
||||
, pythonRelaxDepsHook
|
||||
, gd
|
||||
, iml
|
||||
, libpng
|
||||
@ -103,7 +102,6 @@ buildPythonPackage rec {
|
||||
pip # needed to query installed packages
|
||||
pkg-config
|
||||
sage-setup
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, libGL
|
||||
, libXmu
|
||||
, libXi
|
||||
, freeglut
|
||||
, libglut
|
||||
, libjpeg
|
||||
, libtool
|
||||
, wxGTK32
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
libGL
|
||||
libXmu
|
||||
libXi
|
||||
freeglut
|
||||
libglut
|
||||
libjpeg
|
||||
wxGTK32
|
||||
gtk3
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, freeglut
|
||||
, libglut
|
||||
, gcc-unwrapped
|
||||
, libGL
|
||||
, libGLU
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freeglut
|
||||
libglut
|
||||
gcc-unwrapped.lib
|
||||
libGL
|
||||
libGLU
|
||||
|
||||
@ -51,16 +51,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rio";
|
||||
version = "0.0.39";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphamorim";
|
||||
repo = "rio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pnU2wxgopHMWgJ7JGdO2P/MCfxqCY7MTEE39qtD0XKw=";
|
||||
hash = "sha256-Jp8f8u9CkY+pz6QaoWp6P6+OqsIjhzXH0eeoBiSDR0k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GwI2zHX1YcR4pC+qtkDoxx2U+zipbqqxsCI8/XNg2BU=";
|
||||
cargoHash = "sha256-3FirYpHxTRvXgRQACVvmwlaCNTyJ8dLbZ258qv5vbsc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ncurses
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xterm";
|
||||
version = "390";
|
||||
version = "392";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
|
||||
];
|
||||
hash = "sha256-dRF8PMUXSgnEJe8QbmlATXL17wXgOl2gCq8VeS1vnA8=";
|
||||
hash = "sha256-TVc3LvCOr6n7doLbjQe+D+BRPljoR4wuyOm2JIbn/l4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -24,12 +24,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"argcomplete"
|
||||
"decli"
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport;
|
||||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.45.1";
|
||||
version = "2.45.2";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
|
||||
in
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
hash = "sha256-5k00Co5ieuIs+4vMZRzKC0l88en99SNzVUT/SnMvEr8=";
|
||||
hash = "sha256-Ub/ofrHAL+0UhAUYdTZe6rIpgx0w0M7F2JoU+eQOmts=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withManual "doc";
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
set -eu -o pipefail
|
||||
|
||||
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')"
|
||||
latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')"
|
||||
latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '{}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')"
|
||||
targetVersion="${1:-$latestTag}"
|
||||
|
||||
if [ ! "${oldVersion}" = "${targetVersion}" ]; then
|
||||
|
||||
@ -15,7 +15,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygit2
|
||||
|
||||
@ -23,11 +23,11 @@ let
|
||||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.6.3";
|
||||
version = "6.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
hash = "sha256-911qSnWCOht9cTpJZ+yi9Zb0ZuWPxrwG1yZCky/X4wc=";
|
||||
hash = "sha256-dHCPhzQFwSJy/sEWxt1Shi6O0RwQARx+V19eqBJj6l4=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -37,7 +37,7 @@ let
|
||||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "mercurial-${version}";
|
||||
sha256 = "sha256-G5tzwoIGOgpVI35rYXDeelnBgTbAiq7BDcXCHQzqSrs=";
|
||||
hash = "sha256-FRa7frX2z9jQGFBXS2TpOUANs0+xwegNETUAQIU0S4o=";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
buildPythonApplication,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pythonRelaxDepsHook,
|
||||
anchor-kr,
|
||||
anitopy,
|
||||
click,
|
||||
@ -47,7 +46,6 @@ buildPythonApplication {
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
anchor-kr
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc
|
||||
, xdotool, xorgserver, xsetroot, xterm, runtimeShell
|
||||
, xdotool, xorg, xsetroot, xterm, runtimeShell
|
||||
, fetchpatch
|
||||
, nixosTests }:
|
||||
|
||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
nativeCheckInputs = [
|
||||
(python3.withPackages (ps: with ps; [ ewmh pytest xlib ]))
|
||||
xdotool
|
||||
xorgserver
|
||||
xorg.xvfb
|
||||
xsetroot
|
||||
xterm
|
||||
python3.pkgs.pytestCheckHook
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
|
||||
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev
|
||||
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
|
||||
, xorgserver, xvfb-run
|
||||
, xvfb-run
|
||||
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
|
||||
}:
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango
|
||||
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
|
||||
perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
|
||||
xorgserver xvfb-run
|
||||
xvfb-run
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-builddir" ];
|
||||
|
||||
@ -162,7 +162,7 @@ rec {
|
||||
vulkan-loader
|
||||
|
||||
flac
|
||||
freeglut
|
||||
libglut
|
||||
libjpeg
|
||||
libpng12
|
||||
libpulseaudio
|
||||
|
||||
@ -45,6 +45,7 @@
|
||||
"relro"
|
||||
"stackprotector"
|
||||
"strictoverflow"
|
||||
"zerocallusedregs"
|
||||
] ++ lib.optional (with stdenvNoCC;
|
||||
# Musl-based platforms will keep "pie", other platforms will not.
|
||||
# If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}`
|
||||
|
||||
@ -7,5 +7,5 @@ for p in "${params[@]}"; do
|
||||
done
|
||||
|
||||
if $needsTarget; then
|
||||
extraBefore+=(-target @defaultTarget@ @march@)
|
||||
extraBefore+=(-target @defaultTarget@ @machineFlags@)
|
||||
fi
|
||||
|
||||
@ -32,7 +32,7 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then
|
||||
fi
|
||||
|
||||
if (( "${NIX_DEBUG:-0}" >= 1 )); then
|
||||
declare -a allHardeningFlags=(fortify fortify3 stackprotector pie pic strictoverflow format trivialautovarinit zerocallusedregs)
|
||||
declare -a allHardeningFlags=(fortify fortify3 stackprotector stackclashprotection pie pic strictoverflow format trivialautovarinit zerocallusedregs)
|
||||
declare -A hardeningDisableMap=()
|
||||
|
||||
# Determine which flags were effectively disabled so we can report below.
|
||||
@ -79,6 +79,10 @@ for flag in "${!hardeningEnableMap[@]}"; do
|
||||
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
|
||||
hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
|
||||
;;
|
||||
stackclashprotection)
|
||||
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stack-clash-protection >&2; fi
|
||||
hardeningCFlagsBefore+=('-fstack-clash-protection')
|
||||
;;
|
||||
pie)
|
||||
# NB: we do not use `+=` here, because PIE flags must occur before any PIC flags
|
||||
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
|
||||
|
||||
@ -67,6 +67,7 @@ let
|
||||
concatMapStrings
|
||||
concatStringsSep
|
||||
escapeShellArg
|
||||
escapeShellArgs
|
||||
getBin
|
||||
getDev
|
||||
getLib
|
||||
@ -234,6 +235,32 @@ let
|
||||
then guess
|
||||
else null;
|
||||
|
||||
thumb = if targetPlatform.gcc.thumb then "thumb" else "arm";
|
||||
tune = if targetPlatform ? gcc.tune
|
||||
then findBestTuneApproximation targetPlatform.gcc.tune
|
||||
else null;
|
||||
|
||||
# Machine flags. These are necessary to support
|
||||
|
||||
# TODO: We should make a way to support miscellaneous machine
|
||||
# flags and other gcc flags as well.
|
||||
|
||||
machineFlags =
|
||||
# Always add -march based on cpu in triple. Sometimes there is a
|
||||
# discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
|
||||
# that case.
|
||||
optional (targetPlatform ? gcc.arch && !(targetPlatform.isDarwin && targetPlatform.isAarch64) && isGccArchSupported targetPlatform.gcc.arch) "-march=${targetPlatform.gcc.arch}" ++
|
||||
# TODO: aarch64-darwin has mcpu incompatible with gcc
|
||||
optional (targetPlatform ? gcc.cpu && !(targetPlatform.isDarwin && targetPlatform.isAarch64)) "-mcpu=${targetPlatform.gcc.cpu}" ++
|
||||
# -mfloat-abi only matters on arm32 but we set it here
|
||||
# unconditionally just in case. If the abi specifically sets hard
|
||||
# vs. soft floats we use it here.
|
||||
optional (targetPlatform ? gcc.float-abi) "-mfloat-abi=${targetPlatform.gcc.float-abi}" ++
|
||||
optional (targetPlatform ? gcc.fpu) "-mfpu=${targetPlatform.gcc.fpu}" ++
|
||||
optional (targetPlatform ? gcc.mode) "-mmode=${targetPlatform.gcc.mode}" ++
|
||||
optional (targetPlatform ? gcc.thumb) "-m${thumb}" ++
|
||||
optional (tune != null) "-mtune=${tune}";
|
||||
|
||||
defaultHardeningFlags = bintools.defaultHardeningFlags or [];
|
||||
|
||||
# if cc.hardeningUnsupportedFlagsByTargetPlatform exists, this is
|
||||
@ -610,53 +637,11 @@ stdenvNoCC.mkDerivation {
|
||||
export hardening_unsupported_flags="${concatStringsSep " " ccHardeningUnsupportedFlags}"
|
||||
''
|
||||
|
||||
# Machine flags. These are necessary to support
|
||||
|
||||
# TODO: We should make a way to support miscellaneous machine
|
||||
# flags and other gcc flags as well.
|
||||
|
||||
# Always add -march based on cpu in triple. Sometimes there is a
|
||||
# discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
|
||||
# that case.
|
||||
#
|
||||
# For clang, this is handled in add-clang-cc-cflags-before.sh
|
||||
|
||||
# TODO: aarch64-darwin has mcpu incompatible with gcc
|
||||
+ optionalString ((targetPlatform ? gcc.arch) && !isClang && !(targetPlatform.isDarwin && targetPlatform.isAarch64) &&
|
||||
isGccArchSupported targetPlatform.gcc.arch) ''
|
||||
echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
|
||||
+ lib.optionalString (!isClang && machineFlags != []) ''
|
||||
printf "%s\n" ${lib.escapeShellArgs machineFlags} >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
|
||||
# -mcpu is not very useful, except on PowerPC where it is used
|
||||
# instead of march. On all other platforms you should use mtune
|
||||
# and march instead.
|
||||
# TODO: aarch64-darwin has mcpu incompatible with gcc
|
||||
+ optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(targetPlatform.isDarwin && targetPlatform.isAarch64))) ''
|
||||
echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
|
||||
# -mfloat-abi only matters on arm32 but we set it here
|
||||
# unconditionally just in case. If the abi specifically sets hard
|
||||
# vs. soft floats we use it here.
|
||||
+ optionalString (targetPlatform ? gcc.float-abi) ''
|
||||
echo "-mfloat-abi=${targetPlatform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
+ optionalString (targetPlatform ? gcc.fpu) ''
|
||||
echo "-mfpu=${targetPlatform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
+ optionalString (targetPlatform ? gcc.mode) ''
|
||||
echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
+ optionalString (targetPlatform ? gcc.thumb) ''
|
||||
echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
+ (let tune = if targetPlatform ? gcc.tune
|
||||
then findBestTuneApproximation targetPlatform.gcc.tune
|
||||
else null;
|
||||
in optionalString (tune != null) ''
|
||||
echo "-mtune=${tune}" >> $out/nix-support/cc-cflags-before
|
||||
'')
|
||||
|
||||
# TODO: categorize these and figure out a better place for them
|
||||
+ optionalString targetPlatform.isWindows ''
|
||||
hardening_unsupported_flags+=" pic"
|
||||
@ -718,9 +703,7 @@ stdenvNoCC.mkDerivation {
|
||||
##
|
||||
+ optionalString isClang ''
|
||||
# Escape twice: once for this script, once for the one it gets substituted into.
|
||||
export march=${escapeShellArg
|
||||
(optionalString (targetPlatform ? gcc.arch)
|
||||
(escapeShellArg "-march=${targetPlatform.gcc.arch}"))}
|
||||
export machineFlags=${escapeShellArg (escapeShellArgs machineFlags)}
|
||||
export defaultTarget=${targetPlatform.config}
|
||||
substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh
|
||||
''
|
||||
|
||||
@ -38,6 +38,11 @@ in
|
||||
Default: pname
|
||||
*/
|
||||
, ename ? pname
|
||||
/*
|
||||
version: Either a stable version such as "1.2" or an unstable version.
|
||||
An unstable version can use either Nix format (preferred) such as
|
||||
"1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230".
|
||||
*/
|
||||
, version
|
||||
/*
|
||||
commit: Optional package history commit.
|
||||
@ -71,6 +76,19 @@ genericBuild ({
|
||||
|
||||
inherit packageBuild commit ename recipe;
|
||||
|
||||
melpaVersion =
|
||||
let
|
||||
parsed = lib.flip builtins.match version
|
||||
# match <version>-unstable-YYYY-MM-DD format
|
||||
"^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$";
|
||||
unstableVersionInNixFormat = parsed != null; # heuristics
|
||||
date = builtins.concatStringsSep "" parsed;
|
||||
time = "0"; # unstable version in nix format lacks this info
|
||||
in
|
||||
if unstableVersionInNixFormat
|
||||
then date + "." + time
|
||||
else version;
|
||||
|
||||
preUnpack = ''
|
||||
mkdir -p "$NIX_BUILD_TOP/recipes"
|
||||
if [ -n "$recipe" ]; then
|
||||
@ -96,7 +114,7 @@ genericBuild ({
|
||||
-L "$NIX_BUILD_TOP/package-build" \
|
||||
-l "$melpa2nix" \
|
||||
-f melpa2nix-build-package \
|
||||
$ename $version $commit
|
||||
$ename $melpaVersion $commit
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@ -104,9 +122,9 @@ genericBuild ({
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
archive="$NIX_BUILD_TOP/packages/$ename-$version.el"
|
||||
archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el"
|
||||
if [ ! -f "$archive" ]; then
|
||||
archive="$NIX_BUILD_TOP/packages/$ename-$version.tar"
|
||||
archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar"
|
||||
fi
|
||||
|
||||
emacs --batch -Q \
|
||||
|
||||
@ -218,8 +218,7 @@ let
|
||||
buildGoDir() {
|
||||
local cmd="$1" dir="$2"
|
||||
|
||||
. $TMPDIR/buildFlagsArray
|
||||
|
||||
declare -ga buildFlagsArray
|
||||
declare -a flags
|
||||
flags+=($buildFlags "''${buildFlagsArray[@]}")
|
||||
flags+=(''${tags:+-tags=''${tags// /,}})
|
||||
@ -258,11 +257,6 @@ let
|
||||
buildFlagsArray+=(-x)
|
||||
fi
|
||||
|
||||
if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
|
||||
declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
|
||||
else
|
||||
touch $TMPDIR/buildFlagsArray
|
||||
fi
|
||||
if [ -z "$enableParallelBuilding" ]; then
|
||||
export NIX_BUILD_CORES=1
|
||||
fi
|
||||
|
||||
@ -3,6 +3,9 @@ maturinBuildHook() {
|
||||
|
||||
runHook preBuild
|
||||
|
||||
# Put the wheel to dist/ so that regular Python tooling can find it.
|
||||
local dist="$PWD/dist"
|
||||
|
||||
if [ ! -z "${buildAndTestSubdir-}" ]; then
|
||||
pushd "${buildAndTestSubdir}"
|
||||
fi
|
||||
@ -16,6 +19,7 @@ maturinBuildHook() {
|
||||
--manylinux off \
|
||||
--strip \
|
||||
--release \
|
||||
--out "$dist" \
|
||||
${maturinBuildFlags-}
|
||||
)
|
||||
|
||||
@ -23,10 +27,6 @@ maturinBuildHook() {
|
||||
popd
|
||||
fi
|
||||
|
||||
# Move the wheel to dist/ so that regular Python tooling can find it.
|
||||
mkdir -p dist
|
||||
mv ${cargoRoot:+$cargoRoot/}target/wheels/*.whl dist/
|
||||
|
||||
# These are python build hooks and may depend on ./dist
|
||||
runHook postBuild
|
||||
|
||||
|
||||
@ -23,10 +23,13 @@ fixDarwinDylibNames() {
|
||||
for fn in "$@"; do
|
||||
if [ -L "$fn" ]; then continue; fi
|
||||
echo "$fn: fixing dylib"
|
||||
set +e
|
||||
int_out=$(@targetPrefix@install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1)
|
||||
result=$?
|
||||
set -e
|
||||
if [ "$result" -ne 0 ] &&
|
||||
! grep "shared library stub file and can't be changed" <<< "$out"
|
||||
! grep -q -e "shared library stub file and can't be changed" \
|
||||
-e "is not a Mach-O file" <<< "$int_out"
|
||||
then
|
||||
echo "$int_out" >&2
|
||||
exit "$result"
|
||||
|
||||
@ -219,6 +219,11 @@ installShellCompletion() {
|
||||
else
|
||||
install -Dm644 -T "$arg" "$outPath"
|
||||
fi || return
|
||||
|
||||
if [ ! -s "$outPath" ]; then
|
||||
echo "installShellCompletion: error: installed shell completion file \`$outPath' does not exist or has zero size" >&2
|
||||
return 1
|
||||
fi
|
||||
# Clear the per-path flags
|
||||
name=
|
||||
done
|
||||
|
||||
@ -22,10 +22,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
neo4j
|
||||
numpy
|
||||
|
||||
@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.poetry-core
|
||||
python3.pkgs.pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alsa-plugins";
|
||||
version = "1.2.7.1";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-jDN4FJVLt8FnRWczpgRhQqKTHxLsy6PsKkrmGKNDJRE=";
|
||||
hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -13,7 +13,6 @@ python3Packages.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
] ++ [
|
||||
installShellFiles
|
||||
|
||||
@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies =
|
||||
with python3.pkgs;
|
||||
|
||||
@ -27,7 +27,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
python3Packages.pythonRelaxDepsHook
|
||||
python3Packages.setuptools
|
||||
python3Packages.wheel
|
||||
];
|
||||
|
||||
@ -32,7 +32,7 @@ let
|
||||
--replace 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ p.setuptools p.wheel p.pythonRelaxDepsHook ];
|
||||
nativeBuildInputs = [ p.setuptools p.wheel ];
|
||||
|
||||
pythonRelaxDeps = [ "pillow" "torchvision" ];
|
||||
|
||||
|
||||
@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, dbus
|
||||
, libepoxy
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, libglut
|
||||
, freetype
|
||||
, gtk2-x11
|
||||
, lib
|
||||
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
dbus
|
||||
libepoxy
|
||||
freeglut
|
||||
libglut
|
||||
freetype
|
||||
gtk2-x11
|
||||
libGL
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut
|
||||
{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, libglut
|
||||
, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext
|
||||
, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux
|
||||
, libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
dbus
|
||||
libepoxy
|
||||
freeglut
|
||||
libglut
|
||||
freetype
|
||||
gtk3
|
||||
libGL
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, dbus
|
||||
, libepoxy
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, libglut
|
||||
, freetype
|
||||
, gtk3
|
||||
, lib
|
||||
@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
dbus
|
||||
libepoxy
|
||||
freeglut
|
||||
libglut
|
||||
freetype
|
||||
gtk3
|
||||
libGL
|
||||
|
||||
@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ lib.optionalString isMinimalBuild "-minimal"
|
||||
+ lib.optionalString cursesUI "-cursesUI"
|
||||
+ lib.optionalString qt5UI "-qt5UI";
|
||||
version = "3.29.3";
|
||||
version = "3.29.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-JSruFEjUnKoElU/V4n0YndUVcFVzE+eygWNnFqI4vMs=";
|
||||
hash = "sha256-E5ExMAO4PUjiqxFai1JaVX942MFURhi0jR2QGEoQ8K8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
|
||||
--subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
|
||||
# CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake
|
||||
configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags"
|
||||
configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags $cmakeFlags"
|
||||
'';
|
||||
|
||||
# The configuration script is not autoconf-based, although being similar;
|
||||
|
||||
@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec {
|
||||
wrapQtAppsHook
|
||||
]) ++ (with python3Packages; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec {
|
||||
wrapProgram "$out/bin/${pname}" \
|
||||
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon mesa.drivers wayland
|
||||
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland
|
||||
]}
|
||||
'';
|
||||
|
||||
|
||||
@ -86,7 +86,6 @@ rustPlatform.buildRustPackage rec {
|
||||
xorg.libXrandr
|
||||
libxkbcommon
|
||||
vulkan-loader
|
||||
mesa.drivers
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
@ -99,7 +99,6 @@ rustPlatform.buildRustPackage rec {
|
||||
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
libxkbcommon
|
||||
mesa.drivers
|
||||
vulkan-loader
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
|
||||
@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies =
|
||||
with python3.pkgs;
|
||||
|
||||
@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -1,5 +1,14 @@
|
||||
{ lib, stdenv, fetchzip, fetchpatch
|
||||
, autoreconfHook, libselinux, libuuid, pkg-config
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
libselinux,
|
||||
libuuid,
|
||||
pkg-config,
|
||||
lz4,
|
||||
lzo,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -11,8 +20,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libselinux libuuid ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libselinux
|
||||
libuuid
|
||||
lz4
|
||||
lzo
|
||||
];
|
||||
|
||||
patches = [
|
||||
./f2fs-tools-cross-fix.patch
|
||||
@ -24,11 +41,14 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/";
|
||||
description = "Userland tools for the f2fs filesystem";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ehmry jagajaga ];
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
ehmry
|
||||
jagajaga
|
||||
];
|
||||
};
|
||||
}
|
||||
74
pkgs/by-name/fl/flite/package.nix
Normal file
74
pkgs/by-name/fl/flite/package.nix
Normal file
@ -0,0 +1,74 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
alsa-lib,
|
||||
libpulseaudio,
|
||||
testers,
|
||||
audioBackend ? "pulseaudio",
|
||||
}:
|
||||
assert lib.assertOneOf "audioBackend" audioBackend [
|
||||
"alsa"
|
||||
"pulseaudio"
|
||||
];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flite";
|
||||
version = "2.2";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
"dev"
|
||||
"lib"
|
||||
"out"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "festvox";
|
||||
repo = "flite";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tq5pyg3TiQt8CPqGXTyLOaGgaeLTmPp+Duw3+2VAF9g=";
|
||||
};
|
||||
|
||||
# https://github.com/festvox/flite/pull/60.
|
||||
# Replaces `ar` with `$(AR)` in config/common_make_rules.
|
||||
# Improves cross-compilation compatibility.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch";
|
||||
hash = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux (
|
||||
{
|
||||
alsa = alsa-lib;
|
||||
pulseaudio = libpulseaudio;
|
||||
}
|
||||
.${audioBackend} or (throw "${audioBackend} is not a supported backend!")
|
||||
);
|
||||
|
||||
configureFlags = [
|
||||
"--enable-shared"
|
||||
] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ];
|
||||
|
||||
# main/Makefile creates and removes 'flite_voice_list.c' from multiple targets:
|
||||
# make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop
|
||||
enableParallelBuilding = false;
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
# `flite` does have a `--version` command, but it returns 1
|
||||
command = "flite --help";
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Small, fast run-time speech synthesis engine";
|
||||
homepage = "http://www.festvox.org/flite/";
|
||||
license = lib.licenses.bsdOriginal;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
mainProgram = "flite";
|
||||
};
|
||||
})
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 75f62aed..91b9571b 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -16,6 +16,10 @@ ifeq ($(shell uname -m),arm64)
|
||||
export aarch64=1
|
||||
endif
|
||||
|
||||
+ifeq ($(shell uname -m),aarch64)
|
||||
+ export aarch64=1
|
||||
+endif
|
||||
+
|
||||
.PHONY: clean all profile debug minimap2 samtools
|
||||
|
||||
.DEFAULT_GOAL := all
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3Packages
|
||||
, zlib
|
||||
, curl
|
||||
@ -11,6 +12,7 @@
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flye";
|
||||
version = "2.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenderglass";
|
||||
@ -19,7 +21,33 @@ python3Packages.buildPythonApplication rec {
|
||||
hash = "sha256-lwiY0VTEsLMMXt1VowsS3jj44v30Z766xNRwQtQKr10=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/mikolmogorov/Flye/pull/691
|
||||
name = "aarch64-fix.patch";
|
||||
url = "https://github.com/mikolmogorov/Flye/commit/e4dcc3fdf0fa1430a974fcd7da31b03ea642df9b.patch";
|
||||
hash = "sha256-Ny2daPt8eYOKnwZ6bdBoCcFWhe9eiIHF4vJU/occwU0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://github.com/mikolmogorov/Flye/pull/711
|
||||
name = "remove-distutils.patch";
|
||||
url = "https://github.com/mikolmogorov/Flye/commit/fb34f1ccfdf569d186a4ce822ee18eced736636b.patch";
|
||||
hash = "sha256-52bnZ8XyP0HsY2OpNYMU3xJgotNVdQc/O2w3XIReUdQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://github.com/mikolmogorov/Flye/pull/670
|
||||
name = "remove-find_module.patch";
|
||||
url = "https://github.com/mikolmogorov/Flye/commit/441b1c6eb0f60b7c4fb1a40d659c7dabb7ad41b6.patch";
|
||||
hash = "sha256-RytFIN1STK33/nvXpck6woQcwV/e1fmA8AgmptiIiDU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace flye/polishing/alignment.py \
|
||||
--replace-fail "/bin/bash" "${lib.getExe bash}"
|
||||
'';
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ coreutils ];
|
||||
|
||||
@ -29,22 +57,18 @@ python3Packages.buildPythonApplication rec {
|
||||
libdeflate
|
||||
];
|
||||
|
||||
patches = [ ./aarch64-fix.patch ];
|
||||
pythonImportsCheck = [ "flye" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace flye/polishing/alignment.py \
|
||||
--replace-fail "/bin/bash" "${lib.getExe bash}"
|
||||
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
|
||||
|
||||
substituteInPlace flye/tests/test_toy.py \
|
||||
--replace-fail "find_executable(\"flye" "find_executable(\"$out/bin/flye" \
|
||||
--replace-fail "[\"flye" "[\"$out/bin/flye"
|
||||
preCheck = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "De novo assembler for single molecule sequencing reads using repeat graphs";
|
||||
homepage = "https://github.com/fenderglass/Flye";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "flye";
|
||||
maintainers = with maintainers; [ assistant ];
|
||||
};
|
||||
|
||||
@ -20,6 +20,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"defusedxml"
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user