mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-25 14:48:25 +03:00
Merge branch 'staging' into staging-next
This commit is contained in:
Vladimír Čunát
commit
0983465c91
@ -1,12 +1,12 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "9.0.1441";
|
||||
version = "9.0.1562";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tGWOIXx4gNMg0CB4ytUrj9bQLXw+4pl2lfgGR81+EJk=";
|
||||
hash = "sha256-+QKh3CxSjwcJ+Rj9RHYHRKSZixkfA1ZCAPDIyV/Npt8=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xterm";
|
||||
version = "379";
|
||||
version = "380";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
|
||||
];
|
||||
hash = "sha256-p93ydO6EuX+xKDZ1AJ1Tyi0CoP/VzlpRGNr8NiPrsxA=";
|
||||
hash = "sha256-DB3B+oAPpktcWNFt25BecAsnylOKZb6MA7K6V2EQbDg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -32,6 +32,6 @@ done
|
||||
|
||||
for region in "${regions[@]}"; do
|
||||
for hook in "${fixupHooks[@]}"; do
|
||||
eval "$hook" "$i"
|
||||
eval "$hook" "$region"
|
||||
done
|
||||
done
|
||||
|
||||
@ -77,8 +77,12 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
|
||||
# - If GCC allowed implicit declaration of symbols, it would not fail during
|
||||
# compilation even if the configure scripts did not check header presence.
|
||||
#
|
||||
+ lib.optionalString (hostPlatform.isDarwin) ''
|
||||
export ac_cv_func_aligned_alloc=no
|
||||
+ lib.optionalString (buildPlatform.isDarwin) ''
|
||||
export build_configargs=ac_cv_func_aligned_alloc=no
|
||||
'' + lib.optionalString (hostPlatform.isDarwin) ''
|
||||
export host_configargs=ac_cv_func_aligned_alloc=no
|
||||
'' + lib.optionalString (targetPlatform.isDarwin) ''
|
||||
export target_configargs=ac_cv_func_aligned_alloc=no
|
||||
''
|
||||
|
||||
# In order to properly install libgccjit on macOS Catalina, strip(1)
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roc-toolkit";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "roc-streaming";
|
||||
repo = "roc-toolkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wwcc2r1hrM9zryMJp+DOifSh0g6T/gdZJMpVdhqhjR8=";
|
||||
hash = "sha256-x4+/MIFKcos9xWhvSNWdsUQA2oLiyYS0MJE60HY/3hQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -28,9 +28,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
# fix build with gcc9
|
||||
NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc";
|
||||
|
||||
# Even when statically linking, libstdc++.la is put in dependency_libs here,
|
||||
# and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the
|
||||
# compiler do what it does best. (libaudiofile.la is a generated file, so we
|
||||
|
||||
@ -10,15 +10,17 @@ assert useVulkan -> withExamples;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dav1d";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-1k6TsaXI9nwrBXTj3hncblkQuN/bvDudWDCsx4E4iwY=";
|
||||
hash = "sha256-Y9wqa6lIs0eKT+q+95gjzfHIc3pglXzLNaDjsWy1gok=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja nasm pkg-config ];
|
||||
# TODO: doxygen (currently only HTML and not build by default).
|
||||
buildInputs = [ xxHash ]
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "directx-headers";
|
||||
version = "1.610.0";
|
||||
version = "1.610.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "DirectX-Headers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lPYXAMFSyU3FopWdE6dDRWD6sVKcjxDVsTbgej/T2sk=";
|
||||
hash = "sha256-se+/TgqKdatTnBlHcBC1K4aOGGfPEW+E1efpP34+xc0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
import ./generic.nix rec {
|
||||
version = "4.4.3";
|
||||
sha256 = "sha256-zZDzG1hD+0AHqElzeGR6OVm+H5wqtdktloSPmEUzT/c=";
|
||||
extraPatches = [
|
||||
{
|
||||
name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch";
|
||||
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135";
|
||||
hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8=";
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,4 +1,21 @@
|
||||
import ./generic.nix rec {
|
||||
version = "5.1.3";
|
||||
sha256 = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE=";
|
||||
extraPatches = [
|
||||
{
|
||||
name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch";
|
||||
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135";
|
||||
hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8=";
|
||||
}
|
||||
{
|
||||
name = "libsvtav1-1.5.0-compat-vbv_bufsize.patch";
|
||||
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee";
|
||||
hash = "sha256-v9Viyo12QfZpbcVqd1aHgLl/DgSkdE9F1kr6afTGPik=";
|
||||
}
|
||||
{
|
||||
name = "libsvtav1-1.5.0-compat-maximum_buffer_size_ms-conditional.patch";
|
||||
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/96748ac54f998ba6fe22802799c16b4eba8d4ccc";
|
||||
hash = "sha256-Z5HSe7YpryYGHD3BYXejAhqR4EPnmfTGyccxNvU3AaU=";
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fribidi";
|
||||
version = "1.0.12";
|
||||
version = "1.0.13";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
# NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DNIz+X/IxnuzrCfOhEDe9dP/rPUWdluRwsxlRJgpNJU=";
|
||||
sha256 = "sha256-f6FsgMgb1iL3sZjTE1baE5zDGKY/x3YSF69BMJA/VKI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnu-efi";
|
||||
version = "3.0.15";
|
||||
version = "3.0.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo=";
|
||||
sha256 = "sha256-eAfpAzSTQ6ehQuu5NHA6KHIjXolojPWGwDKwoQh7yvQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ pciutils ];
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
, lcms2
|
||||
, libnice
|
||||
, webrtc-audio-processing
|
||||
, webrtc-audio-processing_1
|
||||
, lilv
|
||||
, lv2
|
||||
, serd
|
||||
@ -90,6 +89,7 @@
|
||||
, vo-aacenc
|
||||
, libfreeaptx
|
||||
, zxing-cpp
|
||||
, usrsctp
|
||||
, VideoToolbox
|
||||
, AudioToolbox
|
||||
, AVFoundation
|
||||
@ -108,13 +108,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-bad";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-PY+vHONALIU1zjqMThpslg5LVlXb2mtVlD25rHkCLQ8=";
|
||||
hash = "sha256-4XmP7i2GEn8GN0gcYH+YMpO/D9garXClx7RyBa82Idg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -165,6 +165,7 @@ stdenv.mkDerivation rec {
|
||||
libde265
|
||||
libdvdnav
|
||||
libdvdread
|
||||
libnice
|
||||
qrencode
|
||||
libsndfile
|
||||
libusb1
|
||||
@ -193,6 +194,7 @@ stdenv.mkDerivation rec {
|
||||
vo-aacenc
|
||||
libfreeaptx
|
||||
zxing-cpp
|
||||
usrsctp
|
||||
] ++ lib.optionals enableZbar [
|
||||
zbar
|
||||
] ++ lib.optionals faacSupport [
|
||||
@ -222,7 +224,6 @@ stdenv.mkDerivation rec {
|
||||
flite
|
||||
libdrm
|
||||
libgudev
|
||||
libnice
|
||||
sbc
|
||||
spandsp
|
||||
|
||||
@ -276,7 +277,6 @@ stdenv.mkDerivation rec {
|
||||
"-Dmusepack=disabled"
|
||||
"-Dopenni2=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dopensles=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing
|
||||
"-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
|
||||
"-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
|
||||
"-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
|
||||
@ -311,7 +311,6 @@ stdenv.mkDerivation rec {
|
||||
"-Duvch264=disabled" # requires gudev
|
||||
"-Dv4l2codecs=disabled" # requires gudev
|
||||
"-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
|
||||
@ -361,6 +360,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
maintainers = with maintainers; [ matthewbauer lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gst-plugins-base";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-62USDE7nm3oVPDwZctXAFYwhUYd8xR7Hclu6V0lnnUk=";
|
||||
hash = "sha256-HFliiaDUIHOAIz66jDapMsTRrOuhmTKTfZtXwkzvifM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -168,6 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"gstreamer-video-1.0"
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
maintainers = with maintainers; [ matthewbauer lilyinstarlight ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gstreamer";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-sq/nNgOSHGCLpIlp27fXQ3dnRL/l2AWeziQRN7f4jiE=";
|
||||
hash = "sha256-n/6rlQU/n2mV6zs9oiXojyHBKc1g2gAtP3ldtw1tWXQ=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
@ -120,6 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"gstreamer-controller-1.0"
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ttuegel matthewbauer ];
|
||||
maintainers = with maintainers; [ ttuegel matthewbauer lilyinstarlight ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -48,5 +48,5 @@
|
||||
ipu6-camera-hal = ipu6ep-camera-hal;
|
||||
};
|
||||
|
||||
# note: gst-python is in ./python/default.nix - called under pythonPackages
|
||||
# note: gst-python is in ../../python-modules/gst-python - called under python3Packages
|
||||
}
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-devtools";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-62JybT4nqHgjaaJP1jZKiIXtJGKzu9qwkd/8gTnuBtg=";
|
||||
hash = "sha256-RGrJxC1QLL/ZCBc3zBuFOzwfUNt3ynzNAa6hD2h1UME=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -65,5 +65,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gstreamer.freedesktop.org";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-editing-services";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-RTsUZPw4V94mmnyw69lmr+Ahcdl772cqC4oKbUPgzr8=";
|
||||
hash = "sha256-FaW85iUJseEl6FoJ7EHzIcD1SSZLUETACV/PstXAzqI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -69,5 +69,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gstreamer.freedesktop.org";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -52,13 +52,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-good";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-fIzFlCXysjL2DKfRPlbt1hXaT3Eec90Bp8/6Rua8DN0=";
|
||||
hash = "sha256-r4EVSzou8/TS/ro5XyVpb+6m/RPsYsktPHqXNHBxAnM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -190,6 +190,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
maintainers = with maintainers; [ matthewbauer lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-libav";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-/Kr5h4/o87yCMX7xOhVYgky2jfH4loxnl/VWxeM7z/0=";
|
||||
hash = "sha256-LsXIBYCLQ3Gn4ysdoCAqHIprNrbOkFCAv1w0CX0SqSM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gstreamer.freedesktop.org";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, writeText
|
||||
, rustPlatform
|
||||
, meson
|
||||
@ -27,11 +26,14 @@
|
||||
, Security
|
||||
, gst-plugins-good
|
||||
, nix-update-script
|
||||
# specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform)
|
||||
, plugins ? null
|
||||
# Checks meson.is_cross_build(), so even canExecute isn't enough.
|
||||
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null
|
||||
, hotdoc
|
||||
# TODO: required for case-insensitivity hack below
|
||||
, yq
|
||||
, moreutils
|
||||
# specify a limited set of plugins to build if not all supported plugins
|
||||
, plugins ? null
|
||||
}:
|
||||
|
||||
let
|
||||
@ -94,7 +96,6 @@ let
|
||||
|
||||
selectedPlugins = if plugins != null then lib.unique (lib.sort lib.lessThan plugins) else lib.subtractLists (
|
||||
[
|
||||
"audiofx" # tests have race-y failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/337
|
||||
"csound" # tests have weird failure on x86, does not currently work on arm or darwin
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"reqwest" # tests hang on darwin
|
||||
@ -161,6 +162,8 @@ stdenv.mkDerivation rec {
|
||||
cargo
|
||||
cargo-c
|
||||
nasm
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -177,7 +180,7 @@ stdenv.mkDerivation rec {
|
||||
map (plugin: lib.mesonEnable plugin true) selectedPlugins
|
||||
) ++ [
|
||||
(lib.mesonOption "sodium-source" "system")
|
||||
(lib.mesonEnable "doc" false) # `hotdoc` not packaged in nixpkgs as of writing
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
] ++ (let
|
||||
crossFile = writeText "cross-file.conf" ''
|
||||
[binaries]
|
||||
@ -187,7 +190,7 @@ stdenv.mkDerivation rec {
|
||||
"--cross-file=${crossFile}"
|
||||
]);
|
||||
|
||||
# turn off all auto plugins if a list is specified
|
||||
# turn off all auto plugins since we use a list of plugins we generate
|
||||
mesonAutoFeatures = "disabled";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-rtsp-server";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-K+Suz7iHEBAOpxFe0CFkA+gJQ0Tr8UYJQnG41Nc4KL8=";
|
||||
hash = "sha256-0Co536m9v5mj3S03jheUKzzkLf42+wwn4tCwFyL8Vh0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -62,6 +62,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bkchr ];
|
||||
maintainers = with maintainers; [ bkchr lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-ugly";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-jzD0TbC9BjcJv2++VROOOpivCry2HDYPNVgrvhDoBpE=";
|
||||
hash = "sha256-PcmO1cIpM2izxObOVdib6DSgpi6b+I7xeSjPA7fVo2A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -93,6 +93,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
maintainers = with maintainers; [ matthewbauer lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gstreamer-vaapi";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-0uZC+XRfl9n3On9Qhedlmpox/iCbd05uRdrgQbQ13wY=";
|
||||
hash = "sha256-onhnBi6LaTBfylt9PxPtfDGLcD59cnVslDlb0wXHsyw=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Set of VAAPI GStreamer Plug-ins";
|
||||
homepage = "https://gstreamer.freedesktop.org";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -34,11 +34,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
|
||||
version = "7.2.0";
|
||||
version = "7.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz";
|
||||
hash = "sha256-/FVgyAfq4O/V+VtapMZYAMeo7tZkIAimsefj//94c8w=";
|
||||
hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,11 +8,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libaom";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
|
||||
sha256 = "sha256-tt19UCsZP99rq6BYBSzSHecyIu4CiimD+P1f3CY2QEU=";
|
||||
sha256 = "sha256-U7hmKdpjTtqStM4UIjCvgJ2swpZ1x0Px1Q9+gSHbaeQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-8NoLv7pHbBauPhz9hiJW0wkVkR96uqGxbOYu5lMZJ4Q=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature fontconfigSupport "fontconfig")
|
||||
(lib.enableFeature rasterizerSupport "rasterizer")
|
||||
|
||||
@ -1,38 +1,48 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages, spirv-llvm-translator }:
|
||||
|
||||
let
|
||||
llvm = llvmPackages.llvm;
|
||||
clang-unwrapped = llvmPackages.clang-unwrapped;
|
||||
in
|
||||
{ lib, stdenv, fetchFromGitHub, buildPackages, ninja, cmake, python3, llvm_14 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libclc";
|
||||
version = "15.0.7";
|
||||
version = "16.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
rev = "llvmorg-${version}";
|
||||
sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
|
||||
hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0=";
|
||||
};
|
||||
sourceRoot = "source/libclc";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
# cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' \
|
||||
--replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
|
||||
--replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_CLANG clang PATHS "${buildPackages.clang_14.cc}/bin" NO_DEFAULT_PATH )' \
|
||||
--replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_AS llvm-as PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \
|
||||
--replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_LINK llvm-link PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \
|
||||
--replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_OPT opt PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \
|
||||
--replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
|
||||
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'COMMAND prepare_builtins' 'COMMAND ${buildPackages.libclc.dev}/bin/prepare_builtins'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja python3 spirv-llvm-translator ];
|
||||
buildInputs = [ llvm clang-unwrapped ];
|
||||
nativeBuildInputs = [ cmake ninja python3 ];
|
||||
buildInputs = [ llvm_14 ];
|
||||
strictDeps = true;
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dt $dev/bin prepare_builtins
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "http://libclc.llvm.org/";
|
||||
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
patches = [ ./fix-includes.patch ];
|
||||
|
||||
configureFlags = [ "--disable-lynx" ]
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libevdev";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-nt8gBsyGpQVSeWR8OOySPRGoIe5NwsMDPo0g6O4jfNk=";
|
||||
sha256 = "sha256-Bqd78qxcmTMFiCvBZBAX9b7BWS1tG2R4e61JKrNPLzY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
name = "liblc3";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = name;
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
owner = "google";
|
||||
repo = "liblc3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Be+dPUnxC2+cHzqL2FAqXOU7NjEAHiPBKh7spuYkvhc=";
|
||||
sha256 = "sha256-PEnK12FWAtxOMR3WyuxOQTgF+lD9S5YX+oKuWRbFfXM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-tg4v9/Nnue7itWNNOmMwPd/t4OahjfyojESodw5+QjQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
postPatch = ''
|
||||
# Fix headers to use libsodium instead of NaCl
|
||||
sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c
|
||||
|
||||
@ -1,27 +1,18 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices, pkgsStatic }:
|
||||
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices, pkgsStatic }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.44.2";
|
||||
version = "1.45.0";
|
||||
pname = "libuv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K6v+00basjI32ON27ZjC5spQi/zWCcslDwQwyosq2iY=";
|
||||
sha256 = "sha256-qKw9QFR24Uw7pVA9isPH8Va+9/5DYuqXz6l6jWcXn+4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [
|
||||
# Fix tests for statically linked variant upstream PR is
|
||||
# https://github.com/libuv/libuv/pull/3735
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libuv/libuv/commit/9d898acc564351dde74e9ed9865144e5c41f5beb.patch";
|
||||
sha256 = "sha256-6XsjrseD8a+ny887EKOX0NmHocLMXGf2YL13vkNHUZ0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
toDisable = [
|
||||
"getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
|
||||
@ -30,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
"getaddrinfo_fail" "getaddrinfo_fail_sync"
|
||||
"threadpool_multiple_event_loops" # times out on slow machines
|
||||
"get_passwd" # passed on NixOS but failed on other Linuxes
|
||||
"tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes
|
||||
"tcp_writealot" "udp_multicast_join" "udp_multicast_join6" "metrics_pool_events" # times out sometimes
|
||||
"fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927
|
||||
|
||||
# Assertion failed in test/test-tcp-bind6-error.c on line 60: r == UV_EADDRINUSE
|
||||
|
||||
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-qhKHdBf3bTZC2fTHIzAjgNgzF1Y51jpVZB0Bkopd230=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [
|
||||
# pull upstream fix for SDL1 cross-compilation.
|
||||
# https://github.com/Libvisual/libvisual/pull/238
|
||||
|
||||
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "18zsnsxc53pans4a01cs4401a2cjk3qi098hi440pj4zijifgcsb";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
version = "3.8.1";
|
||||
version = "3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
|
||||
hash = "sha256-Nk8+K3fNfc3oP9fEUhnINOVLDHXkKLb4lKI9Et1By/4=";
|
||||
hash = "sha256-Duet9acgFhC7f+Csu3ybO+g75EkE3TXrvNllzYlr/qo=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openal-soft";
|
||||
version = "1.22.2";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kcat";
|
||||
repo = "openal-soft";
|
||||
rev = version;
|
||||
sha256 = "sha256-MVM0qCZDWcO7/Hnco+0dBqzBLcWD279xjx0slxxlc4w=";
|
||||
sha256 = "sha256-jwY1NzNJdWIvVv7TvJyg4cIGFLWGZhL3BkMI1NbOEG0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qca-qt5";
|
||||
version = "2.3.5";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
|
||||
sha256 = "sha256-kffZFqs2kr9ZkfClU7+BUxYb/doUvQBdSAorTjhDYug=";
|
||||
sha256 = "sha256-7lnVMdS4L7FoX02NdMLKoHd/UBgA90JuqjchCaQwUkk=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl qtbase ];
|
||||
|
||||
@ -2,13 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbc";
|
||||
version = "1.4";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/linux/bluetooth/${pname}-${version}.tar.xz";
|
||||
sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si";
|
||||
sha256 = "sha256-jxI2jh279V4UU2UgRzz7M4yEs5KTnMm2Qpg2D9SgeZI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libsndfile ];
|
||||
|
||||
|
||||
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ freetype ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wavpack";
|
||||
version = "5.5.0";
|
||||
version = "5.6.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "dbry";
|
||||
repo = "WavPack";
|
||||
rev = version;
|
||||
hash = "sha256-4QDtLywu0PT+YsMV26M74bL2P7p4s1tk8ZBQtQcubaU=";
|
||||
hash = "sha256-fWAGE87JTNTnYoxrkMf3I8C53kZrQiiBy3Zyg0cw8Og=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" "man" ];
|
||||
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [
|
||||
./enable-riscv.patch
|
||||
./enable-powerpc.patch
|
||||
|
||||
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gst-python";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-vvKz2Czkvka3dbG7VjBcEAPuAbU1pTqC+f6JJJchU60=";
|
||||
hash = "sha256-cL7T+r5jS8Yi723k5uscM7yc79ZL2rIA9voxa0aMcxw=";
|
||||
};
|
||||
|
||||
# Python 2.x is not supported.
|
||||
@ -61,5 +61,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://gstreamer.freedesktop.org";
|
||||
description = "Python bindings for GStreamer";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -76,7 +76,7 @@ let
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
pname = "matplotlib";
|
||||
format = "pyproject";
|
||||
|
||||
@ -84,7 +84,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-j279MTQw1+9wo4oydigcsuhkazois7IesifaIOFeaBM=";
|
||||
hash = "sha256-e3MwXyXqtFQb1+4Llth+U66cnxgjvlZZuAbNhXhv6II=";
|
||||
};
|
||||
|
||||
env.XDG_RUNTIME_DIR = "/tmp";
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "9.1.8";
|
||||
version = "9.1.13";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "squidfunk";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-a0AeRjS0fV4q3z6MPZBBv8Ffv61W3zHPrnPT4evBnaw=";
|
||||
hash = "sha256-S+cCNcQR8Y1UGj+4Nfy9Z10N/9PRq13fSeR2YFntxWI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests";
|
||||
version = "2.29.0";
|
||||
version = "2.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8uNKdfR0kBm7Dj7/tmaDYw5P/q91gZ+1G+vvG/Wu8Fk=";
|
||||
hash = "sha256-lCxadY+Y15Dq7Ropy27vx/+w0c968Fw9J5Flbb1q0eE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "SQLAlchemy";
|
||||
version = "2.0.13";
|
||||
version = "2.0.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -50,7 +50,7 @@ buildPythonPackage rec {
|
||||
owner = "sqlalchemy";
|
||||
repo = "sqlalchemy";
|
||||
rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-tKxzKv0Ng0saybeFJNleCN5D8gOFw4z9m858OeddJH0=";
|
||||
hash = "sha256-05GhFearTA9At8MgmEfeXfbS3MAZ0Rmx8jER18q7fmI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =[
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "valgrind";
|
||||
version = "3.20.0";
|
||||
version = "3.21.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-hTbAMdvgeNNC8SH6iBqezSBctaeOY5AFrVcAEb2588Y=";
|
||||
hash = "sha256-EM4WGLs+M/rRbreVUrCj4SEXYkSKDX/OEcimJDuayXE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "doxygen";
|
||||
version = "1.9.6";
|
||||
version = "1.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doxygen";
|
||||
repo = "doxygen";
|
||||
rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-SqboPBqK7gDVTTjGgCUB9oIGBZR55EA7x65a0wumiKw=";
|
||||
sha256 = "sha256-ezeMQk+Vyi9qNsYwbaRRruaIYGY8stFf71W7GonXqco=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -37,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "01s8i64qczxqawgrzrw19asaqmcspf5l2h3203xzg56wnnhhzcw7";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config python makeWrapper wafHook ];
|
||||
buildInputs = [ libsamplerate libsndfile readline eigen celt
|
||||
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alsa-lib";
|
||||
version = "1.2.8";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-GrAbdOM0JcqZwuNsCET9aIgnMZO9iYJA/o+TrMvL80c=";
|
||||
hash = "sha256-3JxkP9xMz9BXLMaFhY3UHgivtYPzBGCzF+QYgnX2FbI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
35
pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch
Normal file
35
pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From beed138222421a2eb4212d83cb889404bd7efc49 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Wed, 23 Mar 2022 07:27:05 +0000
|
||||
Subject: [PATCH] auditswig.i: avoid setter generation for audit_rule_data::buf
|
||||
|
||||
As it's a flexible array generated code was never safe to use.
|
||||
With kernel's https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ed98ea2128b6fd83bce13716edf8f5fe6c47f574
|
||||
change it's a build failure now:
|
||||
|
||||
audit> audit_wrap.c:5010:15: error: invalid use of flexible array member
|
||||
audit> 5010 | arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
|
||||
audit> | ^
|
||||
|
||||
Let's avoid setter generation entirely.
|
||||
|
||||
Closes: https://github.com/linux-audit/audit-userspace/issues/252
|
||||
---
|
||||
bindings/swig/src/auditswig.i | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i
|
||||
index 21aafca31..9a2c5661d 100644
|
||||
--- a/bindings/swig/src/auditswig.i
|
||||
+++ b/bindings/swig/src/auditswig.i
|
||||
@@ -39,6 +39,10 @@ signed
|
||||
#define __attribute(X) /*nothing*/
|
||||
typedef unsigned __u32;
|
||||
typedef unsigned uid_t;
|
||||
+/* Sidestep SWIG's limitation of handling c99 Flexible arrays by not:
|
||||
+ * generating setters against them: https://github.com/swig/swig/issues/1699
|
||||
+ */
|
||||
+%ignore audit_rule_data::buf;
|
||||
%include "/usr/include/linux/audit.h"
|
||||
#define __extension__ /*nothing*/
|
||||
%include <stdint.i>
|
||||
@ -1,52 +1,33 @@
|
||||
{
|
||||
lib, stdenv, buildPackages, fetchurl, fetchpatch,
|
||||
runCommand,
|
||||
autoreconfHook,
|
||||
autoconf, automake, libtool, bash,
|
||||
# Enabling python support while cross compiling would be possible, but
|
||||
# the configure script tries executing python to gather info instead of
|
||||
# relying on python3-config exclusively
|
||||
enablePython ? stdenv.hostPlatform == stdenv.buildPlatform, python3, swig,
|
||||
linuxHeaders ? stdenv.cc.libc.linuxHeaders
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, bash
|
||||
, buildPackages
|
||||
, libtool
|
||||
, linuxHeaders
|
||||
, python3
|
||||
, swig
|
||||
|
||||
# Enabling python support while cross compiling would be possible, but the
|
||||
# configure script tries executing python to gather info instead of relying on
|
||||
# python3-config exclusively
|
||||
, enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audit";
|
||||
version = "3.1";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz";
|
||||
sha256 = "sha256-tc882rsnhsCLHeNZmjsaVH5V96n5wesgePW0TPROg3g=";
|
||||
url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-RuRrN2I8zgnm7hNOeNZor8NPThyHDIU+8S5BkweM/oc=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ autoreconfHook ]
|
||||
++ lib.optionals enablePython [ python3 swig ];
|
||||
buildInputs = [ bash ];
|
||||
|
||||
configureFlags = [
|
||||
# z/OS plugin is not useful on Linux,
|
||||
# and pulls in an extra openldap dependency otherwise
|
||||
"--disable-zos-remote"
|
||||
(if enablePython then "--with-python" else "--without-python")
|
||||
"--with-arm"
|
||||
"--with-aarch64"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
patches = [
|
||||
./fix-static.patch
|
||||
|
||||
# Fix pending upstream inclusion for linux-headers-5.17 support:
|
||||
# https://github.com/linux-audit/audit-userspace/pull/253
|
||||
(fetchpatch {
|
||||
name = "ignore-flexible-array.patch";
|
||||
url = "https://github.com/linux-audit/audit-userspace/commit/beed138222421a2eb4212d83cb889404bd7efc49.patch";
|
||||
sha256 = "1hf02zaxv6x0wmn4ca9fj48y2shks7vfna43i1zz58xw9jq7sza0";
|
||||
})
|
||||
./000-fix-static-attribute-malloc.diff
|
||||
./001-ignore-flexible-array.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -55,11 +36,44 @@ stdenv.mkDerivation rec {
|
||||
--replace "/usr/include/linux/audit.h" \
|
||||
"${linuxHeaders}/include/linux/audit.h"
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals enablePython [
|
||||
python3
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
# z/OS plugin is not useful on Linux, and pulls in an extra openldap
|
||||
# dependency otherwise
|
||||
"--disable-zos-remote"
|
||||
"--with-arm"
|
||||
"--with-aarch64"
|
||||
(if enablePython then "--with-python" else "--without-python")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Audit Library";
|
||||
homepage = "https://people.redhat.com/sgrubb/audit/";
|
||||
license = lib.licenses.gpl2;
|
||||
description = "Audit Library";
|
||||
changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -111,12 +111,12 @@ let
|
||||
in {
|
||||
inherit makeLinuxHeaders;
|
||||
|
||||
linuxHeaders = let version = "6.2"; in
|
||||
linuxHeaders = let version = "6.3"; in
|
||||
makeLinuxHeaders {
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
|
||||
hash = "sha256-dIYvqKtA7a6FuzOFwLcf4QMoi85RhSbWMZeACzy97LE=";
|
||||
hash = "sha256-ujSR9e1r0nCjcMRAQ049aQhfzdUoki+gHnPXZX23Ox4=";
|
||||
};
|
||||
patches = [
|
||||
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
# symbolic name and `patch' is the actual patch. The patch may
|
||||
# optionally be compressed with gzip or bzip2.
|
||||
kernelPatches ? []
|
||||
, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc"
|
||||
, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name or "" != "pc"
|
||||
, extraMeta ? {}
|
||||
|
||||
, isZen ? false
|
||||
@ -55,7 +55,7 @@
|
||||
, isHardened ? false
|
||||
|
||||
# easy overrides to stdenv.hostPlatform.linux-kernel members
|
||||
, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules
|
||||
, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules or true
|
||||
, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
|
||||
, kernelArch ? stdenv.hostPlatform.linuxArch
|
||||
, kernelTests ? []
|
||||
@ -128,11 +128,10 @@ let
|
||||
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]
|
||||
++ lib.optional (lib.versionAtLeast version "5.2") pahole;
|
||||
|
||||
platformName = stdenv.hostPlatform.linux-kernel.name;
|
||||
# e.g. "defconfig"
|
||||
kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
|
||||
kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";
|
||||
# e.g. "bzImage"
|
||||
kernelTarget = stdenv.hostPlatform.linux-kernel.target;
|
||||
kernelTarget = stdenv.hostPlatform.linux-kernel.target or "vmlinux";
|
||||
|
||||
makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags
|
||||
++ extraMakeFlags;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
|
||||
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
|
||||
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, ubootTools
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
@ -88,6 +88,7 @@ let
|
||||
isModular = config.isYes "MODULES";
|
||||
|
||||
kernelConf = stdenv.hostPlatform.linux-kernel;
|
||||
target = kernelConf.target or "vmlinux";
|
||||
|
||||
buildDTBs = kernelConf.DTB or false;
|
||||
in
|
||||
@ -100,13 +101,13 @@ stdenv.mkDerivation ({
|
||||
inherit version src;
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ]
|
||||
++ optional (kernelConf.target == "uImage") buildPackages.ubootTools
|
||||
++ optional (lib.versionOlder version "5.8") libelf
|
||||
nativeBuildInputs = [
|
||||
bc gmp libmpc mpfr nettools openssl perl python3Minimal rsync ubootTools
|
||||
zstd
|
||||
] ++ optional (lib.versionOlder version "5.8") libelf
|
||||
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
|
||||
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
|
||||
++ optional (lib.versionAtLeast version "5.8") elfutils
|
||||
;
|
||||
++ optional (lib.versionAtLeast version "5.8") elfutils;
|
||||
|
||||
patches =
|
||||
map (p: p.patch) kernelPatches
|
||||
@ -179,7 +180,8 @@ stdenv.mkDerivation ({
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
export buildRoot=$(mktemp -d)
|
||||
export buildRoot=$TMPDIR/kernel-buildroot
|
||||
mkdir -p $buildRoot
|
||||
|
||||
echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
|
||||
|
||||
@ -296,8 +298,8 @@ stdenv.mkDerivation ({
|
||||
# Some image types need special install targets (e.g. uImage is installed with make uinstall)
|
||||
installTargets = [
|
||||
(kernelConf.installTarget or (
|
||||
/**/ if kernelConf.target == "uImage" then "uinstall"
|
||||
else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall"
|
||||
/**/ if target == "uImage" then "uinstall"
|
||||
else if target == "zImage" || target == "Image.gz" then "zinstall"
|
||||
else "install"))
|
||||
];
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@ assert usePam -> pam != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcap";
|
||||
version = "2.68";
|
||||
version = "2.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-kL47bUG+X4GuSwPsdgErDSfIKSk2hPbAW2XV+cznJLI=";
|
||||
sha256 = "sha256-8xH489rYRpnQVm0db37JQ6kpiyj3FMrjyTHf1XSS1+s=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" "man" "doc" ]
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow
|
||||
, capabilitiesSupport ? true
|
||||
, capabilitiesSupport ? stdenv.isLinux
|
||||
, libcap_ng
|
||||
, libxcrypt
|
||||
, ncursesSupport ? true
|
||||
@ -12,15 +12,18 @@
|
||||
, translateManpages ? true
|
||||
, po4a
|
||||
, installShellFiles
|
||||
, writeSupport ? stdenv.isLinux
|
||||
, shadowSupport ? stdenv.isLinux
|
||||
, memstreamHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
|
||||
version = "2.38.1";
|
||||
version = "2.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
|
||||
hash = "sha256-YEkqGbRObPmj3f9oMlszO4tStsWc4+vWoOyqTFEX6E8=";
|
||||
hash = "sha256-MrMKM2zakDGC7WH+s+m5CLdipeZv4U5D77iNNxYgdcs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -33,10 +36,11 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
patchShebangs tests/run.sh
|
||||
|
||||
substituteInPlace include/pathnames.h \
|
||||
--replace "/bin/login" "${shadow}/bin/login"
|
||||
substituteInPlace sys-utils/eject.c \
|
||||
--replace "/bin/umount" "$bin/bin/umount"
|
||||
'' + lib.optionalString shadowSupport ''
|
||||
substituteInPlace include/pathnames.h \
|
||||
--replace "/bin/login" "${shadow}/bin/login"
|
||||
'';
|
||||
|
||||
# !!! It would be better to obtain the path to the mount helpers
|
||||
@ -45,11 +49,11 @@ stdenv.mkDerivation rec {
|
||||
# root...
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--enable-write"
|
||||
"--disable-use-tty-group"
|
||||
"--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
|
||||
"--disable-makeinstall-setuid" "--disable-makeinstall-chown"
|
||||
"--disable-su" # provided by shadow
|
||||
(lib.enableFeature writeSupport "write")
|
||||
(lib.enableFeature nlsSupport "nls")
|
||||
(lib.withFeature ncursesSupport "ncursesw")
|
||||
(lib.withFeature systemdSupport "systemd")
|
||||
@ -74,7 +78,8 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals pamSupport [ pam ]
|
||||
++ lib.optionals capabilitiesSupport [ libcap_ng ]
|
||||
++ lib.optionals ncursesSupport [ ncurses ]
|
||||
++ lib.optionals systemdSupport [ systemd ];
|
||||
++ lib.optionals systemdSupport [ systemd ]
|
||||
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ];
|
||||
|
||||
doCheck = false; # "For development purpose only. Don't execute on production system!"
|
||||
|
||||
@ -90,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes";
|
||||
# https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing
|
||||
license = with licenses; [ gpl2Only gpl2Plus gpl3Plus lgpl21Plus bsd3 bsdOriginalUC publicDomain ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,11 +12,11 @@ let
|
||||
# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "v4l-utils";
|
||||
version = "1.22.1";
|
||||
version = "1.24.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-Zcb76DCkTKEFxEOwJxgsGyyQU6kdHnKthJ36s4i5TjE=";
|
||||
hash = "sha256-y7f+imMH9c5TOgXN7XC7k8O6BjlaubbQB+tTt12AX1s=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ];
|
||||
|
||||
@ -487,7 +487,7 @@ rec {
|
||||
nghttp2.lib
|
||||
coreutils
|
||||
gnugrep
|
||||
pcre.out
|
||||
gnugrep.pcre2.out
|
||||
gmp
|
||||
libiconv
|
||||
brotli.lib
|
||||
@ -563,7 +563,7 @@ rec {
|
||||
nghttp2.lib
|
||||
coreutils
|
||||
gnugrep
|
||||
pcre.out
|
||||
gnugrep.pcre2.out
|
||||
gmp
|
||||
libiconv
|
||||
brotli.lib
|
||||
@ -587,8 +587,9 @@ rec {
|
||||
persistent = self: super: with prevStage; {
|
||||
inherit
|
||||
gnumake gzip gnused bzip2 ed xz patch bash python3
|
||||
ncurses libffi zlib gmp pcre gnugrep cmake
|
||||
ncurses libffi zlib gmp gnugrep cmake
|
||||
coreutils findutils diffutils patchutils ninja libxml2;
|
||||
inherit (gnugrep) pcre2;
|
||||
|
||||
# Hack to make sure we don't link ncurses in bootstrap tools. The proper
|
||||
# solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
|
||||
@ -643,8 +644,9 @@ rec {
|
||||
persistent = self: super: with prevStage; {
|
||||
inherit
|
||||
gnumake gzip gnused bzip2 gawk ed xz patch bash
|
||||
ncurses libffi zlib gmp pcre gnugrep
|
||||
ncurses libffi zlib gmp gnugrep
|
||||
coreutils findutils diffutils patchutils pbzx;
|
||||
inherit (gnugrep) pcre2;
|
||||
|
||||
darwin = super.darwin.overrideScope (_: _: {
|
||||
inherit (darwin) dyld ICU Libsystem Csu libiconv rewrite-tbd;
|
||||
@ -734,7 +736,7 @@ rec {
|
||||
gawk
|
||||
gnugrep
|
||||
patch
|
||||
pcre.out
|
||||
gnugrep.pcre2.out
|
||||
gettext
|
||||
binutils.bintools
|
||||
binutils.bintools.lib
|
||||
|
||||
@ -54,7 +54,7 @@ in rec {
|
||||
chmod -R u+w $out/include
|
||||
cp -rL ${darwin.ICU}/include* $out/include
|
||||
cp -rL ${libiconv}/include/* $out/include
|
||||
cp -rL ${lib.getDev gnugrep.pcre}/include/* $out/include
|
||||
cp -rL ${lib.getDev gnugrep.pcre2}/include/* $out/include
|
||||
mv $out/include $out/include-Libsystem
|
||||
|
||||
# Copy coreutils, bash, etc.
|
||||
@ -86,7 +86,7 @@ in rec {
|
||||
cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
|
||||
cp -d ${lib.getLib openssl}/lib/*.dylib $out/lib
|
||||
|
||||
cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
|
||||
cp -d ${gnugrep.pcre2.out}/lib/libpcre2*.dylib $out/lib
|
||||
cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib
|
||||
cp -d ${lib.getLib gettext}/lib/libintl*.dylib $out/lib
|
||||
chmod +x $out/lib/libintl*.dylib
|
||||
|
||||
@ -311,12 +311,6 @@ _accumFlagsArray() {
|
||||
_addRpathPrefix() {
|
||||
if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then
|
||||
export NIX_LDFLAGS="-rpath $1/lib ${NIX_LDFLAGS-}"
|
||||
if [ -n "${NIX_LIB64_IN_SELF_RPATH:-}" ]; then
|
||||
export NIX_LDFLAGS="-rpath $1/lib64 ${NIX_LDFLAGS-}"
|
||||
fi
|
||||
if [ -n "${NIX_LIB32_IN_SELF_RPATH:-}" ]; then
|
||||
export NIX_LDFLAGS="-rpath $1/lib32 ${NIX_LDFLAGS-}"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -127,8 +127,6 @@ let
|
||||
''
|
||||
export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
|
||||
export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
|
||||
${lib.optionalString (system == "x86_64-linux") "NIX_LIB64_IN_SELF_RPATH=1"}
|
||||
${lib.optionalString (system == "mipsel-linux") "NIX_LIB32_IN_SELF_RPATH=1"}
|
||||
'';
|
||||
|
||||
|
||||
@ -639,7 +637,7 @@ in
|
||||
]
|
||||
# Library dependencies
|
||||
++ map getLib (
|
||||
[ attr acl zlib pcre libidn2 libunistring ]
|
||||
[ attr acl zlib gnugrep.pcre2 libidn2 libunistring ]
|
||||
++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
|
||||
)
|
||||
# More complicated cases
|
||||
@ -658,7 +656,8 @@ in
|
||||
inherit (prevStage)
|
||||
gzip bzip2 xz bash coreutils diffutils findutils gawk
|
||||
gnused gnutar gnugrep gnupatch patchelf
|
||||
attr acl zlib pcre libunistring;
|
||||
attr acl zlib libunistring;
|
||||
inherit (prevStage.gnugrep) pcre2;
|
||||
${localSystem.libc} = getLibc prevStage;
|
||||
|
||||
# Hack: avoid libidn2.{bin,dev} referencing bootstrap tools. There's a logical cycle.
|
||||
|
||||
@ -130,7 +130,7 @@ in with pkgs; rec {
|
||||
cp -d ${patch}/bin/* $out/bin
|
||||
cp ${patchelf}/bin/* $out/bin
|
||||
|
||||
cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep
|
||||
cp -d ${gnugrep.pcre2.out}/lib/libpcre2*.so* $out/lib # needed by grep
|
||||
|
||||
# Copy what we need of GCC.
|
||||
cp -d ${bootGCC.out}/bin/gcc $out/bin
|
||||
|
||||
@ -22,14 +22,14 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-utils";
|
||||
version = "unstable-2020-10-21";
|
||||
version = "unstable-2022-11-06";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "xdg";
|
||||
repo = "xdg-utils";
|
||||
rev = "d11b33ec7f24cfb1546f6b459611d440013bdc72";
|
||||
sha256 = "sha256-8PtXfI8hRneEpnUvIV3M+6ACjlkx0w/NEiJFdGbbHnQ=";
|
||||
rev = "8ae02631a9806da11b34cd6b274af02d28aee5da";
|
||||
sha256 = "sha256-WdnnAiPYbREny633FnBi5tD9hDuF8NCVVbUaAVIKTxM=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withXdgOpenUsePortalPatch [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "e2fsprogs";
|
||||
version = "1.46.6";
|
||||
version = "1.47.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-vy/MfuUXj+c6MFf34qo/5S6Yt7tGFQnGewIboA+Uxvc=";
|
||||
hash = "sha256-Zmev3lbu8MavJmhJdEAOTSKI6knpRBv15iKRldUaNXg=";
|
||||
};
|
||||
|
||||
# fuse2fs adds 14mb of dependencies
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "m17n-db";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz";
|
||||
sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5";
|
||||
sha256 = "sha256-vHR+J9ct9YoH9DG3JdeuQJIyLbxGEUykBTgoIbK6XGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://www.nongnu.org/m17n/";
|
||||
description = "Multilingual text processing library (database)";
|
||||
changelog = "https://git.savannah.nongnu.org/cgit/m17n/m17n-db.git/plain/NEWS?h=REL-${lib.replaceStrings [ "." ] [ "-" ] version}";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ astsmtl ];
|
||||
|
||||
@ -1,24 +1,20 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, m17n_db, autoreconfHook, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, m17n_db
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "m17n-lib";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.savannah.gnu.org/releases/m17n/m17n-lib-${version}.tar.gz";
|
||||
sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
|
||||
hash = "sha256-5bA0SvnxFdlJV6P5ud68T45nG2n4wf1eC2iKeU16J/I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Patch pending upstream inclusion:
|
||||
# https://savannah.nongnu.org/bugs/index.php?61377
|
||||
name = "parallel-build.patch";
|
||||
url = "https://savannah.nongnu.org/bugs/download.php?file_id=53704";
|
||||
hash = "sha256-1smKSIFVRJZSwCv0NiUsnndxKcPnJ/wqzH8+ka6nfNM=";
|
||||
excludes = [ "src/ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# reconf needed to sucesfully cross-compile
|
||||
|
||||
@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "curl";
|
||||
version = "8.0.1";
|
||||
version = "8.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2"
|
||||
"https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2"
|
||||
];
|
||||
hash = "sha256-m2selrdI0EuWh4a2vfQHqlx1q1Oj03wcjIHNtzZVXM8=";
|
||||
hash = "sha256-UdKvcieZE7XUyrH+Hzi5RM9wkEyIvuJGtb1XWETnA1o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pciutils";
|
||||
version = "3.9.0"; # with release-date database
|
||||
version = "3.10.0"; # with release-date database
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/utils/pciutils/pciutils-${version}.tar.xz";
|
||||
sha256 = "sha256-zep66XI53uIySaCcaKGaKHo/EJ++ssIy67YWyzhZkBI=";
|
||||
sha256 = "sha256-I4ouJxZnMOU6F/4Hv60ingf6ObYYEX5ZRLbX7an7sOk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, pcre, libiconv, perl, autoreconfHook }:
|
||||
{ lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl, autoreconfHook }:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
let version = "3.7"; in
|
||||
let version = "3.11"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gnugrep";
|
||||
@ -13,23 +13,17 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/grep/grep-${version}.tar.xz";
|
||||
sha256 = "0g42svbc1nq5bamxfj6x7320wli4dlj86padk0hwgbk04hqxl42w";
|
||||
hash = "sha256-HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs=";
|
||||
};
|
||||
|
||||
# https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=b50c6442e43d79471a31a2a202d3e50c0557446f
|
||||
patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./sigsegv-loongarch.patch;
|
||||
|
||||
# Perl is needed for testing
|
||||
nativeBuildInputs = [ perl ] ++ lib.optional stdenv.hostPlatform.isLoongArch64 autoreconfHook;
|
||||
nativeCheckInputs = [ perl glibcLocales ];
|
||||
outputs = [ "out" "info" ]; # the man pages are rather small
|
||||
|
||||
buildInputs = [ pcre libiconv ];
|
||||
buildInputs = [ pcre2 libiconv ];
|
||||
|
||||
# cygwin: FAIL: multibyte-white-space
|
||||
# freebsd: FAIL mb-non-UTF8-performance
|
||||
# all platforms: timing sensitivity in long-pattern-perf
|
||||
#doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
|
||||
doCheck = false;
|
||||
doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD;
|
||||
|
||||
# On macOS, force use of mkdir -p, since Grep's fallback
|
||||
# (./install-sh) is broken.
|
||||
@ -62,12 +56,14 @@ stdenv.mkDerivation {
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
maintainers = [
|
||||
maintainers.eelco
|
||||
maintainers.das_j
|
||||
maintainers.m00wl
|
||||
];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "grep";
|
||||
};
|
||||
|
||||
passthru = {inherit pcre;};
|
||||
passthru = {
|
||||
inherit pcre2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From b50c6442e43d79471a31a2a202d3e50c0557446f Mon Sep 17 00:00:00 2001
|
||||
From: Sun Haiyong <youbest@sina.com>
|
||||
Date: Sat, 4 Sep 2021 15:06:43 +0200
|
||||
Subject: sigsegv: Improve cross-compilation support for LoongArch CPU.
|
||||
|
||||
* m4/stack-direction.m4 (SV_STACK_DIRECTION): Assume the stack grows
|
||||
down on LoongArch.
|
||||
---
|
||||
m4/stack-direction.m4 | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
|
||||
index 9328725..e682be9 100644
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -1,4 +1,4 @@
|
||||
-# stack-direction.m4 serial 7
|
||||
+# stack-direction.m4 serial 8
|
||||
dnl Copyright (C) 2002-2021 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
|
||||
i?86 | x86_64 | \
|
||||
i860 | \
|
||||
ia64 | \
|
||||
+ loongarch* | \
|
||||
m32r | \
|
||||
m68* | \
|
||||
m88k | \
|
||||
--
|
||||
cgit v1.1
|
||||
@ -35,14 +35,14 @@ let
|
||||
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "rav1e";
|
||||
version = "0.6.4";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-G7o82MAZmMOfs1wp3AVUgXxDW6Txuc0qTm5boRpXF6g=";
|
||||
sha256 = "sha256-urYMT1sJUMBj1L/2Hi+hcYbWbi0ScSls0pm9gLj9H3o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-12bePpI8z35gzCHGKDpaGUVvosQqijP60NCgElHDsyw=";
|
||||
cargoHash = "sha256-qQfEpynhlIEKU1Ptq/jM1Wdtn+BVCZT1lmou2S1GL4I=";
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "svt-av1";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "AOMediaCodec";
|
||||
repo = "SVT-AV1";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-jmr5egbuqLnBW7OFuaQk3F4s5xqTpXhWcJAfZySGWeU=";
|
||||
sha256 = "sha256-EBWtvHOcFa6co0NeYns7Wkhz3LhqWJIRjBWfCrWJyss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -21587,9 +21587,7 @@ with pkgs;
|
||||
|
||||
libcint = callPackage ../development/libraries/libcint { };
|
||||
|
||||
libclc = callPackage ../development/libraries/libclc {
|
||||
llvmPackages = llvmPackages_14;
|
||||
};
|
||||
libclc = callPackage ../development/libraries/libclc { };
|
||||
|
||||
libcli = callPackage ../development/libraries/libcli { };
|
||||
|
||||
@ -27823,15 +27821,14 @@ with pkgs;
|
||||
|
||||
usermount = callPackage ../os-specific/linux/usermount { };
|
||||
|
||||
util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
|
||||
else unixtools.util-linux;
|
||||
util-linux = callPackage ../os-specific/linux/util-linux { };
|
||||
|
||||
util-linuxMinimal = if stdenv.isLinux then util-linux.override {
|
||||
util-linuxMinimal = util-linux.override {
|
||||
nlsSupport = false;
|
||||
ncursesSupport = false;
|
||||
systemdSupport = false;
|
||||
translateManpages = false;
|
||||
} else util-linux;
|
||||
};
|
||||
|
||||
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
|
||||
|
||||
|
||||
@ -25928,7 +25928,7 @@ with self; {
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [ pkgs.glibcLocales ];
|
||||
propagatedBuildInputs = [ TextCharWidth ];
|
||||
preConfigure = ''
|
||||
substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${if stdenv.isDarwin then pkgs.darwin.adv_cmds else pkgs.glibc.bin}/bin/locale'
|
||||
substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.unixtools.locale}/bin/locale'
|
||||
'';
|
||||
meta = {
|
||||
description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words";
|
||||
|
||||
@ -61,7 +61,7 @@ let
|
||||
};
|
||||
column = {
|
||||
linux = pkgs.util-linux;
|
||||
darwin = pkgs.netbsd.column;
|
||||
darwin = pkgs.darwin.text_cmds;
|
||||
};
|
||||
eject = {
|
||||
linux = pkgs.util-linux;
|
||||
@ -106,7 +106,7 @@ let
|
||||
};
|
||||
locale = {
|
||||
linux = pkgs.glibc;
|
||||
darwin = pkgs.netbsd.locale;
|
||||
darwin = pkgs.darwin.adv_cmds;
|
||||
};
|
||||
logger = {
|
||||
linux = pkgs.util-linux;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user