Merge #226795: staging-next 2023-04-18
This commit is contained in:
Vladimír Čunát
commit
d6b863fd9b
176 changed files with 1890 additions and 986 deletions
|
|
@ -1,15 +1,5 @@
|
|||
{ pkgs, lib, makeInstalledTest, ... }:
|
||||
{ pkgs, makeInstalledTest, ... }:
|
||||
|
||||
makeInstalledTest {
|
||||
tested = pkgs.pipewire;
|
||||
testConfig = {
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake
|
||||
, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
|
||||
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
|
||||
, AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluidsynth";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
rev = "v${version}";
|
||||
sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k";
|
||||
sha256 = "sha256-BSJu3jB7b5G2ThXBUHUNnBGl55EXe3nIzdBdgfOWDSM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];
|
||||
|
||||
buildInputs = [ glib libsndfile libjack2 ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ]
|
||||
++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Denable-framework=off"
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${lib.optionalString libOnly "lib"}mpg123";
|
||||
version = "1.31.2";
|
||||
version = "1.31.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
|
||||
sha256 = "sha256-sX8ikF4x9DtrQB399qce0Ru30Fb2jbRJ1wufmug5x94=";
|
||||
hash = "sha256-HKd9Omml/4RbegU294P+5VThBBE5prl49q/hT1gUrRo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withConplay "conplay";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ in
|
|||
stdenv.mkDerivation {
|
||||
pname = "vim";
|
||||
|
||||
inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
|
||||
inherit (common) version src postPatch hardeningDisable enableParallelBuilding enableParallelInstalling meta;
|
||||
|
||||
nativeBuildInputs = [ gettext pkg-config ];
|
||||
buildInputs = [ ncurses bash gawk ]
|
||||
|
|
@ -50,6 +50,15 @@ stdenv.mkDerivation {
|
|||
ln -s $out/bin/vim $out/bin/vi
|
||||
mkdir -p $out/share/vim
|
||||
cp "${vimrc}" $out/share/vim/vimrc
|
||||
|
||||
# Prevent bugs in the upstream makefile from silently failing and missing outputs.
|
||||
# Some of those are build-time requirements for other packages.
|
||||
for tool in ex xxd vi view vimdiff; do
|
||||
if [ ! -e "$out/bin/$tool" ]; then
|
||||
echo "ERROR: install phase did not install '$tool'."
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
__impureHostDeps = [ "/dev/ptmx" ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ let
|
|||
packageOverrides = self: super: {
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.3.24";
|
||||
src = oldAttrs.src.override {
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
substituteInPlace lib/Makefile.local \
|
||||
--replace '-install_name $(libdir)' "-install_name $out/lib"
|
||||
|
||||
# do not override CFLAGS of the Makefile created by mkmf
|
||||
substituteInPlace bindings/Makefile.local \
|
||||
--replace 'CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC"' ""
|
||||
'' + lib.optionalString withEmacs ''
|
||||
substituteInPlace emacs/notmuch-emacs-mua \
|
||||
--replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
|
||||
|
|
|
|||
|
|
@ -356,6 +356,9 @@ in
|
|||
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
|
||||
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
|
||||
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx"
|
||||
|
||||
# testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4
|
||||
sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx
|
||||
''
|
||||
# This to avoid using /lib:/usr/lib at linking
|
||||
+ ''
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport;
|
|||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.39.2";
|
||||
version = "2.40.0";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
|
||||
in
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "R1918Tc7LNTkOHBhhRdZZtXBH2jE2x5IwmJXxD3c8tY=";
|
||||
hash = "sha256-sXpZj79Ycp7xO1d0ZeuTstSE3xIBUYtwi1BE/2I79G0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withManual "doc";
|
||||
|
|
@ -185,12 +185,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
# Fix references to the perl, sed, awk and various coreutil binaries used by
|
||||
# shell scripts that git calls (e.g. filter-branch)
|
||||
# and completion scripts
|
||||
SCRIPT="$(cat <<'EOS'
|
||||
BEGIN{
|
||||
@a=(
|
||||
'${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
|
||||
'${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
|
||||
'${coreutils}/bin/wc', '${coreutils}/bin/tr'
|
||||
'${coreutils}/bin/wc', '${coreutils}/bin/tr',
|
||||
'${coreutils}/bin/ls'
|
||||
${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
|
||||
);
|
||||
}
|
||||
|
|
@ -201,7 +203,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
EOS
|
||||
)"
|
||||
perl -0777 -i -pe "$SCRIPT" \
|
||||
$out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}
|
||||
$out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse} \
|
||||
$out/share/bash-completion/completions/{git,gitk}
|
||||
|
||||
|
||||
# Also put git-http-backend into $PATH, so that we can use smart
|
||||
|
|
@ -214,8 +217,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
||||
wrapProgram $out/libexec/git-core/git-cvsimport \
|
||||
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
||||
wrapProgram $out/libexec/git-core/git-add--interactive \
|
||||
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
||||
wrapProgram $out/libexec/git-core/git-archimport \
|
||||
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
||||
wrapProgram $out/libexec/git-core/git-instaweb \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
|
||||
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
|
||||
, ruby_2_7, tzdata, git, nettools, nixosTests, nodejs, openssl
|
||||
, gitlabEnterprise ? false, callPackage, yarn
|
||||
, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config
|
||||
}:
|
||||
|
|
@ -17,7 +17,8 @@ let
|
|||
|
||||
rubyEnv = bundlerEnv rec {
|
||||
name = "gitlab-env-${version}";
|
||||
inherit ruby;
|
||||
# GitLab doesn't support Ruby 3 https://gitlab.com/groups/gitlab-org/-/epics/5149
|
||||
ruby = ruby_2_7;
|
||||
gemdir = ./rubyEnv;
|
||||
gemset =
|
||||
let x = import (gemdir + "/gemset.nix") src;
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ let
|
|||
(lib.withFeatureAs httpSupport "serf" serf)
|
||||
"--with-zlib=${zlib.dev}"
|
||||
"--with-sqlite=${sqlite.dev}"
|
||||
"--with-apr=${apr.dev}"
|
||||
"--with-apr-util=${aprutil.dev}"
|
||||
] ++ lib.optionals javahlBindings [
|
||||
"--enable-javahl"
|
||||
"--with-jdk=${jdk}"
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, pixman
|
||||
, pkg-config
|
||||
, substituteAll
|
||||
, wayland-scanner
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots_0_16
|
||||
|
|
@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -61,6 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
else writeText "config.def.h" conf;
|
||||
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
|
||||
|
||||
makeFlags = [
|
||||
"PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
|
||||
"WAYLAND_SCANNER=wayland-scanner"
|
||||
"PREFIX=$(out)"
|
||||
"MANDIR=$(man)/share/man/man1"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(
|
||||
XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"}
|
||||
|
|
@ -68,11 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
)
|
||||
'';
|
||||
|
||||
installFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"MANDIR=$(man)/share/man/man1"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/djpohly/dwl/";
|
||||
description = "Dynamic window manager for Wayland";
|
||||
|
|
|
|||
|
|
@ -8,11 +8,13 @@
|
|||
, libxcb
|
||||
, libxkbcommon
|
||||
, libxml2
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
, pango
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, wayland-scanner
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots_0_16
|
||||
|
|
@ -35,10 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
scdoc
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg
|
||||
, meson, ninja, pkg-config, wayland-scanner, scdoc
|
||||
, wayland, libxkbcommon, pcre2, json_c, libevdev
|
||||
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
|
||||
|
|
@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
inherit swaybg;
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch";
|
||||
url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff";
|
||||
hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0=";
|
||||
})
|
||||
] ++ lib.optionals (!isNixOS) [
|
||||
# References to /nix/store/... will get GC'ed which causes problems when
|
||||
# copying the default configuration:
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
|
|||
"--sysconfdir /etc"
|
||||
"-Duse_system_wlroots=enabled"
|
||||
"-Duse_system_wfconfig=enabled"
|
||||
(lib.mesonEnable "wf-touch:tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
|
||||
];
|
||||
|
||||
passthru.providedSessions = [ "wayfire" ];
|
||||
|
|
|
|||
|
|
@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
|
|||
# CMake is just used for finding doctest.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonEnable "tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
, isGNU ? false, isClang ? cc.isClang or false, isCcache ? cc.isCcache or false, gnugrep ? null
|
||||
, buildPackages ? {}
|
||||
, libcxx ? null
|
||||
, grossHackForStagingNext ? false
|
||||
|
||||
# Whether or not to add `-B` and `-L` to `nix-support/cc-{c,ld}flags`
|
||||
, useCcForLibs ?
|
||||
|
|
@ -52,7 +51,6 @@
|
|||
|
||||
# the derivation at which the `-B` and `-L` flags added by `useCcForLibs` will point
|
||||
, gccForLibs ? if useCcForLibs then cc else null
|
||||
, tmpDropB ? false # temporary hack; see PR #225846
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -336,7 +334,7 @@ stdenv.mkDerivation {
|
|||
##
|
||||
## GCC libs for non-GCC support
|
||||
##
|
||||
+ optionalString (useGccForLibs && !tmpDropB) ''
|
||||
+ optionalString (useGccForLibs && isClang) ''
|
||||
|
||||
echo "-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
|
@ -415,7 +413,7 @@ stdenv.mkDerivation {
|
|||
# already knows how to find its own libstdc++, and adding
|
||||
# additional -isystem flags will confuse gfortran (see
|
||||
# https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
|
||||
+ optionalString (libcxx == null && (if grossHackForStagingNext then isClang else true) && (useGccForLibs && gccForLibs.langCC or false)) ''
|
||||
+ optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) ''
|
||||
for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do
|
||||
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
|
||||
done
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ class Dependency:
|
|||
found: bool = False # Whether it was found somewhere
|
||||
|
||||
|
||||
def auto_patchelf_file(path: Path, runtime_deps: list[Path]) -> list[Dependency]:
|
||||
def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = []) -> list[Dependency]:
|
||||
try:
|
||||
with open_elf(path) as elf:
|
||||
|
||||
|
|
@ -235,6 +235,8 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path]) -> list[Dependency]
|
|||
dependencies.append(Dependency(path, dep, False))
|
||||
print(f" {dep} -> not found!")
|
||||
|
||||
rpath.extend(append_rpaths)
|
||||
|
||||
# Dedup the rpath
|
||||
rpath_str = ":".join(dict.fromkeys(map(Path.as_posix, rpath)))
|
||||
|
||||
|
|
@ -251,8 +253,9 @@ def auto_patchelf(
|
|||
paths_to_patch: List[Path],
|
||||
lib_dirs: List[Path],
|
||||
runtime_deps: List[Path],
|
||||
recursive: bool =True,
|
||||
ignore_missing: List[str] = []) -> None:
|
||||
recursive: bool = True,
|
||||
ignore_missing: List[str] = [],
|
||||
append_rpaths: List[Path] = []) -> None:
|
||||
|
||||
if not paths_to_patch:
|
||||
sys.exit("No paths to patch, stopping.")
|
||||
|
|
@ -265,7 +268,7 @@ def auto_patchelf(
|
|||
dependencies = []
|
||||
for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch):
|
||||
if not path.is_symlink() and path.is_file():
|
||||
dependencies += auto_patchelf_file(path, runtime_deps)
|
||||
dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths)
|
||||
|
||||
missing = [dep for dep in dependencies if not dep.found]
|
||||
|
||||
|
|
@ -312,6 +315,12 @@ def main() -> None:
|
|||
parser.add_argument(
|
||||
"--runtime-dependencies", nargs="*", type=Path,
|
||||
help="Paths to prepend to the runtime path of executable binaries.")
|
||||
parser.add_argument(
|
||||
"--append-rpaths",
|
||||
nargs="*",
|
||||
type=Path,
|
||||
help="Paths to append to all runtime paths unconditionally",
|
||||
)
|
||||
|
||||
print("automatically fixing dependencies for ELF files")
|
||||
args = parser.parse_args()
|
||||
|
|
@ -322,7 +331,8 @@ def main() -> None:
|
|||
args.libs,
|
||||
args.runtime_dependencies,
|
||||
args.recursive,
|
||||
args.ignore_missing)
|
||||
args.ignore_missing,
|
||||
append_rpaths=args.append_rpaths)
|
||||
|
||||
|
||||
interpreter_path: Path = None # type: ignore
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ autoPatchelf() {
|
|||
ignoreMissingDepsArray=( "*" )
|
||||
fi
|
||||
|
||||
local appendRunpathsArray=($appendRunpaths)
|
||||
local runtimeDependenciesArray=($runtimeDependencies)
|
||||
@pythonInterpreter@ @autoPatchelfScript@ \
|
||||
${norecurse:+--no-recurse} \
|
||||
|
|
@ -68,7 +69,8 @@ autoPatchelf() {
|
|||
--paths "$@" \
|
||||
--libs "${autoPatchelfLibs[@]}" \
|
||||
"${extraAutoPatchelfLibs[@]}" \
|
||||
--runtime-dependencies "${runtimeDependenciesArray[@]/%//lib}"
|
||||
--runtime-dependencies "${runtimeDependenciesArray[@]/%//lib}" \
|
||||
--append-rpaths "${appendRunpathsArray[@]}"
|
||||
}
|
||||
|
||||
# XXX: This should ultimately use fixupOutputHooks but we currently don't have
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ _doStrip() {
|
|||
if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null 1>&2
|
||||
then continue; fi
|
||||
|
||||
stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S}"
|
||||
stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s}"
|
||||
stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S -p}"
|
||||
stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s -p}"
|
||||
done
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,12 @@ backendStdenv.mkDerivation {
|
|||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
# Picked up by autoPatchelf
|
||||
# Needed e.g. for libnvrtc to locate (dlopen) libnvrtc-builtins
|
||||
appendRunpaths = [
|
||||
"$ORIGIN"
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
# TODO: choose whether to install static/dynamic libs
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
, buildPackages
|
||||
, libxcrypt
|
||||
, disableGdbPlugin ? !enablePlugin
|
||||
, disableBootstrap ? !stdenv.hostPlatform.isDarwin
|
||||
, nukeReferences
|
||||
, callPackage
|
||||
}:
|
||||
|
|
@ -57,6 +56,7 @@ with builtins;
|
|||
|
||||
let majorVersion = "12";
|
||||
version = "${majorVersion}.2.0";
|
||||
disableBootstrap = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ postInstall() {
|
|||
fi
|
||||
|
||||
# Get rid of some "fixed" header files
|
||||
rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h}
|
||||
rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h}
|
||||
|
||||
# Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
|
||||
for i in $out/bin/*-gcc*; do
|
||||
|
|
|
|||
|
|
@ -44,6 +44,9 @@ let
|
|||
inherit (stdenv)
|
||||
buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903
|
||||
disableBootstrap' = disableBootstrap && !langFortran;
|
||||
|
||||
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
|
||||
crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
|
||||
|
||||
|
|
@ -217,7 +220,7 @@ let
|
|||
# TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc
|
||||
++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; })
|
||||
++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
|
||||
++ lib.optional disableBootstrap "--disable-bootstrap"
|
||||
++ lib.optional disableBootstrap' "--disable-bootstrap"
|
||||
|
||||
# Platform-specific flags
|
||||
++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, targetPlatform }:
|
||||
|
||||
let
|
||||
p = targetPlatform.gcc or {}
|
||||
gcc = targetPlatform.gcc or {};
|
||||
p = gcc
|
||||
// targetPlatform.parsed.abi;
|
||||
in lib.concatLists [
|
||||
(lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
|
||||
|
|
@ -10,7 +11,18 @@ in lib.concatLists [
|
|||
(lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
|
||||
(lib.optional (p ? float) "--with-float=${p.float}")
|
||||
(lib.optional (p ? mode) "--with-mode=${p.mode}")
|
||||
(lib.optional
|
||||
(let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit)
|
||||
"--with-long-double-128")
|
||||
(lib.optionals targetPlatform.isPower64
|
||||
# musl explicitly rejects 128-bit long double on
|
||||
# powerpc64; see musl/arch/powerpc64/bits/float.h
|
||||
(lib.optionals
|
||||
(!targetPlatform.isMusl
|
||||
&& (targetPlatform.isLittleEndian ||
|
||||
# "... --with-long-double-format is only supported if the default cpu is power7 or newer"
|
||||
# https://github.com/NixOS/nixpkgs/pull/170215#issuecomment-1202164709
|
||||
(lib.lists.elem
|
||||
(lib.strings.substring 0 6 (p.cpu or ""))
|
||||
[ "power7" "power8" "power9" "power1"/*0, 11, etc*/ ]))) [
|
||||
"--with-long-double-128"
|
||||
"--with-long-double-format=${gcc.long-double-format or "ieee"}"
|
||||
]))
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
|
||||
, stdenv-tmpDropB
|
||||
, gccForLibs, preLibcCrossHeaders
|
||||
, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
|
|
@ -237,14 +236,14 @@ let
|
|||
inherit llvm_meta;
|
||||
stdenv = if stdenv.hostPlatform.useLLVM or false
|
||||
then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc
|
||||
else stdenv-tmpDropB;
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
compiler-rt-no-libc = callPackage ./compiler-rt {
|
||||
inherit llvm_meta;
|
||||
stdenv = if stdenv.hostPlatform.useLLVM or false
|
||||
then overrideCC stdenv buildLlvmTools.clangNoCompilerRt
|
||||
else stdenv-tmpDropB;
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
# N.B. condition is safe because without useLLVM both are the same.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, stdenv-tmpDropB
|
||||
, callPackage
|
||||
, overrideCC
|
||||
, wrapCCWith
|
||||
|
|
@ -79,8 +78,6 @@ let
|
|||
|
||||
# Runtimes
|
||||
runtimes = callPackage ./llvm.nix {
|
||||
stdenv = stdenv-tmpDropB;
|
||||
|
||||
buildDocs = false;
|
||||
buildMan = false;
|
||||
buildTests = false;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, makeRustPlatform
|
||||
, llvmPackages_11
|
||||
, llvmPackages_15, llvm_15
|
||||
, fetchpatch
|
||||
} @ args:
|
||||
|
||||
import ./default.nix {
|
||||
|
|
@ -57,7 +58,16 @@ import ./default.nix {
|
|||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_68;
|
||||
|
||||
rustcPatches = [ ];
|
||||
rustcPatches = [
|
||||
# Fixes ICE.
|
||||
# https://github.com/rust-lang/rust/pull/107688
|
||||
(fetchpatch {
|
||||
name = "re-erased-regions-are-local.patch";
|
||||
url = "https://github.com/rust-lang/rust/commit/9d110847ab7f6aef56a8cd20cb6cea4fbcc51cd9.patch";
|
||||
excludes = [ "*tests/*" ];
|
||||
hash = "sha256-EZH5K1BEOOfi97xZr1xEHFP4jjvJ1+xqtRMvxBoL8pU=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"])
|
||||
(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"])
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ let
|
|||
inherit (lib) optionals optional optionalString concatStringsSep;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "rustc";
|
||||
pname = "${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}rustc";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -26,6 +26,10 @@ let
|
|||
"2.3.0" = {
|
||||
sha256 = "sha256-v3Q5SXEq4Cy3ST87i1fOJBlIv2ETHjaGDdszTaFDnJc=";
|
||||
};
|
||||
|
||||
"2.3.2" = {
|
||||
sha256 = "sha256-RMwWLPpjMqmojHoSHRkDiCikuk9r/7d+8cexdAfLHqo=";
|
||||
};
|
||||
};
|
||||
|
||||
in with versionMap.${version};
|
||||
|
|
|
|||
|
|
@ -121,20 +121,20 @@
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "10";
|
||||
patch = "10";
|
||||
patch = "11";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-BBnpCFv1G3pnIAmz9Q2/GFms3xi6cl0OwZqlyFA/DqM=";
|
||||
hash = "sha256-PDvDBIMDchyQSgPrgya2Mekh8RzDvimIRWpC8RXa8Ew=";
|
||||
};
|
||||
|
||||
python311 = {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "11";
|
||||
patch = "2";
|
||||
patch = "3";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-KeS49fFlhUKowT4t0nc1jJxI8rL3MYZS7xZ15AK50q8=";
|
||||
hash = "sha256-il25nJYafs8nx1lWGJyWAslodR8R2+riuQDb/xwIW14=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ let
|
|||
, buildEnv, bundler, bundix
|
||||
, libiconv, libobjc, libunwind, Foundation
|
||||
, makeBinaryWrapper, buildRubyGem, defaultGemConfig
|
||||
, baseRuby ? buildPackages.ruby_3_1.override {
|
||||
, baseRuby ? buildPackages.ruby.override {
|
||||
docSupport = false;
|
||||
rubygemsSupport = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rubygems";
|
||||
version = "3.4.8";
|
||||
version = "3.4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
|
||||
sha256 = "sha256-0FlDZJNJJGVkvBmKWNBqNRaTto6ciCOuQEK6uq6dotQ=";
|
||||
sha256 = "sha256-WFCnwvw4DN09pwShznuwSNQtSACTPfULiSAmW1hF4Vs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, drmSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
|
||||
, drmSupport ? false
|
||||
, libdrm
|
||||
, mesa
|
||||
, libxkbcommon
|
||||
|
|
@ -86,13 +86,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals waylandSupport [ wayland wayland-scanner ];
|
||||
|
||||
propagatedBuildInputs = dlopenPropagatedBuildInputs;
|
||||
|
||||
dlopenPropagatedBuildInputs = [ ]
|
||||
# Propagated for #include <GLES/gl.h> in SDL_opengles.h.
|
||||
++ lib.optional openglSupport libGL
|
||||
# Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h.
|
||||
++ lib.optionals x11Support [ libX11 xorgproto ];
|
||||
++ lib.optionals x11Support [ libX11 ];
|
||||
|
||||
propagatedBuildInputs = lib.optionals x11Support [ xorgproto ]
|
||||
++ dlopenPropagatedBuildInputs;
|
||||
|
||||
dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ]
|
||||
++ lib.optional dbusSupport dbus
|
||||
|
|
@ -100,13 +101,14 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional pipewireSupport pipewire
|
||||
++ lib.optional pulseaudioSupport libpulseaudio
|
||||
++ lib.optional udevSupport udev
|
||||
++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
|
||||
++ lib.optionals waylandSupport [ wayland libxkbcommon ]
|
||||
++ lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
|
||||
++ lib.optionals drmSupport [ libdrm mesa ];
|
||||
|
||||
buildInputs = [ libiconv ]
|
||||
++ dlopenBuildInputs
|
||||
++ lib.optional ibusSupport ibus
|
||||
++ lib.optionals waylandSupport [ wayland-protocols ]
|
||||
++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
|
|||
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "-ldb-6.9" "-ldb"
|
||||
substituteInPlace apu-1-config \
|
||||
--replace "-ldb-6.9" "-ldb"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ apr expat libiconv libxcrypt ]
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
# fix build with gcc9
|
||||
NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc";
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ stdenv.mkDerivation {
|
|||
|
||||
inherit src;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
inherit prePatch;
|
||||
|
||||
buildInputs = []
|
||||
|
|
|
|||
|
|
@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/deniskropp/DirectFB/blob/master/src/core/Makefile.am#L15
|
||||
# BUILDTIME is embedded in the result
|
||||
# if switching to cmake then a similar substitution has to be done
|
||||
substituteInPlace src/core/Makefile.am \
|
||||
--replace '`date -u "+%Y-%m-%d %H:%M"`' "`date -u \"+%Y-%m-%d %H:%M\" --date="@''${SOURCE_DATE_EPOCH}"`"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook perl pkg-config flux ];
|
||||
|
||||
buildInputs = [ zlib libjpeg freetype giflib libpng ]
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "directx-headers";
|
||||
version = "1.608.2b";
|
||||
version = "1.610.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "DirectX-Headers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o4p8L2VKvMHdu1L2I1JI6pwIRtnyVCoKebg9yKTk1T8=";
|
||||
hash = "sha256-lPYXAMFSyU3FopWdE6dDRWD6sVKcjxDVsTbgej/T2sk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, wayland-scanner
|
||||
, libGL
|
||||
, libX11
|
||||
, mesa
|
||||
, libdrm
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
}:
|
||||
|
|
@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
|
|||
eglexternalplatform
|
||||
libGL
|
||||
libX11
|
||||
mesa
|
||||
libdrm
|
||||
wayland
|
||||
wayland-protocols
|
||||
];
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
, withIlbc ? withFullDeps
|
||||
, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio
|
||||
, withLadspa ? withFullDeps # LADSPA audio filtering
|
||||
, withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library
|
||||
, withLzma ? withHeadlessDeps # xz-utils
|
||||
, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
|
||||
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
|
||||
|
|
@ -209,6 +210,7 @@
|
|||
, libogg
|
||||
, libopenmpt
|
||||
, libopus
|
||||
, libplacebo
|
||||
, librsvg
|
||||
, libssh
|
||||
, libtheora
|
||||
|
|
@ -288,7 +290,7 @@
|
|||
*/
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals optionalString enableFeature;
|
||||
inherit (lib) optional optionals optionalString enableFeature versionAtLeast;
|
||||
in
|
||||
|
||||
|
||||
|
|
@ -469,6 +471,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(enableFeature withModplug "libmodplug")
|
||||
(enableFeature withMysofa "libmysofa")
|
||||
(enableFeature withOpus "libopus")
|
||||
(optionalString (versionAtLeast version "5.0" && withLibplacebo) "--enable-libplacebo")
|
||||
(enableFeature withSvg "librsvg")
|
||||
(enableFeature withSrt "libsrt")
|
||||
(enableFeature withSsh "libssh")
|
||||
|
|
@ -571,6 +574,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
|
||||
++ optionals withJack [ libjack2 ]
|
||||
++ optionals withLadspa [ ladspaH ]
|
||||
++ optionals withLibplacebo [ libplacebo vulkan-headers ]
|
||||
++ optionals withLzma [ xz ]
|
||||
++ optionals withMfx [ intel-media-sdk ]
|
||||
++ optionals withModplug [ libmodplug ]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash }:
|
||||
{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash
|
||||
, gnulib
|
||||
}:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
|
|
@ -45,6 +47,14 @@ stdenv.mkDerivation rec {
|
|||
'' + lib.optionalString stdenv.hostPlatform.isCygwin ''
|
||||
sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
|
||||
sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
|
||||
'' +
|
||||
# This change to gettext's vendored copy of gnulib is already
|
||||
# merged upstream; we can drop this patch on the next version
|
||||
# bump. It must be applied twice because gettext vendors gnulib
|
||||
# not once, but twice!
|
||||
''
|
||||
patch -p2 -d gettext-tools/gnulib-lib/ < ${gnulib.passthru.longdouble-redirect-patch}
|
||||
patch -p2 -d gettext-tools/libgrep/ < ${gnulib.passthru.longdouble-redirect-patch}
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,13 @@ in
|
|||
# Same for musl: https://github.com/NixOS/nixpkgs/issues/78805
|
||||
"-Wno-error=missing-attributes"
|
||||
])
|
||||
(lib.optionals (stdenv.hostPlatform.isPower64) [
|
||||
# Do not complain about the Processor Specific ABI (i.e. the
|
||||
# choice to use IEEE-standard `long double`). We pass this
|
||||
# flag in order to mute a `-Werror=psabi` passed by glibc;
|
||||
# hopefully future glibc releases will not pass that flag.
|
||||
"-Wno-error=psabi"
|
||||
])
|
||||
]);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
rev = "6faca61810d335c7837f320733fe8e15a1431fc2";
|
||||
rev = "63acb96f92473ceb5e21d873d7c0aee266b3d6d3";
|
||||
|
||||
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
|
||||
configGuess = fetchurl {
|
||||
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
|
||||
sha256 = "06wkkhpbx9slmknr2g7mcd8x3zsdhnmmay25l31h3rkdp1wkq7kx";
|
||||
sha256 = "049qgfh4xjd4fxd7ygm1phd5faqphfvhfcv8dsdldprsp86lf55v";
|
||||
};
|
||||
configSub = fetchurl {
|
||||
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
|
||||
sha256 = "1qkph8cqanmgy3s4a18bm1a4vk62i8pf8cy5pc1hkpqwn4g6l0di";
|
||||
sha256 = "1rk30y27mzls49wyfdb5jhzjr08hkxl7xqhnxmhcmkvqlmpsjnxl";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "gnu-config";
|
||||
version = "2021-01-25";
|
||||
version = "2023-01-21";
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation {
|
|||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that
|
||||
# program.
|
||||
maintainers = [ maintainers.dezgeg ];
|
||||
maintainers = with maintainers; [ dezgeg emilytrau ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libxslt librsvg ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = !stdenv.hostPlatform.isPower64;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
|
|
|
|||
|
|
@ -98,6 +98,8 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64"
|
||||
);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# prevent tests from being run during the buildPhase
|
||||
makeFlags = [ "tests=" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
, neon
|
||||
, openal
|
||||
, opencv4
|
||||
, openexr
|
||||
, openexr_3
|
||||
, openh264
|
||||
, libopenmpt
|
||||
, pango
|
||||
|
|
@ -80,6 +80,7 @@
|
|||
, libGLU
|
||||
, libGL
|
||||
, addOpenGLRunpath
|
||||
, gtk3
|
||||
, libintl
|
||||
, game-music-emu
|
||||
, openssl
|
||||
|
|
@ -92,23 +93,26 @@
|
|||
, VideoToolbox
|
||||
, AudioToolbox
|
||||
, AVFoundation
|
||||
, Cocoa
|
||||
, CoreMedia
|
||||
, CoreVideo
|
||||
, Foundation
|
||||
, MediaToolbox
|
||||
, enableGplPlugins ? true
|
||||
, bluezSupport ? stdenv.isLinux
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-bad";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ehHBO1XdHSOG3ZAiGeQcv83ajh4Ko+c4GGyVB0s12k8=";
|
||||
hash = "sha256-PY+vHONALIU1zjqMThpslg5LVlXb2mtVlD25rHkCLQ8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -128,6 +132,8 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
gstreamer # for gst-tester-1.0
|
||||
gobject-introspection
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland # for wayland-scanner
|
||||
];
|
||||
|
|
@ -164,7 +170,7 @@ stdenv.mkDerivation rec {
|
|||
neon
|
||||
openal
|
||||
opencv4
|
||||
openexr
|
||||
openexr_3
|
||||
openh264
|
||||
rtmpdump
|
||||
pango
|
||||
|
|
@ -177,6 +183,7 @@ stdenv.mkDerivation rec {
|
|||
gnutls
|
||||
libGL
|
||||
libGLU
|
||||
gtk3
|
||||
game-music-emu
|
||||
openssl
|
||||
libxml2
|
||||
|
|
@ -233,6 +240,7 @@ stdenv.mkDerivation rec {
|
|||
VideoToolbox
|
||||
AudioToolbox
|
||||
AVFoundation
|
||||
Cocoa
|
||||
CoreMedia
|
||||
CoreVideo
|
||||
Foundation
|
||||
|
|
@ -241,10 +249,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
"-Dglib-asserts=disabled" # asserts should be disabled on stable releases
|
||||
|
||||
"-Damfcodec=disabled" # Windows-only
|
||||
"-Davtp=disabled"
|
||||
"-Ddirectshow=disabled" # Windows-only
|
||||
"-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
|
||||
"-Dzbar=${if enableZbar then "enabled" else "disabled"}"
|
||||
"-Dfaac=${if faacSupport then "enabled" else "disabled"}"
|
||||
|
|
@ -278,8 +287,11 @@ stdenv.mkDerivation rec {
|
|||
"-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
|
||||
"-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx`
|
||||
"-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
]
|
||||
++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only
|
||||
"-Dnvcodec=disabled" # Linux-only
|
||||
"-Dva=disabled" # see comment on `libva` in `buildInputs`
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
|
|
@ -297,9 +309,12 @@ stdenv.mkDerivation rec {
|
|||
"-Dladspa=disabled" # requires lrdf
|
||||
"-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
|
||||
"-Dwildmidi=disabled" # see dependencies above
|
||||
] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64) [
|
||||
"-Dqsv=disabled" # Linux (and Windows) x86 only
|
||||
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
|
||||
"-Dgl=disabled"
|
||||
] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [
|
||||
"-Dgtk3=disabled" # Wayland-based GTK sink
|
||||
"-Dwayland=disabled"
|
||||
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
|
||||
# `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
|
||||
|
|
@ -323,11 +338,6 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
patchShebangs \
|
||||
scripts/extract-release-date-from-doap-file.py
|
||||
|
||||
# upstream bumps this version check one minor version at a time
|
||||
# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/subprojects/gst-plugins-bad/ext/opencv/meson.build#L74
|
||||
substituteInPlace ext/opencv/meson.build \
|
||||
--replace '< 4.7.0' '< 5.0.0'
|
||||
'';
|
||||
|
||||
# This package has some `_("string literal")` string formats
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
diff --git a/sys/nvcodec/gstcudaloader.c b/sys/nvcodec/gstcudaloader.c
|
||||
index 4223ba1fbd..ca8bb5ceb1 100644
|
||||
--- a/sys/nvcodec/gstcudaloader.c
|
||||
+++ b/sys/nvcodec/gstcudaloader.c
|
||||
@@ -135,6 +135,11 @@ gst_cuda_load_library (void)
|
||||
diff --git a/gst-libs/gst/cuda/gstcudaloader.c b/gst-libs/gst/cuda/gstcudaloader.c
|
||||
index fffcbefd2b..6f738d3af3 100644
|
||||
--- a/gst-libs/gst/cuda/gstcudaloader.c
|
||||
+++ b/gst-libs/gst/cuda/gstcudaloader.c
|
||||
@@ -165,6 +165,11 @@ gst_cuda_load_library (void)
|
||||
return TRUE;
|
||||
|
||||
module = g_module_open (filename, G_MODULE_BIND_LAZY);
|
||||
+
|
||||
+ if (module == NULL) {
|
||||
+ module = g_module_open("@driverLink@/lib/" CUDA_LIBNAME, G_MODULE_BIND_LAZY);
|
||||
+ module = g_module_open ("@driverLink@/lib/" CUDA_LIBNAME, G_MODULE_BIND_LAZY);
|
||||
+ }
|
||||
+
|
||||
if (module == NULL) {
|
||||
GST_WARNING ("Could not open library %s, %s", filename, g_module_error ());
|
||||
return FALSE;
|
||||
diff --git a/sys/nvcodec/gstcuvidloader.c b/sys/nvcodec/gstcuvidloader.c
|
||||
index 3c7505ca36..eeb376fa80 100644
|
||||
index e957e062e0..004ec2dcd5 100644
|
||||
--- a/sys/nvcodec/gstcuvidloader.c
|
||||
+++ b/sys/nvcodec/gstcuvidloader.c
|
||||
@@ -85,6 +85,11 @@ gst_cuvid_load_library (guint api_major_ver, guint api_minor_ver)
|
||||
|
|
@ -31,10 +31,10 @@ index 3c7505ca36..eeb376fa80 100644
|
|||
GST_WARNING ("Could not open library %s, %s", filename, g_module_error ());
|
||||
return FALSE;
|
||||
diff --git a/sys/nvcodec/gstnvenc.c b/sys/nvcodec/gstnvenc.c
|
||||
index 19637671ad..39858ccdee 100644
|
||||
index 106857a954..3bab9989f0 100644
|
||||
--- a/sys/nvcodec/gstnvenc.c
|
||||
+++ b/sys/nvcodec/gstnvenc.c
|
||||
@@ -874,6 +874,11 @@ gst_nvenc_load_library (guint * api_major_ver, guint * api_minor_ver)
|
||||
@@ -907,6 +907,11 @@ gst_nvenc_load_library (guint * api_major_ver, guint * api_minor_ver)
|
||||
};
|
||||
|
||||
module = g_module_open (NVENC_LIBRARY_NAME, G_MODULE_BIND_LAZY);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, gettext
|
||||
, python3
|
||||
, gstreamer
|
||||
, graphene
|
||||
, orc
|
||||
, pango
|
||||
, libtheora
|
||||
|
|
@ -20,17 +21,16 @@
|
|||
, libGL
|
||||
, gobject-introspection
|
||||
, enableX11 ? stdenv.isLinux
|
||||
, libXv
|
||||
, libXext
|
||||
, libXi
|
||||
, libXv
|
||||
, enableWayland ? stdenv.isLinux
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, enableAlsa ? stdenv.isLinux
|
||||
, alsa-lib
|
||||
# Enabling Cocoa seems to currently not work, giving compile
|
||||
# errors. Suspected is that a newer version than clang
|
||||
# is needed than 5.0 but it is not clear.
|
||||
, enableCocoa ? false
|
||||
# TODO: fix once x86_64-darwin sdk updated
|
||||
, enableCocoa ? (stdenv.isDarwin && stdenv.isAarch64)
|
||||
, Cocoa
|
||||
, OpenGL
|
||||
, enableGl ? (enableX11 || enableWayland || enableCocoa)
|
||||
|
|
@ -38,11 +38,14 @@
|
|||
, cdparanoia
|
||||
, glib
|
||||
, testers
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gst-plugins-base";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -50,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-fjCz3YGnA4D/dVT5mEcdaZb/drvm/FRHCW+FHiRHPJ8=";
|
||||
hash = "sha256-62USDE7nm3oVPDwZctXAFYwhUYd8xR7Hclu6V0lnnUk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -66,13 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
orc
|
||||
glib
|
||||
gstreamer
|
||||
# docs
|
||||
# TODO add hotdoc here
|
||||
gobject-introspection
|
||||
] ++ lib.optional enableWayland wayland;
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
] ++ lib.optionals enableWayland [
|
||||
wayland
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
graphene
|
||||
orc
|
||||
libtheora
|
||||
libintl
|
||||
|
|
@ -91,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
alsa-lib
|
||||
] ++ lib.optionals enableX11 [
|
||||
libXext
|
||||
libXi
|
||||
libXv
|
||||
] ++ lib.optionals enableWayland [
|
||||
wayland
|
||||
|
|
@ -104,10 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
"-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
|
||||
# See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
|
||||
"-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dtests=disabled"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -11,33 +11,32 @@
|
|||
, makeWrapper
|
||||
, libcap
|
||||
, libunwind
|
||||
, darwin
|
||||
, elfutils # for libdw
|
||||
, bash-completion
|
||||
, lib
|
||||
, Cocoa
|
||||
, CoreServices
|
||||
, gobject-introspection
|
||||
, testers
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gstreamer";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
"out"
|
||||
"dev"
|
||||
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs, see:
|
||||
# - https://github.com/NixOS/nixpkgs/pull/98767
|
||||
# - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551
|
||||
];
|
||||
|
||||
src = let
|
||||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-YH2vZLu9X7GK+dF+IcDSLE1wL//oOyPLItGxryyiOio=";
|
||||
hash = "sha256-sq/nNgOSHGCLpIlp27fXQ3dnRL/l2AWeziQRN7f4jiE=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
@ -57,11 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
glib
|
||||
bash-completion
|
||||
gobject-introspection
|
||||
|
||||
# documentation
|
||||
# TODO add hotdoc here
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libcap # for setcap binary
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -72,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libunwind
|
||||
elfutils
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
CoreServices
|
||||
];
|
||||
|
||||
|
|
@ -82,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mesonFlags = [
|
||||
"-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
|
||||
"-Dlibunwind=disabled"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
}:
|
||||
|
||||
{
|
||||
gstreamer = callPackage ./core { inherit CoreServices; };
|
||||
gstreamer = callPackage ./core { inherit Cocoa CoreServices; };
|
||||
|
||||
gstreamermm = callPackage ./gstreamermm { };
|
||||
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
gst-plugins-good = callPackage ./good { inherit Cocoa; };
|
||||
|
||||
gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
|
||||
gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation Cocoa CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
|
||||
|
||||
gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; };
|
||||
|
||||
|
|
|
|||
|
|
@ -11,21 +11,22 @@
|
|||
, python3
|
||||
, gobject-introspection
|
||||
, json-glib
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-devtools";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-u71F6tcDNn6o9L6bPAgte2K+9HskCjkIPyeETih1jEc=";
|
||||
hash = "sha256-62JybT4nqHgjaaJP1jZKiIXtJGKzu9qwkd/8gTnuBtg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
@ -37,9 +38,8 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
|
||||
# documentation
|
||||
# TODO add hotdoc here
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,21 +12,22 @@
|
|||
, flex
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-editing-services";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-X9iW3mn74kQh62sP+NL4tMPLo/MCXOrNMCFy85qKuqI=";
|
||||
hash = "sha256-RTsUZPw4V94mmnyw69lmr+Ahcdl772cqC4oKbUPgzr8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,9 +38,8 @@ stdenv.mkDerivation rec {
|
|||
gobject-introspection
|
||||
python3
|
||||
flex
|
||||
|
||||
# documentation
|
||||
# TODO add hotdoc here
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
, twolame
|
||||
, gtkSupport ? false, gtk3
|
||||
, qt5Support ? false, qt5
|
||||
, qt6Support ? false, qt6
|
||||
, raspiCameraSupport ? false, libraspberrypi
|
||||
, enableJack ? true, libjack2
|
||||
, libXdamage
|
||||
|
|
@ -43,19 +44,21 @@
|
|||
, libgudev
|
||||
, wavpack
|
||||
, glib
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-good";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-+PPCBr9c2rwAlTkgtHs1da8O8V6fhxwLaWb20KpYaLc=";
|
||||
hash = "sha256-fIzFlCXysjL2DKfRPlbt1hXaT3Eec90Bp8/6Rua8DN0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -72,8 +75,13 @@ stdenv.mkDerivation rec {
|
|||
orc
|
||||
libshout
|
||||
glib
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
] ++ lib.optionals qt5Support (with qt5; [
|
||||
qtbase
|
||||
]) ++ lib.optionals qt6Support (with qt6; [
|
||||
qtbase
|
||||
qttools
|
||||
]) ++ lib.optionals stdenv.isLinux [
|
||||
wayland-protocols
|
||||
];
|
||||
|
|
@ -114,6 +122,10 @@ stdenv.mkDerivation rec {
|
|||
qtdeclarative
|
||||
qtwayland
|
||||
qtx11extras
|
||||
]) ++ lib.optionals qt6Support (with qt6; [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtwayland
|
||||
]) ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
|
|
@ -129,10 +141,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
"-Dglib-asserts=disabled" # asserts should be disabled on stable releases
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
] ++ lib.optionals (!qt5Support) [
|
||||
"-Dqt5=disabled"
|
||||
] ++ lib.optionals (!qt6Support) [
|
||||
"-Dqt6=disabled"
|
||||
] ++ lib.optionals (!gtkSupport) [
|
||||
"-Dgtk3=disabled"
|
||||
] ++ lib.optionals (!enableJack) [
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
, gst-plugins-base
|
||||
, gettext
|
||||
, libav
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
# Note that since gst-libav-1.6, libav is actually ffmpeg. See
|
||||
|
|
@ -16,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-libav";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-P+3RBWD836obZGLL95o4xOe1fX85A1k5P8DO9tvyff4=";
|
||||
hash = "sha256-/Kr5h4/o87yCMX7xOhVYgky2jfH4loxnl/VWxeM7z/0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
@ -31,6 +33,8 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -40,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,21 +9,22 @@
|
|||
, gobject-introspection
|
||||
, gst-plugins-base
|
||||
, gst-plugins-bad
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-rtsp-server";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-7kAnGL6bEn8OXmbKTBtPQuSSbsk7owe3zMpdxsyXlMo=";
|
||||
hash = "sha256-K+Suz7iHEBAOpxFe0CFkA+gJQ0Tr8UYJQnG41Nc4KL8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,9 +34,8 @@ stdenv.mkDerivation rec {
|
|||
gobject-introspection
|
||||
pkg-config
|
||||
python3
|
||||
|
||||
# documentation
|
||||
# TODO add hotdoc here
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -20,17 +20,19 @@
|
|||
, CoreFoundation
|
||||
, DiskArbitration
|
||||
, enableGplPlugins ? true
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-ugly";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-jKogeJoJwwS0nPVj0zzKlCGxh1uE/MGH5KOF+gHWrv0=";
|
||||
hash = "sha256-jzD0TbC9BjcJv2++VROOOpivCry2HDYPNVgrvhDoBpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,6 +41,8 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -60,8 +64,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
"-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
] ++ (if enableGplPlugins then [
|
||||
"-Dgpl=enabled"
|
||||
] else [
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, bzip2
|
||||
, libva
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, libdrm
|
||||
, udev
|
||||
, xorg
|
||||
|
|
@ -17,21 +18,22 @@
|
|||
, nasm
|
||||
, libvpx
|
||||
, python3
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gstreamer-vaapi";
|
||||
version = "1.20.3";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-bumesxar3emtNwApFb2MOGeRj2/cdLfPKsTBrg1pC0U=";
|
||||
hash = "sha256-0uZC+XRfl9n3On9Qhedlmpox/iCbd05uRdrgQbQ13wY=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -40,9 +42,9 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
python3
|
||||
bzip2
|
||||
|
||||
# documentation
|
||||
# TODO add hotdoc here
|
||||
wayland
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
|
|||
gst-plugins-bad
|
||||
libva
|
||||
wayland
|
||||
wayland-protocols
|
||||
libdrm
|
||||
udev
|
||||
xorg.libX11
|
||||
|
|
@ -65,9 +68,11 @@ stdenv.mkDerivation rec {
|
|||
libvpx
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dvulkan=enabled"
|
||||
] ++ lib.optionals (!cupsSupport) [
|
||||
"-Dprint-cups=disabled"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [
|
||||
"-Dmedia-gstreamer=disabled" # requires gstreamer-gl
|
||||
] ++ lib.optionals (!x11Support) [
|
||||
"-Dx11-backend=false"
|
||||
|
|
|
|||
|
|
@ -15,10 +15,17 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# CMakeLists.txt by default points to $out
|
||||
"-DINSTALL_INCLUDEDIR=${placeholder "dev"}/include"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AOSP libldac dispatcher";
|
||||
homepage = "https://github.com/EHfive/ldacBT";
|
||||
|
|
|
|||
|
|
@ -22,8 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
cmocka # cmake expects cmocka module
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON"
|
||||
++ lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
|
||||
, callPackage
|
||||
|
||||
# for passthru.tests
|
||||
, imagemagick
|
||||
, libheif
|
||||
|
|
@ -11,7 +14,7 @@
|
|||
, gst_all_1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
version = "1.0.11";
|
||||
pname = "libde265";
|
||||
|
||||
|
|
@ -22,6 +25,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-0aRUh5h49fnjBjy42A5fWYHnhnQ4CFoeSIXZilZewW8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-27102.patch";
|
||||
url = "https://github.com/strukturag/libde265/commit/0b1752abff97cb542941d317a0d18aa50cb199b1.patch";
|
||||
sha256 = "sha256-q0NKuk2r5RQT9MJpRO3CTPj6VqYRBnffs9yZ+GM+lNc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-27103.patch";
|
||||
url = "https://github.com/strukturag/libde265/commit/d6bf73e765b7a23627bfd7a8645c143fd9097995.patch";
|
||||
sha256 = "sha256-vxciVzSuVCVDpdz+TKg2tMWp2ArubYji5GLaR9VP4F0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -29,6 +45,10 @@ stdenv.mkDerivation rec {
|
|||
passthru.tests = {
|
||||
inherit imagemagick libheif imlib2Full;
|
||||
inherit (gst_all_1) gst-plugins-bad;
|
||||
|
||||
test-corpus-decode = callPackage ./test-corpus-decode.nix {
|
||||
libde265 = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -38,4 +58,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ gebner ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
48
pkgs/development/libraries/libde265/test-corpus-decode.nix
Normal file
48
pkgs/development/libraries/libde265/test-corpus-decode.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libde265
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libde265-test-corpus-decode";
|
||||
version = "unstable-2020-02-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strukturag";
|
||||
repo = "libde265-data";
|
||||
rev = "bdfdfdbe682f514c5185c270c74eac42731a7fa8";
|
||||
sha256 = "sha256-fOgu7vMoyH30Zzbkfm4a6JVDZtYLO/0R2syC2Wux+Z8=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ libde265 ];
|
||||
# based on invocations in https://github.com/strukturag/libde265/blob/0b1752abff97cb542941d317a0d18aa50cb199b1/scripts/ci-run.sh
|
||||
checkPhase = ''
|
||||
echo "Single-threaded:"
|
||||
find . -name '*.bin' | while read f; do
|
||||
echo "Decoding $f"
|
||||
dec265 -q -c $f
|
||||
dec265 -0 -q -c $f
|
||||
dec265 -q --disable-deblocking --disable-sao $f
|
||||
done
|
||||
echo "Multi-threaded:"
|
||||
find RandomAccess/ -name '*.bin' | while read f; do
|
||||
echo "Decoding $f"
|
||||
dec265 -t 4 -q -c $f
|
||||
dec265 -t 4 -0 -q -c $f
|
||||
dec265 -t 4 -q --disable-deblocking --disable-sao $f
|
||||
done
|
||||
'';
|
||||
# a larger corpus of files can be found
|
||||
# as an ubuntu package libde265-teststreams @
|
||||
# https://launchpad.net/~strukturag/+archive/ubuntu/libde265/+packages
|
||||
# but it is *much* larger
|
||||
|
||||
installPhase = ''
|
||||
touch $out
|
||||
'';
|
||||
}
|
||||
|
|
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0qdg3r7k086wzszr969s0ljlqdvfqm31zpl8p5h397bw076zr6p2";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-7t1CoLus3rPba9paapM7+H3qpdsw7FlzJsSHFwM/2Lk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja edid-decode python3 ];
|
||||
|
||||
buildInputs = [ hwdata ];
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson pkg-config ninja edid-decode hwdata python3 ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs tool/gen-search-table.py
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
{ lib, stdenv, fetchpatch, fetchurl, libgpg-error, enableCapabilities ? false, libcap }:
|
||||
|
||||
assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgcrypt";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/libgcrypt/libgcrypt-${version}.tar.bz2";
|
||||
sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
name = "fix-x86_64-apple-darwin.patch";
|
||||
sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi";
|
||||
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=71939faa7c54e7b4b28d115e748a85f134876a02";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ libgpg-error ]
|
||||
++ lib.optional enableCapabilities libcap;
|
||||
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
postInstall = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
|
||||
'' + lib.optionalString enableCapabilities ''
|
||||
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/libgcrypt/";
|
||||
description = "General-pupose cryptographic library";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.all;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2014-3591"
|
||||
"CVE-2015-0837"
|
||||
"CVE-2015-7511"
|
||||
"CVE-2017-0379"
|
||||
"CVE-2017-7526"
|
||||
"CVE-2017-9526"
|
||||
"CVE-2018-0495"
|
||||
"CVE-2018-6829"
|
||||
"CVE-2018-12437"
|
||||
];
|
||||
};
|
||||
}
|
||||
75
pkgs/development/libraries/libgcrypt/1.8.nix
Normal file
75
pkgs/development/libraries/libgcrypt/1.8.nix
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, libgpg-error
|
||||
, enableCapabilities ? false, libcap
|
||||
, buildPackages
|
||||
# for passthru.tests
|
||||
, gnupg
|
||||
, libotr
|
||||
, rsyslog
|
||||
}:
|
||||
|
||||
assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgcrypt";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/libgcrypt/libgcrypt-${version}.tar.bz2";
|
||||
sha256 = "sha256-aJaRVQH5UeI9AtywRTRpwswiqk13oAH/c6JkfC0p590=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
outputBin = "dev";
|
||||
|
||||
# The CPU Jitter random number generator must not be compiled with
|
||||
# optimizations and the optimize -O0 pragma only works for gcc.
|
||||
# The build enables -O2 by default for everything else.
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "fortify";
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
buildInputs = [ libgpg-error ]
|
||||
++ lib.optional enableCapabilities libcap;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ]
|
||||
++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157
|
||||
|
||||
# Necessary to generate correct assembly when compiling for aarch32 on
|
||||
# aarch64
|
||||
configurePlatforms = [ "host" "build" ];
|
||||
|
||||
postConfigure = ''
|
||||
sed -i configure \
|
||||
-e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/'
|
||||
'';
|
||||
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
postFixup = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
|
||||
'' + lib.optionalString enableCapabilities ''
|
||||
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit gnupg libotr rsyslog;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/libgcrypt/";
|
||||
changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
|
||||
description = "General-purpose cryptographic library";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.all;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2018-12437" # CVE is about LibTomCrypt
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libhwy";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "highway";
|
||||
rev = version;
|
||||
hash = "sha256-CHzDLzOnu/QfejWiRKE9I5UUyRxoEooNtYVe8FQwu7c=";
|
||||
hash = "sha256-bQtfye+gn7GOyzCtji4st5hsV40rPzuaYDP7N1tZ8wg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libinput";
|
||||
version = "1.22.1";
|
||||
version = "1.23.0";
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "libinput";
|
||||
repo = "libinput";
|
||||
rev = version;
|
||||
sha256 = "RgwEp60Anr+CpJws6srIv/Qzk2r9NoekeNQ0UT3FRZ0=";
|
||||
sha256 = "7Wxriy1fVsfAhcfhOhuvLehhmQYrQ2IgZTK53bt12HI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -132,5 +132,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members;
|
||||
changelog = "https://gitlab.freedesktop.org/libinput/libinput/-/releases/${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, lib, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, brotli
|
||||
, cmake
|
||||
, giflib
|
||||
|
|
@ -33,6 +34,15 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Add missing <atomic> content to fix gcc compilation for RISCV architecture
|
||||
# https://github.com/libjxl/libjxl/pull/2211
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch";
|
||||
hash = "sha256-X4fbYTMS+kHfZRbeGzSdBW5jQKw8UN44FEyFRUtw0qo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gtest
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ stdenv.mkDerivation {
|
|||
sha256 = "sha256-Be+dPUnxC2+cHzqL2FAqXOU7NjEAHiPBKh7spuYkvhc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
|||
|
|
@ -4,6 +4,13 @@ stdenv.mkDerivation rec {
|
|||
pname = "libmodplug";
|
||||
version = "0.8.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure \
|
||||
--replace ' -mmacosx-version-min=10.5' "" \
|
||||
|
|
@ -17,9 +24,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnice";
|
||||
version = "0.1.18";
|
||||
version = "0.1.21";
|
||||
|
||||
outputs = [ "bin" "out" "dev" ]
|
||||
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1x3kj9b3dy9m2h6j96wgywfamas1j8k2ca43k5v82kmml9dx5asy";
|
||||
hash = "sha256-cuc6Ks8g9ZCT4h1WAWBuQFhzUD6zXzRvpiHeI+mbOzk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpcap";
|
||||
version = "1.10.3";
|
||||
version = "1.10.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-KoiFxANRbPewkz7UsU1sqjDgIFJInr1BTcdaxS51WeY=";
|
||||
hash = "sha256-7RmgOD+tcuOtQ1/SOdfNgNZJFrhyaVUBWdIORxYOvl8=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libnl ]
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
|
|||
pname = "libqmi";
|
||||
version = "1.32.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputs = [ "out" "dev" ]
|
||||
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
|
|
@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
gobject-introspection
|
||||
python3
|
||||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
|
|
@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dudevdir=${placeholder "out"}/lib/udev"
|
||||
(lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform))
|
||||
(lib.mesonBool "introspection" (stdenv.buildPlatform == stdenv.hostPlatform))
|
||||
(lib.mesonBool "man" (stdenv.buildPlatform == stdenv.hostPlatform))
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
|
|
@ -12,7 +13,7 @@
|
|||
, xz
|
||||
, zlib
|
||||
|
||||
# for passthru.tests
|
||||
# for passthru.tests
|
||||
, libgeotiff
|
||||
, python3Packages
|
||||
, imagemagick
|
||||
|
|
@ -84,9 +85,13 @@ stdenv.mkDerivation rec {
|
|||
# sure cross-compilation works first!
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config sphinx ];
|
||||
|
||||
propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
|
||||
|
||||
buildInputs = [ libdeflate ];
|
||||
# TODO: opengl support (bogus configure detection)
|
||||
propagatedBuildInputs = [
|
||||
libdeflate
|
||||
libjpeg
|
||||
xz
|
||||
zlib
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
|
||||
|
||||
buildInputs = [ libdrm ]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
|
||||
, fetchpatch
|
||||
, threadingSupport ? true # multi-threading
|
||||
, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp)
|
||||
, pngSupport ? true, libpng # PNG image format
|
||||
|
|
@ -36,6 +37,15 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-nhXkq+qKpaa75YQB/W/cRozslTIFPdXeqj1y6emQeHk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://www.mozilla.org/en-US/security/advisories/mfsa2023-13/#MFSA-TMP-2023-0001
|
||||
(fetchpatch {
|
||||
url = "https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129.patch";
|
||||
name = "fix-msfa-tmp-2023-0001.patch";
|
||||
hash = "sha256-TRKXpNkYVzftBw09mX+WeQRhRoOzBgXFTNZBzSdCKvc=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature threadingSupport "threading")
|
||||
(lib.enableFeature openglSupport "gl")
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ in
|
|||
let
|
||||
libxml = stdenv.mkDerivation rec {
|
||||
pname = "libxml2";
|
||||
version = "2.10.3";
|
||||
version = "2.10.4";
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ]
|
||||
++ lib.optional pythonSupport "py"
|
||||
|
|
@ -43,7 +43,7 @@ libxml = stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
|
||||
sha256 = "XSzD14vsPb4hKp1/pimtolp9qSivQyyTBg/1wX7iipw=";
|
||||
sha256 = "7QyRxYRQCPGTZznk7uIDVTHByUdCxlQfRO5m2IWUjUU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
import ./generic.nix {
|
||||
version = "23.0.1";
|
||||
hash = "sha256-6OWGhWtViTq66b3NuYtBwIHZCbsfrzcubnJiMHvzSt8=";
|
||||
}
|
||||
4
pkgs/development/libraries/mesa/23.0.nix
Normal file
4
pkgs/development/libraries/mesa/23.0.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
import ./generic.nix {
|
||||
version = "23.0.3";
|
||||
hash = "sha256-OGNipdgN87CWY2tn80Dhzme3BbRHZ9W90R0u0QNxktU=";
|
||||
}
|
||||
|
|
@ -133,13 +133,6 @@ self = stdenv.mkDerivation {
|
|||
|
||||
./opencl.patch
|
||||
./disk_cache-include-dri-driver-path-in-cache-key.patch
|
||||
|
||||
# FIXME: submitted upstream at https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22133
|
||||
# Remove when no longer applicable
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/1457f1b752f59258c0b33558619b0063b4ce6280.diff";
|
||||
hash = "sha256-WFemyfmCWY4rJMfGxVZdYeGQvGcOTEDMrRt5OIWp348=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -28,9 +28,13 @@ stdenv.mkDerivation rec {
|
|||
# mpfr.h requires gmp.h
|
||||
propagatedBuildInputs = [ gmp ];
|
||||
|
||||
configureFlags =
|
||||
lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++
|
||||
lib.optional stdenv.hostPlatform.is64bit "--with-pic";
|
||||
configureFlags = lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe"
|
||||
++ lib.optional stdenv.hostPlatform.is64bit "--with-pic"
|
||||
++ lib.optional stdenv.hostPlatform.isPower64 [
|
||||
# Without this, the `tget_set_d128` test experiences a link
|
||||
# error due to missing `__dpd_trunctdkf`.
|
||||
"--disable-decimal-float"
|
||||
];
|
||||
|
||||
doCheck = true; # not cross;
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ libdeflate libpng libtiff zlib lcms2 ]
|
||||
buildInputs = [ libpng libtiff zlib lcms2 ]
|
||||
++ lib.optionals jpipServerSupport [ curl fcgi ]
|
||||
++ lib.optional (jpipLibSupport) jdk;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils
|
||||
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils, writeShellScript
|
||||
, makeWrapper
|
||||
, withCryptodev ? false, cryptodev
|
||||
, withZlib ? false, zlib
|
||||
, enableSSL2 ? false
|
||||
, enableSSL3 ? false
|
||||
, enableKTLS ? stdenv.isLinux
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
# Used to avoid cross compiling perl, for example, in darwin bootstrap tools.
|
||||
# This will cause c_rehash to refer to perl via the environment, but otherwise
|
||||
# will produce a perfectly functional openssl binary and library.
|
||||
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
# path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default
|
||||
, conf ? null
|
||||
, removeReferencesTo
|
||||
|
|
@ -72,12 +69,9 @@ let
|
|||
!(stdenv.hostPlatform.useLLVM or false) &&
|
||||
stdenv.cc.isGNU;
|
||||
|
||||
nativeBuildInputs = [ perl ]
|
||||
nativeBuildInputs = [ makeWrapper perl ]
|
||||
++ lib.optionals static [ removeReferencesTo ];
|
||||
buildInputs = lib.optional withCryptodev cryptodev
|
||||
# perl is included to allow the interpreter path fixup hook to set the
|
||||
# correct interpreter in c_rehash.
|
||||
++ lib.optional withPerl perl
|
||||
++ lib.optional withZlib zlib;
|
||||
|
||||
# TODO(@Ericson2314): Improve with mass rebuild
|
||||
|
|
@ -172,23 +166,17 @@ let
|
|||
|
||||
# 'etc' is a separate output on static builds only.
|
||||
etc=$out
|
||||
'') + lib.optionalString (!stdenv.hostPlatform.isWindows)
|
||||
# Fix bin/c_rehash's perl interpreter line
|
||||
#
|
||||
# - openssl 1_0_2: embeds a reference to buildPackages.perl
|
||||
# - openssl 1_1: emits "#!/usr/bin/env perl"
|
||||
#
|
||||
# In the case of openssl_1_0_2, reset the invalid reference and let the
|
||||
# interpreter hook take care of it.
|
||||
#
|
||||
# In both cases, if withPerl = false, the intepreter line is expected be
|
||||
# "#!/usr/bin/env perl"
|
||||
''
|
||||
substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl"
|
||||
'' + ''
|
||||
'') + ''
|
||||
mkdir -p $bin
|
||||
mv $out/bin $bin/bin
|
||||
|
||||
# c_rehash is a legacy perl script with the same functionality
|
||||
# as `openssl rehash`
|
||||
# this wrapper script is created to maintain backwards compatibility without
|
||||
# depending on perl
|
||||
makeWrapper $bin/bin/openssl $bin/bin/c_rehash \
|
||||
--add-flags "rehash"
|
||||
|
||||
mkdir $dev
|
||||
mv $out/include $dev/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in
|
||||
index 6464839a0..05546201f 100644
|
||||
index 9c885a38f..c474eb45d 100644
|
||||
--- a/src/daemon/minimal.conf.in
|
||||
+++ b/src/daemon/minimal.conf.in
|
||||
@@ -110,7 +110,7 @@ context.modules = [
|
||||
@@ -111,7 +111,7 @@ context.modules = [
|
||||
# access.allowed to list an array of paths of allowed
|
||||
# apps.
|
||||
#access.allowed = [
|
||||
|
|
@ -11,7 +11,7 @@ index 6464839a0..05546201f 100644
|
|||
#]
|
||||
|
||||
# An array of rejected paths.
|
||||
@@ -298,5 +298,5 @@ context.exec = [
|
||||
@@ -359,5 +359,5 @@ context.exec = [
|
||||
# It can be interesting to start another daemon here that listens
|
||||
# on another address with the -a option (eg. -a tcp:4713).
|
||||
#
|
||||
|
|
@ -19,10 +19,10 @@ index 6464839a0..05546201f 100644
|
|||
+ #@pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" }
|
||||
]
|
||||
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
|
||||
index a948a1b9b..4ece43c6f 100644
|
||||
index 697bf094d..3a7b54ddd 100644
|
||||
--- a/src/daemon/pipewire.conf.in
|
||||
+++ b/src/daemon/pipewire.conf.in
|
||||
@@ -132,7 +132,7 @@ context.modules = [
|
||||
@@ -142,7 +142,7 @@ context.modules = [
|
||||
# access.allowed to list an array of paths of allowed
|
||||
# apps.
|
||||
#access.allowed = [
|
||||
|
|
@ -31,18 +31,20 @@ index a948a1b9b..4ece43c6f 100644
|
|||
#]
|
||||
|
||||
# An array of rejected paths.
|
||||
@@ -246,12 +246,12 @@ context.exec = [
|
||||
@@ -294,7 +294,7 @@ context.exec = [
|
||||
# but it is better to start it as a systemd service.
|
||||
# Run the session manager with -h for options.
|
||||
#
|
||||
- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
|
||||
+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
|
||||
- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@"
|
||||
+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@"
|
||||
@sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] }
|
||||
#
|
||||
# You can optionally start the pulseaudio-server here as well
|
||||
# but it is better to start it as a systemd service.
|
||||
@@ -302,6 +302,6 @@ context.exec = [
|
||||
# It can be interesting to start another daemon here that listens
|
||||
# on another address with the -a option (eg. -a tcp:4713).
|
||||
#
|
||||
- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
|
||||
+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" }
|
||||
- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf"
|
||||
+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf"
|
||||
@pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] }
|
||||
]
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ let
|
|||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "pipewire";
|
||||
version = "0.3.68";
|
||||
version = "0.3.70";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -91,7 +91,7 @@ let
|
|||
owner = "pipewire";
|
||||
repo = "pipewire";
|
||||
rev = version;
|
||||
sha256 = "sha256-dm+mgtvXJEBjCYMBbiBHZq42ikfsEDaybMzLMPLxBcE=";
|
||||
sha256 = "sha256-xhJzE6JcfNcLMm+TqTIPaBEnEthEqUZiTqhWz1fO5Ng=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -107,13 +107,6 @@ let
|
|||
./0090-pipewire-config-template-paths.patch
|
||||
# Place SPA data files in lib output to avoid dependency cycles
|
||||
./0095-spa-data-dir.patch
|
||||
|
||||
# backport patch fixing no sound in some cases
|
||||
# FIXME: remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8748c77451ce332dd24549b414200499ede4f184.diff";
|
||||
hash = "sha256-nxWszqLUbO1XS/DWIBYrGpVZFy2c5+E2V9dlBMekShM=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ let
|
|||
|
||||
wrapQtAppsHook = makeSetupHook {
|
||||
name = "wrap-qt5-apps-hook";
|
||||
propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeWrapper ]
|
||||
propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ]
|
||||
++ lib.optional stdenv.isLinux self.qtwayland.dev;
|
||||
} ../hooks/wrap-qt-apps-hook.sh;
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
|
|
|
|||
|
|
@ -1,207 +1,207 @@
|
|||
{
|
||||
"qt3d": {
|
||||
"url": "https://invent.kde.org/qt/qt/qt3d.git",
|
||||
"rev": "c3c7e6ebc29cce466d954f72f340a257d76b5ec2",
|
||||
"sha256": "13ixg0gx7sp90k0db2xn7r2rj1w3zw3vs84pav0v8fwfvph9ki98"
|
||||
"rev": "e94b0fa39a2f4bf260969fb18bf075dba39b2df1",
|
||||
"sha256": "0mc7rym5pngpwpjghih7afjlyvvrlpdzw1wrbggykpmm8vrk5hzv"
|
||||
},
|
||||
"qtactiveqt": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
|
||||
"rev": "2334cafc110c4e63bec3a5c7abdcd67e5e5ee754",
|
||||
"sha256": "0p7pydqsrws5x9l74y37ldffd3yz4riyizl8669x6y6hj6177yd3"
|
||||
"rev": "38635c3b343ce30b71e44c5a59f2f7393fba8259",
|
||||
"sha256": "010jh2vdlymaxs1wd0agzb2gvgms9xrhs4vb5bjiiq5pys1sgkbp"
|
||||
},
|
||||
"qtandroidextras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
|
||||
"rev": "7ede0a6c555518a3fecba8930d5e4d9c58875d0d",
|
||||
"sha256": "0nvdrbqm469iikkvzwjni3zb7dxwpy3x161m9yly4irklixhxkzh"
|
||||
"rev": "b458aee3f907f2ce1880ad4031abecb2a1eab90a",
|
||||
"sha256": "14vn9k80ilc2smaflnamyg5k0ddj3n4m123yfwb79rfg3lddhvs5"
|
||||
},
|
||||
"qtbase": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtbase.git",
|
||||
"rev": "6c09620dc84900c31a2d307a8640dbc15b1fcfdd",
|
||||
"sha256": "0nr8xlfdrgjr6rrd5f99p8vzlxx6n8xch5l2z95pb2lx4w4pz26q"
|
||||
"rev": "d3b21bc8b70eaa1af848371dc1d34c4617c1f73c",
|
||||
"sha256": "11yww09fgcqsxv4sk4cflxdsdpdqc0x9b3qw63asfpwrnv9qry0a"
|
||||
},
|
||||
"qtcharts": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtcharts.git",
|
||||
"rev": "e30be213e483f2d6f3c40af0cbdc11a8e92e2026",
|
||||
"sha256": "0vn1xh40lxa6vi87vr6qpskli2vh47mxi3d5srhf8rark0m51lf4"
|
||||
"rev": "3d4a84eb6d62ce22a47794f309f9268729ac375f",
|
||||
"sha256": "047hl5hd0l337b7bsc28lfx9p9jbrnqswfdk80ndvgvp96ziblg5"
|
||||
},
|
||||
"qtconnectivity": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
|
||||
"rev": "2d241e0b79971917845a6ed448e838ef273d73d7",
|
||||
"sha256": "15zk9q1n9yfg4nkr0rs7agsvzim8nlrqzm1h4h9r0iwr91g9vqp5"
|
||||
"rev": "0f9e49cde3b7ca40cd94e63d2f5d29f5b586d3d6",
|
||||
"sha256": "1iwqa98ihzqqpqgwsj0lm4zkfwgag9k634sxjnx6gxvfq0h6d4nx"
|
||||
},
|
||||
"qtdatavis3d": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
|
||||
"rev": "9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005",
|
||||
"sha256": "151650nqq29m99cbf7ac02vxzw4ivm4spr4kd2ss3gwhfxby3zgj"
|
||||
"rev": "7636478bb30f0af8afe9af429eb8512d6fbcc11b",
|
||||
"sha256": "08xkhxwp5mlcp4q45adqn58p37wn2z2zabw23f51qvfw8rir9g62"
|
||||
},
|
||||
"qtdeclarative": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
|
||||
"rev": "05c3f4921d81fb1b0eb497515c24ae56221d1e0a",
|
||||
"sha256": "0101bbpnrj4rp51dcnn2gjcq7vw55g4c8y4lmg2nd5g69whmkl1c"
|
||||
"rev": "0e1bed3c3e27d44d86d6f68a8b93b96a4821575c",
|
||||
"sha256": "0v4c3pls67ww6ffiscbp05yb2vv583zrxj8p4jcy3yxa06khniy5"
|
||||
},
|
||||
"qtdoc": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtdoc.git",
|
||||
"rev": "79d6ef693b6241db4a86a90943c02180c4944214",
|
||||
"sha256": "0ldskh9dd8qwa96nz1q5sbb8r2jdfcxvq589dyw87m3gpb8v16qq"
|
||||
"rev": "701325d57940c6e54353d0d4b6c3ebac6f9688a3",
|
||||
"sha256": "01x2075d71z3ag99dppixs1y85zrr0vck0piah62l9n0v3wz4r6p"
|
||||
},
|
||||
"qtgamepad": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtgamepad.git",
|
||||
"rev": "ad63dc64f4bdafb503f7015d04e8849cef5d99b4",
|
||||
"sha256": "06ag3cmg56f4z9pc3ix9lddz5ydx48pf438xc2l1z3x4wxbkfbsy"
|
||||
"rev": "7c05744e38d44afac687df3349d548c8790837db",
|
||||
"sha256": "0j8rak512f96i0wy4n0d4fjsgfzn283k2kfpn93d2blld4r2rd5s"
|
||||
},
|
||||
"qtgraphicaleffects": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
|
||||
"rev": "4119e4e6dc94447d773a01c1d6e4de0fefb9235a",
|
||||
"sha256": "0sdywxrbjzz9qmrywd54hqqssv59b9mlvra16hjxfd0di50brab2"
|
||||
"rev": "06cfcbb6940d2729f5a6575e264873ce65ac99c3",
|
||||
"sha256": "02jc7q7ijmhmffdp2ql2j3fw8ag7q98xlq40pywmzgrf1ggb34sw"
|
||||
},
|
||||
"qtimageformats": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtimageformats.git",
|
||||
"rev": "dbc9c396199ef78e820b40ddb8a4e76c0a86d48c",
|
||||
"sha256": "18dhnvkv9hialjfcm80g9y38fsxfcfk4fgrrsm3hy2yda6a6g1c6"
|
||||
"rev": "c249f58541afa45955c23b75c1fb88c5e3e4d18b",
|
||||
"sha256": "025fxiy6ahgfqw3w7a08r2ff4ry2m1qn65haimpnn6bmi4vp88m8"
|
||||
},
|
||||
"qtlocation": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtlocation.git",
|
||||
"rev": "435f931a7e42172e12ceba8f0d9da06ba4ec0bee",
|
||||
"sha256": "1p7hz09jv8whlv0m39cnjz3yc6pjzyxkc8zinl6f0qmrska6m4gp"
|
||||
"rev": "2a8a48e9101236f118c2c4f0d79fae9c9d7b3f2a",
|
||||
"sha256": "0ajvlqkm2641ahms34kg6a2hykvql1hxlm5nsaba7233hnfv3nsy"
|
||||
},
|
||||
"qtlottie": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtlottie.git",
|
||||
"rev": "56f94cb8e2da9801ada7aa06f86ccf807f5a4ed8",
|
||||
"sha256": "1pyshl395qmf84h5lyw3rgn3gmz98sm1dq003jvr74w9i746hszf"
|
||||
"rev": "f9f123a97989638c36b5c2b03f4ff6261ddaed9a",
|
||||
"sha256": "06b5rjzqd1630c87spldxxd0bvkb94sbnaxwxbi7ac74k35ydq7s"
|
||||
},
|
||||
"qtmacextras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtmacextras.git",
|
||||
"rev": "bc397be87f9b02e8279cfe2fc9b893c9f95219b9",
|
||||
"sha256": "1dr8a7sv00dmk1hc6kzs93rhvjk2wkxx0mxl7riafdzxzyajcl7n"
|
||||
"rev": "209e3ddcf0a6b48ff47a7dc97f2ea38470c8780d",
|
||||
"sha256": "09aipbnalb44w6g3kzm9dc84ls2xmp1clwmy5zd012xsvjwqd3h5"
|
||||
},
|
||||
"qtmultimedia": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
|
||||
"rev": "32557dbe01ba66005b8e28b38033eeee9819a4c6",
|
||||
"sha256": "09mds5v3b3jq34r40hqg2a39q16p4q648wda7cqgm2yp249j06g8"
|
||||
"rev": "ff4c7bc3bf7ba4b748fdeb9d09887271c2b28505",
|
||||
"sha256": "14wx49mkqqzvwzhbx3jhbrjngq4vb3x2kmgzrq7f6nri0g7dpss8"
|
||||
},
|
||||
"qtnetworkauth": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
|
||||
"rev": "f082a4c84c54e888b8d023ba68b7085551403425",
|
||||
"sha256": "03sd0a58b8z340in4avk6lqqa9qzkzkaxnk2yn1a270sxrsq6y0l"
|
||||
"rev": "59311ee7d78a8b19d3dbe61cf49d42c5bd7c934a",
|
||||
"sha256": "1rdgfmfsqp3hdkkq6bi8vdxgrh45xzf1b2nryhnk8pid81wa2bzq"
|
||||
},
|
||||
"qtpurchasing": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
|
||||
"rev": "9dfea35b04dcb52d02d7a2883df88d89ba9999ef",
|
||||
"sha256": "0swliqwzz3b297z7y6sr79ijgv3914s2g9ymq77plxglfdrnm74j"
|
||||
"rev": "5737c10128c6eeb28c10df569c8492bb2e8f4230",
|
||||
"sha256": "0iny9npc7w7b1rz9yx659bva66rllhbfqh4af9wdwbi9ssr4x5pc"
|
||||
},
|
||||
"qtquick3d": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquick3d.git",
|
||||
"rev": "47defc8b33b7bdf1dbf289b65b301fba2def9b1c",
|
||||
"sha256": "0kfwkxln3yz0c5rd1kfjmw0y2drwm1gg2s7f52kajfvg4274ha9c"
|
||||
"rev": "ccd0284235e9e3e1f97d808125af5024d3f04140",
|
||||
"sha256": "1mfw97v60fdszab0gqxjydw00f89rx8clw3dq72zx1rgv8rn2s67"
|
||||
},
|
||||
"qtquickcontrols": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
|
||||
"rev": "18977875d16e22ad68a1dc2d7ee0a9c9f873c941",
|
||||
"sha256": "0n3930zzvp4s6m715rvx1bjh2s2fg7cadjs2hq6bc8k9mwlqibk1"
|
||||
"rev": "eb9dead185ae209dd2364d09db74d8ab613d982d",
|
||||
"sha256": "1pza9cjv49x59lvzyv45hwz01z8l9zzn8a3ssazycxvcq3w0pncb"
|
||||
},
|
||||
"qtquickcontrols2": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
|
||||
"rev": "56ce8233382a091a8476c831edd416b5f704ae4f",
|
||||
"sha256": "1h68s2fdgn1pbf5hsk6c8v4icz8c4cpbxv8iirz22yhlzabc3hdm"
|
||||
"rev": "86a84eaa74c4071e5750f23b6e9911762880d391",
|
||||
"sha256": "1zywq3ll49bzzvl6rzn4zpp96a4mdx0b9l5ic0x6zc4dr8c8jk5m"
|
||||
},
|
||||
"qtquicktimeline": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
|
||||
"rev": "4cd0142a30bfa5eef47c720ac24dd73e12764806",
|
||||
"sha256": "13vhlgxq8ap796p3y9c3kj645p0370bqjwm5hkz13pazm15sbc9z"
|
||||
"rev": "dd5d4af65890baad8baa85a445a752a877a4f7e3",
|
||||
"sha256": "1m096pskaxhzxyvz17lksg1qlni7qacvqf3z71wvwvxzgjvs5bqh"
|
||||
},
|
||||
"qtremoteobjects": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
|
||||
"rev": "929c7ad0676f084b9ecc469cd47a307596923cb3",
|
||||
"sha256": "0l94k9fdzk96j40gab2l5n4lmadzaqhvbg8s3m5f3v4im00xa2x9"
|
||||
"rev": "27b496d5aff650e4cf9a3148857c723dce10ef25",
|
||||
"sha256": "0wyf1nb6wjh4jd2n8cng7a6lzv1dkwrniabsvn1adl1nqknq7asv"
|
||||
},
|
||||
"qtscript": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtscript.git",
|
||||
"rev": "4d8e4bd20b7100b0b7192547b19c3c239aaf7034",
|
||||
"sha256": "1pvihbjjmczby4934lir3h3kq0rqcvxnbw2vdkl9lhkds3lm0qhf"
|
||||
"rev": "4f8c35a528586541ea55bb8b3361eaa6749e52b1",
|
||||
"sha256": "01jddzy51ks899mszz35lcdgmpl5czcgh5g9fb84pxdnpgaxrx9b"
|
||||
},
|
||||
"qtscxml": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtscxml.git",
|
||||
"rev": "0c93f94a44e2dce7eed9d17d4976b0c1e14be7bb",
|
||||
"sha256": "1vvzvin23ws6njhyg93s2dlkxb9p50mkipc611lsx7971gv1wih0"
|
||||
"rev": "d30a77111835395828fdcaa89a88110c5d9f6857",
|
||||
"sha256": "1yid5653653qlpk305y276gdrifdxpjzfa1629csq2b8hpwkddc2"
|
||||
},
|
||||
"qtsensors": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtsensors.git",
|
||||
"rev": "6add85fa1a234a7e1943ba175c6fc799ccbae48e",
|
||||
"sha256": "1k02x3wzczwg7cqh6hav31akdsz9kk8s0vryd3q7zfrhqy9m88sh"
|
||||
"rev": "391c710b88865a3e0311b61d93fcdbbfd6996d46",
|
||||
"sha256": "19myf3w6g64clj9msy71is7b9krkfrzcqlyza37m3pimy7x305a0"
|
||||
},
|
||||
"qtserialbus": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtserialbus.git",
|
||||
"rev": "ced5c7223d037aece1e7f37d4314f388252de025",
|
||||
"sha256": "009ajdry6lvf9pifzm2zl0w5zhkmrrxm53mjf9s76jqrsi6yqk30"
|
||||
"rev": "f8684ae6b0c12b6b21f1547fabe38b60c39f8893",
|
||||
"sha256": "0k60wibb2xis7gvx9d7q14a3sq1ij1m196ax4rfwwrzsz2vviir0"
|
||||
},
|
||||
"qtserialport": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtserialport.git",
|
||||
"rev": "e2851096dc6f6a7cfa635d69ea950b382e3658ab",
|
||||
"sha256": "071g8d9i3wi8rqqy4lxpp3z25a55pd2xwsy3r8v0a6s6y5g5lcpf"
|
||||
"rev": "7fb308ec721f034a0d673784d951577d764a8e67",
|
||||
"sha256": "1f8sjyd7ksy4420lr6vn18mzb64jm0p8mml5d2vpgp344w2jbqm0"
|
||||
},
|
||||
"qtspeech": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtspeech.git",
|
||||
"rev": "255845e2b2e605363762be25932d92fc10d32749",
|
||||
"sha256": "0apyk2z9r7i54sh0zgbs8vfncc4jrcrzzvi3q14d105pkhrschp9"
|
||||
"rev": "4856b6e231d7e2373ec8f89e861603a0d815793a",
|
||||
"sha256": "0v8lx6g43apfnyn37ccgjnq7abayplgnihx62fncgl2cpmy9nkha"
|
||||
},
|
||||
"qtsvg": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtsvg.git",
|
||||
"rev": "a7a0f2491334e8cb4ef5731f5eb741f3f7b9af76",
|
||||
"sha256": "13zpzvwqv61dsd74s92nf46rhaw2rw3hl8m6d313wjlaaqi95ln6"
|
||||
"rev": "9b5ab29cbba1908fd4928e2bda2b93e418e36187",
|
||||
"sha256": "0vnwhbkk40wj9rfy3fhjm9slra3y3j1mk67n3vnrzvmzrmpl4443"
|
||||
},
|
||||
"qttools": {
|
||||
"url": "https://invent.kde.org/qt/qt/qttools.git",
|
||||
"rev": "090e526e713d01eac34c64e4a09ad961c612febf",
|
||||
"sha256": "1zrxv9wdnqayn5hhblwyqyrdn8mj7x2ks2f4qsr2w3cdidcjjz7y"
|
||||
"rev": "5649efd376ed7dbb171905e9edebbd547d1f73eb",
|
||||
"sha256": "1c49v7pni6bljnf4ppxrrdr0h0hpw4i7s6an91m7ca18s8x4m1rb"
|
||||
},
|
||||
"qttranslations": {
|
||||
"url": "https://invent.kde.org/qt/qt/qttranslations.git",
|
||||
"rev": "af8cd030fed6a47cc1e8727e7ee5445e037bf712",
|
||||
"sha256": "14fx3r9s3p16rhv9fyrwnv6bn24nvh5xnjwcw1mb04c44ddb9r86"
|
||||
"rev": "2b802231af3eb21c3c781753aba804217f855e86",
|
||||
"sha256": "1xdp1x6qkdm0xz8yg1j2c1fpav54c1rwxlpfj116xspfik4zy7gf"
|
||||
},
|
||||
"qtvirtualkeyboard": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
|
||||
"rev": "5f66c9571303170f07954f73b09cad4cee1ce5d0",
|
||||
"sha256": "0jzl7a2zr83nd9sskmz9fk2w2spn3v821j0l7kcp2hxydgyhk8v3"
|
||||
"rev": "4191fd9098ae25ffd5917370427460842e73f0cb",
|
||||
"sha256": "0jl9dw1azh961hcakmyxavfm0w7g1a89lyj2bal8dqvv9y3089cj"
|
||||
},
|
||||
"qtwayland": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwayland.git",
|
||||
"rev": "df41e7e3e1f0e5495c5c8c52f1c9bb5a32b0da27",
|
||||
"sha256": "0f292axj0ivgwgx97zc8x744243i7lgqcxbkjxham6md81m1xbwj"
|
||||
"rev": "c4c3fc69250c01cb35aaae5ea1ea2bcc8236dff0",
|
||||
"sha256": "040wgrxr2kkshpyg3gwcggdxlxrjd7pbnr3fj8v63byx34sz2w9b"
|
||||
},
|
||||
"qtwebchannel": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
|
||||
"rev": "f8949655ccfacc2d34cfb0af23c540db84a2b9e5",
|
||||
"sha256": "1303hghvk6avshb7imnkv24qv1ij5d3nbljba20l6v6dsr7zg7ba"
|
||||
"rev": "c508ffb1996eeddfd10dda493974746e6b375080",
|
||||
"sha256": "0hs7cqfiwc0mdsa9zngackfljy7d5306mpn3rwjfi5rawd85xsp0"
|
||||
},
|
||||
"qtwebglplugin": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
|
||||
"rev": "655be6c5406f8ba42acaca363fc55d78a6198733",
|
||||
"sha256": "08biydqk1lhjzvrgl3zhbrrgnjcy611pmh9scyw42avdvj2qzpc2"
|
||||
"rev": "64beacdd2d0f6fe0796bd291c9ab33f206a333c3",
|
||||
"sha256": "1vqmxkfzggsalq2ic2b902jy0b47zkgzl95gg8dia8089vfny4kn"
|
||||
},
|
||||
"qtwebsockets": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
|
||||
"rev": "90f3590c3c49a0820462af9a778dd13d8df42244",
|
||||
"sha256": "1dxc3imh8455vy3pggrzjflb2v5382q9ha2fwplybxawld9wdw45"
|
||||
"rev": "ed7416b1b8af9de9926388408469a35f2ad6a795",
|
||||
"sha256": "1434bqqb1hm49b1acwb22b2lc9p936dlylg0m56h2pl4vv9w0v3b"
|
||||
},
|
||||
"qtwebview": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebview.git",
|
||||
"rev": "dfd86e07019488954cddcf2ba314df3cd0c01c0c",
|
||||
"sha256": "1crph9sdmxxs0787il86j2dv6k3qylmy8a83hfzczcjcx3pwcf7a"
|
||||
"rev": "23d67d0de3301dbed5d8c5880b6cf60bfa9eeb2a",
|
||||
"sha256": "16rqz6jiiswaiwa7hn6pn0cq9la8843b4jxi8di30ymq9ysivbqq"
|
||||
},
|
||||
"qtwinextras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwinextras.git",
|
||||
"rev": "48318520a4031167c4c0ad559e1a11b2f4c053d6",
|
||||
"sha256": "04smnp9pl3szizdp05dz7qmdgg8sk57d3r40sdy7v9zwi4lwaqi4"
|
||||
"rev": "44d18eaff83b7491a130e41678cadcc3ba836a8d",
|
||||
"sha256": "10fky86gcma9fwdbk3s733x7gqgxzsg6iaf9j42b0f8c2n5jhql3"
|
||||
},
|
||||
"qtx11extras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtx11extras.git",
|
||||
"rev": "e44c85e8643f2724109993a7b9eaf0dff3530fec",
|
||||
"sha256": "1vs1013zxw54xfmkpid99p5f38hlqds172vija7xjyjaww7j7y3b"
|
||||
"rev": "8bba77a558049727d1bc88736dd03d1b5c41cead",
|
||||
"sha256": "1lk4jm2pp0n8disxpcr1520bd798lif23fisnmkzysxcrlw1dflh"
|
||||
},
|
||||
"qtxmlpatterns": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
|
||||
"rev": "3199d91de3f38e5ece3d36bcefe2c33b2c014f3f",
|
||||
"sha256": "1l6babh2cjqwaqk12cqpkkl2qy909b1fd84p0ab19raw419ncawz"
|
||||
"rev": "fa0c41677ab43bc50bc4d086dfce96602060b7e0",
|
||||
"sha256": "1wrh1m9s4pdbvlgy93jv6acn9k1an6jb086cbxscgimgw3kb867p"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchgit, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "5.15.8";
|
||||
version = "5.15.9";
|
||||
overrides = {};
|
||||
|
||||
mk = name: args:
|
||||
|
|
@ -64,7 +64,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
|||
|
||||
qtwebengine =
|
||||
let
|
||||
branchName = "5.15.12";
|
||||
branchName = "5.15.13";
|
||||
rev = "v${branchName}-lts";
|
||||
in
|
||||
{
|
||||
|
|
@ -72,7 +72,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
|||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/qt/qtwebengine.git";
|
||||
sha256 = "sha256-8EQqSvxw9rqf+64CIbcCb1VXhNx1GNC8eDIgLyYDyvk=";
|
||||
sha256 = "sha256-gZmhJTA5A3+GeySJoppYGffNC6Ych2pOYlsu3w+fnmw=";
|
||||
inherit rev branchName;
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ let
|
|||
wrapQtAppsHook = makeSetupHook
|
||||
{
|
||||
name = "wrap-qt6-apps-hook";
|
||||
propagatedBuildInputs = [ buildPackages.makeWrapper ];
|
||||
propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ];
|
||||
} ./hooks/wrap-qt-apps-hook.sh;
|
||||
|
||||
qmake = makeSetupHook
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ qtModule {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libunwind orc ]
|
||||
++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ];
|
||||
propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav ]
|
||||
++ lib.optionals stdenv.isLinux [ gst-vaapi ]
|
||||
propagatedBuildInputs =
|
||||
lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]
|
||||
++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, withCryptodev ? false, cryptodev
|
||||
, enableSSL2 ? false
|
||||
, enableSSL3 ? false
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
# Used to avoid cross compiling perl, for example, in darwin bootstrap tools.
|
||||
# This will cause c_rehash to refer to perl via the environment, but otherwise
|
||||
# will produce a perfectly functional openssl binary and library.
|
||||
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, removeReferencesTo
|
||||
}:
|
||||
|
||||
|
|
@ -52,11 +49,8 @@ stdenv.mkDerivation rec {
|
|||
!(stdenv.hostPlatform.useLLVM or false) &&
|
||||
stdenv.cc.isGNU;
|
||||
|
||||
nativeBuildInputs = [ perl removeReferencesTo ];
|
||||
buildInputs = lib.optional withCryptodev cryptodev
|
||||
# perl is included to allow the interpreter path fixup hook to set the
|
||||
# correct interpreter in c_rehash.
|
||||
++ lib.optional withPerl perl;
|
||||
nativeBuildInputs = [ makeWrapper perl removeReferencesTo ];
|
||||
buildInputs = lib.optional withCryptodev cryptodev;
|
||||
|
||||
# TODO(@Ericson2314): Improve with mass rebuild
|
||||
configurePlatforms = [];
|
||||
|
|
@ -140,22 +134,17 @@ stdenv.mkDerivation rec {
|
|||
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
|
||||
rm "$out/lib/"*.a
|
||||
fi
|
||||
'') + lib.optionalString (!stdenv.hostPlatform.isWindows)
|
||||
# Fix bin/c_rehash's perl interpreter line
|
||||
#
|
||||
# - openssl 1_0_2: embeds a reference to buildPackages.perl
|
||||
# - openssl 1_1: emits "#!/usr/bin/env perl"
|
||||
#
|
||||
# In the case of openssl_1_0_2, reset the invalid reference and let the
|
||||
# interpreter hook take care of it.
|
||||
#
|
||||
# In both cases, if withPerl = false, the intepreter line is expected be
|
||||
# "#!/usr/bin/env perl"
|
||||
''
|
||||
substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl"
|
||||
'' + ''
|
||||
'') + ''
|
||||
mkdir -p $bin
|
||||
mv $out/bin $bin/bin
|
||||
|
||||
# c_rehash is a legacy perl script with the same functionality
|
||||
# as `openssl rehash`
|
||||
# this wrapper script is created to maintain backwards compatibility without
|
||||
# depending on perl
|
||||
makeWrapper $bin/bin/openssl $bin/bin/c_rehash \
|
||||
--add-flags "rehash"
|
||||
|
||||
mkdir $dev
|
||||
mv $out/include $dev/
|
||||
# remove dependency on Perl at runtime
|
||||
|
|
|
|||
|
|
@ -47,6 +47,12 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# or-tools normally attempts to build Protobuf for the build platform when
|
||||
# cross-compiling. Instead, just tell it where to find protoc.
|
||||
postPatch = ''
|
||||
echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_DEPS=OFF"
|
||||
"-DBUILD_PYTHON=ON"
|
||||
|
|
@ -54,23 +60,25 @@ stdenv.mkDerivation rec {
|
|||
"-DFETCH_PYTHON_DEPS=OFF"
|
||||
"-DUSE_GLPK=ON"
|
||||
"-DUSE_SCIP=OFF"
|
||||
"-DPython3_EXECUTABLE=${python.pythonForBuild.interpreter}"
|
||||
] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ensureNewerSourcesForZipFilesHook
|
||||
pkg-config
|
||||
python
|
||||
python.pkgs.pip
|
||||
python.pythonForBuild
|
||||
swig4
|
||||
unzip
|
||||
];
|
||||
] ++ (with python.pythonForBuild.pkgs; [
|
||||
pip
|
||||
mypy-protobuf
|
||||
]);
|
||||
buildInputs = [
|
||||
bzip2
|
||||
cbc
|
||||
eigen
|
||||
glpk
|
||||
python.pkgs.absl-py
|
||||
python.pkgs.mypy-protobuf
|
||||
python.pkgs.pybind11
|
||||
python.pkgs.setuptools
|
||||
python.pkgs.wheel
|
||||
|
|
@ -101,7 +109,7 @@ stdenv.mkDerivation rec {
|
|||
pip install --prefix="$python" python/
|
||||
'';
|
||||
|
||||
outputs = [ "out" "python" ];
|
||||
outputs = [ "out" "dev" "python" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/google/or-tools";
|
||||
|
|
|
|||
|
|
@ -11,10 +11,11 @@ index 4358a23..6ce7776 100644
|
|||
if target in build_targets:
|
||||
return PathVariable.PathIsDirCreate(key, val, env)
|
||||
else:
|
||||
@@ -155,6 +155,7 @@ if sys.platform == 'win32':
|
||||
@@ -155,6 +155,8 @@ if sys.platform == 'win32':
|
||||
env = Environment(variables=opts,
|
||||
tools=('default', 'textfile',),
|
||||
CPPPATH=['.', ],
|
||||
+ AR=os.environ['AR'],
|
||||
+ ENV=os.environ,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
, freezegun
|
||||
, gunicorn
|
||||
, pytest-mock
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, re-assert
|
||||
, trustme
|
||||
|
|
@ -79,6 +80,7 @@ buildPythonPackage rec {
|
|||
freezegun
|
||||
gunicorn
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
re-assert
|
||||
] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
|
||||
|
|
@ -116,7 +118,7 @@ buildPythonPackage rec {
|
|||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Work around "OSError: AF_UNIX path too long"
|
||||
export TMPDIR="/tmp"
|
||||
'';
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/aio-libs/aiohttp/blob/v${version}/CHANGES.rst";
|
||||
|
|
|
|||
|
|
@ -25,10 +25,15 @@ buildPythonPackage rec {
|
|||
hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag=";
|
||||
})
|
||||
# https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22
|
||||
(assert lib.versions.major pyopenssl.version == "22"; fetchpatch {
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch";
|
||||
hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY=";
|
||||
})
|
||||
# AssertionError: 'self-signed certificate' != 'self signed certificate'
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/cfcd3ce12fb27f5b26deb011a82f66b5d68d521a.patch";
|
||||
hash = "sha256-bCW817Z7jCxYySfUukNR4cibURH3qZWEQjeeyvRIqZY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -43,6 +48,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "aioquic" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Implementation of QUIC and HTTP/3";
|
||||
homepage = "https://github.com/aiortc/aioquic";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
|
|
@ -13,6 +12,7 @@
|
|||
, hypothesis
|
||||
, mock
|
||||
, pytest-mock
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, trio
|
||||
, trustme
|
||||
|
|
@ -55,6 +55,7 @@ buildPythonPackage rec {
|
|||
curio
|
||||
hypothesis
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
trio
|
||||
trustme
|
||||
|
|
@ -74,6 +75,10 @@ buildPythonPackage rec {
|
|||
"test_exception_group_children"
|
||||
"test_exception_group_host"
|
||||
"test_exception_group_filtering"
|
||||
# regression in python 3.11.3 and 3.10.11
|
||||
# https://github.com/agronholm/anyio/issues/550
|
||||
"TestTLSStream"
|
||||
"TestTLSListener"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, six
|
||||
, isPyPy
|
||||
, cffi
|
||||
, pkg-config
|
||||
, pytestCheckHook
|
||||
, pytest-benchmark
|
||||
, pytest-subtests
|
||||
|
|
@ -28,26 +29,27 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "cryptography";
|
||||
version = "39.0.1"; # Also update the hash in vectors.nix
|
||||
version = "40.0.1"; # Also update the hash in vectors.nix
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0fYZjubZFIQF5JiHgDkH/olioj5sb4PqfZjxwN43VpU=";
|
||||
hash = "sha256-KAPy+LHpX2FEGZJsfm9V2CivxhTKXtYVQ4d65mjMNHI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sourceRoot = "${pname}-${version}/${cargoRoot}";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-0x+KIqJznDEyIUqVuYfIESKmHBWfzirPeX2R/cWlngc=";
|
||||
hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU=";
|
||||
};
|
||||
|
||||
cargoRoot = "src/rust";
|
||||
|
||||
nativeBuildInputs = lib.optionals (!isPyPy) [
|
||||
cffi
|
||||
pkg-config
|
||||
] ++ [
|
||||
rustPlatform.cargoSetupHook
|
||||
setuptools-rust
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "cryptography_vectors";
|
||||
inherit version;
|
||||
hash = "sha256-DLrrUL2388nXqTsmoEYu9ul8doynjZAoVP4EXDC2gMY=";
|
||||
hash = "sha256-hGBwa1tdDOSoVXHKM4nPiPcAu2oMYTPcn+D1ovW9oEE=";
|
||||
};
|
||||
|
||||
# No tests included
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue