mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Merge branch 'staging' into staging-next
This commit is contained in:
Vladimír Čunát
commit
82ec893b68
@ -55,6 +55,11 @@ trim_trailing_whitespace = unset
|
||||
[*.lock]
|
||||
indent_size = unset
|
||||
|
||||
# trailing whitespace is an actual syntax element of classic Markdown/
|
||||
# CommonMark to enforce a line break
|
||||
[*.md]
|
||||
trim_trailing_whitespace = unset
|
||||
|
||||
[eggs.nix]
|
||||
trim_trailing_whitespace = unset
|
||||
|
||||
|
||||
@ -74,6 +74,10 @@
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<literallayout>Pulseaudio has been upgraded to version 15.0 and now optionally <link xlink:href="https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters">supports additional Bluetooth audio codecs</link> like aptX or LDAC, with codec switching support being available in <literal>pavucontrol</literal>. This feature is disabled by default but can be enabled by using <literal>hardware.pulseaudio.package = pkgs.pulseaudioFull;</literal>.
|
||||
Existing 3rd party modules that provided similar functionality, like <literal>pulseaudio-modules-bt</literal> or <literal>pulseaudio-hsphfpd</literal> are deprecated and have been removed.</literallayout>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The new
|
||||
<link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook"><literal>postgresqlTestHook</literal></link>
|
||||
|
||||
@ -27,6 +27,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- Systemd has been upgraded to the version 250.
|
||||
|
||||
- Pulseaudio has been upgraded to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) like aptX or LDAC, with codec switching support being available in `pavucontrol`. This feature is disabled by default but can be enabled by using `hardware.pulseaudio.package = pkgs.pulseaudioFull;`.
|
||||
Existing 3rd party modules that provided similar functionality, like `pulseaudio-modules-bt` or `pulseaudio-hsphfpd` are deprecated and have been removed.
|
||||
|
||||
- The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks.
|
||||
|
||||
- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, bc, findutils, flac, lame, opusTools, procps, sox }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "caudec";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs ./install.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ bash makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
./install.sh --prefix=$out/bin
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluidsynth";
|
||||
version = "2.2.3";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
|
||||
sha256 = "sha256-aR8TLxl6OziP+DMSNro0DB/UtvzXDeDYQ3o/iy70XD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, writeScript
|
||||
, bash
|
||||
, tor
|
||||
, gnutar
|
||||
, zip
|
||||
, xz
|
||||
}:
|
||||
@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ];
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
||||
@ -95,7 +95,6 @@ in stdenv.mkDerivation (rec {
|
||||
clang
|
||||
makeWrapper
|
||||
nodePackages.esy
|
||||
bash
|
||||
perl
|
||||
which
|
||||
nasm
|
||||
|
||||
@ -43,7 +43,6 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
|
||||
};
|
||||
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
|
||||
nativeBuildInputs = nativeBuildInputs ++ [
|
||||
bash
|
||||
jq
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool
|
||||
, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
|
||||
, wrapGAppsHook, fetchpatch, bash, doxygen
|
||||
, wrapGAppsHook, fetchpatch, doxygen
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs =
|
||||
[ pkg-config autoconf automake gettext intltool
|
||||
wrapGAppsHook bash doxygen
|
||||
wrapGAppsHook doxygen
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:
|
||||
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }:
|
||||
let
|
||||
myPatchElf = file: with lib; ''
|
||||
patchelf --set-interpreter \
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
tar xfvz data.tar.gz
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
|
||||
nativeBuildInputs = [ makeWrapper patchelf udevRules ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect, nixosTests }:
|
||||
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
|
||||
let
|
||||
myPatchElf = file: with lib; ''
|
||||
patchelf --set-interpreter \
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
tar xfv data.tar.xz
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper patchelf coreutils ];
|
||||
nativeBuildInputs = [ makeWrapper patchelf ];
|
||||
buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ];
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }:
|
||||
{ version ? "release", lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
let
|
||||
|
||||
@ -39,8 +39,6 @@ buildGoModule {
|
||||
inherit (versionSpec) rev sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ coreutils ];
|
||||
|
||||
subPackages = [ "cmd/bee" ];
|
||||
|
||||
# no symbol table, no debug info, and pass the commit for the version string
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# Native build inputs:
|
||||
, ninja, pkg-config
|
||||
, python3, perl
|
||||
, gnutar, which
|
||||
, which
|
||||
, llvmPackages
|
||||
# postPatch:
|
||||
, pkgsBuildHost
|
||||
@ -133,7 +133,7 @@ let
|
||||
nativeBuildInputs = [
|
||||
ninja pkg-config
|
||||
python3WithPackages perl
|
||||
gnutar which
|
||||
which
|
||||
llvmPackages.bintools
|
||||
];
|
||||
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
# build time
|
||||
, autoconf
|
||||
, cargo
|
||||
, gnused
|
||||
, makeWrapper
|
||||
, nodejs
|
||||
, perl
|
||||
@ -208,7 +207,6 @@ buildStdenv.mkDerivation ({
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
cargo
|
||||
gnused
|
||||
llvmPackages.llvm # llvm-objdump
|
||||
makeWrapper
|
||||
nodejs
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
, ffmpeg
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gnused
|
||||
, graphviz
|
||||
, gtk2
|
||||
, intltool
|
||||
@ -120,7 +119,6 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
bcunit
|
||||
cmake
|
||||
gnused
|
||||
graphviz
|
||||
intltool
|
||||
makeWrapper
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, dbus
|
||||
, sqlite
|
||||
, file
|
||||
, gzip
|
||||
, makeWrapper
|
||||
, notmuch
|
||||
# Build with support for notmuch backend
|
||||
@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config gzip makeWrapper ];
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:
|
||||
{ lib, stdenv, fetchFromGitHub, mercury, pandoc, ncurses, gpgme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch-bower";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gawk mercury pandoc ];
|
||||
nativeBuildInputs = [ mercury pandoc ];
|
||||
|
||||
buildInputs = [ ncurses gpgme ];
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, appstream
|
||||
, bash
|
||||
, coreutils
|
||||
, curl
|
||||
, desktop-file-utils
|
||||
@ -40,7 +39,6 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bash
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, python3Packages, zlib, bash, coreutils }:
|
||||
{ lib, stdenv, fetchurl, python3Packages, zlib, bash }:
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages;
|
||||
@ -16,8 +16,6 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ];
|
||||
|
||||
nativeBuildInputs = [ coreutils ];
|
||||
|
||||
buildInputs = [ zlib ] ++ pythonPath;
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, fetchFromGitHub, last, exonerate, minia, python3, bwa
|
||||
, samtools, findutils }:
|
||||
, samtools }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tebreak";
|
||||
@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ findutils python3.pkgs.cython ];
|
||||
nativeBuildInputs = [ python3.pkgs.cython ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pysam
|
||||
scipy
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, nixosTests
|
||||
|
||||
, cmake
|
||||
, gzip
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, ncurses
|
||||
@ -68,7 +67,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gzip
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
ncurses
|
||||
|
||||
@ -26,7 +26,7 @@ assert sendEmailSupport -> perlSupport;
|
||||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.35.3";
|
||||
version = "2.36.0";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
|
||||
in
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "sha256-FenbT5vy7Z//MMtioAxcfAkBAV9asEjNtOiwTd7gD6I=";
|
||||
sha256 = "sha256-r16/wWWEZPXQ1For/YhMk1+2B6EMwCHZW8gHeIYcwdM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withManual "doc";
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, alsa-lib
|
||||
, autoPatchelfHook
|
||||
, binutils-unwrapped
|
||||
, gnutar
|
||||
, libav_0_8
|
||||
, libnotify
|
||||
, libresample
|
||||
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
binutils-unwrapped
|
||||
gnutar
|
||||
rpmextract
|
||||
unzip
|
||||
];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
|
||||
, pkg-config, cmake, gnumake, yasm, python3Packages
|
||||
, pkg-config, cmake, yasm, python3Packages
|
||||
, libgcrypt, libgpg-error, libunistring
|
||||
, boost, avahi, lame
|
||||
, gettext, pcre-cpp, yajl, fribidi, which
|
||||
@ -160,7 +160,7 @@ in stdenv.mkDerivation {
|
||||
doxygen
|
||||
makeWrapper
|
||||
which
|
||||
pkg-config gnumake
|
||||
pkg-config
|
||||
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
|
||||
jre_headless yasm gettext python3Packages.python flatbuffers
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, appstream-glib
|
||||
, pkg-config
|
||||
, txt2man
|
||||
, gzip
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, gsettings-desktop-schemas
|
||||
@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gettext
|
||||
gzip
|
||||
meson
|
||||
ninja
|
||||
libxml2
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, gnumake,
|
||||
{ lib, stdenv, fetchFromGitHub,
|
||||
libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "wmfs";
|
||||
@ -12,10 +12,6 @@ stdenv.mkDerivation {
|
||||
rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnumake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
imlib2
|
||||
libX11
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, fakechroot
|
||||
, fakeNss
|
||||
, fakeroot
|
||||
, findutils
|
||||
, go
|
||||
, jq
|
||||
, jshon
|
||||
@ -556,7 +555,7 @@ rec {
|
||||
};
|
||||
result = runCommand "docker-image-${baseName}.tar.gz"
|
||||
{
|
||||
nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ];
|
||||
nativeBuildInputs = [ jshon pigz jq moreutils ];
|
||||
# Image name must be lowercase
|
||||
imageName = lib.toLower name;
|
||||
imageTag = if tag == null then "" else tag;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, lib, coreutils, unzip, jq, zip, fetchurl,writeScript, ...}:
|
||||
{stdenv, unzip, jq, zip, fetchurl,writeScript, ...}:
|
||||
|
||||
{
|
||||
name
|
||||
@ -40,5 +40,5 @@ stdenv.mkDerivation {
|
||||
zip -r -q -FS "$out/$UUID.xpi" *
|
||||
rm -r "$out/$UUID"
|
||||
'';
|
||||
nativeBuildInputs = [ coreutils unzip zip jq ];
|
||||
nativeBuildInputs = [ unzip zip jq ];
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, gnutar, findutils, fetchurl, ... }:
|
||||
{ stdenv, fetchurl, ... }:
|
||||
{ name
|
||||
, url
|
||||
, version
|
||||
@ -13,11 +13,6 @@ stdenv.mkDerivation {
|
||||
inherit url sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnutar
|
||||
findutils
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
tar -xzpf $src
|
||||
'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }:
|
||||
{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }:
|
||||
|
||||
let
|
||||
aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
|
||||
@ -205,7 +205,7 @@ let
|
||||
writeNginxConfig = name: text: pkgs.runCommandLocal name {
|
||||
inherit text;
|
||||
passAsFile = [ "text" ];
|
||||
nativeBuildInputs = [ gawk gnused gixy ];
|
||||
nativeBuildInputs = [ gixy ];
|
||||
} /* sh */ ''
|
||||
# nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
|
||||
awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, xorgproto, libX11, bison, ksh, perl, gnum4
|
||||
, libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
|
||||
, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
|
||||
, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk
|
||||
, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales
|
||||
, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot
|
||||
, rpcsvc-proto }:
|
||||
|
||||
@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
|
||||
libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
bison ncompress gawk autoPatchelfHook makeWrapper fakeroot
|
||||
bison ncompress autoPatchelfHook makeWrapper fakeroot
|
||||
rpcsvc-proto
|
||||
];
|
||||
# build fails otherwise
|
||||
|
||||
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
||||
# Used during the configure phase
|
||||
ENVCMD = "${coreutils}/bin/env";
|
||||
|
||||
nativeBuildInputs = [ coreutils ];
|
||||
buildInputs = [ perl ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ coreutils ] ++ lib.optional stdenv.isDarwin cctools;
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin cctools;
|
||||
buildInputs = [ ncurses libiconv libX11 libuuid ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Binaries provided by Open Dylan to be used to bootstrap from source.
|
||||
# The binaries can also be used as is.
|
||||
{lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
|
||||
{lib, stdenv, fetchurl, patchelf, boehmgc, gcc, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opendylan";
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
}
|
||||
else throw "platform ${stdenv.hostPlatform.system} not supported.";
|
||||
|
||||
nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ];
|
||||
nativeBuildInputs = [ patchelf boehmgc makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p "$out"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip
|
||||
, autoconf, automake, autoreconfHook, bash, clang, dos2unix, file, gzip, perl
|
||||
, autoconf, automake, autoreconfHook, clang, dos2unix, file, perl
|
||||
, pkg-config
|
||||
, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool
|
||||
, libuuid, openssl, pango, xorg
|
||||
@ -75,11 +75,9 @@ in stdenv.mkDerivation {
|
||||
autoconf
|
||||
automake
|
||||
autoreconfHook
|
||||
bash
|
||||
clang
|
||||
dos2unix
|
||||
file
|
||||
gzip
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, swig
|
||||
, bash
|
||||
, libxml2
|
||||
, clang_10
|
||||
, python3
|
||||
@ -29,7 +28,6 @@
|
||||
, libgit2
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, findutils
|
||||
, makeWrapper
|
||||
, gnumake
|
||||
, file
|
||||
@ -188,12 +186,8 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
bash
|
||||
cmake
|
||||
coreutils
|
||||
findutils
|
||||
git
|
||||
gnumake
|
||||
libtool
|
||||
makeWrapper
|
||||
ninja
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, bash, which, autoconf, automake,
|
||||
{ lib, which, autoconf, automake,
|
||||
mkCoqDerivation, coq, version ? null }:
|
||||
|
||||
with lib; mkCoqDerivation {
|
||||
@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
|
||||
release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
|
||||
releaseRev = v: "flocq-${v}";
|
||||
|
||||
nativeBuildInputs = [ bash which autoconf ];
|
||||
nativeBuildInputs = [ which autoconf ];
|
||||
mlPlugin = true;
|
||||
useMelquiondRemake.logpath = "Flocq";
|
||||
|
||||
|
||||
@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
pkgsBuildBuild.guile_1_8;
|
||||
nativeBuildInputs = [
|
||||
gawk
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@ -42,7 +42,6 @@ builder rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
gawk
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
|
||||
@ -40,7 +40,6 @@ builder rec {
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
pkgsBuildBuild.guile;
|
||||
nativeBuildInputs = [
|
||||
gawk
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@ -40,7 +40,6 @@ builder rec {
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
pkgsBuildBuild.guile;
|
||||
nativeBuildInputs = [
|
||||
gawk
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@ -11,6 +11,9 @@ setuptoolsBuildPhase() {
|
||||
if [ -n "$setupPyGlobalFlags" ]; then
|
||||
args+="$setupPyGlobalFlags"
|
||||
fi
|
||||
if [ -n "$enableParallelBuilding" ]; then
|
||||
setupPyBuildFlags+="--parallel $NIX_BUILD_CORES"
|
||||
fi
|
||||
if [ -n "$setupPyBuildFlags" ]; then
|
||||
args+="build_ext $setupPyBuildFlags"
|
||||
fi
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildEnv, makeWrapper
|
||||
{ lib, stdenv, buildEnv, makeBinaryWrapper
|
||||
|
||||
# manually pased
|
||||
, python
|
||||
@ -27,7 +27,7 @@ let
|
||||
inherit ignoreCollisions;
|
||||
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
if [ -L "$out/bin" ]; then
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "at-spi2-core";
|
||||
version = "2.44.0";
|
||||
version = "2.44.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "fu488oWwiQYP1rblGz6yys91LMo6CCx/TCxauEHlE1M=";
|
||||
sha256 = "S+sjJwumz3yvILWXNU11GU2Jr7adLvzxX0JxaIum90Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch";
|
||||
sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2";
|
||||
})
|
||||
|
||||
# Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS.
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/b551b3e9737958216a1a9d359150a4110a9d0549.patch";
|
||||
sha256 = "kOVjlklZzKvBZXmmrE1UiO4XWRoBLViGwdn6/eDH+DY=";
|
||||
})
|
||||
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, bash, perl }:
|
||||
{ lib, stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gecode";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bash perl ];
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
preConfigure = "patchShebangs configure";
|
||||
|
||||
|
||||
@ -45,23 +45,15 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glib";
|
||||
version = "2.72.0";
|
||||
version = "2.72.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "177w1MTnpi4I77jl8lKgE1cAe5WIqH/ytGOjhXAR950=";
|
||||
sha256 = "wH5XFHslTO+SzoCgN43AwCpDWOfeRwLp9AMGl4EJX+I=";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [
|
||||
./darwin-compilation.patch
|
||||
|
||||
# Fix Inkscape compilation with clang++
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/issues/2625
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/97d39b745ff1f621424f68a41ce0a7c5bb554c87.patch";
|
||||
sha256 = "wftuyf3ExFfrISngCQpEUpIGfHCCLXeYv/PEb/TE6a8=";
|
||||
revert = true;
|
||||
})
|
||||
] ++ optionals stdenv.hostPlatform.isMusl [
|
||||
./quark_init_on_demand.patch
|
||||
./gobject_init_on_demand.patch
|
||||
|
||||
@ -40,13 +40,10 @@ callPackage ./common.nix { inherit stdenv; } {
|
||||
makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
|
||||
'';
|
||||
|
||||
# The stackprotector and fortify hardening flags are autodetected by glibc
|
||||
# and enabled by default if supported. Setting it for every gcc invocation
|
||||
# does not work.
|
||||
hardeningDisable = [ "stackprotector" "fortify" ]
|
||||
# XXX: Not actually musl-speciic but since only musl enables pie by default,
|
||||
# limit rebuilds by only disabling pie w/musl
|
||||
++ lib.optional stdenv.hostPlatform.isMusl "pie";
|
||||
# The pie, stackprotector and fortify hardening flags are autodetected by
|
||||
# glibc and enabled by default if supported. Setting it for every gcc
|
||||
# invocation does not work.
|
||||
hardeningDisable = [ "fortify" "pie" "stackprotector" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.concatStringsSep " "
|
||||
(builtins.concatLists [
|
||||
|
||||
@ -84,6 +84,7 @@
|
||||
, libxml2
|
||||
, srt
|
||||
, vo-aacenc
|
||||
, libfreeaptx
|
||||
, VideoToolbox
|
||||
, AudioToolbox
|
||||
, AVFoundation
|
||||
@ -96,13 +97,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-bad";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-AVuNTZo5Xr9ETUCHaGeiA03TMEs61IvDoN0MHucdwR0=";
|
||||
sha256 = "0j1q89dl8369djibc5p27lyj8y8p4maplmdzlryvrw0ib77w5lq9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -170,6 +171,7 @@ stdenv.mkDerivation rec {
|
||||
libintl
|
||||
srt
|
||||
vo-aacenc
|
||||
libfreeaptx
|
||||
] ++ lib.optionals enableZbar [
|
||||
zbar
|
||||
] ++ lib.optionals faacSupport [
|
||||
@ -261,7 +263,7 @@ stdenv.mkDerivation rec {
|
||||
"-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3
|
||||
"-Dgs=disabled" # depends on `google-cloud-cpp`
|
||||
"-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
|
||||
"-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235
|
||||
"-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx`
|
||||
]
|
||||
++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Dva=disabled" # see comment on `libva` in `buildInputs`
|
||||
|
||||
@ -41,13 +41,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-base";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw=";
|
||||
sha256 = "0162ly7pscymq6bsf1d5fva2k9s16zvfwyi1q6z4yfd97d0sdn4n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gstreamer";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc=";
|
||||
sha256 = "0cghi6n4nhdbajz3wqcgbh5xm94myvnqgsi9g2bz9n1s9904l2fy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-devtools";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-afyHVuydk+XFJYyZCIQ08gPpH9vFryjR8sWD/YGbeh0=";
|
||||
sha256 = "0asbapgf485h2gqq0sn9c4qknwi0ccpraf1685ixp2sv23pwgwc1";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-editing-services";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-+Detz0Bz0ZpZCJhOh5zQOfQZLKNo5x056MzYpWuf7t8=";
|
||||
sha256 = "1ps887yyj6jkj8a2613n43b4fbvynxwryinxvavi00cfnlhipkka";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -48,13 +48,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-good";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-LRGcFauMnnn4zTxr9YL/egULKMyuUqtIZeGhRkmRZZw=";
|
||||
sha256 = "1al4f35mx41cy2h6agvmsqkjfchsyfs0iyxzpv6pnl0xh9pqfriw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-libav";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc=";
|
||||
sha256 = "1iwz7928yi48xia5kfkj54x5dfmhbj25g9125vainpmp6fv1z9wi";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-rtsp-server";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-wgn17ZBtpxP91EqIROkJqmyK89+2MCWbCSz7d6d1WEM=";
|
||||
sha256 = "028maajlvfn96v3gqk2ws1k6w9hjfk7dsxnm84d73pnpi99bqia7";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-ugly";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-To3LXSZVLwpJN/a8Ynm9kHD1XKauDqoy1y0mTEQAHC4=";
|
||||
sha256 = "06fvgyjwcf4paqxgp1xmgd0d0glkxys7n818526k10wrw92m20s2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gstreamer-vaapi";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-95pHNG39XlheBj53B45fxJiwbe6JW/y/R9iGP8rJ6jI=";
|
||||
sha256 = "0dqiy8mhcpq3yla8dk69pkjid7hiv98ykvwskb4pk45g6z2zdyw7";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3
|
||||
, coreutils, gnused, util-linux, fetchpatch
|
||||
, util-linux, fetchpatch
|
||||
, boost
|
||||
, withStatic ? false # build only shared libs by default, build static+shared if true
|
||||
}:
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
cmake ragel python3
|
||||
# Consider simply using busybox for these
|
||||
# Need at least: rev, sed, cut, nm
|
||||
coreutils gnused util-linux
|
||||
util-linux
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -37,6 +37,22 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-G4wL5DDbX0FqaA4cnOlVLZ25ObN8dNsRtxyas29tpDA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)"
|
||||
|
||||
declare -a skip_tests=(
|
||||
# test won't work in nix sandbox
|
||||
'test_write_disk_perms'
|
||||
# can't be sure builder will have sparse-capable fs
|
||||
'test_sparse_basic'
|
||||
)
|
||||
|
||||
for test_name in "''${skip_tests[@]}" ; do
|
||||
sed -i "/$test_name/d" Makefile.am
|
||||
rm "libarchive/test/$test_name.c"
|
||||
done
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -60,17 +76,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = lib.optional (!xarSupport) "--without-xml2";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.am --replace '/bin/pwd' 'pwd'
|
||||
'';
|
||||
|
||||
preBuild = lib.optionalString stdenv.isCygwin ''
|
||||
echo "#include <windows.h>" >> config.h
|
||||
'';
|
||||
|
||||
# 484: test_write_disk_perms FAIL
|
||||
# TODO: how to disable it? Should it be reported upstream?
|
||||
doCheck = false;
|
||||
# https://github.com/libarchive/libarchive/issues/1475
|
||||
doCheck = !stdenv.hostPlatform.isMusl;
|
||||
|
||||
preFixup = ''
|
||||
sed -i $lib/lib/libarchive.la \
|
||||
|
||||
@ -45,7 +45,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libinput";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "libinput";
|
||||
repo = "libinput";
|
||||
rev = version;
|
||||
sha256 = "Ey6ItBIrf1POACp2+6R0B4KxJq5V1HoO+y4j6hZSGAE=";
|
||||
sha256 = "eujnabUaeNEJC/tPPhwcNS9sqDIorF52RjfqKBotbmc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, postgresql, python3, gnused }:
|
||||
{ lib, stdenv, fetchFromGitHub, postgresql, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpqxx";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-O30czHwEDXz5xY4o3MWhmEK06OKTKMQCy0M6qwSEpy8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnused python3 ];
|
||||
nativeBuildInputs = [ python3 ];
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvdpau";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0c1zsfr6ypzwv8g9z50kdahpb7pirarq4z8avqqyyma5b9684n22";
|
||||
sha256 = "sha256-pdUKQrjCiP68BxUatkOsjeBqGERpZcckH4m06BCCGRM=";
|
||||
};
|
||||
patches = [ ./installdir.patch ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, coreutils, gfortran, gnused
|
||||
{ lib, stdenv, fetchFromGitHub, gfortran
|
||||
, python3, util-linux, which
|
||||
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
coreutils
|
||||
gfortran
|
||||
gnused
|
||||
python3
|
||||
util-linux
|
||||
which
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
|
||||
{ lib, stdenv, fetchurl, gfortran, imake, makedepend, motif, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2006";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = with xorg; [ gfortran motif libX11 libXft libXt ];
|
||||
nativeBuildInputs = [ gnumake imake makedepend ];
|
||||
nativeBuildInputs = [ imake makedepend ];
|
||||
sourceRoot = ".";
|
||||
|
||||
patches = [ ./patch.patch ./0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ qtModule
|
||||
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
|
||||
|
||||
, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which
|
||||
, bison, flex, git, gperf, ninja, pkg-config, python2, which
|
||||
, nodejs, qtbase, perl
|
||||
|
||||
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
|
||||
@ -30,7 +30,7 @@ qtModule {
|
||||
pname = "qtwebengine";
|
||||
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
|
||||
nativeBuildInputs = [
|
||||
bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs
|
||||
bison flex git gperf ninja pkg-config python2 which gn nodejs
|
||||
] ++ lib.optional stdenv.isDarwin xcbuild;
|
||||
doCheck = true;
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gfortran
|
||||
, cmake
|
||||
, shared ? true
|
||||
@ -11,23 +10,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblapack";
|
||||
version = "3.10.0";
|
||||
version = "3.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Reference-LAPACK";
|
||||
repo = "lapack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ewYUM+M7jDO5LLnB4joiKkqgXjEDmWbFZbgad8x98gc=";
|
||||
sha256 = "07wwydw72gl4fhfqcyc8sbz7ynm0i23pggyfqn0r9a29g7qh8bqs";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-4048.patch";
|
||||
url = "https://github.com/Reference-LAPACK/lapack/commit/0631b6beaed60ba118b0b027c0f8d35397bf5df0.patch";
|
||||
sha256 = "1bqjw3f6ak9iz97y7ckn0rrfcgrzbn9prgfasl489qpxgzp2kjh8";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gfortran cmake ];
|
||||
|
||||
# Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10.
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xlsxwriter";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "jmcnamara";
|
||||
repo = "XlsxWriter";
|
||||
rev = "RELEASE_${version}";
|
||||
hash = "sha256-I87/8OhMoI9/BRXdmTZ1Ul+d+/x+Kg/9CuqMgTsP8Eo=";
|
||||
hash = "sha256-9fIxNkOdM+Bz1F9AWq02H3LLQnefxGSAtp9kM2OtJ9M=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -122,6 +122,8 @@ buildPythonPackage rec {
|
||||
export PATH=$(pwd):$PATH
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
pythonImportsCheck = [ "pandas" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybind11";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pybind";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wBvEWQlZhHoSCMbGgYtB3alWBLA8mA8Mz6JPLhXa3Pc=";
|
||||
hash = "sha256-O3bkexUBa+gfiJEM6KSR8y/iVqHqlCFmz/9EghxdIpw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -66,6 +66,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pybind/pybind11";
|
||||
changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst";
|
||||
description = "Seamless operability between C++11 and Python";
|
||||
longDescription = ''
|
||||
Pybind11 is a lightweight header-only library that exposes
|
||||
|
||||
@ -43,6 +43,8 @@ buildPythonPackage rec {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
pythonImportsCheck = [ "pydantic" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchPypi
|
||||
, python-dateutil
|
||||
, pkgs
|
||||
, coreutils
|
||||
, which
|
||||
}:
|
||||
|
||||
@ -16,7 +15,6 @@ buildPythonPackage rec {
|
||||
sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ coreutils ];
|
||||
checkInputs = [ which ];
|
||||
propagatedBuildInputs = [ python-dateutil ];
|
||||
|
||||
|
||||
@ -530,7 +530,6 @@ stdenv.mkDerivation rec {
|
||||
# when a command can’t be found in a bazel build, you might also
|
||||
# need to add it to `defaultShellPath`.
|
||||
nativeBuildInputs = [
|
||||
coreutils
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
python3
|
||||
|
||||
@ -525,7 +525,6 @@ stdenv.mkDerivation rec {
|
||||
# when a command can’t be found in a bazel build, you might also
|
||||
# need to add it to `defaultShellPath`.
|
||||
nativeBuildInputs = [
|
||||
coreutils
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
python3
|
||||
|
||||
@ -58,6 +58,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# unsandboxed non-NixOS builds, see:
|
||||
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
|
||||
./boost-Do-not-add-system-paths-on-nix.patch
|
||||
|
||||
# https://github.com/mesonbuild/meson/pull/9841
|
||||
# cross-compilation fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mesonbuild/meson/commit/266e8acb5807b38a550cb5145cea0e19545a21d7.patch";
|
||||
sha256 = "sha256-1GdKsm2xvq2GxTNeTyBH5O73hxboL0YI+w2BCoUeWXM=";
|
||||
})
|
||||
] ++ lib.optionals withDarwinFrameworksGtkDocPatch [
|
||||
# Fix building gtkdoc for GLib
|
||||
# https://github.com/mesonbuild/meson/pull/10186
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, python3, fetchFromGitHub, which, findutils, coreutils
|
||||
{ stdenv, lib, python3, fetchFromGitHub, which, coreutils
|
||||
, perl, installShellFiles
|
||||
, doCheck ? true
|
||||
}: stdenv.mkDerivation rec {
|
||||
@ -52,7 +52,6 @@
|
||||
python3
|
||||
(with python3.pkgs; [ beautifulsoup4 markdown ])
|
||||
which
|
||||
findutils
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, dbus
|
||||
, sqlite
|
||||
, file
|
||||
, gzip
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
@ -25,7 +24,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gzip
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config python3Packages.docutils ];
|
||||
buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
# to generate makefile.in
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-cbindgen";
|
||||
version = "0.21.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eqrion";
|
||||
repo = "cbindgen";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WvCGAjFxjaql/y35QfHyHvwbEL4pKtlc3JO2NecqQCM=";
|
||||
hash = "sha256-yux5VpN8UqBscu5TyojlZmu4q2uz8b9Tu++eNlPUj/M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Kl2/u+ttPn1k7f3+XRCord4u+c4QZ80/Okb40XeyeIk=";
|
||||
cargoSha256 = "sha256:1838dsmaqdlbd3j040bdy1fvl3z77xmcz73r11qmnqsga4yva6d7";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A project for generating C bindings from Rust code";
|
||||
homepage = "https://github.com/eqrion/cbindgen";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, gnome-builder
|
||||
, gnused
|
||||
, glib
|
||||
, libgee
|
||||
, json-glib
|
||||
@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
scdoc
|
||||
# GNOME Builder Plugin
|
||||
gnused
|
||||
gnome-builder
|
||||
];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
autoreconfHook, cups, gzip, libjpeg, rpmextract,
|
||||
autoreconfHook, cups, libjpeg, rpmextract,
|
||||
fetchurl, lib, stdenv
|
||||
}:
|
||||
|
||||
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
sourceRoot = srcdirs.filter;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gzip rpmextract ];
|
||||
nativeBuildInputs = [ autoreconfHook rpmextract ];
|
||||
buildInputs = [ cups libjpeg ];
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, gnumake, pkg-config, wget, unzip, gawk
|
||||
{ stdenv, lib, fetchFromGitHub, pkg-config, wget, unzip
|
||||
, sqlite, which, lua, installShellFiles, makeWrapper
|
||||
}:
|
||||
let
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnumake pkg-config wget unzip gawk sqlite which installShellFiles makeWrapper
|
||||
pkg-config wget unzip sqlite which installShellFiles makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ luaEnv ];
|
||||
|
||||
@ -192,7 +192,6 @@ let
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
libapparmor
|
||||
gawk
|
||||
which
|
||||
];
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, stdenvNoCC, dtc, findutils }:
|
||||
{ lib, stdenvNoCC, dtc }:
|
||||
|
||||
with lib; {
|
||||
applyOverlays = (base: overlays': stdenvNoCC.mkDerivation {
|
||||
name = "device-tree-overlays";
|
||||
nativeBuildInputs = [ dtc findutils ];
|
||||
nativeBuildInputs = [ dtc ];
|
||||
buildCommand = let
|
||||
overlays = toList overlays';
|
||||
in ''
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ell";
|
||||
version = "0.49";
|
||||
version = "0.50";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
|
||||
rev = version;
|
||||
sha256 = "sha256-/5ivelqRDvJuPVJqMs27VJUIq7/Dw6ROt/cmjSo309s=";
|
||||
sha256 = "sha256-LQAbE/pAKjVFsn9FjIbvY6sTBcVBdi4LCOnDVZ/WGV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,11 +31,12 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://01.org/ell";
|
||||
homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
|
||||
description = "Embedded Linux Library";
|
||||
longDescription = ''
|
||||
The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems.
|
||||
'';
|
||||
changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mic92 dtzWill maxeaubrey ];
|
||||
|
||||
@ -81,12 +81,12 @@ let
|
||||
in {
|
||||
inherit makeLinuxHeaders;
|
||||
|
||||
linuxHeaders = let version = "5.16"; in
|
||||
linuxHeaders = let version = "5.17"; in
|
||||
makeLinuxHeaders {
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82";
|
||||
sha256 = "1cdi43x4c3l4chznh57gm55szycj4wjlxl1dss1ilnfvvmhyypsm";
|
||||
};
|
||||
patches = [
|
||||
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
|
||||
, libelf, cpio, elfutils, zstd, gawk, python3Minimal, zlib, pahole
|
||||
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
|
||||
, writeTextFile
|
||||
}:
|
||||
|
||||
@ -320,7 +320,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
|
||||
enableParallelBuilding = true;
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd python3Minimal ]
|
||||
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ]
|
||||
++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools
|
||||
++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf
|
||||
# Removed util-linuxMinimal since it should not be a dependency.
|
||||
|
||||
@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
|
||||
pname = "libcap-ng";
|
||||
# When updating make sure to test that the version with
|
||||
# all of the python bindings still works
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j";
|
||||
sha256 = "sha256-vtb2hI4iuy+Dtfdksq7w7TkwVOgDqOOocRyyo55rSS0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ swig ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, readline, systemd, liburcu, json_c, kmod, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "multipath-tools";
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
$(find * -name Makefile\*)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ gzip pkg-config perl ];
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
buildInputs = [ systemd lvm2 libaio readline liburcu json_c ];
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sysstat";
|
||||
version = "12.4.4";
|
||||
version = "12.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz";
|
||||
sha256 = "sha256-lRLnR54E+S4lHFxrS9lLj2Q9ISvQ6Yao6k0Uem6UPSQ=";
|
||||
sha256 = "sha256-70RazqMBu7mW5BCEL2KQqNBJ6ITUhoz+9+hdwEt+7ls=";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# (which will eventually become the default version.)
|
||||
{ gcc6Stdenv, lib, fetchurl, fetchFromGitHub
|
||||
|
||||
, which, findutils, m4, gawk
|
||||
, which, m4
|
||||
, python2, openjdk, mono, libressl
|
||||
, ...
|
||||
}:
|
||||
@ -51,7 +51,7 @@ let
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2 openjdk gawk which m4 findutils mono ];
|
||||
nativeBuildInputs = [ python2 openjdk which m4 mono ];
|
||||
buildInputs = [ libressl boost ];
|
||||
|
||||
inherit patches;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, removeReferencesTo
|
||||
, file, openssl, perl, perlPackages, nettools, gnused
|
||||
, file, openssl, perl, perlPackages, nettools
|
||||
, withPerlTools ? false }: let
|
||||
|
||||
perlWithPkgs = perl.withPackages (ps: with ps; [
|
||||
@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
|
||||
substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo gnused file ];
|
||||
nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo file ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional withPerlTools perlWithPkgs;
|
||||
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
, procps
|
||||
, which
|
||||
, jre
|
||||
, coreutils
|
||||
, nixosTests
|
||||
# generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
|
||||
, generation
|
||||
@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper coreutils ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -4,7 +4,8 @@
|
||||
, avahi, libjack2, libasyncns, lirc, dbus
|
||||
, sbc, bluez5, udev, openssl, fftwFloat
|
||||
, soxr, speexdsp, systemd, webrtc-audio-processing
|
||||
, check, meson, ninja, m4
|
||||
, gst_all_1
|
||||
, check, meson, ninja, m4, wrapGAppsHook
|
||||
|
||||
, x11Support ? false
|
||||
|
||||
@ -19,6 +20,7 @@
|
||||
, airtunesSupport ? false
|
||||
|
||||
, bluetoothSupport ? true
|
||||
, advancedBluetoothCodecs ? false
|
||||
|
||||
, remoteControlSupport ? false
|
||||
|
||||
@ -48,7 +50,9 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja makeWrapper perlPackages.perl perlPackages.XMLParser m4 ]
|
||||
++ lib.optionals stdenv.isLinux [ glib ];
|
||||
++ lib.optionals stdenv.isLinux [ glib ]
|
||||
# gstreamer plugin discovery requires wrapping
|
||||
++ lib.optional (bluetoothSupport && advancedBluetoothCodecs) wrapGAppsHook;
|
||||
|
||||
propagatedBuildInputs =
|
||||
lib.optionals stdenv.isLinux [ libcap ];
|
||||
@ -65,6 +69,8 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib udev ]
|
||||
++ lib.optional airtunesSupport openssl
|
||||
++ lib.optionals bluetoothSupport [ bluez5 sbc ]
|
||||
# aptX and LDAC codecs are in gst-plugins-bad so far, rtpldacpay is in -good
|
||||
++ lib.optionals (bluetoothSupport && advancedBluetoothCodecs) (builtins.attrValues { inherit (gst_all_1) gst-plugins-bad gst-plugins-good gst-plugins-base gstreamer; })
|
||||
++ lib.optional remoteControlSupport lirc
|
||||
++ lib.optional zeroconfSupport avahi
|
||||
);
|
||||
@ -74,7 +80,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dasyncns=${if !libOnly then "enabled" else "disabled"}"
|
||||
"-Davahi=${if zeroconfSupport then "enabled" else "disabled"}"
|
||||
"-Dbluez5=${if !libOnly then "enabled" else "disabled"}"
|
||||
"-Dbluez5-gstreamer=disabled"
|
||||
# advanced bluetooth audio codecs are provided by gstreamer
|
||||
"-Dbluez5-gstreamer=${if (!libOnly && bluetoothSupport && advancedBluetoothCodecs) then "enabled" else "disabled"}"
|
||||
"-Ddatabase=simple"
|
||||
"-Ddoxygen=false"
|
||||
"-Delogind=disabled"
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq, libarchive
|
||||
{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive
|
||||
, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt
|
||||
, nlohmann_json, spdlog }:
|
||||
|
||||
# Common attributes of irods packages
|
||||
|
||||
{
|
||||
nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ];
|
||||
nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ];
|
||||
buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost
|
||||
libcxx catch2 nanodbc fmt nlohmann_json spdlog ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq
|
||||
{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq
|
||||
, libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2
|
||||
, nanodbc_llvm, fmt, nlohmann_json, spdlog }:
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
in
|
||||
let
|
||||
common = import ./common.nix {
|
||||
inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake
|
||||
inherit lib stdenv bzip2 zlib autoconf automake cmake
|
||||
help2man texinfo libtool cppzmq libarchive jansson
|
||||
zeromq openssl pam libiodbc libkrb5 gcc libcxx
|
||||
boost avro-cpp which catch2 nanodbc fmt nlohmann_json
|
||||
@ -99,4 +99,3 @@ rec {
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, autoreconfHook
|
||||
, gnused
|
||||
, boost
|
||||
, fuse
|
||||
, log4cxx
|
||||
@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gnused ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ zookeeper_mt log4cxx boost fuse ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, makeWrapper, gawk
|
||||
{ lib, fetchFromGitHub, makeWrapper
|
||||
, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages
|
||||
, stdenv, shortenPerlShebang
|
||||
}:
|
||||
@ -22,7 +22,7 @@ perlPackages.buildPerlPackage rec {
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper gawk ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
|
||||
buildInputs = [ gnuplot perl ]
|
||||
++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]);
|
||||
|
||||
@ -21,11 +21,11 @@ let
|
||||
in
|
||||
(if withQt then mkDerivation else stdenv.mkDerivation) rec {
|
||||
pname = "gnuplot";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-5Xx14TGBM5UdMqg7zcSv8X/tKHIsTnHyMFz8KuHK57o=";
|
||||
sha256 = "sha256-UfiburkPltNUP5UjU2jRiOseJu2ilpEiVqvNNTW9TYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools;
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
, pango
|
||||
, bash
|
||||
, bison
|
||||
, fetchpatch
|
||||
, xorg
|
||||
, ApplicationServices
|
||||
, python3
|
||||
@ -28,26 +27,16 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "graphviz";
|
||||
version = "2.49.3";
|
||||
version = "2.50.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "graphviz";
|
||||
repo = "graphviz";
|
||||
# use rev as tags have disappeared before
|
||||
rev = "3425dae078262591d04fec107ec71ab010651852";
|
||||
sha256 = "1qvyjly7r1ihacdvxq0r59l4csr09sc05palpshzqsiz2wb1izk0";
|
||||
rev = "ca43e4c6a217650447e2928c2e9cb493c73ebd7d";
|
||||
sha256 = "1psfgr8y4hh9yyzl04f7xbqb2y9k1xbja051j6b06q9dx7bmkmky";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix cross.
|
||||
# https://gitlab.com/graphviz/graphviz/-/merge_requests/2281
|
||||
# Remove when version > 2.49.3.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/graphviz/graphviz/-/commit/0cdb89acbb0caf5baf3d04a8821c9d0dfe065ea8.patch";
|
||||
sha256 = "130mqlxzhzaz3vp4ccaq7z7fd9q6vjxmimz70g8y818igsbb13rf";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user