Merge branch 'master' into staging-next
This commit is contained in:
Vladimír Čunát
commit
ac95eb6cac
24 changed files with 93 additions and 148 deletions
|
|
@ -250,5 +250,5 @@ Thirdly, it is because everything target-mentioning only exists to accommodate c
|
|||
:::
|
||||
|
||||
::: {.note}
|
||||
If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon.
|
||||
If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.__spliced.buildHost` or `.__spliced.hostTarget`.
|
||||
:::
|
||||
|
|
|
|||
|
|
@ -38,12 +38,15 @@ rec {
|
|||
//
|
||||
(drv.passthru or {})
|
||||
//
|
||||
(if (drv ? crossDrv && drv ? nativeDrv)
|
||||
then {
|
||||
crossDrv = overrideDerivation drv.crossDrv f;
|
||||
nativeDrv = overrideDerivation drv.nativeDrv f;
|
||||
}
|
||||
else { }));
|
||||
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
|
||||
(lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) {
|
||||
crossDrv = overrideDerivation drv.crossDrv f;
|
||||
nativeDrv = overrideDerivation drv.nativeDrv f;
|
||||
})
|
||||
//
|
||||
lib.optionalAttrs (drv ? __spliced) {
|
||||
__spliced = {} // (lib.mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced);
|
||||
});
|
||||
|
||||
|
||||
/* `makeOverridable` takes a function from attribute set to attribute set and
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "texstudio";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "${pname}-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-CwfnRkG8GsRQuE0+l394gMdj5ao3SUKaDnYP2dfUEew=";
|
||||
hash = "sha256-BaTfebLilUeDNtCJZmgAx+hN+L+4MtnuL6t3wQRX/Ns=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
, pango
|
||||
, pipewire
|
||||
, pciutils
|
||||
, libheimdal
|
||||
, heimdal
|
||||
, libpulseaudio
|
||||
, systemd
|
||||
, channel
|
||||
|
|
@ -134,7 +134,7 @@ stdenv.mkDerivation {
|
|||
pango
|
||||
pipewire
|
||||
pciutils
|
||||
libheimdal
|
||||
heimdal
|
||||
libpulseaudio
|
||||
systemd
|
||||
ffmpeg
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "threema-desktop";
|
||||
version = "1.2.13";
|
||||
version = "1.2.21";
|
||||
|
||||
src = fetchurl {
|
||||
# As Threema only offers a Latest Release url, the plan is to upload each
|
||||
# new release url to web.archive.org until their Github releases page gets populated.
|
||||
url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
|
||||
sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE=";
|
||||
url = "https://web.archive.org/web/20220915175906if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
|
||||
sha256 = "0icxn5whsvwmdmfbkfk4xnl3dn4iif5s5yw5hsimmyx066fq0qhb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
, pango
|
||||
, pipewire
|
||||
, pciutils
|
||||
, libheimdal
|
||||
, heimdal
|
||||
, libpulseaudio
|
||||
, systemd
|
||||
, writeScript
|
||||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation {
|
|||
pango
|
||||
pipewire
|
||||
pciutils
|
||||
libheimdal
|
||||
heimdal
|
||||
libpulseaudio
|
||||
systemd
|
||||
ffmpeg
|
||||
|
|
|
|||
|
|
@ -62,13 +62,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-0heCwXFms6Ni/F1TaS5QEK+ePlR9DXUrzVj3vA5DvCk=";
|
||||
sha256 = "sha256-I9xJWHoY8fZ5T9zca77gFciC+7JdD6fMwV16giiY4FU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,28 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
||||
, libusb1, rtl-sdr, soapysdr-with-plugins
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "21.12";
|
||||
version = "22.11";
|
||||
pname = "rtl_433";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "merbanan";
|
||||
repo = "rtl_433";
|
||||
rev = version;
|
||||
sha256 = "sha256-KoDKyI7KDdGSe79ZTuL9ObKnOJsqTN4wrMq+/cvQ/Xk=";
|
||||
sha256 = "sha256-qDY+prdf8O/dqmAgLU6lpsNIvL1R5V2AwsB+4CpOqGM=";
|
||||
};
|
||||
|
||||
patches = [( fetchpatch {
|
||||
name = "CVE-2022-27419";
|
||||
url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch";
|
||||
sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88";
|
||||
}) ( fetchpatch {
|
||||
name = "CVE-2022-25051";
|
||||
url = "https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8.patch";
|
||||
sha256 = "sha256-IfxwdnuA7WbaVdxMTln069mA5hKNuPz+XYQaNA4YY24=";
|
||||
})];
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ];
|
||||
|
|
@ -36,5 +26,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ earldouglas markuskowa ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ in
|
|||
|
||||
nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
|
||||
|
||||
STRIP = if strip then "${(binutils.nativeDrv or binutils).targetPrefix}strip" else null;
|
||||
STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null;
|
||||
}) ''
|
||||
mkdir ./root
|
||||
make-initrd-ng "$contentsPath" ./root
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, makeSetupHook, nodejs, srcOnly, diffutils, jq, makeWrapper }:
|
||||
{ lib, makeSetupHook, nodejs, srcOnly, buildPackages, makeWrapper }:
|
||||
|
||||
{
|
||||
npmConfigHook = makeSetupHook
|
||||
|
|
@ -9,9 +9,8 @@
|
|||
|
||||
# Specify the stdenv's `diff` and `jq` by abspath to ensure that the user's build
|
||||
# inputs do not cause us to find the wrong binaries.
|
||||
# The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.
|
||||
diff = "${diffutils.nativeDrv or diffutils}/bin/diff";
|
||||
jq = "${jq.nativeDrv or jq}/bin/jq";
|
||||
diff = "${buildPackages.diffutils}/bin/diff";
|
||||
jq = "${buildPackages.jq}/bin/jq";
|
||||
|
||||
nodeVersion = nodejs.version;
|
||||
nodeVersionMajor = lib.versions.major nodejs.version;
|
||||
|
|
@ -29,7 +28,7 @@
|
|||
deps = [ makeWrapper ];
|
||||
substitutions = {
|
||||
hostNode = "${nodejs}/bin/node";
|
||||
jq = "${jq.nativeDrv or jq}/bin/jq";
|
||||
jq = "${buildPackages.jq}/bin/jq";
|
||||
};
|
||||
} ./npm-install-hook.sh;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, callPackage
|
||||
, cargo
|
||||
, clang
|
||||
, diffutils
|
||||
, lib
|
||||
, makeSetupHook
|
||||
, maturin
|
||||
|
|
@ -65,8 +64,7 @@ in {
|
|||
|
||||
# Specify the stdenv's `diff` by abspath to ensure that the user's build
|
||||
# inputs do not cause us to find the wrong `diff`.
|
||||
# The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.
|
||||
diff = "${diffutils.nativeDrv or diffutils}/bin/diff";
|
||||
diff = "${lib.getBin buildPackages.diffutils}/bin/diff";
|
||||
|
||||
# We want to specify the correct crt-static flag for both
|
||||
# the build and host platforms. This is important when the wanted
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
{ fetchurl, fetchpatch, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsl";
|
||||
version = "1.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gsl/gsl-${version}.tar.gz";
|
||||
sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
|
||||
};
|
||||
|
||||
# do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "bug-39055.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
|
||||
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "fix-parallel-test.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=12654373c3b60541230921aae81f93b484ec5eaf";
|
||||
sha256 = "1flzpbsfj7gjywv6v9qvm8wpdrkbpj7shryinfdpb40y7si9njdw";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "The GNU Scientific Library, a large numerical library";
|
||||
homepage = "https://www.gnu.org/software/gsl/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
longDescription = ''
|
||||
The GNU Scientific Library (GSL) is a numerical library for C
|
||||
and C++ programmers. It is free software under the GNU General
|
||||
Public License.
|
||||
|
||||
The library provides a wide range of mathematical routines such
|
||||
as random number generators, special functions and least-squares
|
||||
fitting. There are over 1000 functions in total with an
|
||||
extensive test suite.
|
||||
'';
|
||||
platforms = lib.platforms.unix;
|
||||
# Failing "eigen" tests on aarch64.
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -107,6 +107,8 @@ let
|
|||
} ./hooks/qmake-hook.sh;
|
||||
};
|
||||
|
||||
# TODO(@Artturin): convert to makeScopeWithSplicing
|
||||
# simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01
|
||||
self = lib.makeScope newScope addPackages;
|
||||
in
|
||||
self
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation (args // {
|
|||
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
|
||||
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
|
||||
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
|
||||
${self.qtbase.dev.nativeDrv or self.qtbase.dev}/libexec/syncqt.pl -version "''${version%%-*}"
|
||||
${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
|
||||
fi
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,11 @@
|
|||
, cmake
|
||||
, fetchurl
|
||||
, git
|
||||
, cctools
|
||||
, developer_cmds
|
||||
, DarwinTools
|
||||
, makeWrapper
|
||||
, CoreServices
|
||||
, bison
|
||||
, openssl
|
||||
, protobuf
|
||||
|
|
@ -26,30 +31,24 @@
|
|||
, python3
|
||||
, cyrus_sasl
|
||||
, openldap
|
||||
, numactl
|
||||
, cctools
|
||||
, CoreServices
|
||||
, developer_cmds
|
||||
, DarwinTools
|
||||
, makeWrapper
|
||||
, antlr
|
||||
}:
|
||||
|
||||
let
|
||||
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
|
||||
pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps;
|
||||
in
|
||||
stdenv.mkDerivation rec{
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysql-shell";
|
||||
version = "8.0.30";
|
||||
version = "8.0.31";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
|
||||
sha256 = "sha256-/UJgcYkPG8RShZzybqdcMQDpNUTVWAfAa2p0Cm23fXA=";
|
||||
sha256 = "sha256-VA9dqvPmw2WXP3hAJS2xRTvxBM8D/IPsWYIaYwRZI/s=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
|
||||
sha256 = "sha256-yYjVxrqaVmkqbNbpgTRltfyTaO1LRh35cFmi/BYMi4Q=";
|
||||
sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -62,7 +61,9 @@ stdenv.mkDerivation rec{
|
|||
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
|
||||
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]
|
||||
++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
|
|
@ -84,13 +85,15 @@ stdenv.mkDerivation rec{
|
|||
openldap
|
||||
v8
|
||||
python3
|
||||
] ++ pythonDeps ++ lib.optionals stdenv.isLinux [
|
||||
numactl
|
||||
libtirpc
|
||||
] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ];
|
||||
antlr.runtime.cpp
|
||||
] ++ pythonDeps
|
||||
++ lib.optionals stdenv.isLinux [ libtirpc ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
preConfigure = ''
|
||||
# Build MySQL
|
||||
echo "Building mysqlclient mysqlxclient"
|
||||
|
||||
cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
|
||||
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build
|
||||
|
||||
|
|
@ -114,7 +117,7 @@ stdenv.mkDerivation rec{
|
|||
CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}"
|
||||
wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "worker-build";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oqnYWrytQ3hCf4T/PNIXTs3tW+W8HvuvIulRhdhzsDU=";
|
||||
sha256 = "sha256-s5fcs1A31ePr2EvFdNvX55jMRkHZkR+LRkcy59brwXg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-t35LMyiQl2bsGjNIKqb8sKbrmCLZ0pmoo0qX0buGA+o=";
|
||||
cargoSha256 = "sha256-2jLv3/mLLnSsSKEGaAd4jaM5FOdTvdJg2W1Nc4mVkqs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, dataPath ? "/var/lib/snappymail" }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snappymail";
|
||||
version = "2.21.0";
|
||||
version = "2.21.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
||||
sha256 = "sha256-rJRNSlzGPNRFsvloTatB0o9uumbp18I15L5G6ms47EM=";
|
||||
sha256 = "sha256-lDtbbovgPuXOgNKkHN2EiDltgzSQCVNvN/Qw4FOUVwo=";
|
||||
};
|
||||
|
||||
sourceRoot = "snappymail";
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "reorg";
|
||||
repo = "pg_repack";
|
||||
rev = "f42c1bd707bd5d69a9eb33494133db2e47a2c05a"; # no release tag
|
||||
sha256 = "sha256-pZjspnmPTXS/SbyLAd7vcoF01cbC6PnxZjuto4lUuQA=";
|
||||
rev = "ver_${version}";
|
||||
sha256 = "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plpgsql_check";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nxq4wpOWYt4oyoLxERWPhlEwWmLiDEk27EFyDtW/BfI=";
|
||||
sha256 = "sha256-XluwevRw+cP0Tx8cr4ixTnX1rakj9zq98rclcrxfMKI=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ else let
|
|||
dependencies = map (map lib.chooseDevOutputs) [
|
||||
[
|
||||
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild))
|
||||
(map (drv: drv.nativeDrv or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs
|
||||
(map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs
|
||||
++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
|
||||
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh
|
||||
++ lib.optionals doCheck checkInputs
|
||||
|
|
@ -218,7 +218,7 @@ else let
|
|||
]
|
||||
[
|
||||
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost))
|
||||
(map (drv: drv.crossDrv or drv) (checkDependencyList "buildInputs" buildInputs))
|
||||
(map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs))
|
||||
]
|
||||
[
|
||||
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget))
|
||||
|
|
@ -227,12 +227,12 @@ else let
|
|||
propagatedDependencies = map (map lib.chooseDevOutputs) [
|
||||
[
|
||||
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated))
|
||||
(map (drv: drv.nativeDrv or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))
|
||||
(map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))
|
||||
(map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated))
|
||||
]
|
||||
[
|
||||
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHostPropagated" depsHostHostPropagated))
|
||||
(map (drv: drv.crossDrv or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs))
|
||||
(map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs))
|
||||
]
|
||||
[
|
||||
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
{ lib, fetchFromGitHub, makeWrapper
|
||||
, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages
|
||||
, stdenv, shortenPerlShebang
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, makeFontsConf
|
||||
, freefont_ttf
|
||||
, gnuplot
|
||||
, perl
|
||||
, perlPackages
|
||||
, stdenv
|
||||
, shortenPerlShebang
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -11,18 +19,18 @@ in
|
|||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "feedgnuplot";
|
||||
version = "1.58";
|
||||
version = "1.61";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dkogan";
|
||||
repo = "feedgnuplot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qix4lwwyhqibz0a6q2rrb497rmk00v1fvmdyinj0dqmgjw155zr";
|
||||
sha256 = "sha256-r5rszxr65lSozkUNaqfBn4I4XjLtvQ6T/BG366JXLRM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
|
||||
buildInputs = [ gnuplot perl ]
|
||||
++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]);
|
||||
|
|
@ -43,10 +51,9 @@ perlPackages.buildPerlPackage rec {
|
|||
wrapProgram $out/bin/feedgnuplot \
|
||||
--prefix "PATH" ":" "$PATH" \
|
||||
--prefix "PERL5LIB" ":" "$PERL5LIB"
|
||||
install -D -m 444 -t $out/share/bash-completion/completions \
|
||||
completions/bash/feedgnuplot
|
||||
install -D -m 444 -t $out/share/zsh/site-functions \
|
||||
completions/zsh/_feedgnuplot
|
||||
|
||||
installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot
|
||||
installShellCompletion --zsh completions/zsh/_feedgnuplot
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -582,6 +582,7 @@ mapAliases ({
|
|||
gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
|
||||
grv = throw "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01
|
||||
gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
|
||||
gsl_1 = throw "'gsl_1' has been renamed to/replaced by 'gsl'"; # Added 2022-11-19
|
||||
gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22
|
||||
gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
|
||||
gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15
|
||||
|
|
@ -756,6 +757,7 @@ mapAliases ({
|
|||
libgpgerror = libgpg-error; # Added 2021-09-04
|
||||
libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21
|
||||
libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22
|
||||
libheimdal = heimdal; # Added 2022-11-18
|
||||
libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14
|
||||
libixp_hg = libixp;
|
||||
libjpeg_drop = libjpeg_original; # Added 2020-06-05
|
||||
|
|
|
|||
|
|
@ -790,6 +790,7 @@ with pkgs;
|
|||
mysql-shell = callPackage ../development/tools/mysql-shell {
|
||||
inherit (darwin) cctools developer_cmds DarwinTools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
antlr = antlr4_10;
|
||||
boost = boost177; # Configure checks for specific version.
|
||||
protobuf = protobuf3_19;
|
||||
icu = icu69;
|
||||
|
|
@ -18579,7 +18580,7 @@ with pkgs;
|
|||
cypress = callPackage ../development/web/cypress { };
|
||||
|
||||
cyrus_sasl = callPackage ../development/libraries/cyrus-sasl {
|
||||
libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5;
|
||||
libkrb5 = if stdenv.isFreeBSD then heimdal else libkrb5;
|
||||
};
|
||||
|
||||
# Make bdb5 the default as it is the last release under the custom
|
||||
|
|
@ -19317,8 +19318,6 @@ with pkgs;
|
|||
|
||||
gsl = callPackage ../development/libraries/gsl { };
|
||||
|
||||
gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { };
|
||||
|
||||
gsl-lite = callPackage ../development/libraries/gsl-lite { };
|
||||
|
||||
gsm = callPackage ../development/libraries/gsm {};
|
||||
|
|
@ -19496,7 +19495,6 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
libheimdal = heimdal;
|
||||
|
||||
harfbuzz = callPackage ../development/libraries/harfbuzz {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText;
|
||||
|
|
|
|||
|
|
@ -8,16 +8,9 @@
|
|||
# The solution is to splice the package sets together as we do below, so every
|
||||
# `callPackage`d expression in fact gets both versions. Each# derivation (and
|
||||
# each derivation's outputs) consists of the run-time version, augmented with a
|
||||
# `nativeDrv` field for the build-time version, and `crossDrv` field for the
|
||||
# `__spliced.buildHost` field for the build-time version, and `__spliced.hostTarget` field for the
|
||||
# run-time version.
|
||||
#
|
||||
# We could have used any names we want for the disambiguated versions, but
|
||||
# `crossDrv` and `nativeDrv` were somewhat similarly used for the old
|
||||
# cross-compiling infrastructure. The names are mostly invisible as
|
||||
# `mkDerivation` knows how to pull out the right ones for `buildDepends` and
|
||||
# friends, but a few packages use them directly, so it seemed efficient (to
|
||||
# @Ericson2314) to reuse those names, at least initially, to minimize breakage.
|
||||
#
|
||||
# For performance reasons, rather than uniformally splice in all cases, we only
|
||||
# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`
|
||||
# parameter there the boolean value of that equality check.
|
||||
|
|
@ -46,14 +39,16 @@ let
|
|||
valueHostTarget = pkgsHostTarget.${name} or {};
|
||||
valueTargetTarget = pkgsTargetTarget.${name} or {};
|
||||
augmentedValue = defaultValue
|
||||
# TODO(@Ericson2314): Stop using old names after transition period
|
||||
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; })
|
||||
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; })
|
||||
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
|
||||
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; })
|
||||
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; })
|
||||
// {
|
||||
__spliced =
|
||||
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
|
||||
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })
|
||||
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
|
||||
// (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
|
||||
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })
|
||||
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue