Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
c4fe2133de
46 changed files with 574 additions and 342 deletions
35
pkgs/applications/audio/listenbrainz-mpd/default.nix
Normal file
35
pkgs/applications/audio/listenbrainz-mpd/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitea
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, openssl
|
||||
, libiconv
|
||||
, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "listenbrainz-mpd";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "elomatreb";
|
||||
repo = "listenbrainz-mpd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DO7YUqaJZyVWjiAZ9WIVNTTvOU0qdsI2ct7aT/6O5dQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MiAalxe0drRHrST3maVvi8GM2y3d0z4Zl7R7Zx8VjEM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = if stdenv.isDarwin then [ libiconv Security ] else [ openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd";
|
||||
changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md";
|
||||
description = "ListenBrainz submission client for MPD";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ DeeUnderscore ];
|
||||
};
|
||||
}
|
||||
|
|
@ -25,8 +25,7 @@
|
|||
}:
|
||||
let
|
||||
mutableExtensionsFilePath = toString mutableExtensionsFile;
|
||||
mutableExtensions = if builtins.pathExists mutableExtensionsFile
|
||||
then import mutableExtensionsFilePath else [];
|
||||
mutableExtensions = lib.optionals builtins.pathExists mutableExtensionsFile (import mutableExtensionsFilePath);
|
||||
vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
|
||||
inherit lib writeShellScriptBin extensionsFromVscodeMarketplace;
|
||||
vscodeDefault = vscode;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gtk3 udev desktop-file-utils shared-mime-info
|
||||
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2
|
||||
] ++ (if ifuseSupport then [ ifuse ] else []);
|
||||
] ++ (lib.optionals ifuseSupport [ ifuse ]);
|
||||
# Introduced because ifuse doesn't build due to CVEs in libplist
|
||||
# Revert when libplist builds again…
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ symlinkJoin, kdevelop-unwrapped, plugins ? null }:
|
||||
{ lib, symlinkJoin, kdevelop-unwrapped, plugins ? null }:
|
||||
|
||||
symlinkJoin {
|
||||
name = "kdevelop-with-plugins";
|
||||
|
||||
paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []);
|
||||
paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
, qtbase
|
||||
, qtwayland
|
||||
, removeReferencesTo
|
||||
, speechd
|
||||
, sqlite
|
||||
, wrapQtAppsHook
|
||||
, xdg-utils
|
||||
|
|
@ -121,6 +122,7 @@ stdenv.mkDerivation rec {
|
|||
regex
|
||||
sip
|
||||
setuptools
|
||||
speechd
|
||||
zeroconf
|
||||
jeepney
|
||||
pycryptodome
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }:
|
||||
{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, chromium, makeWrapper }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vhs";
|
||||
|
|
@ -14,12 +14,11 @@ buildGoModule rec {
|
|||
vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
buildInputs = [ ttyd ffmpeg ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]}
|
||||
wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ chromium ffmpeg ttyd ]}
|
||||
$out/bin/vhs man > vhs.1
|
||||
installManPage vhs.1
|
||||
installShellCompletion --cmd vhs \
|
||||
|
|
|
|||
|
|
@ -90,9 +90,7 @@ mkChromiumDerivation (base: rec {
|
|||
license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "chromium";
|
||||
hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium")
|
||||
then ["aarch64-linux" "x86_64-linux"]
|
||||
else [];
|
||||
hydraPlatforms = lib.optionals (channel == "stable" || channel == "ungoogled-chromium") ["aarch64-linux" "x86_64-linux"];
|
||||
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ let
|
|||
|
||||
usesNixExtensions = nixExtensions != null;
|
||||
|
||||
nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []);
|
||||
nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions);
|
||||
|
||||
requiresSigning = browser ? MOZ_REQUIRE_SIGNING
|
||||
-> toString browser.MOZ_REQUIRE_SIGNING != "";
|
||||
|
|
@ -114,7 +114,7 @@ let
|
|||
throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon"
|
||||
else
|
||||
a
|
||||
) (if usesNixExtensions then nixExtensions else []);
|
||||
) (lib.optionals usesNixExtensions nixExtensions);
|
||||
|
||||
enterprisePolicies =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -173,11 +173,11 @@
|
|||
"vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0="
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-ISK6cpE4DVrVzjC0N5BdyR3Z5LfF9qfg/ACTgDP+WqY=",
|
||||
"hash": "sha256-YmgzzDLNJg7zm8smboI0gE2kOgjb2RwPf5v1CbzgvGA=",
|
||||
"homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
|
||||
"owner": "brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v3.2.0",
|
||||
"rev": "v3.2.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU="
|
||||
},
|
||||
|
|
@ -438,24 +438,24 @@
|
|||
"vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-z5Fi+ac7dcDr/eTTJWWfsIm9tJJ+NgcY2L08h317G7g=",
|
||||
"hash": "sha256-WE1UjyqsrhlGWJHZ6VlNCBtdSsXM6ewK4WJrmqFN6NU=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.53.0",
|
||||
"rev": "v4.53.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno="
|
||||
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-0NCndgGz/xrYNvWjs49u//VXvndw0RFyAINnGUTKQ4s=",
|
||||
"hash": "sha256-eXIYVB3YzhJNjYNR1oB7bj5uGZgRhgMD5eWxLls6KoE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.53.0",
|
||||
"rev": "v4.53.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno="
|
||||
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
|
||||
},
|
||||
"googleworkspace": {
|
||||
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
|
||||
|
|
@ -494,11 +494,11 @@
|
|||
"vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg="
|
||||
},
|
||||
"helm": {
|
||||
"hash": "sha256-MSBCn4AriAWys2FIYJIGamcaLGx0gtO5IiB/WxcN2rg=",
|
||||
"hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/helm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-helm",
|
||||
"rev": "v2.8.0",
|
||||
"rev": "v2.9.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -1045,13 +1045,13 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-UivENbjPajJdH9PwHznMP+cLXBJ8C38wgHS2IqyoqRk=",
|
||||
"hash": "sha256-5irTp8teFShAd0FV2fIKf4dE9WokmxK3rREEozinQZM=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.97.0",
|
||||
"rev": "v1.99.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-iQLZpSa1gJ4z2/r1Om9vFrcKP5ik7kcx+rNVZLhmSBc="
|
||||
"vendorHash": "sha256-yuGUEy9us2BL2v06tL3XDcpCujQk8H2DUzQiJQQNsvo="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
|
||||
|
|
|
|||
|
|
@ -37,20 +37,18 @@ rec {
|
|||
);
|
||||
nativeBuildInputs = lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
if hasFeature feat then
|
||||
(if builtins.hasAttr "native" info then info.native else []) ++
|
||||
(if builtins.hasAttr "pythonNative" info then info.pythonNative else [])
|
||||
else
|
||||
[]
|
||||
lib.optionals (hasFeature feat) (
|
||||
(lib.optionals (builtins.hasAttr "native" info) info.native) ++
|
||||
(lib.optionals (builtins.hasAttr "pythonNative" info) info.pythonNative)
|
||||
)
|
||||
)
|
||||
) featuresInfo);
|
||||
buildInputs = lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
if hasFeature feat then
|
||||
(if builtins.hasAttr "runtime" info then info.runtime else []) ++
|
||||
(if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else [])
|
||||
else
|
||||
[]
|
||||
lib.optionals (hasFeature feat) (
|
||||
(lib.optionals (builtins.hasAttr "runtime" info) info.runtime) ++
|
||||
(lib.optionals (builtins.hasAttr "pythonRuntime" info) info.pythonRuntime)
|
||||
)
|
||||
)
|
||||
) featuresInfo);
|
||||
cmakeFlags = lib.mapAttrsToList (
|
||||
|
|
|
|||
|
|
@ -41,12 +41,9 @@ let
|
|||
++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages)
|
||||
++ lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
if unwrapped.hasFeature feat then
|
||||
(if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else [])
|
||||
else
|
||||
[]
|
||||
lib.optionals ((unwrapped.hasFeature feat) && (builtins.hasAttr "pythonRuntime" info)) info.pythonRuntime
|
||||
)
|
||||
) unwrapped.featuresInfo)
|
||||
) unwrapped.featuresInfo)
|
||||
;
|
||||
pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs);
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
# * application: Whether this package is a python library or an
|
||||
# application which happens to be written in python.
|
||||
# * doCheck: Whether to run the test suites.
|
||||
pythonPackages:
|
||||
{ src, info, meta ? {}, application ? false, doCheck ? true }: let
|
||||
lib: pythonPackages:
|
||||
{ src, info, meta ? {}, application ? false, doCheck ? true}: let
|
||||
build = if application
|
||||
then pythonPackages.buildPythonApplication
|
||||
else pythonPackages.buildPythonPackage;
|
||||
|
|
@ -18,7 +18,8 @@ in build {
|
|||
|
||||
nativeBuildInputs = map (p: pythonPackages.${p}) (
|
||||
(info.setup_requires or []) ++
|
||||
(if doCheck then (info.tests_require or []) else []));
|
||||
(lib.optionals doCheck (info.tests_require or []))
|
||||
);
|
||||
|
||||
propagatedBuildInputs = map (p: pythonPackages.${p})
|
||||
(info.install_requires or []);
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@ let
|
|||
meta.licence = let
|
||||
depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses");
|
||||
in (lib.flatten (lib.forEach depLicenses (spdx:
|
||||
if (spdx != "")
|
||||
then lib.getLicenseFromSpdxId spdx
|
||||
else []
|
||||
lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx)
|
||||
)));
|
||||
};
|
||||
in nuget-source
|
||||
|
|
|
|||
74
pkgs/desktops/deepin/apps/deepin-reader/default.nix
Normal file
74
pkgs/desktops/deepin/apps/deepin-reader/default.nix
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, qtwebengine
|
||||
, karchive
|
||||
, poppler
|
||||
, libchardet
|
||||
, libspectre
|
||||
, openjpeg
|
||||
, djvulibre
|
||||
, gtest
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-reader";
|
||||
version = "5.10.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0jHhsxEjBbu3ktvjX1eKnkZDwzRk9MrUSJSdYeOvWtI=";
|
||||
};
|
||||
|
||||
patches = [ ./use-pkg-config.diff ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace reader/{reader.pro,document/Model.cpp} htmltopdf/htmltopdf.pro 3rdparty/deepin-pdfium/src/src.pro \
|
||||
--replace "/usr" "$out"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
qtwebengine
|
||||
karchive
|
||||
poppler
|
||||
libchardet
|
||||
libspectre
|
||||
djvulibre
|
||||
openjpeg
|
||||
gtest
|
||||
];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple memo software with texts and voice recordings";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-reader";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
46
pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff
Normal file
46
pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
|
||||
index 3e04f340..894b0ac7 100755
|
||||
--- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
|
||||
+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
|
||||
@@ -20,13 +20,8 @@ DEFINES += USE_SYSTEM_LIBJPEG \
|
||||
USE_SYSTEM_LIBOPENJPEG2 \
|
||||
USE_SYSTEM_FREETYPE
|
||||
|
||||
-INCLUDEPATH += /usr/include/openjpeg-2.3 \
|
||||
- /usr/include/openjpeg-2.4 \
|
||||
- /usr/include/freetype2 \
|
||||
- /usr/include/freetype2/freetype \
|
||||
- /usr/include/freetype2/freetype/config
|
||||
-
|
||||
-LIBS += -lopenjp2 -llcms2 -lfreetype
|
||||
+CONFIG += link_pkgconfig
|
||||
+PKGCONFIG += libopenjp2 lcms2 freetype2
|
||||
|
||||
#QMAKE_CXXFLAGS += "-Wc++11-narrowing" #is_clang
|
||||
#QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override" #is_clang Suppress no override warning for overridden functions.
|
||||
diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro
|
||||
index 196b91d3..bda71ff4 100755
|
||||
--- a/3rdparty/deepin-pdfium/src/src.pro
|
||||
+++ b/3rdparty/deepin-pdfium/src/src.pro
|
||||
@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
-CONFIG += c++14
|
||||
+CONFIG += c++14 link_pkgconfig
|
||||
+
|
||||
+PKGCONFIG += chardet
|
||||
|
||||
###安全漏洞检测
|
||||
#QMAKE_CXX += -g -fsanitize=undefined,address -O2
|
||||
@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri)
|
||||
|
||||
INCLUDEPATH += $$PWD/../include
|
||||
|
||||
-INCLUDEPATH += /usr/include/chardet
|
||||
-
|
||||
-LIBS += -lchardet
|
||||
-
|
||||
public_headers += \
|
||||
$$PWD/../include/dpdfglobal.h \
|
||||
$$PWD/../include/dpdfdoc.h \
|
||||
|
|
@ -38,6 +38,7 @@ let
|
|||
deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
|
||||
deepin-picker = callPackage ./apps/deepin-picker { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
deepin-reader = callPackage ./apps/deepin-reader { };
|
||||
|
||||
#### Go Packages
|
||||
go-lib = callPackage ./go-package/go-lib { inherit replaceAll; };
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
, testers
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtksourceview";
|
||||
version = "2.10.5";
|
||||
|
|
@ -17,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
name = "change-igemacintegration-to-gtkosxapplication.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch";
|
||||
|
|
@ -35,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
atk cairo glib gtk2
|
||||
pango libxml2Python perl
|
||||
gettext
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
gnome-common gtk-mac-integration-gtk2
|
||||
];
|
||||
|
||||
preConfigure = optionalString stdenv.isDarwin ''
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
intltoolize --force
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
hooks = import ./hooks/default.nix;
|
||||
keep = lib.extends hooks pythonPackagesFun;
|
||||
extra = _: {};
|
||||
optionalExtensions = cond: as: if cond then as else [];
|
||||
optionalExtensions = cond: as: lib.optionals cond as;
|
||||
pythonExtension = import ../../../top-level/python-packages.nix;
|
||||
python2Extension = import ../../../top-level/python2-packages.nix;
|
||||
extensions = lib.composeManyExtensions ([
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ let
|
|||
}));
|
||||
|
||||
# See build-setupcfg/default.nix for documentation.
|
||||
buildSetupcfg = import ../../../build-support/build-setupcfg self;
|
||||
buildSetupcfg = import ../../../build-support/build-setupcfg lib self;
|
||||
|
||||
# Check whether a derivation provides a Python module.
|
||||
hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, sha512
|
||||
, type ? "jar"
|
||||
, suffix ? ""
|
||||
, sourceProvenance ? (if type == "jar" then [ lib.sourceTypes.binaryBytecode ] else [])
|
||||
, sourceProvenance ? (lib.optionals (type == "jar") [ lib.sourceTypes.binaryBytecode ])
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libadwaita";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = "libadwaita";
|
||||
rev = version;
|
||||
hash = "sha256-FJmH/DTTn01UlATgxC0d7vrpVLwAot6Y4cZralQz2nU=";
|
||||
hash = "sha256-ftq7PLbTmhAAAhAYfrwicWn8t88+dG45G8q/vQa2cKw=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
|||
|
|
@ -6,38 +6,37 @@
|
|||
, python3
|
||||
, python3Packages
|
||||
, wafHook
|
||||
, boost175
|
||||
, boost
|
||||
, openssl
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ndn-cxx";
|
||||
version = "0.7.1";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "named-data";
|
||||
repo = "ndn-cxx";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-oTSc/lh0fDdk7dQeDhYKX5+gFl2t2Xlu1KkNmw7DitE=";
|
||||
sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];
|
||||
|
||||
buildInputs = [ boost175 openssl sqlite ];
|
||||
buildInputs = [ boost openssl sqlite ];
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--with-openssl=${openssl.dev}"
|
||||
"--boost-includes=${boost175.dev}/include"
|
||||
"--boost-libs=${boost175.out}/lib"
|
||||
# "--with-tests" # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896)
|
||||
"--boost-includes=${boost.dev}/include"
|
||||
"--boost-libs=${boost.out}/lib"
|
||||
"--with-tests"
|
||||
];
|
||||
|
||||
|
||||
doCheck = false; # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896)
|
||||
doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
LD_PRELOAD=build/ndn-cxx.so build/unit-tests
|
||||
LD_PRELOAD=build/libndn-cxx.so build/unit-tests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ rec {
|
|||
system-images = lib.flatten (map (apiVersion:
|
||||
map (type:
|
||||
map (abiVersion:
|
||||
if lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages then
|
||||
lib.optionals (lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages) (
|
||||
deployAndroidPackage {
|
||||
inherit os;
|
||||
package = system-images-packages.${apiVersion}.${type}.${abiVersion};
|
||||
|
|
@ -197,7 +197,7 @@ rec {
|
|||
sed -i '/^Addon.Vendor/d' source.properties
|
||||
'';
|
||||
}
|
||||
else []
|
||||
)
|
||||
) abiVersions
|
||||
) systemImageTypes
|
||||
) platformVersions);
|
||||
|
|
@ -217,7 +217,7 @@ rec {
|
|||
};
|
||||
|
||||
# All NDK bundles.
|
||||
ndk-bundles = if includeNDK then map makeNdkBundle ndkVersions else [];
|
||||
ndk-bundles = lib.optionals includeNDK (map makeNdkBundle ndkVersions);
|
||||
|
||||
# The "default" NDK bundle.
|
||||
ndk-bundle = if includeNDK then lib.findFirst (x: x != null) null ndk-bundles else null;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "8.1.0";
|
||||
version = "8.2.0";
|
||||
pname = "approvaltests";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "approvals";
|
||||
repo = "ApprovalTests.Python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-01OgofksXFglohcQtJqkir/nqBJArw3pXEmnX9P7rOA=";
|
||||
hash = "sha256-7OeFOPBOs+SXKOQGKxiigVvoY50+bqRo+oDbVYTMQxU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ buildPythonPackage {
|
|||
# Revisit this whenever package or Rust is upgraded
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
propagatedBuildInputs = if pythonOlder "3.10" then [ typing-extensions ] else [];
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitchapi";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "twitchAPI";
|
||||
inherit version;
|
||||
hash = "sha256-zmMzHuaSsuj2MxkmQyzROrZ/zxO0/I7llKlnpZzauDw=";
|
||||
hash = "sha256-gGLSR6XESaUUt31njQJtPeTOKSgVJHlS+UdYhPKvQJQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ gem 'jwt'
|
|||
gem 'kramdown-rfc2629'
|
||||
gem 'libv8'
|
||||
gem 'libxml-ruby'
|
||||
gem 'mail'
|
||||
gem 'magic'
|
||||
gem 'markaby'
|
||||
gem 'method_source'
|
||||
|
|
|
|||
|
|
@ -12,12 +12,8 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = [ autoconf automake ];
|
||||
buildInputs = [ libX11 libXt libXpm libXaw ];
|
||||
preConfigure = "autoreconf --install";
|
||||
patches = if stdenv.buildPlatform.isDarwin then [ ./darwin.patch ] else [];
|
||||
configureFlags =
|
||||
if localStateDir != null then
|
||||
["--localstatedir=${localStateDir}"]
|
||||
else
|
||||
[];
|
||||
patches = lib.optionals stdenv.buildPlatform.isDarwin [ ./darwin.patch ];
|
||||
configureFlags = lib.optionals (localStateDir != null) ["--localstatedir=${localStateDir}"];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The falling tower game";
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
, installShellFiles
|
||||
}:
|
||||
let
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec=";
|
||||
hash = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
|
|
@ -23,10 +23,10 @@ buildGoModule {
|
|||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YH+lo6gKqmhu1/3HZdWXnxTXaUwC8To+OCmGpji6i3k=";
|
||||
hash = "sha256-3a3+nFHmGONvL/TyQRqgJtrSDIn0zdGy9YwhZP17mU0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sqjN+NgwdP2qw7/CBxKvSwwA3teg/trXg/oa1Ff0N8s=";
|
||||
vendorHash = "sha256-toi6efYZobjDV3YPT9seE/WZAzNaxgb1ioVG4txcuXM=";
|
||||
|
||||
subPackages = [ "cmd/caddy" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ buildGoModule rec {
|
|||
"-X main.Version=${version}"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://fly.io/docs/app-guides/run-a-global-image-service";
|
||||
changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, boost175
|
||||
, boost
|
||||
, fetchFromGitHub
|
||||
, libpcap
|
||||
, ndn-cxx
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfd";
|
||||
version = "0.7.1";
|
||||
version = "22.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "named-data";
|
||||
repo = lib.toUpper pname;
|
||||
rev = "NFD-${version}";
|
||||
sha256 = "sha256-8Zm8oxbpw9qD31NuofDdgPYnTWIz5E04NhkZhiRkK9E=";
|
||||
sha256 = "sha256-epY5qtET7rsKL3KIKvxfa+wF+AGZbYs+zRhy8SnIffk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd;
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--boost-includes=${boost175.dev}/include"
|
||||
"--boost-libs=${boost175.out}/lib"
|
||||
"--boost-includes=${boost.dev}/include"
|
||||
"--boost-libs=${boost.out}/lib"
|
||||
"--with-tests"
|
||||
] ++ lib.optional (!withWebSocket) "--without-websocket";
|
||||
|
||||
|
|
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Named Data Networking (NDN) Forwarding Daemon";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ lib.maintainers.bertof ];
|
||||
maintainers = with maintainers; [ bertof ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ let
|
|||
}"
|
||||
else
|
||||
"key 'meta.${k}' is unrecognized; expected one of: \n [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
|
||||
checkMeta = meta: if config.checkMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
|
||||
checkMeta = meta: lib.optionals config.checkMeta (lib.remove null (lib.mapAttrsToList checkMetaAttr meta));
|
||||
|
||||
checkOutputsToInstall = attrs: let
|
||||
expectedOutputs = attrs.meta.outputsToInstall or [];
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ let
|
|||
else "/bin/bash";
|
||||
|
||||
path =
|
||||
(if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++
|
||||
(if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
|
||||
(if system == "x86_64-solaris" then [ "/opt/local/gnu" ] else []) ++
|
||||
(lib.optionals (system == "i686-solaris") [ "/usr/gnu" ]) ++
|
||||
(lib.optionals (system == "i686-netbsd") [ "/usr/pkg" ]) ++
|
||||
(lib.optionals (system == "x86_64-solaris") [ "/opt/local/gnu" ]) ++
|
||||
["/" "/usr" "/usr/local"];
|
||||
|
||||
prehookBase = ''
|
||||
|
|
|
|||
|
|
@ -14,21 +14,21 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pulumi";
|
||||
version = "3.54.0";
|
||||
version = "3.55.0";
|
||||
|
||||
# Used in pulumi-language packages, which inherit this prop
|
||||
sdkVendorHash = "sha256-NstNzPKHlN8S+HSpYnG60ZtZtUQsh1Idr8Zz2Ef/jiw=";
|
||||
sdkVendorHash = "sha256-ZE+df01jRx3nDiPGdlh1JNJn5NqsHW22fiUzeNlkzF8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Rl0kh9NCliADfU9Nxc2SwnOIGDilYEeA0rcVCfal5N8=";
|
||||
hash = "sha256-x5XebYFpxFi2QgrrK+wdMFOLiJLnRmar4gsply8F718=";
|
||||
# Some tests rely on checkout directory name
|
||||
name = "pulumi";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Bkmpw+ZneB1zHmaV4S29LFNoCjB2QmO5nR/iwQQQPpo=";
|
||||
vendorSha256 = "sha256-8vchyD3MTi9Fxrd6SiywFK4tadyauvDxjs9RmoJuULA=";
|
||||
|
||||
sourceRoot = "${src.name}/pkg";
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
"INSTALL=cp"
|
||||
];
|
||||
|
||||
patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else [];
|
||||
patches = lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ];
|
||||
|
||||
buildInputs = lib.optional enableNLS libnatspec
|
||||
++ lib.optional stdenv.isCygwin libiconv;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,10 @@
|
|||
, Foundation
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, meson
|
||||
, ninja
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, gobject-introspection
|
||||
# Optional dependencies
|
||||
, libjpeg
|
||||
|
|
@ -38,15 +39,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vips";
|
||||
version = "8.13.3";
|
||||
version = "8.14.1";
|
||||
|
||||
outputs = [ "bin" "out" "man" "dev" ];
|
||||
outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo=";
|
||||
hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
@ -56,9 +57,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
gtk-doc
|
||||
meson
|
||||
ninja
|
||||
docbook-xsl-nons
|
||||
gobject-introspection
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
gtk-doc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -95,11 +99,17 @@ stdenv.mkDerivation rec {
|
|||
glib
|
||||
];
|
||||
|
||||
autoreconfPhase = ''
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
mesonFlags = [
|
||||
"-Dcgif=disabled"
|
||||
"-Dspng=disabled"
|
||||
"-Dpdfium=disabled"
|
||||
"-Dnifti=disabled"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog";
|
||||
homepage = "https://libvips.github.io/libvips/";
|
||||
description = "Image processing system for large images";
|
||||
license = licenses.lgpl2Plus;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, glew
|
||||
|
|
@ -25,6 +26,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# From Upstream PR#135: https://github.com/naelstrof/slop/pull/135
|
||||
name = "Fix-linking-of-GLEW-library.patch";
|
||||
url = "https://github.com/naelstrof/slop/commit/811b7e44648b9dd6c1da1554e70298cf4157e5fe.patch";
|
||||
sha256 = "sha256-LNUrAeVZUJFNOt1csOaIid7gLBdtqRxp8AcC7f3cnIQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, boost175
|
||||
, boost
|
||||
, fetchFromGitHub
|
||||
, libpcap
|
||||
, ndn-cxx
|
||||
|
|
@ -12,25 +12,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ndn-tools";
|
||||
version = "0.7.1";
|
||||
version = "22.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "named-data";
|
||||
repo = pname;
|
||||
rev = "ndn-tools-${version}";
|
||||
sha256 = "sha256-3hE/esOcS/ln94wZIRVCLjWgouEYnJJf3EvirNEGTeA=";
|
||||
sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config sphinx wafHook ];
|
||||
buildInputs = [ libpcap ndn-cxx openssl ];
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--boost-includes=${boost175.dev}/include"
|
||||
"--boost-libs=${boost175.out}/lib"
|
||||
# "--with-tests"
|
||||
"--boost-includes=${boost.dev}/include"
|
||||
"--boost-libs=${boost.out}/lib"
|
||||
"--with-tests"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
doCheck = false; # some tests fail because of the sandbox environment
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
build/unit-tests
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
|||
|
||||
path = lib.makeBinPath ([
|
||||
coreutils findutils gnugrep
|
||||
] ++ (if stdenv.isDarwin then [ darwin.DarwinTools ] else []));
|
||||
] ++ (lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]));
|
||||
is_darwin = if stdenv.isDarwin then "yes" else "no";
|
||||
|
||||
sandboxtest = ./sandbox.nix;
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gpg-tui";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "gpg-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4Xi4ePFJL56HxCkbTlu4WiCTRzLEqvfbEk/2q9QjAd8=";
|
||||
hash = "sha256-2OMjqY1oTVKyEuCJrGGSQfgjQPSOQRx6LPhoFUuf/pw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MEj7c87msMv/+D70EDWmWEHTtmQcx5DEMf2I/AXnwm8=";
|
||||
cargoHash = "sha256-EhnQvVXv08l4ONnuIudU0WBw5AptD7OcvPUNOdpRZj4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gpgme # for gpgme-config
|
||||
|
|
|
|||
|
|
@ -82,7 +82,8 @@ rec {
|
|||
|
||||
|
||||
findLhs2TeXIncludes =
|
||||
{ rootFile
|
||||
{ lib
|
||||
, rootFile
|
||||
}:
|
||||
|
||||
builtins.genericClosure {
|
||||
|
|
@ -97,7 +98,7 @@ rec {
|
|||
{ src = key; }
|
||||
"${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}");
|
||||
|
||||
in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else [])
|
||||
in pkgs.lib.concatMap (x: lib.optionals (builtins.pathExists x) [{key = x;}])
|
||||
(map (x: dirOf key + ("/" + x)) deps);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18099,6 +18099,10 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk_11_0.frameworks) Virtualization;
|
||||
};
|
||||
|
||||
listenbrainz-mpd = callPackage ../applications/audio/listenbrainz-mpd {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
lit = callPackage ../development/tools/misc/lit { };
|
||||
|
||||
litecli = callPackage ../development/tools/database/litecli {};
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spl
|
|||
useAppleSDKLibs = stdenv.hostPlatform.isAarch64;
|
||||
|
||||
selectAttrs = attrs: names:
|
||||
lib.listToAttrs (lib.concatMap (n: if attrs ? "${n}" then [(lib.nameValuePair n attrs."${n}")] else []) names);
|
||||
lib.listToAttrs (lib.concatMap (n: lib.optionals (attrs ? "${n}") [(lib.nameValuePair n attrs."${n}")]) names);
|
||||
|
||||
chooseLibs = (
|
||||
# There are differences in which libraries are exported. Avoid evaluation
|
||||
|
|
|
|||
|
|
@ -39,9 +39,7 @@ let
|
|||
attrs:
|
||||
if lib.isDerivation attrs
|
||||
then [ attrs ]
|
||||
else if lib.isAttrs attrs
|
||||
then accumulateDerivations (lib.attrValues attrs)
|
||||
else []
|
||||
else lib.optionals (lib.isAttrs attrs) (accumulateDerivations (lib.attrValues attrs))
|
||||
) jobList;
|
||||
|
||||
# names of all subsets of `pkgs.haskell.packages`
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
packagePython value
|
||||
else
|
||||
[]);
|
||||
in if res.success then res.value else []
|
||||
in lib.optionals res.success res.value
|
||||
);
|
||||
|
||||
jobs = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue