Merge branch 'master' into staging-next
This commit is contained in:
Vladimír Čunát
commit
8a77ed60ac
|
|
@ -719,10 +719,10 @@
|
|||
}];
|
||||
};
|
||||
alyaeanyx = {
|
||||
email = "alexandra.hollmeier@mailbox.org";
|
||||
email = "alyaeanyx@mailbox.org";
|
||||
github = "alyaeanyx";
|
||||
githubId = 74795488;
|
||||
name = "Alexandra Hollmeier";
|
||||
name = "alyaeanyx";
|
||||
keys = [{
|
||||
fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE";
|
||||
}];
|
||||
|
|
|
|||
|
|
@ -121,6 +121,16 @@ in {
|
|||
List of plugins to be disabled.
|
||||
'';
|
||||
};
|
||||
|
||||
EspLocation = mkOption {
|
||||
type = types.path;
|
||||
default = config.boot.loader.efi.efiSysMountPoint;
|
||||
defaultText = lib.literalExpression "config.boot.loader.efi.efiSysMountPoint";
|
||||
description = lib.mdDoc ''
|
||||
The EFI system partition (ESP) path used if UDisks is not available
|
||||
or if this partition is not mounted at /boot/efi, /boot, or /efi
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bisq-desktop";
|
||||
version = "1.9.8";
|
||||
version = "1.9.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb";
|
||||
sha256 = "1hwfchwqvflfzpv8n9wvj567a68fa4bch0hi8vk4pzmwxsx4z7g1";
|
||||
sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ];
|
||||
|
|
|
|||
|
|
@ -7,14 +7,13 @@ version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq '
|
|||
depname="Bisq-64bit-$version.deb"
|
||||
src="https://github.com/bisq-network/bisq/releases/download/v$version/$depname"
|
||||
signature="$src.asc"
|
||||
key="CB36 D7D2 EBB2 E35D 9B75 500B CD5D C1C5 29CD FD3B"
|
||||
|
||||
pushd $(mktemp -d --suffix=-bisq-updater)
|
||||
export GNUPGHOME=$PWD/gnupg
|
||||
mkdir -m 700 -p "$GNUPGHOME"
|
||||
curl -L -o "$depname" -- "$src"
|
||||
curl -L -o signature.asc -- "$signature"
|
||||
gpg --batch --recv-keys "$key"
|
||||
curl https://bisq.network/pubkey/E222AA02.asc | gpg --import
|
||||
gpg --batch --verify signature.asc "$depname"
|
||||
sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname")
|
||||
popd
|
||||
|
|
|
|||
|
|
@ -19,13 +19,14 @@ let
|
|||
dontPatchELF ? true,
|
||||
dontStrip ? true,
|
||||
nativeBuildInputs ? [],
|
||||
passthru ? { },
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // {
|
||||
|
||||
name = "vscode-extension-${name}";
|
||||
|
||||
passthru = {
|
||||
passthru = passthru // {
|
||||
inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ appimageTools, lib, fetchurl }:
|
||||
let
|
||||
pname = "neo4j-desktop";
|
||||
version = "1.4.12";
|
||||
version = "1.5.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage";
|
||||
hash = "sha256-CfdXus9Zj6Tx6wAXpV2tRdqvJqowgE+NIL04v3fwtJE=";
|
||||
hash = "sha256-0/jS1LaaIam6w7RbLXSKXiXlpocZMTMuTZvFRU4qypg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-bar";
|
||||
version = "unstable-2021-09-23";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5";
|
||||
sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3uDEmIrfvUD/QGwgFYYWQUeYq35XJdpSVL9nHBl11kY=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-paths.patch ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "remnote";
|
||||
version = "1.7.6";
|
||||
version = "1.8.52";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.remnote.io/RemNote-${version}.AppImage";
|
||||
sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM=";
|
||||
sha256 = "sha256-0t4i/4dlZ1tv4kz8eD5cjIuhx0lT8dQbh+bpjqAfqTE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tut";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RasmusLindroth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Oypl80UsYRRSIMvHDPSS6rrvzjlxZ/UKDNDGc2Yan+w=";
|
||||
sha256 = "sha256-AtwwLRZx9O8IWPFgFI/ZK0tbeshEmaKpTQxA1PepnWM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qeYgkF9sIJ0slRarXbCHZ+1JmtZwXDnrJIpRKGOoW5Q=";
|
||||
vendorHash = "sha256-gPF4XrUqDDJCCY1zrUr3AXDG0uoADR8LBxRP4yolcug=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI for Mastodon with vim inspired keys";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.5.7";
|
||||
version = "2.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hEfPiDbEdmuD/IHM9Tfy0kUkKDpbTZ0HzMjIt/ifcPk=";
|
||||
sha256 = "sha256-4L0xj4+NLThSLzXTncUnUILOsV3qr9+f8osv19OW6oI=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
|
|
|||
|
|
@ -213,11 +213,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"cloudamqp": {
|
||||
"hash": "sha256-S4iXhss4ASM4FJdBgElH/3IwpPFjUMy57BXG7C7p5+0=",
|
||||
"hash": "sha256-xua8ZJjc+y6bzF/I2N752Cv22XAXvOjrH9Du1TdipM0=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
|
||||
"owner": "cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.22.1",
|
||||
"rev": "v1.23.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ="
|
||||
},
|
||||
|
|
@ -743,13 +743,13 @@
|
|||
"vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-jYEeJoMqYo5BCsr8pZlowwUPdW/QrCoHiSpDrEGK9QQ=",
|
||||
"hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.7.0",
|
||||
"rev": "v1.8.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-9m+eukHaSdSstWBtjxpgYkgyQVXx0jmKfEz3D9YROO4="
|
||||
"vendorHash": "sha256-cvTIFjKYrIohRjUTxGOxgla2t/elj3Aw79kbVdaQbrY="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
|
||||
|
|
@ -888,11 +888,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"pagerduty": {
|
||||
"hash": "sha256-0gEuIvgiFntP7dHmpkB3IRGMrAI8JbWG0zxiyNdFAiM=",
|
||||
"hash": "sha256-utbV/EVSYIln0ruf4qis9rbKifx/DUct3tDOTUO22N0=",
|
||||
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
|
||||
"owner": "PagerDuty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v2.9.2",
|
||||
"rev": "v2.9.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -1050,13 +1050,13 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-2w4Qh9S0YxvcNdgtPLsNEumZiJn3+VH80zwamJW1FWQ=",
|
||||
"hash": "sha256-UivENbjPajJdH9PwHznMP+cLXBJ8C38wgHS2IqyoqRk=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.96.0",
|
||||
"rev": "v1.97.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-SRQWZGyQDbESrpu0tsy6EBfvjY/l89fQexCdhSYPzGI="
|
||||
"vendorHash": "sha256-iQLZpSa1gJ4z2/r1Om9vFrcKP5ik7kcx+rNVZLhmSBc="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
|
||||
|
|
|
|||
|
|
@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
|
|||
gtksourceview5
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/meson.build \
|
||||
--replace "1.2.0" "${libadwaita.version}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/io.posidon.Paper $out/bin/paper
|
||||
'';
|
||||
|
|
|
|||
57
pkgs/applications/office/pdfmm/default.nix
Normal file
57
pkgs/applications/office/pdfmm/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ bash
|
||||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, ghostscript
|
||||
, glibc
|
||||
, gnome
|
||||
, gnused
|
||||
, lib
|
||||
, resholve
|
||||
, xorg
|
||||
}:
|
||||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "pdfmm";
|
||||
version = "unstable-2019-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpfleury";
|
||||
repo = pname;
|
||||
rev = "45ee7796659d23bb030bf06647f1af85e1d2b52d";
|
||||
hash = "sha256-TOISD/2g7MwnLrtpMnfr2Ln0IiwlJVNavWl4eh/uwN0=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm 0755 pdfmm $out/bin/pdfmm
|
||||
'';
|
||||
|
||||
solutions.default = {
|
||||
scripts = [
|
||||
"bin/pdfmm"
|
||||
];
|
||||
interpreter = "${bash}/bin/bash";
|
||||
inputs = [
|
||||
coreutils
|
||||
ghostscript
|
||||
glibc
|
||||
gnome.zenity
|
||||
gnused
|
||||
xorg.xmessage
|
||||
];
|
||||
execer = [
|
||||
"cannot:${glibc.bin}/bin/locale"
|
||||
"cannot:${gnome.zenity}/bin/zenity"
|
||||
"cannot:${xorg.xmessage}/bin/xmessage"
|
||||
];
|
||||
keep."$toutLu" = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical assistant to reduce the size of a PDF file";
|
||||
homepage = "https://github.com/jpfleury/pdfmm";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "gprojector";
|
||||
version = "3.0.4";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz";
|
||||
sha256 = "sha256-6EixVNRgYnuY9INb7gAyBzo125DhPEUPD+pGxjzmhy8=";
|
||||
sha256 = "sha256-aw/p6mbTJl023d46NUZV3pnP4WVdYqZTFmgGlHEKfq0=";
|
||||
};
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoPackage
|
||||
, buildGoModule
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, git
|
||||
, bash
|
||||
, gzip
|
||||
, openssh
|
||||
, gzip
|
||||
, pam
|
||||
, pamSupport ? true
|
||||
, sqliteSupport ? true
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "1.18.2-1";
|
||||
|
||||
|
|
@ -23,10 +23,13 @@ buildGoPackage rec {
|
|||
hash = "sha256-XSh17AwPtC+Y24lgjjXJzT/uBHg+0hWZ2RZ/eNF4mCY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
outputs = [ "out" "data" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = lib.optional pamSupport pam;
|
||||
|
||||
patches = [
|
||||
|
|
@ -39,22 +42,23 @@ buildGoPackage rec {
|
|||
|
||||
tags = lib.optional pamSupport "pam"
|
||||
++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
"-X 'main.Tags=${lib.concatStringsSep " " tags}'"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $data
|
||||
cp -R ./go/src/${goPackagePath}/{public,templates,options} $data
|
||||
cp -R ./{public,templates,options} $data
|
||||
mkdir -p $out
|
||||
cp -R ./go/src/${goPackagePath}/options/locale $out/locale
|
||||
cp -R ./options/locale $out/locale
|
||||
wrapProgram $out/bin/gitea \
|
||||
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
|
||||
'';
|
||||
|
||||
goPackagePath = "code.gitea.io/gitea";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A self-hosted lightweight software forge";
|
||||
homepage = "https://forgejo.org";
|
||||
|
|
|
|||
|
|
@ -165,6 +165,7 @@ buildFHSUserEnv {
|
|||
writeText "davinci-wrapper"
|
||||
''
|
||||
export QT_XKB_CONFIG_ROOT="${xkeyboard_config}/share/X11/xkb"
|
||||
export QT_PLUGIN_PATH="${davinci}/libs/plugins:$QT_PLUGIN_PATH"
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci}/libs
|
||||
${davinci}/bin/resolve
|
||||
''
|
||||
|
|
|
|||
|
|
@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/containers/krunvm";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
platforms = libkrun.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
112
pkgs/applications/virtualization/lima/bin.nix
Normal file
112
pkgs/applications/virtualization/lima/bin.nix
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchurl
|
||||
, writeScript
|
||||
, installShellFiles
|
||||
, qemu
|
||||
, makeBinaryWrapper
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.14.2";
|
||||
|
||||
dist = {
|
||||
aarch64-darwin = rec {
|
||||
archSuffix = "Darwin-arm64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894";
|
||||
};
|
||||
|
||||
x86_64-darwin = rec {
|
||||
archSuffix = "Darwin-x86_64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0";
|
||||
};
|
||||
|
||||
aarch64-linux = rec {
|
||||
archSuffix = "Linux-aarch64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230";
|
||||
};
|
||||
|
||||
x86_64-linux = rec {
|
||||
archSuffix = "Linux-x86_64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit version;
|
||||
pname = "lima";
|
||||
src = fetchurl {
|
||||
inherit (dist.${stdenvNoCC.hostPlatform.system} or
|
||||
(throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}")) url sha256;
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]
|
||||
++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r bin share $out
|
||||
chmod +x $out/bin/limactl
|
||||
wrapProgram $out/bin/limactl \
|
||||
--prefix PATH : ${lib.makeBinPath [ qemu ]}
|
||||
installShellCompletion --cmd limactl \
|
||||
--bash <($out/bin/limactl completion bash) \
|
||||
--fish <($out/bin/limactl completion fish) \
|
||||
--zsh <($out/bin/limactl completion zsh)
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
USER=nix $out/bin/limactl validate $out/share/lima/examples/default.yaml
|
||||
USER=nix $out/bin/limactl validate $out/share/lima/examples/experimental/vz.yaml
|
||||
'';
|
||||
|
||||
# Stripping removes entitlements of the binary on Darwin making it non-operational.
|
||||
# Therefore, disable stripping on Darwin.
|
||||
dontStrip = stdenvNoCC.isDarwin;
|
||||
|
||||
passthru.updateScript =
|
||||
let
|
||||
lima-bin = builtins.toString ./bin.nix;
|
||||
in
|
||||
writeScript "update-lima-bin.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl jq gawk
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" -Ls https://api.github.com/repos/lima-vm/lima/releases/latest | jq -r .tag_name | cut -c 2-)
|
||||
curl -Ls -o SHA256SUMS https://github.com/lima-vm/lima/releases/download/v$LATEST_VERSION/SHA256SUMS
|
||||
AARCH64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-arm64/{print $1}')
|
||||
X86_64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-x86_64/{print $1}')
|
||||
AARCH64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-aarch64/{print $1}')
|
||||
X86_64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-x86_64/{print $1}')
|
||||
|
||||
# reset version first so that all platforms are always updated and in sync
|
||||
update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-darwin
|
||||
update-source-version lima-bin $LATEST_VERSION $AARCH64_DARWIN_SHA256 --file=${lima-bin} --system=aarch64-darwin
|
||||
update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-darwin
|
||||
update-source-version lima-bin $LATEST_VERSION $X86_64_DARWIN_SHA256 --file=${lima-bin} --system=x86_64-darwin
|
||||
update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-linux
|
||||
update-source-version lima-bin $LATEST_VERSION $AARCH64_LINUX_SHA256 --file=${lima-bin} --system=aarch64-linux
|
||||
update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-linux
|
||||
update-source-version lima-bin $LATEST_VERSION $X86_64_LINUX_SHA256 --file=${lima-bin} --system=x86_64-linux
|
||||
rm SHA256SUMS
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/lima-vm/lima";
|
||||
description = "Linux virtual machines (on macOS, in most cases)";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ tricktron ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wmfocus";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HrS+C/6KDG2Rn/3u/mMmp4vzQ5YAHUFL4HFecteuzsc=";
|
||||
sha256 = "sha256-zXqPZORwi7X1wBTecPg9nOCvRHWNTtloCpgbPwtFhzo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EzgYnfUgwK2ldzrlqe9N9jeGgK+RzQPjbOjJCGEkcwE=";
|
||||
cargoHash = "sha256-4eoV/viI7Q7I7mIqcHVAyPf/y2RWaWX0B+mLZWMEbcI=";
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config ];
|
||||
buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaylock-effects";
|
||||
version = "1.6.10";
|
||||
version = "1.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jirutka";
|
||||
repo = "swaylock-effects";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VkyH9XN/pR1UY/liG5ygDHp+ymdqCPeWHyU7/teJGbU=";
|
||||
sha256 = "sha256-MKmWVYssO9HAcP5uqwpy9kDa6/kfZyV2NI7ibozt7Ug=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@
|
|||
, ...
|
||||
}@attrs:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";
|
||||
|
||||
|
|
@ -107,4 +105,4 @@ let
|
|||
};
|
||||
});
|
||||
in
|
||||
fix pkg
|
||||
lib.fix pkg
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
, hexPkg ? name
|
||||
, ... }@attrs:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
pkg = self: builder (attrs // {
|
||||
|
||||
|
|
@ -17,4 +15,4 @@ let
|
|||
};
|
||||
});
|
||||
in
|
||||
fix pkg
|
||||
lib.fix pkg
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
, ...
|
||||
}@attrs:
|
||||
|
||||
with lib;
|
||||
let
|
||||
shell = drv: stdenv.mkDerivation {
|
||||
name = "interactive-shell-${drv.name}";
|
||||
|
|
@ -90,5 +89,5 @@ let
|
|||
};
|
||||
});
|
||||
in
|
||||
fix pkg
|
||||
lib.fix pkg
|
||||
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@
|
|||
, ...
|
||||
}@attrs:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
|
||||
|
||||
|
|
@ -30,7 +28,7 @@ let
|
|||
buildInputs = [ drv ];
|
||||
};
|
||||
|
||||
customPhases = filterAttrs
|
||||
customPhases = lib.filterAttrs
|
||||
(_: v: v != null)
|
||||
{ inherit setupHook configurePhase buildPhase installPhase; };
|
||||
|
||||
|
|
@ -40,7 +38,7 @@ let
|
|||
inherit version;
|
||||
|
||||
buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
|
||||
propagatedBuildInputs = unique beamDeps;
|
||||
propagatedBuildInputs = lib.unique beamDeps;
|
||||
|
||||
inherit src;
|
||||
|
||||
|
|
@ -85,4 +83,4 @@ let
|
|||
};
|
||||
} // customPhases);
|
||||
in
|
||||
fix pkg
|
||||
lib.fix pkg
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
, meta ? { }
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
pname = "hex-source-${pkg}";
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
, meta ? { }
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
pname = "rebar-deps-${name}";
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -22,15 +22,13 @@
|
|||
, ...
|
||||
}@attrs:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
shell = drv: stdenv.mkDerivation {
|
||||
name = "interactive-shell-${drv.pname}";
|
||||
buildInputs = [ drv ];
|
||||
};
|
||||
|
||||
customPhases = filterAttrs
|
||||
customPhases = lib.filterAttrs
|
||||
(_: v: v != null)
|
||||
{ inherit setupHook configurePhase buildPhase installPhase; };
|
||||
|
||||
|
|
@ -105,4 +103,4 @@ let
|
|||
} // (if attrs ? passthru then attrs.passthru else { }));
|
||||
} // customPhases);
|
||||
in
|
||||
fix pkg
|
||||
lib.fix pkg
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, bison, flex
|
||||
, makeWrapper }:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "intercal";
|
||||
|
|
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram $out/bin/ick --suffix PATH ':' ${stdenv.cc}/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "The original esoteric programming language";
|
||||
longDescription = ''
|
||||
INTERCAL, an abbreviation for "Compiler Language With No
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, writeScript
|
||||
, common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
repo = "git@github.com:scala/scala.git";
|
||||
|
||||
|
|
@ -102,7 +100,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A general purpose programming language";
|
||||
longDescription = ''
|
||||
Scala is a general purpose programming language designed to express
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
|
||||
, excludePorts ? [] }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
# choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
|
||||
excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]);
|
||||
excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -29,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Small Device C Compiler";
|
||||
longDescription = ''
|
||||
SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, doxygen, cmake, readline }:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "lolcode";
|
||||
|
|
@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
# Maybe it clashes with lci scientific logic software package...
|
||||
postInstall = "mv $out/bin/lci $out/bin/lolcode-lci";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://lolcode.org";
|
||||
description = "An esoteric programming language";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@ assert (enableCrypt -> (libxcrypt != null));
|
|||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
|
||||
|
|
@ -33,7 +31,7 @@ let
|
|||
strictDeps = true;
|
||||
# TODO: Add a "dev" output containing the header files.
|
||||
outputs = [ "out" "man" "devdoc" ] ++
|
||||
optional crossCompiling "mini";
|
||||
lib.optional crossCompiling "mini";
|
||||
setOutputFlags = false;
|
||||
|
||||
# On FreeBSD, if Perl is built with threads support, having
|
||||
|
|
@ -57,9 +55,9 @@ let
|
|||
# Enable TLS/SSL verification in HTTP::Tiny by default
|
||||
./http-tiny-verify-ssl-by-default.patch
|
||||
]
|
||||
++ optional stdenv.isSunOS ./ld-shared.patch
|
||||
++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
|
||||
++ optional crossCompiling ./MakeMaker-cross.patch;
|
||||
++ lib.optional stdenv.isSunOS ./ld-shared.patch
|
||||
++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
|
||||
++ lib.optional crossCompiling ./MakeMaker-cross.patch;
|
||||
|
||||
# This is not done for native builds because pwd may need to come from
|
||||
# bootstrap tools when building bootstrap perl.
|
||||
|
|
@ -93,18 +91,18 @@ let
|
|||
"-Dlocincpth=${libcInc}/include"
|
||||
"-Dloclibpth=${libcLib}/lib"
|
||||
]
|
||||
++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
|
||||
++ optional stdenv.isSunOS "-Dcc=gcc"
|
||||
++ optional enableThreading "-Dusethreads"
|
||||
++ optional (!enableCrypt) "-A clear:d_crypt_r"
|
||||
++ optional stdenv.hostPlatform.isStatic "--all-static"
|
||||
++ optionals (!crossCompiling) [
|
||||
++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
|
||||
++ lib.optional stdenv.isSunOS "-Dcc=gcc"
|
||||
++ lib.optional enableThreading "-Dusethreads"
|
||||
++ lib.optional (!enableCrypt) "-A clear:d_crypt_r"
|
||||
++ lib.optional stdenv.hostPlatform.isStatic "--all-static"
|
||||
++ lib.optionals (!crossCompiling) [
|
||||
"-Dprefix=${placeholder "out"}"
|
||||
"-Dman1dir=${placeholder "out"}/share/man/man1"
|
||||
"-Dman3dir=${placeholder "out"}/share/man/man3"
|
||||
];
|
||||
|
||||
configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure";
|
||||
configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure";
|
||||
|
||||
dontAddStaticConfigureFlags = true;
|
||||
|
||||
|
|
@ -138,9 +136,9 @@ let
|
|||
OLD_ZLIB = False
|
||||
GZIP_OS_CODE = AUTO_DETECT
|
||||
EOF
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
|
||||
'' + optionalString (!enableThreading) ''
|
||||
'' + lib.optionalString (!enableThreading) ''
|
||||
# We need to do this because the bootstrap doesn't have a static libpthread
|
||||
sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
|
||||
'';
|
||||
|
|
@ -183,7 +181,7 @@ let
|
|||
}" /no-such-path \
|
||||
--replace "${stdenv.cc}" /no-such-path \
|
||||
--replace "$man" /no-such-path
|
||||
'' + optionalString crossCompiling
|
||||
'' + lib.optionalString crossCompiling
|
||||
''
|
||||
mkdir -p $mini/lib/perl5/cross_perl/${version}
|
||||
for dir in cnf/{stub,cpan}; do
|
||||
|
|
@ -207,7 +205,7 @@ let
|
|||
"$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.perl.org/";
|
||||
description = "The standard implementation of the Perl 5 programmming language";
|
||||
license = licenses.artistic1;
|
||||
|
|
@ -215,7 +213,7 @@ let
|
|||
platforms = platforms.all;
|
||||
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
|
||||
};
|
||||
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
||||
crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022
|
||||
|
||||
perl-cross-src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picoLisp";
|
||||
|
|
@ -9,11 +8,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [openssl] ++ optional stdenv.is64bit jdk;
|
||||
buildInputs = [openssl] ++ lib.optional stdenv.is64bit jdk;
|
||||
patchPhase = ''
|
||||
sed -i "s/which java/command -v java/g" mkAsm
|
||||
|
||||
${optionalString stdenv.isAarch32 ''
|
||||
${lib.optionalString stdenv.isAarch32 ''
|
||||
sed -i s/-m32//g Makefile
|
||||
cat >>Makefile <<EOF
|
||||
ext.o: ext.c
|
||||
|
|
@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
EOF
|
||||
''}
|
||||
'';
|
||||
sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
|
||||
sourceRoot = ''picoLisp/src${lib.optionalString stdenv.is64bit "64"}'';
|
||||
postBuild = ''
|
||||
cd ../src; make gate
|
||||
'';
|
||||
|
|
@ -49,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
# darwin: build times out
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
description = "A simple Lisp with an integrated database";
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@ assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations))
|
|||
assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode))
|
||||
"Deterministic builds are not achieved when (default unoptimized) bytecode is created.";
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
buildPackages = pkgsBuildHost;
|
||||
inherit (passthru) pythonForBuild;
|
||||
|
|
@ -133,9 +131,9 @@ let
|
|||
# * https://github.com/python/cpython/commit/e6b247c8e524
|
||||
../3.7/no-win64-workaround.patch
|
||||
|
||||
] ++ optionals (x11Support && stdenv.isDarwin) [
|
||||
] ++ lib.optionals (x11Support && stdenv.isDarwin) [
|
||||
./use-correct-tcl-tk-on-darwin.patch
|
||||
] ++ optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
|
||||
# Disable the use of ldconfig in ctypes.util.find_library (since
|
||||
# ldconfig doesn't work on NixOS), and don't use
|
||||
|
|
@ -147,7 +145,7 @@ let
|
|||
# Fix ctypes.util.find_library with gcc10.
|
||||
./find_library-gcc10.patch
|
||||
|
||||
] ++ optionals stdenv.hostPlatform.isCygwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isCygwin [
|
||||
./2.5.2-ctypes-util-find_library.patch
|
||||
./2.5.2-tkinter-x11.patch
|
||||
./2.6.2-ssl-threads.patch
|
||||
|
|
@ -158,7 +156,7 @@ let
|
|||
./2.7.3-dylib.patch
|
||||
./2.7.3-getpath-exe-extension.patch
|
||||
./2.7.3-no-libm.patch
|
||||
] ++ optionals hasDistutilsCxxPatch [
|
||||
] ++ lib.optionals hasDistutilsCxxPatch [
|
||||
|
||||
# Patch from http://bugs.python.org/issue1222585 adapted to work with
|
||||
# `patch -p1' and with a last hunk removed
|
||||
|
|
@ -166,7 +164,7 @@ let
|
|||
# only works for GCC and Apple Clang. This makes distutils to call C++
|
||||
# compiler when needed.
|
||||
./python-2.7-distutils-C++.patch
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
./cross-compile.patch
|
||||
];
|
||||
|
||||
|
|
@ -175,31 +173,31 @@ let
|
|||
for i in /usr /sw /opt /pkg; do
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
done
|
||||
'' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
|
||||
'' + lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
|
||||
for i in Lib/plat-*/regen; do
|
||||
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
|
||||
done
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
|
||||
substituteInPlace Lib/multiprocessing/__init__.py \
|
||||
--replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
|
||||
'';
|
||||
|
||||
configureFlags = optionals enableOptimizations [
|
||||
configureFlags = lib.optionals enableOptimizations [
|
||||
"--enable-optimizations"
|
||||
] ++ optionals (!static) [
|
||||
] ++ lib.optionals (!static) [
|
||||
"--enable-shared"
|
||||
] ++ [
|
||||
"--with-threads"
|
||||
"--with-system-ffi"
|
||||
"--with-system-expat"
|
||||
"--enable-unicode=ucs${toString ucsEncoding}"
|
||||
] ++ optionals stdenv.hostPlatform.isCygwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isCygwin [
|
||||
"ac_cv_func_bind_textdomain_codeset=yes"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"--disable-toolbox-glue"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"PYTHON_FOR_BUILD=${getBin buildPackages.python}/bin/python"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python"
|
||||
"ac_cv_buggy_getaddrinfo=no"
|
||||
# Assume little-endian IEEE 754 floating point when cross compiling
|
||||
"ac_cv_little_endian_double=yes"
|
||||
|
|
@ -223,23 +221,23 @@ let
|
|||
]
|
||||
# Never even try to use lchmod on linux,
|
||||
# don't rely on detecting glibc-isms.
|
||||
++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"
|
||||
++ optional static "LDFLAGS=-static";
|
||||
++ lib.optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"
|
||||
++ lib.optional static "LDFLAGS=-static";
|
||||
|
||||
strictDeps = true;
|
||||
buildInputs =
|
||||
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
|
||||
lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
|
||||
[ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ]
|
||||
++ optionals x11Support [ tcl tk libX11 ]
|
||||
++ optional (stdenv.isDarwin && configd != null) configd;
|
||||
++ lib.optionals x11Support [ tcl tk libX11 ]
|
||||
++ lib.optional (stdenv.isDarwin && configd != null) configd;
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook ]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
[ buildPackages.stdenv.cc buildPackages.python ];
|
||||
|
||||
mkPaths = paths: {
|
||||
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
|
||||
LIBRARY_PATH = makeLibraryPath paths;
|
||||
C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" paths;
|
||||
LIBRARY_PATH = lib.makeLibraryPath paths;
|
||||
};
|
||||
|
||||
# Python 2.7 needs this
|
||||
|
|
@ -258,13 +256,13 @@ in with passthru; stdenv.mkDerivation ({
|
|||
LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
|
||||
inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2"
|
||||
+ optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2"
|
||||
+ lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";
|
||||
DETERMINISTIC_BUILD = 1;
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
|
||||
postPatch = optionalString (x11Support && (tix != null)) ''
|
||||
postPatch = lib.optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
|
|
@ -291,18 +289,18 @@ in with passthru; stdenv.mkDerivation ({
|
|||
# Determinism: Windows installers were not deterministic.
|
||||
# We're also not interested in building Windows installers.
|
||||
find "$out" -name 'wininst*.exe' | xargs -r rm -f
|
||||
'' + optionalString stripBytecode ''
|
||||
'' + lib.optionalString stripBytecode ''
|
||||
# Determinism: deterministic bytecode
|
||||
# First we delete all old bytecode.
|
||||
find $out -name "*.pyc" -delete
|
||||
'' + optionalString rebuildBytecode ''
|
||||
'' + lib.optionalString rebuildBytecode ''
|
||||
# We build 3 levels of optimized bytecode. Note the default level, without optimizations,
|
||||
# is not reproducible yet. https://bugs.python.org/issue29708
|
||||
# Not creating bytecode will result in a large performance loss however, so we do build it.
|
||||
find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
|
||||
'' + optionalString stdenv.hostPlatform.isCygwin ''
|
||||
'' + lib.optionalString stdenv.hostPlatform.isCygwin ''
|
||||
cp libpython2.7.dll.a $out/lib
|
||||
'';
|
||||
|
||||
|
|
@ -311,14 +309,14 @@ in with passthru; stdenv.mkDerivation ({
|
|||
postFixup = ''
|
||||
# Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7.
|
||||
cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
|
||||
'' + optionalString strip2to3 ''
|
||||
'' + lib.optionalString strip2to3 ''
|
||||
rm -R $out/bin/2to3 $out/lib/python*/lib2to3
|
||||
'' + optionalString stripConfig ''
|
||||
'' + lib.optionalString stripConfig ''
|
||||
rm -R $out/bin/python*-config $out/lib/python*/config*
|
||||
'' + optionalString stripIdlelib ''
|
||||
'' + lib.optionalString stripIdlelib ''
|
||||
# Strip IDLE
|
||||
rm -R $out/bin/idle* $out/lib/python*/idlelib
|
||||
'' + optionalString stripTests ''
|
||||
'' + lib.optionalString stripTests ''
|
||||
# Strip tests
|
||||
rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
, makePythonHook
|
||||
, makeWrapper }:
|
||||
|
||||
with lib;
|
||||
|
||||
makePythonHook {
|
||||
name = "wrap-python-hook";
|
||||
deps = makeWrapper;
|
||||
|
|
@ -20,7 +18,7 @@ makePythonHook {
|
|||
|
||||
mkStringSkipper = labelNum: quote: let
|
||||
label = "q${toString labelNum}";
|
||||
isSingle = elem quote [ "\"" "'\"'\"'" ];
|
||||
isSingle = lib.elem quote [ "\"" "'\"'\"'" ];
|
||||
endQuote = if isSingle then "[^\\\\]${quote}" else quote;
|
||||
in ''
|
||||
/^[a-z]?${quote}/ {
|
||||
|
|
@ -46,8 +44,8 @@ makePythonHook {
|
|||
:r
|
||||
/\\$|,$/{N;br}
|
||||
/__future__|^ |^ *(#.*)?$/{n;br}
|
||||
${concatImapStrings mkStringSkipper quoteVariants}
|
||||
/^[^# ]/i ${replaceStrings ["\n"] [";"] preamble}
|
||||
${lib.concatImapStrings mkStringSkipper quoteVariants}
|
||||
/^[^# ]/i ${lib.replaceStrings ["\n"] [";"] preamble}
|
||||
}
|
||||
'';
|
||||
} ./wrap.sh
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Contains the ruby version heuristics
|
||||
{ lib }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
# The returned set should be immutable
|
||||
rubyVersion = major: minor: tiny: tail:
|
||||
|
|
@ -10,15 +10,15 @@ let
|
|||
# Contains the patch number "223" if tail is "p223" or null
|
||||
patchLevel =
|
||||
let
|
||||
p = removePrefix "p" tail;
|
||||
p = lib.removePrefix "p" tail;
|
||||
isPosInt = num:
|
||||
0 == stringLength
|
||||
(replaceStrings
|
||||
0 == lib.stringLength
|
||||
(lib.replaceStrings
|
||||
["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"]
|
||||
["" "" "" "" "" "" "" "" "" "" ]
|
||||
num);
|
||||
in
|
||||
if hasPrefix "p" tail && isPosInt p then p
|
||||
if lib.hasPrefix "p" tail && isPosInt p then p
|
||||
else null;
|
||||
|
||||
# Shortcuts
|
||||
|
|
@ -28,11 +28,11 @@ let
|
|||
# Ruby separates lib and gem folders by ABI version which isn't very
|
||||
# consistent.
|
||||
libDir =
|
||||
if versionAtLeast majMinTiny "2.1.0" then
|
||||
if lib.versionAtLeast majMinTiny "2.1.0" then
|
||||
"${majMin}.0"
|
||||
else if versionAtLeast majMinTiny "2.0.0" then
|
||||
else if lib.versionAtLeast majMinTiny "2.0.0" then
|
||||
"2.0.0"
|
||||
else if versionAtLeast majMinTiny "1.9.1" then
|
||||
else if lib.versionAtLeast majMinTiny "1.9.1" then
|
||||
"1.9.1"
|
||||
else
|
||||
throw "version ${majMinTiny} is not supported";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, pkgs }:
|
||||
|
||||
with lib;
|
||||
with pkgs.javaPackages;
|
||||
|
||||
let
|
||||
|
|
@ -10,7 +9,7 @@ let
|
|||
poms = import ./poms.nix { inherit fetchMaven; };
|
||||
in {
|
||||
# Maven needs all of these to function
|
||||
mavenMinimal = flatten
|
||||
mavenMinimal = lib.flatten
|
||||
collections.mavenLibs_2_0_6
|
||||
++ collections.mavenLibs_2_0_9
|
||||
++ collections.mavenLibs_2_2_1
|
||||
|
|
|
|||
|
|
@ -11,17 +11,15 @@
|
|||
# NOTE: When editing this expression see if the same change applies to
|
||||
# SDL2 expression too
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
extraPropagatedBuildInputs = [ ]
|
||||
++ optionals x11Support [ libXext libICE libXrandr ]
|
||||
++ optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ]
|
||||
++ optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ]
|
||||
++ optional alsaSupport alsa-lib
|
||||
++ optional pulseaudioSupport libpulseaudio
|
||||
++ optional stdenv.isDarwin Cocoa;
|
||||
rpath = makeLibraryPath extraPropagatedBuildInputs;
|
||||
++ lib.optionals x11Support [ libXext libICE libXrandr ]
|
||||
++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ]
|
||||
++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ]
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional pulseaudioSupport libpulseaudio
|
||||
++ lib.optional stdenv.isDarwin Cocoa;
|
||||
rpath = lib.makeLibraryPath extraPropagatedBuildInputs;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -40,13 +38,13 @@ stdenv.mkDerivation rec {
|
|||
outputBin = "dev"; # sdl-config
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ optional stdenv.isLinux libcap;
|
||||
++ lib.optional stdenv.isLinux libcap;
|
||||
|
||||
propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs;
|
||||
|
||||
buildInputs = [ ]
|
||||
++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile
|
||||
++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
|
||||
++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile
|
||||
++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-oss"
|
||||
|
|
@ -58,9 +56,9 @@ stdenv.mkDerivation rec {
|
|||
# SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
|
||||
#
|
||||
# Please try revert the change that introduced this comment when updating SDL.
|
||||
] ++ optional stdenv.isDarwin "--disable-x11-shared"
|
||||
++ optional (!x11Support) "--without-x"
|
||||
++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib";
|
||||
] ++ lib.optional stdenv.isDarwin "--disable-x11-shared"
|
||||
++ lib.optional (!x11Support) "--without-x"
|
||||
++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib";
|
||||
|
||||
patches = [
|
||||
./find-headers.patch
|
||||
|
|
|
|||
|
|
@ -55,8 +55,6 @@
|
|||
# NOTE: When editing this expression see if the same change applies to
|
||||
# SDL expression too
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL2";
|
||||
version = "2.24.2";
|
||||
|
|
@ -88,40 +86,40 @@ stdenv.mkDerivation rec {
|
|||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ];
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals waylandSupport [ wayland wayland-scanner ];
|
||||
|
||||
propagatedBuildInputs = dlopenPropagatedBuildInputs;
|
||||
|
||||
dlopenPropagatedBuildInputs = [ ]
|
||||
# Propagated for #include <GLES/gl.h> in SDL_opengles.h.
|
||||
++ optional openglSupport libGL
|
||||
++ lib.optional openglSupport libGL
|
||||
# Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h.
|
||||
++ optionals x11Support [ libX11 xorgproto ];
|
||||
++ lib.optionals x11Support [ libX11 xorgproto ];
|
||||
|
||||
dlopenBuildInputs = optionals alsaSupport [ alsa-lib audiofile ]
|
||||
++ optional dbusSupport dbus
|
||||
++ optional libdecorSupport libdecor
|
||||
++ optional pipewireSupport pipewire
|
||||
++ optional pulseaudioSupport libpulseaudio
|
||||
++ optional udevSupport udev
|
||||
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
|
||||
++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
|
||||
++ optionals drmSupport [ libdrm mesa ];
|
||||
dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ]
|
||||
++ lib.optional dbusSupport dbus
|
||||
++ lib.optional libdecorSupport libdecor
|
||||
++ lib.optional pipewireSupport pipewire
|
||||
++ lib.optional pulseaudioSupport libpulseaudio
|
||||
++ lib.optional udevSupport udev
|
||||
++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
|
||||
++ lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
|
||||
++ lib.optionals drmSupport [ libdrm mesa ];
|
||||
|
||||
buildInputs = [ libiconv ]
|
||||
++ dlopenBuildInputs
|
||||
++ optional ibusSupport ibus
|
||||
++ optional fcitxSupport fcitx
|
||||
++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
|
||||
++ lib.optional ibusSupport ibus
|
||||
++ lib.optional fcitxSupport fcitx
|
||||
++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-oss"
|
||||
] ++ optional (!x11Support) "--without-x"
|
||||
++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
|
||||
++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles"
|
||||
++ optional stdenv.isDarwin "--disable-sdltest";
|
||||
] ++ lib.optional (!x11Support) "--without-x"
|
||||
++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
|
||||
++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles"
|
||||
++ lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
# We remove libtool .la files when static libs are requested,
|
||||
# because they make the builds of downstream libs like `SDL_tff`
|
||||
|
|
@ -156,9 +154,9 @@ stdenv.mkDerivation rec {
|
|||
# list the symbols used in this way.
|
||||
postFixup =
|
||||
let
|
||||
rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs);
|
||||
rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs);
|
||||
in
|
||||
optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''
|
||||
lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''
|
||||
for lib in $out/lib/*.so* ; do
|
||||
if ! [[ -L "$lib" ]]; then
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib"
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ assert sslSupport -> openssl != null;
|
|||
assert bdbSupport -> db != null;
|
||||
assert ldapSupport -> openldap != null;
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apr-util";
|
||||
version = "1.6.1";
|
||||
|
|
@ -22,21 +20,21 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [ ./fix-libxcrypt-build.patch ]
|
||||
++ optional stdenv.isFreeBSD ./include-static-dependencies.patch;
|
||||
++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch;
|
||||
|
||||
NIX_CFLAGS_LINK = [ "-lcrypt" ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isFreeBSD autoreconfHook;
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook;
|
||||
|
||||
configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ]
|
||||
++ optional (!stdenv.isCygwin) "--with-crypto"
|
||||
++ optional sslSupport "--with-openssl=${openssl.dev}"
|
||||
++ optional bdbSupport "--with-berkeley-db=${db.dev}"
|
||||
++ optional ldapSupport "--with-ldap=ldap"
|
||||
++ optionals stdenv.isCygwin
|
||||
++ lib.optional (!stdenv.isCygwin) "--with-crypto"
|
||||
++ lib.optional sslSupport "--with-openssl=${openssl.dev}"
|
||||
++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}"
|
||||
++ lib.optional ldapSupport "--with-ldap=ldap"
|
||||
++ lib.optionals stdenv.isCygwin
|
||||
[ "--without-pgsql" "--without-sqlite2" "--without-sqlite3"
|
||||
"--without-freetds" "--without-berkeley-db" "--without-crypto" ]
|
||||
;
|
||||
|
|
@ -53,10 +51,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [ apr expat libiconv libxcrypt ]
|
||||
++ optional sslSupport openssl
|
||||
++ optional bdbSupport db
|
||||
++ optional ldapSupport openldap
|
||||
++ optional stdenv.isFreeBSD cyrus_sasl;
|
||||
++ lib.optional sslSupport openssl
|
||||
++ lib.optional bdbSupport db
|
||||
++ lib.optional ldapSupport openldap
|
||||
++ lib.optional stdenv.isFreeBSD cyrus_sasl;
|
||||
|
||||
postInstall = ''
|
||||
for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
, version, sha256, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "asio";
|
||||
inherit version;
|
||||
|
|
@ -17,7 +15,7 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://asio.sourceforge.net/";
|
||||
description = "Cross-platform C++ library for network and low-level I/O programming";
|
||||
license = licenses.boost;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{lib, stdenv, fetchurl, aspell, which, writeScript}:
|
||||
|
||||
with lib;
|
||||
|
||||
/* HOWTO:
|
||||
|
||||
* Add some of these to your profile or systemPackages.
|
||||
|
|
@ -105,7 +103,7 @@ let
|
|||
homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html";
|
||||
} // (args.meta or {});
|
||||
|
||||
} // lib.optionalAttrs (stdenv.isDarwin && elem language [ "is" "nb" ]) {
|
||||
} // lib.optionalAttrs (stdenv.isDarwin && lib.elem language [ "is" "nb" ]) {
|
||||
# tar: Cannot open: Illegal byte sequence
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
|
@ -115,7 +113,7 @@ let
|
|||
runHook postUnpack
|
||||
'';
|
||||
|
||||
postPatch = getAttr language {
|
||||
postPatch = lib.getAttr language {
|
||||
is = ''
|
||||
cp icelandic.alias íslenska.alias
|
||||
sed -i 's/ .slenska\.alias/ íslenska.alias/g' Makefile.pre
|
||||
|
|
@ -137,7 +135,7 @@ let
|
|||
preBuild = ''
|
||||
# Aspell can't handle multiple data-dirs
|
||||
# Copy everything we might possibly need
|
||||
${concatMapStringsSep "\n" (p: ''
|
||||
${lib.concatMapStringsSep "\n" (p: ''
|
||||
cp -a ${p}/lib/aspell/* .
|
||||
'') ([ aspell ] ++ langInputs)}
|
||||
export ASPELL_CONF="data-dir $(pwd)"
|
||||
|
|
|
|||
|
|
@ -34,20 +34,19 @@ assert enableNumpy -> enablePython;
|
|||
# Boost <1.69 can't be built on linux with clang >8, because pth was removed
|
||||
assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69";
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
||||
variant = concatStringsSep ","
|
||||
(optional enableRelease "release" ++
|
||||
optional enableDebug "debug");
|
||||
variant = lib.concatStringsSep ","
|
||||
(lib.optional enableRelease "release" ++
|
||||
lib.optional enableDebug "debug");
|
||||
|
||||
threading = concatStringsSep ","
|
||||
(optional enableSingleThreaded "single" ++
|
||||
optional enableMultiThreaded "multi");
|
||||
threading = lib.concatStringsSep ","
|
||||
(lib.optional enableSingleThreaded "single" ++
|
||||
lib.optional enableMultiThreaded "multi");
|
||||
|
||||
link = concatStringsSep ","
|
||||
(optional enableShared "shared" ++
|
||||
optional enableStatic "static");
|
||||
link = lib.concatStringsSep ","
|
||||
(lib.optional enableShared "shared" ++
|
||||
lib.optional enableStatic "static");
|
||||
|
||||
runtime-link = if enableShared then "shared" else "static";
|
||||
|
||||
|
|
@ -61,16 +60,16 @@ let
|
|||
# [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632
|
||||
# [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
|
||||
jobs =
|
||||
if versionOlder version "1.58" then
|
||||
if lib.versionOlder version "1.58" then
|
||||
"$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"
|
||||
else if versionOlder version "1.65" then
|
||||
else if lib.versionOlder version "1.65" then
|
||||
"$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"
|
||||
else
|
||||
"$NIX_BUILD_CORES";
|
||||
|
||||
needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared);
|
||||
|
||||
b2Args = concatStringsSep " " ([
|
||||
b2Args = lib.concatStringsSep " " ([
|
||||
"--includedir=$dev/include"
|
||||
"--libdir=$out/lib"
|
||||
"-j${jobs}"
|
||||
|
|
@ -82,12 +81,12 @@ let
|
|||
"-sEXPAT_LIBPATH=${expat.out}/lib"
|
||||
|
||||
# TODO: make this unconditional
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform ||
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform ||
|
||||
# required on mips; see 61d9f201baeef4c4bb91ad8a8f5f89b747e0dfe4
|
||||
(stdenv.hostPlatform.isMips && versionAtLeast version "1.79")) [
|
||||
(stdenv.hostPlatform.isMips && lib.versionAtLeast version "1.79")) [
|
||||
"address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}"
|
||||
"architecture=${if stdenv.hostPlatform.isMips64
|
||||
then if versionOlder version "1.78" then "mips1" else "mips"
|
||||
then if lib.versionOlder version "1.78" then "mips1" else "mips"
|
||||
else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"
|
||||
else toString stdenv.hostPlatform.parsed.cpu.family}"
|
||||
"binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"
|
||||
|
|
@ -100,13 +99,13 @@ let
|
|||
else if stdenv.hostPlatform.isMips32 then "o32"
|
||||
else if stdenv.hostPlatform.isMips64n64 then "n64"
|
||||
else "sysv"}"
|
||||
] ++ optional (link != "static") "runtime-link=${runtime-link}"
|
||||
++ optional (variant == "release") "debug-symbols=off"
|
||||
++ optional (toolset != null) "toolset=${toolset}"
|
||||
++ optional (!enablePython) "--without-python"
|
||||
++ optional needUserConfig "--user-config=user-config.jam"
|
||||
++ optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off"
|
||||
++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
|
||||
] ++ lib.optional (link != "static") "runtime-link=${runtime-link}"
|
||||
++ lib.optional (variant == "release") "debug-symbols=off"
|
||||
++ lib.optional (toolset != null) "toolset=${toolset}"
|
||||
++ lib.optional (!enablePython) "--without-python"
|
||||
++ lib.optional needUserConfig "--user-config=user-config.jam"
|
||||
++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off"
|
||||
++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
|
||||
"threadapi=win32"
|
||||
] ++ extraB2Args
|
||||
);
|
||||
|
|
@ -121,38 +120,38 @@ stdenv.mkDerivation {
|
|||
patchFlags = [];
|
||||
|
||||
patches = patches
|
||||
++ optional stdenv.isDarwin ./darwin-no-system-python.patch
|
||||
++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch
|
||||
# Fix boost-context segmentation faults on ppc64 due to ABI violation
|
||||
++ optional (versionAtLeast version "1.61" &&
|
||||
versionOlder version "1.71") (fetchpatch {
|
||||
++ lib.optional (lib.versionAtLeast version "1.61" &&
|
||||
lib.versionOlder version "1.71") (fetchpatch {
|
||||
url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";
|
||||
sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libs/context/";
|
||||
})
|
||||
# Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions
|
||||
++ optional (versionAtLeast version "1.65" && versionOlder version "1.67")
|
||||
++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.67")
|
||||
(fetchpatch {
|
||||
url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch";
|
||||
sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0";
|
||||
stripLen = 1;
|
||||
})
|
||||
++ optional (versionAtLeast version "1.65" && versionOlder version "1.70") (fetchpatch {
|
||||
++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.70") (fetchpatch {
|
||||
# support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly
|
||||
url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch";
|
||||
sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libs/context/";
|
||||
})
|
||||
++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch
|
||||
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch
|
||||
++ optional (version == "1.77.0") (fetchpatch {
|
||||
++ lib.optional (lib.versionAtLeast version "1.70" && lib.versionOlder version "1.73") ./cmake-paths.patch
|
||||
++ lib.optional (lib.versionAtLeast version "1.73") ./cmake-paths-173.patch
|
||||
++ lib.optional (version == "1.77.0") (fetchpatch {
|
||||
url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";
|
||||
relative = "include";
|
||||
sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4=";
|
||||
});
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://boost.org/";
|
||||
description = "Collection of C++ libraries";
|
||||
license = licenses.boost;
|
||||
|
|
@ -175,7 +174,7 @@ stdenv.mkDerivation {
|
|||
inherit boostBuildPatches;
|
||||
};
|
||||
|
||||
preConfigure = optionalString useMpi ''
|
||||
preConfigure = lib.optionalString useMpi ''
|
||||
cat << EOF >> user-config.jam
|
||||
using mpi : ${mpi}/bin/mpiCC ;
|
||||
EOF
|
||||
|
|
@ -183,7 +182,7 @@ stdenv.mkDerivation {
|
|||
# On darwin we need to add the `$out/lib` to the libraries' rpath explicitly,
|
||||
# otherwise the dynamic linker is unable to resolve the reference to @rpath
|
||||
# when the boost libraries want to load each other at runtime.
|
||||
+ optionalString (stdenv.isDarwin && enableShared) ''
|
||||
+ lib.optionalString (stdenv.isDarwin && enableShared) ''
|
||||
cat << EOF >> user-config.jam
|
||||
using clang-darwin : : ${stdenv.cc.targetPrefix}c++
|
||||
: <linkflags>"-rpath $out/lib/"
|
||||
|
|
@ -196,7 +195,7 @@ stdenv.mkDerivation {
|
|||
# uniform way for clang and gcc (which works thanks to our cc-wrapper).
|
||||
# We pass toolset later which will make b2 invoke everything in the right
|
||||
# way -- the other toolset in user-config.jam will be ignored.
|
||||
+ optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
+ lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
cat << EOF >> user-config.jam
|
||||
using gcc : cross : ${stdenv.cc.targetPrefix}c++
|
||||
: <archiver>$AR
|
||||
|
|
@ -210,7 +209,7 @@ stdenv.mkDerivation {
|
|||
EOF
|
||||
''
|
||||
# b2 needs to be explicitly told how to find Python when cross-compiling
|
||||
+ optionalString enablePython ''
|
||||
+ lib.optionalString enablePython ''
|
||||
cat << EOF >> user-config.jam
|
||||
using python : : ${python.interpreter}
|
||||
: ${python}/include/python${python.pythonVersion}
|
||||
|
|
@ -225,11 +224,11 @@ stdenv.mkDerivation {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ which boost-build ]
|
||||
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
buildInputs = [ expat zlib bzip2 libiconv ]
|
||||
++ optional enableIcu icu
|
||||
++ optionals enablePython [ libxcrypt python ]
|
||||
++ optional enableNumpy python.pkgs.numpy;
|
||||
++ lib.optional enableIcu icu
|
||||
++ lib.optionals enablePython [ libxcrypt python ]
|
||||
++ lib.optional enableNumpy python.pkgs.numpy;
|
||||
|
||||
configureScript = "./bootstrap.sh";
|
||||
configurePlatforms = [];
|
||||
|
|
@ -239,7 +238,7 @@ stdenv.mkDerivation {
|
|||
"--includedir=$(dev)/include"
|
||||
"--libdir=$(out)/lib"
|
||||
"--with-bjam=b2" # prevent bootstrapping b2 in configurePhase
|
||||
] ++ optional (toolset != null) "--with-toolset=${toolset}"
|
||||
] ++ lib.optional (toolset != null) "--with-toolset=${toolset}"
|
||||
++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ];
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -265,7 +264,7 @@ stdenv.mkDerivation {
|
|||
# Make boost header paths relative so that they are not runtime dependencies
|
||||
cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
|
||||
-exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;
|
||||
'' + optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
|
||||
'' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
|
||||
$RANLIB "$out/lib/"*.a
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmark-gfm";
|
||||
version = "0.29.0.gfm.6";
|
||||
version = "0.29.0.gfm.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "cmark-gfm";
|
||||
rev = version;
|
||||
sha256 = "sha256-ekHY5EGSrJrQwlXNjKpyj7k0Bzq1dYPacRsfNZ8K+lk=";
|
||||
sha256 = "sha256-i+y1VORza6pn8a/AfbBKpov/n0ChR9++RC7E8P9p3MY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
|
||||
, buildPackages, pruneLibtoolFiles, nixosTests }:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyrus-sasl";
|
||||
version = "2.1.28";
|
||||
|
|
@ -50,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
inherit (nixosTests) parsedmarc postfix;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.cyrusimap.org/sasl";
|
||||
description = "Library for adding authentication support to connection-based protocols";
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
|
||||
assert mp4v2Support -> (mp4v2 != null);
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "faac";
|
||||
version = "1.30";
|
||||
|
|
@ -16,19 +15,19 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
configureFlags = [ ]
|
||||
++ optional mp4v2Support "--with-external-mp4v2"
|
||||
++ optional drmSupport "--enable-drm";
|
||||
++ lib.optional mp4v2Support "--with-external-mp4v2"
|
||||
++ lib.optional drmSupport "--enable-drm";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ ]
|
||||
++ optional mp4v2Support mp4v2;
|
||||
++ lib.optional mp4v2Support mp4v2;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Open source MPEG-4 and MPEG-2 AAC encoder";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ codyopel ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
, vlc
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "faad2";
|
||||
version = "2.10.1";
|
||||
|
|
@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
configureFlags = []
|
||||
++ optional drmSupport "--with-drm";
|
||||
++ lib.optional drmSupport "--with-drm";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
|
|
@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
ocaml-faad = ocamlPackages.faad;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An open source MPEG-4 and MPEG-2 AAC decoder";
|
||||
homepage = "https://sourceforge.net/projects/faac/";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@
|
|||
, withDoc ? stdenv.cc.isGNU
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert elem precision [ "single" "double" "long-double" "quad-precision" ];
|
||||
assert lib.elem precision [ "single" "double" "long-double" "quad-precision" ];
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fftw-${precision}";
|
||||
|
|
@ -31,32 +29,32 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ]
|
||||
++ optional withDoc "info"; # it's dev-doc only
|
||||
++ lib.optional withDoc "info"; # it's dev-doc only
|
||||
outputBin = "dev"; # fftw-wisdom
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
|
||||
buildInputs = optionals stdenv.cc.isClang [
|
||||
buildInputs = lib.optionals stdenv.cc.isClang [
|
||||
# TODO: This may mismatch the LLVM version sin the stdenv, see #79818.
|
||||
llvmPackages.openmp
|
||||
] ++ optional enableMpi mpi;
|
||||
] ++ lib.optional enableMpi mpi;
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-shared"
|
||||
"--enable-threads"
|
||||
]
|
||||
++ optional (precision != "double") "--enable-${precision}"
|
||||
++ lib.optional (precision != "double") "--enable-${precision}"
|
||||
# all x86_64 have sse2
|
||||
# however, not all float sizes fit
|
||||
++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2"
|
||||
++ optional enableAvx "--enable-avx"
|
||||
++ optional enableAvx2 "--enable-avx2"
|
||||
++ optional enableAvx512 "--enable-avx512"
|
||||
++ optional enableFma "--enable-fma"
|
||||
++ lib.optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2"
|
||||
++ lib.optional enableAvx "--enable-avx"
|
||||
++ lib.optional enableAvx2 "--enable-avx2"
|
||||
++ lib.optional enableAvx512 "--enable-avx512"
|
||||
++ lib.optional enableFma "--enable-fma"
|
||||
++ [ "--enable-openmp" ]
|
||||
++ optional enableMpi "--enable-mpi"
|
||||
++ lib.optional enableMpi "--enable-mpi"
|
||||
# doc generation causes Fortran wrapper generation which hard-codes gcc
|
||||
++ optional (!withDoc) "--disable-doc";
|
||||
++ lib.optional (!withDoc) "--disable-doc";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
, xorgserver
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geis";
|
||||
|
|
@ -48,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A library for input gesture recognition";
|
||||
homepage = "https://launchpad.net/geis";
|
||||
license = licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
, AGL, OpenGL
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glew";
|
||||
version = "1.10.0";
|
||||
|
|
@ -20,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchPhase = ''
|
||||
sed -i 's|lib64|lib|' config/Makefile.linux
|
||||
${optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
|
||||
''}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, idnSupport ? true, libidn
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "gloox";
|
||||
|
|
@ -16,11 +15,11 @@ stdenv.mkDerivation rec{
|
|||
};
|
||||
|
||||
buildInputs = [ ]
|
||||
++ optional zlibSupport zlib
|
||||
++ optional sslSupport openssl
|
||||
++ optional idnSupport libidn;
|
||||
++ lib.optional zlibSupport zlib
|
||||
++ lib.optional sslSupport openssl
|
||||
++ lib.optional idnSupport libidn;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A portable high-level Jabber/XMPP library for C++";
|
||||
homepage = "http://camaya.net/gloox";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
, fetchpatch, buildPackages
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
gtkCleanImmodulesCache = substituteAll {
|
||||
|
|
@ -44,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
./patches/2.0-immodules.cache.patch
|
||||
./patches/gtk2-theme-paths.patch
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776";
|
||||
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
|
||||
|
|
@ -54,13 +52,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
propagatedBuildInputs = with xorg;
|
||||
[ glib cairo pango gdk-pixbuf atk ]
|
||||
++ optionals (stdenv.isLinux || stdenv.isDarwin) [
|
||||
++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [
|
||||
libXrandr libXrender libXcomposite libXi libXcursor
|
||||
]
|
||||
++ optionals stdenv.isDarwin [ libXdamage ]
|
||||
++ optional xineramaSupport libXinerama
|
||||
++ optionals cupsSupport [ cups ]
|
||||
++ optionals stdenv.isDarwin [ AppKit Cocoa ];
|
||||
++ lib.optionals stdenv.isDarwin [ libXdamage ]
|
||||
++ lib.optional xineramaSupport libXinerama
|
||||
++ lib.optionals cupsSupport [ cups ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Cocoa ];
|
||||
|
||||
preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
|
||||
MACOSX_DEPLOYMENT_TARGET=10.16
|
||||
|
|
@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--with-gdktarget=${gdktarget}"
|
||||
"--with-xinput=yes"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"--disable-glibtest"
|
||||
"--disable-introspection"
|
||||
"--disable-visibility"
|
||||
|
|
@ -94,7 +92,7 @@ stdenv.mkDerivation rec {
|
|||
inherit gdktarget;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A multi-platform toolkit for creating graphical user interfaces";
|
||||
homepage = "https://www.gtk.org/";
|
||||
license = licenses.lgpl2Plus;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ stdenv, lib, hunspell, makeWrapper, dicts ? [] }:
|
||||
with lib;
|
||||
let
|
||||
searchPath = makeSearchPath "share/hunspell" dicts;
|
||||
searchPath = lib.makeSearchPath "share/hunspell" dicts;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = (appendToName "with-dicts" hunspell).name;
|
||||
name = (lib.appendToName "with-dicts" hunspell).name;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildCommand = ''
|
||||
makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${lib.escapeShellArg searchPath}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
, glib, dbus-glib, json-glib
|
||||
, gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "indicator-application-gtk2";
|
||||
version = "12.10.0.1";
|
||||
|
|
@ -45,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
"localstatedir=\${TMPDIR}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)";
|
||||
homepage = "https://launchpad.net/indicators-gtk2";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, CoreFoundation, Security, SystemConfiguration
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "heimdal";
|
||||
version = "7.8.0";
|
||||
|
|
@ -22,9 +21,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ]
|
||||
++ (with perlPackages; [ JSON ]);
|
||||
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
|
||||
buildInputs = lib.optionals (stdenv.isLinux) [ libcap_ng ]
|
||||
++ [ db sqlite openssl libedit openldap pam]
|
||||
++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];
|
||||
++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];
|
||||
|
||||
## ugly, X should be made an option
|
||||
configureFlags = [
|
||||
|
|
@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-berkeley-db"
|
||||
"--with-berkeley-db-include=${db.dev}/include"
|
||||
"--with-openldap=${openldap.dev}"
|
||||
] ++ optionals (stdenv.isLinux) [
|
||||
] ++ lib.optionals (stdenv.isLinux) [
|
||||
"--with-capng"
|
||||
];
|
||||
|
||||
|
|
@ -91,7 +90,7 @@ stdenv.mkDerivation rec {
|
|||
# hx_locl.h:67:25: fatal error: pkcs10_asn1.h: No such file or directory
|
||||
#enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An implementation of Kerberos 5 (and some more stuff)";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
, debugSupport ? false # Debugging (disables optimizations)
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lame";
|
||||
version = "3.100";
|
||||
|
|
@ -25,24 +24,24 @@ stdenv.mkDerivation rec {
|
|||
outputMan = "out";
|
||||
|
||||
nativeBuildInputs = [ ]
|
||||
++ optional nasmSupport nasm;
|
||||
++ lib.optional nasmSupport nasm;
|
||||
|
||||
buildInputs = [ ]
|
||||
#++ optional efenceSupport libefence
|
||||
#++ optional mp3xSupport gtk1
|
||||
++ optional sndfileFileIOSupport libsndfile;
|
||||
++ lib.optional sndfileFileIOSupport libsndfile;
|
||||
|
||||
configureFlags = [
|
||||
(enableFeature nasmSupport "nasm")
|
||||
(enableFeature cpmlSupport "cpml")
|
||||
(lib.enableFeature nasmSupport "nasm")
|
||||
(lib.enableFeature cpmlSupport "cpml")
|
||||
#(enableFeature efenceSupport "efence")
|
||||
(if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame")
|
||||
(enableFeature analyzerHooksSupport "analyzer-hooks")
|
||||
(enableFeature decoderSupport "decoder")
|
||||
(enableFeature frontendSupport "frontend")
|
||||
(enableFeature frontendSupport "dynamic-frontends")
|
||||
(lib.enableFeature analyzerHooksSupport "analyzer-hooks")
|
||||
(lib.enableFeature decoderSupport "decoder")
|
||||
(lib.enableFeature frontendSupport "frontend")
|
||||
(lib.enableFeature frontendSupport "dynamic-frontends")
|
||||
#(enableFeature mp3xSupport "mp3x")
|
||||
(enableFeature mp3rtpSupport "mp3rtp")
|
||||
(lib.enableFeature mp3rtpSupport "mp3rtp")
|
||||
(if debugSupport then "--enable-debug=alot" else "")
|
||||
];
|
||||
|
||||
|
|
@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i '/lame_init_old/d' include/libmp3lame.sym
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A high quality MPEG Audio Layer III (MP3) encoder";
|
||||
homepage = "http://lame.sourceforge.net";
|
||||
license = licenses.lgpl2;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
assert fontconfigSupport -> fontconfig != null;
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libass";
|
||||
version = "0.16.0";
|
||||
|
|
@ -19,18 +18,18 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
configureFlags = [
|
||||
(enableFeature fontconfigSupport "fontconfig")
|
||||
(enableFeature rasterizerSupport "rasterizer")
|
||||
(enableFeature largeTilesSupport "large-tiles")
|
||||
(lib.enableFeature fontconfigSupport "fontconfig")
|
||||
(lib.enableFeature rasterizerSupport "rasterizer")
|
||||
(lib.enableFeature largeTilesSupport "large-tiles")
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config yasm ];
|
||||
|
||||
buildInputs = [ freetype fribidi harfbuzz ]
|
||||
++ optional fontconfigSupport fontconfig
|
||||
++ optional stdenv.isDarwin libiconv;
|
||||
++ lib.optional fontconfigSupport fontconfig
|
||||
++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Portable ASS/SSA subtitle renderer";
|
||||
homepage = "https://github.com/libass/libass";
|
||||
license = licenses.isc;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, collectd }:
|
||||
with lib;
|
||||
|
||||
collectd.overrideAttrs (oldAttrs: {
|
||||
pname = "libcollectdclient";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libidn2";
|
||||
version = "2.3.2";
|
||||
|
|
@ -20,14 +18,14 @@ stdenv.mkDerivation rec {
|
|||
# Beware: non-bootstrap libidn2 is overridden by ./hack.nix
|
||||
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
|
||||
|
||||
patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
|
||||
patches = lib.optional stdenv.isDarwin ./fix-error-darwin.patch;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# The above patch causes the documentation to be regenerated, so the
|
||||
# documentation tools are required.
|
||||
nativeBuildInputs = optionals stdenv.isDarwin [ help2man texinfo ];
|
||||
buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv;
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ help2man texinfo ];
|
||||
buildInputs = [ libunistring ] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -15,21 +15,21 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkrun";
|
||||
version = "1.4.8";
|
||||
version = "1.5.0";
|
||||
|
||||
src = if stdenv.isLinux then fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg=";
|
||||
hash = "sha256-3WYxGpZ3uRbnh/VEDVSNOxp25SE7GQgC5t3ROuKNRE0=";
|
||||
} else fetchurl {
|
||||
url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
|
||||
hash = "sha256-eKjBUianpW4T8OeVwRSEyZFfDE10d3qogkPA4FUJ7rc=";
|
||||
hash = "sha256-T1nYzrzxEJaVBnI00CQPKoT2OYJxdW7y6WNkabNsQYI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ=";
|
||||
hash = "sha256-Clb6PNwLuzx42Qr1tgpjG1WHq9NcDr2bbfnyp4UVVLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
|
@ -61,5 +61,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/containers/libkrun";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
platforms = libkrunfw.meta.platforms;
|
||||
sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,21 +13,21 @@
|
|||
assert sevVariant -> stdenv.isx86_64;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkrunfw";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
|
||||
src = if stdenv.isLinux then fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME=";
|
||||
hash = "sha256-hpVE7g6V3nquZ3R5fQCcfRWuFDHJ3rgisezwdsDMaGg=";
|
||||
} else fetchurl {
|
||||
url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
|
||||
hash = "sha256-i7btjGBgb93tHshIS02Rp492iB4aG0N4UuRwv6Pkukg=";
|
||||
hash = "sha256-moZ2LYLhZDb8Y8jgWbdgK6SbJ8lY8f356d5vKHc/54Q=";
|
||||
};
|
||||
|
||||
kernelSrc = fetchurl {
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz";
|
||||
hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o=";
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz";
|
||||
hash = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ lgpl2Only lgpl21Only ];
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
platforms = [ "x86_64-linux" "aarch64-darwin" ];
|
||||
sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmcrypt";
|
||||
version = "2.5.8";
|
||||
|
|
@ -11,15 +9,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
|
||||
};
|
||||
|
||||
buildInputs = optional stdenv.isDarwin darwin.cctools;
|
||||
buildInputs = lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
||||
configureFlags = optionals disablePosixThreads
|
||||
configureFlags = lib.optionals disablePosixThreads
|
||||
[ "--disable-posix-threads" ];
|
||||
|
||||
meta = {
|
||||
description = "Replacement for the old crypt() package and crypt(1) command, with extensions";
|
||||
homepage = "http://mcrypt.sourceforge.net";
|
||||
license = "GPL";
|
||||
platforms = platforms.all;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@
|
|||
, libva
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "libqtav";
|
||||
version = "unstable-2020-09-10";
|
||||
|
|
@ -64,7 +62,7 @@ mkDerivation rec {
|
|||
|
||||
stripDebugList = [ "lib" "libexec" "bin" "qml" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A multimedia playback framework based on Qt + FFmpeg";
|
||||
#license = licenses.lgpl21; # For the libraries / headers only.
|
||||
license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspf2";
|
||||
version = "2.2.12";
|
||||
|
|
@ -35,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Implementation of the Sender Policy Framework for SMTP " +
|
||||
"authorization (Helsinki Systems fork)";
|
||||
homepage = "https://github.com/helsinki-systems/libspf2";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, cmake, perl }:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "libtap";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, gtk-doc, docbook_xml_dtd_45, docbook_xsl
|
||||
, libxslt, libxml2 }:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
majorVer = "3.0";
|
||||
|
|
@ -23,8 +22,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://wiki.gnome.org/Attic/LibUnique";
|
||||
description = "A library for writing single instance applications";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ stdenv, fetchurl, lib, glib }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libutempter";
|
||||
version = "1.2.1";
|
||||
|
|
@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
"mandir=\${out}/share/man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/altlinux/libutempter";
|
||||
description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvgm";
|
||||
version = "unstable-2022-11-25";
|
||||
version = "unstable-2023-01-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValleyBell";
|
||||
repo = "libvgm";
|
||||
rev = "fd7da37b96b5937a0bb5a41bacbae0a0ef59069f";
|
||||
sha256 = "1tjooO/f72lRdZDxXVSxBySWsUMNWuqI2yQOipa7zFY=";
|
||||
rev = "c250212538dd48d3965826ad7fe669bb0f348cbd";
|
||||
sha256 = "5XHdPtadfsfzkeeOpa5NPrWarHBHeKvmr7p0m31URDc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -77,13 +77,11 @@
|
|||
, zfs
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (stdenv) isDarwin isLinux isx86_64;
|
||||
binPath = makeBinPath ([
|
||||
binPath = lib.makeBinPath ([
|
||||
dnsmasq
|
||||
] ++ optionals isLinux [
|
||||
] ++ lib.optionals isLinux [
|
||||
bridge-utils
|
||||
dmidecode
|
||||
dnsmasq
|
||||
|
|
@ -95,10 +93,10 @@ let
|
|||
numad
|
||||
pmutils
|
||||
systemd
|
||||
] ++ optionals enableIscsi [
|
||||
] ++ lib.optionals enableIscsi [
|
||||
libiscsi
|
||||
openiscsi
|
||||
] ++ optionals enableZfs [
|
||||
] ++ lib.optionals enableZfs [
|
||||
zfs
|
||||
]);
|
||||
in
|
||||
|
|
@ -148,17 +146,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
substituteInPlace meson.build \
|
||||
--replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon',"
|
||||
'' + optionalString isLinux ''
|
||||
'' + lib.optionalString isLinux ''
|
||||
sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \
|
||||
src/storage/storage_backend_disk.c \
|
||||
src/storage/storage_util.c
|
||||
'' + optionalString isDarwin ''
|
||||
'' + lib.optionalString isDarwin ''
|
||||
sed -i '/qemucapabilitiestest/d' tests/meson.build
|
||||
sed -i '/vircryptotest/d' tests/meson.build
|
||||
sed -i '/domaincapstest/d' tests/meson.build
|
||||
sed -i '/qemufirmwaretest/d' tests/meson.build
|
||||
sed -i '/qemuvhostusertest/d' tests/meson.build
|
||||
'' + optionalString (isDarwin && isx86_64) ''
|
||||
'' + lib.optionalString (isDarwin && isx86_64) ''
|
||||
sed -i '/qemucaps2xmltest/d' tests/meson.build
|
||||
sed -i '/qemuhotplugtest/d' tests/meson.build
|
||||
sed -i '/virnetdaemontest/d' tests/meson.build
|
||||
|
|
@ -178,9 +176,9 @@ stdenv.mkDerivation rec {
|
|||
perl
|
||||
perlPackages.XMLXPath
|
||||
]
|
||||
++ optional (!isDarwin) rpcsvc-proto
|
||||
++ lib.optional (!isDarwin) rpcsvc-proto
|
||||
# NOTE: needed for rpcgen
|
||||
++ optional isDarwin darwin.developer_cmds;
|
||||
++ lib.optional isDarwin darwin.developer_cmds;
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
|
|
@ -197,7 +195,7 @@ stdenv.mkDerivation rec {
|
|||
readline
|
||||
xhtml1
|
||||
yajl
|
||||
] ++ optionals isLinux [
|
||||
] ++ lib.optionals isLinux [
|
||||
acl
|
||||
attr
|
||||
audit
|
||||
|
|
@ -213,17 +211,17 @@ stdenv.mkDerivation rec {
|
|||
parted
|
||||
systemd
|
||||
util-linux
|
||||
] ++ optionals isDarwin [
|
||||
] ++ lib.optionals isDarwin [
|
||||
AppKit
|
||||
Carbon
|
||||
gmp
|
||||
libiconv
|
||||
]
|
||||
++ optionals enableCeph [ ceph ]
|
||||
++ optionals enableGlusterfs [ glusterfs ]
|
||||
++ optionals enableIscsi [ libiscsi openiscsi ]
|
||||
++ optionals enableXen [ xen ]
|
||||
++ optionals enableZfs [ zfs ];
|
||||
++ lib.optionals enableCeph [ ceph ]
|
||||
++ lib.optionals enableGlusterfs [ glusterfs ]
|
||||
++ lib.optionals enableIscsi [ libiscsi openiscsi ]
|
||||
++ lib.optionals enableXen [ xen ]
|
||||
++ lib.optionals enableZfs [ zfs ];
|
||||
|
||||
preConfigure =
|
||||
let
|
||||
|
|
@ -348,7 +346,7 @@ stdenv.mkDerivation rec {
|
|||
# Added in nixpkgs:
|
||||
gettext() { "${gettext}/bin/gettext" "$@"; }
|
||||
'
|
||||
'' + optionalString isLinux ''
|
||||
'' + lib.optionalString isLinux ''
|
||||
for f in $out/lib/systemd/system/*.service ; do
|
||||
substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill
|
||||
done
|
||||
|
|
@ -372,7 +370,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.tests.libvirtd = nixosTests.libvirtd;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes";
|
||||
homepage = "https://libvirt.org/";
|
||||
changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst";
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@
|
|||
libvirt,
|
||||
xenSupport ? true }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvmi";
|
||||
version = "0.12.0";
|
||||
|
|
@ -24,16 +22,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv";
|
||||
};
|
||||
|
||||
buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen);
|
||||
buildInputs = [ glib libvirt json_c ] ++ (lib.optional xenSupport xen);
|
||||
nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
|
||||
|
||||
configureFlags = optional (!xenSupport) "--disable-xen";
|
||||
configureFlags = lib.optional (!xenSupport) "--disable-xen";
|
||||
|
||||
# libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here
|
||||
postFixup = optionalString xenSupport ''
|
||||
postFixup = lib.optionalString xenSupport ''
|
||||
libvmi="$out/lib/libvmi.so.${libVersion}"
|
||||
oldrpath=$(patchelf --print-rpath "$libvmi")
|
||||
patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi"
|
||||
patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libytnef";
|
||||
version = "2.0";
|
||||
|
|
@ -15,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Yeraze's TNEF Stream Reader - for winmail.dat files";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -36,13 +36,11 @@
|
|||
- libOSMesa is in $osmesa (~4 MB)
|
||||
*/
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
# Release calendar: https://www.mesa3d.org/release-calendar.html
|
||||
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
|
||||
version = "22.3.3";
|
||||
branch = versions.major version;
|
||||
branch = lib.versions.major version;
|
||||
|
||||
withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm;
|
||||
|
||||
|
|
@ -115,43 +113,43 @@ self = stdenv.mkDerivation {
|
|||
"-Ddisk-cache-key=${placeholder "drivers"}"
|
||||
"-Ddri-search-path=${libglvnd.driverLink}/lib/dri"
|
||||
|
||||
"-Dplatforms=${concatStringsSep "," eglPlatforms}"
|
||||
"-Dgallium-drivers=${concatStringsSep "," galliumDrivers}"
|
||||
"-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}"
|
||||
"-Dplatforms=${lib.concatStringsSep "," eglPlatforms}"
|
||||
"-Dgallium-drivers=${lib.concatStringsSep "," galliumDrivers}"
|
||||
"-Dvulkan-drivers=${lib.concatStringsSep "," vulkanDrivers}"
|
||||
|
||||
"-Ddri-drivers-path=${placeholder "drivers"}/lib/dri"
|
||||
"-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau"
|
||||
"-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"
|
||||
"-Dva-libs-path=${placeholder "drivers"}/lib/dri"
|
||||
"-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"
|
||||
"-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine
|
||||
"-Dosmesa=${boolToString enableOSMesa}" # used by wine
|
||||
"-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine
|
||||
"-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine
|
||||
"-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
|
||||
|
||||
# To enable non-mesa gbm backends to be found (e.g. Nvidia)
|
||||
"-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm"
|
||||
] ++ optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"-Dglvnd=true"
|
||||
] ++ optionals enableOpenCL [
|
||||
] ++ lib.optionals enableOpenCL [
|
||||
"-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend
|
||||
"-Dgallium-rusticl=true" "-Drust_std=2021"
|
||||
"-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib"
|
||||
] ++ optional enablePatentEncumberedCodecs
|
||||
] ++ lib.optional enablePatentEncumberedCodecs
|
||||
"-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
|
||||
++ optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}";
|
||||
++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}";
|
||||
|
||||
buildInputs = with xorg; [
|
||||
expat llvmPackages.libllvm libglvnd xorgproto
|
||||
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
|
||||
libffi libvdpau libelf libXvMC
|
||||
libpthreadstubs openssl /*or another sha1 provider*/
|
||||
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
|
||||
] ++ lib.optionals (lib.elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
|
||||
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
|
||||
++ lib.optionals stdenv.isDarwin [ libunwind ]
|
||||
++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator_14 ]
|
||||
++ lib.optional withValgrind valgrind-light
|
||||
# Mesa will not build zink when gallium-drivers=auto
|
||||
++ lib.optional (elem "zink" galliumDrivers) vulkan-loader;
|
||||
++ lib.optional (lib.elem "zink" galliumDrivers) vulkan-loader;
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
|
|
@ -160,21 +158,21 @@ self = stdenv.mkDerivation {
|
|||
intltool bison flex file
|
||||
python3Packages.python python3Packages.Mako
|
||||
jdupes glslang
|
||||
] ++ lib.optionals (elem "wayland" eglPlatforms) [
|
||||
] ++ lib.optionals (lib.elem "wayland" eglPlatforms) [
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with xorg; [
|
||||
libXdamage libXxf86vm
|
||||
] ++ optional withLibdrm libdrm
|
||||
++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
|
||||
] ++ lib.optional withLibdrm libdrm
|
||||
++ lib.optionals stdenv.isDarwin [ OpenGL Xplugin ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
# Some installs don't have any drivers so this directory is never created.
|
||||
mkdir -p $drivers $osmesa
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p $drivers/lib
|
||||
|
||||
if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then
|
||||
|
|
@ -199,7 +197,7 @@ self = stdenv.mkDerivation {
|
|||
for js in $drivers/share/vulkan/icd.d/*.json; do
|
||||
substituteInPlace "$js" --replace "$out" "$drivers"
|
||||
done
|
||||
'' + optionalString enableOpenCL ''
|
||||
'' + lib.optionalString enableOpenCL ''
|
||||
# Move OpenCL stuff
|
||||
mkdir -p $opencl/lib
|
||||
mv -t "$opencl/lib/" \
|
||||
|
|
@ -221,7 +219,7 @@ self = stdenv.mkDerivation {
|
|||
done
|
||||
'';
|
||||
|
||||
postFixup = optionalString stdenv.isLinux ''
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
# set the default search path for DRI drivers; used e.g. by X server
|
||||
substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}"
|
||||
[ -f "$dev/lib/pkgconfig/d3d.pc" ] && substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}"
|
||||
|
|
@ -252,7 +250,7 @@ self = stdenv.mkDerivation {
|
|||
done
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [
|
||||
"-UPIPE_SEARCH_DIR"
|
||||
"-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\""
|
||||
];
|
||||
|
|
@ -274,7 +272,7 @@ self = stdenv.mkDerivation {
|
|||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An open source 3D graphics library";
|
||||
longDescription = ''
|
||||
The Mesa project began as an open-source implementation of the OpenGL
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, lib, nuspell, makeWrapper, dicts ? [] }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
searchPath = makeSearchPath "share/hunspell" dicts;
|
||||
searchPath = lib.makeSearchPath "share/hunspell" dicts;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = (appendToName "with-dicts" nuspell).name;
|
||||
name = (lib.appendToName "with-dicts" nuspell).name;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildCommand = ''
|
||||
makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${lib.escapeShellArg searchPath}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
OpenCL, Cocoa
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencascade-oce";
|
||||
version = "0.18.3";
|
||||
|
|
@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8
|
||||
gl2ps tbb
|
||||
]
|
||||
++ optionals stdenv.isDarwin [OpenCL Cocoa]
|
||||
++ lib.optionals stdenv.isDarwin [OpenCL Cocoa]
|
||||
;
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
"-DOCE_WITH_GL2PS=ON"
|
||||
"-DOCE_MULTITHREAD_LIBRARY=TBB"
|
||||
]
|
||||
++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"];
|
||||
++ lib.optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"];
|
||||
|
||||
patches = [
|
||||
# Use fontconfig instead of hardcoded directory list
|
||||
|
|
@ -56,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
--replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
|
||||
homepage = "https://github.com/tpaviot/oce";
|
||||
maintainers = [ maintainers.viric ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib, stdenv, fetchzip }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.94";
|
||||
pname = "pcg-c";
|
||||
|
|
@ -31,8 +29,8 @@ stdenv.mkDerivation rec {
|
|||
algorithms for random number generation. Unlike many general-purpose RNGs,
|
||||
they are also hard to predict.
|
||||
'';
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.linus ];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.linus ];
|
||||
broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
, variant ? null
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert elem variant [ null "cpp" "pcre16" "pcre32" ];
|
||||
assert lib.elem variant [ null "cpp" "pcre16" "pcre32" ];
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcre"
|
||||
|
|
@ -21,11 +19,11 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "bin" "dev" "out" "doc" "man" ];
|
||||
|
||||
# Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
|
||||
configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [
|
||||
configureFlags = lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [
|
||||
"--enable-unicode-properties"
|
||||
"--disable-cpp"
|
||||
]
|
||||
++ optional (variant != null) "--enable-${variant}";
|
||||
++ lib.optional (variant != null) "--enable-${variant}";
|
||||
|
||||
# https://bugs.exim.org/show_bug.cgi?id=2173
|
||||
patches = [ ./stacksize-detection.patch ];
|
||||
|
|
@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postFixup = ''
|
||||
moveToOutput bin/pcre-config "$dev"
|
||||
'' + optionalString (variant != null) ''
|
||||
'' + lib.optionalString (variant != null) ''
|
||||
ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a}
|
||||
'';
|
||||
|
||||
|
|
@ -57,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
PCRE library is free, even for building proprietary software.
|
||||
'';
|
||||
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
, debug ? false
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phonon-backend-gstreamer";
|
||||
version = "4.10.0";
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
, debug ? false
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
soname = "phonon4qt5";
|
||||
buildsystemdir = "share/cmake/${soname}";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, pkg-config
|
||||
, cmake
|
||||
, gtest
|
||||
, valgrind
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -36,24 +37,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGTEST_SOURCE_DIR=${gtest.dev}/include"
|
||||
] ++ lib.optionals (!doCheck) [
|
||||
"-DRAPIDJSON_BUILD_TESTS=OFF"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
ctest -E '.*valgrind.*'
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
# for tests, adding gtest to checkInputs does not work
|
||||
# https://github.com/NixOS/nixpkgs/pull/212200
|
||||
buildInputs = [ gtest ];
|
||||
cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ];
|
||||
|
||||
nativeCheckInputs = [ valgrind ];
|
||||
doCheck = !stdenv.hostPlatform.isStatic;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
incfile = builtins.toFile "make.inc.custom" ''
|
||||
CC = g++
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@
|
|||
, python3
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let blas64_ = blas64; in
|
||||
|
||||
let
|
||||
|
|
@ -121,7 +119,7 @@ let
|
|||
blas64 =
|
||||
if blas64_ != null
|
||||
then blas64_
|
||||
else hasPrefix "x86_64" stdenv.hostPlatform.system;
|
||||
else lib.hasPrefix "x86_64" stdenv.hostPlatform.system;
|
||||
# Convert flag values to format OpenBLAS's build expects.
|
||||
# `toString` is almost what we need other than bools,
|
||||
# which we need to map {true -> 1, false -> 0}
|
||||
|
|
@ -129,7 +127,7 @@ let
|
|||
mkMakeFlagValue = val:
|
||||
if !builtins.isBool val then toString val
|
||||
else if val then "1" else "0";
|
||||
mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
|
||||
mkMakeFlagsFromConfig = lib.mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
|
||||
|
||||
shlibExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk_5_2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simpleitk";
|
||||
version = "2.1.1.2";
|
||||
version = "2.2.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
|
|||
owner = "SimpleITK";
|
||||
repo = "SimpleITK";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sokJXOz6p+0eTeps5Tt24pjB3u+L1s6mDlaWN7K9m3g=";
|
||||
hash = "sha256-0YxmixUTXpjegZQv7DDCNTWFTH8QEWqQQszee7aQ5EI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake swig4 ];
|
||||
buildInputs = [ lua itk_5_2 ];
|
||||
buildInputs = [ lua itk ];
|
||||
|
||||
# 2.0.0: linker error building examples
|
||||
cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ gnustep, lib, fetchFromGitHub , libxml2, openssl
|
||||
, openldap, mariadb, libmysqlclient, postgresql }:
|
||||
with lib;
|
||||
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "sope";
|
||||
|
|
@ -15,10 +14,10 @@ gnustep.stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
nativeBuildInputs = [ gnustep.make ];
|
||||
buildInputs = flatten ([ gnustep.base libxml2 openssl ]
|
||||
++ optional (openldap != null) openldap
|
||||
++ optionals (mariadb != null) [ libmysqlclient mariadb ]
|
||||
++ optional (postgresql != null) postgresql);
|
||||
buildInputs = lib.flatten ([ gnustep.base libxml2 openssl ]
|
||||
++ lib.optional (openldap != null) openldap
|
||||
++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ]
|
||||
++ lib.optional (postgresql != null) postgresql);
|
||||
|
||||
postPatch = ''
|
||||
# Exclude NIX_ variables
|
||||
|
|
@ -30,9 +29,9 @@ gnustep.stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ]
|
||||
++ optional (openldap != null) "--enable-openldap"
|
||||
++ optional (mariadb != null) "--enable-mysql"
|
||||
++ optional (postgresql != null) "--enable-postgresql";
|
||||
++ lib.optional (openldap != null) "--enable-openldap"
|
||||
++ lib.optional (mariadb != null) "--enable-mysql"
|
||||
++ lib.optional (postgresql != null) "--enable-postgresql";
|
||||
|
||||
# Yes, this is ugly.
|
||||
preFixup = ''
|
||||
|
|
@ -40,7 +39,7 @@ gnustep.stdenv.mkDerivation rec {
|
|||
rm -rf $out/nix/store
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An extensive set of frameworks which form a complete Web application server environment";
|
||||
license = licenses.publicDomain;
|
||||
homepage = "https://github.com/inverse-inc/sope";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
lib: version:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
fragments = splitVersion version;
|
||||
major = head fragments;
|
||||
minor = concatMapStrings (fixedWidthNumber 2) (tail fragments);
|
||||
fragments = lib.splitVersion version;
|
||||
major = lib.head fragments;
|
||||
minor = lib.concatMapStrings (lib.fixedWidthNumber 2) (lib.tail fragments);
|
||||
in
|
||||
|
||||
major + minor + "00"
|
||||
|
|
|
|||
|
|
@ -9,14 +9,12 @@
|
|||
, enableDeserialize ? false
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
archiveVersion = import ./archive-version.nix lib;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlite${optionalString interactive "-interactive"}";
|
||||
pname = "sqlite${lib.optionalString interactive "-interactive"}";
|
||||
version = "3.40.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
|
|
@ -29,14 +27,14 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "bin" "dev" "out" ];
|
||||
separateDebugInfo = stdenv.isLinux;
|
||||
|
||||
buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ];
|
||||
buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ];
|
||||
|
||||
# required for aarch64 but applied for all arches for simplicity
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";
|
||||
configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline";
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString ([
|
||||
"-DSQLITE_ENABLE_COLUMN_METADATA"
|
||||
|
|
@ -94,7 +92,7 @@ stdenv.mkDerivation rec {
|
|||
inherit sqldiff sqlite-analyzer tracker;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
|
||||
downloadPage = "https://sqlite.org/download.html";
|
||||
homepage = "https://www.sqlite.org/";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, openssl
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "srt";
|
||||
version = "1.5.1";
|
||||
|
|
@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
"-UCMAKE_INSTALL_LIBDIR"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Secure, Reliable, Transport";
|
||||
homepage = "https://github.com/Haivision/srt";
|
||||
license = licenses.mpl20;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{lib, stdenv, fetchFromGitHub, cmake}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unittest-cpp";
|
||||
version = "2.0.0";
|
||||
|
|
@ -20,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://github.com/unittest-cpp/unittest-cpp";
|
||||
description = "Lightweight unit testing framework for C++";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xvidcore";
|
||||
version = "1.3.7";
|
||||
|
|
@ -13,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
preConfigure = ''
|
||||
# Configure script is not in the root of the source directory
|
||||
cd build/generic
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Undocumented darwin hack
|
||||
substituteInPlace configure --replace "-no-cpp-precomp" ""
|
||||
'';
|
||||
|
|
@ -21,22 +20,22 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [ ]
|
||||
# Undocumented darwin hack (assembly is probably disabled due to an
|
||||
# issue with nasm, however yasm is now used)
|
||||
++ optional stdenv.isDarwin "--enable-macosx_module --disable-assembly";
|
||||
++ lib.optional stdenv.isDarwin "--enable-macosx_module --disable-assembly";
|
||||
|
||||
nativeBuildInputs = [ ]
|
||||
++ optional (!stdenv.isDarwin) yasm;
|
||||
++ lib.optional (!stdenv.isDarwin) yasm;
|
||||
|
||||
buildInputs = [ ]
|
||||
# Undocumented darwin hack
|
||||
++ optionals stdenv.isDarwin [ autoconf automake libtool ];
|
||||
++ lib.optionals stdenv.isDarwin [ autoconf automake libtool ];
|
||||
|
||||
# Don't remove static libraries (e.g. 'libs/*.a') on darwin. They're needed to
|
||||
# compile ffmpeg (and perhaps other things).
|
||||
postInstall = optionalString (!stdenv.isDarwin) ''
|
||||
postInstall = lib.optionalString (!stdenv.isDarwin) ''
|
||||
rm $out/lib/*.a
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "MPEG-4 video codec for PC";
|
||||
homepage = "https://www.xvid.com/";
|
||||
license = licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, unzip, autoPatchelfHook }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
archPostfix = optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64";
|
||||
archPostfix = lib.optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "msp-debug-stack-bin";
|
||||
version = "3.15.1.1";
|
||||
|
|
@ -26,7 +24,7 @@ in stdenv.mkDerivation rec {
|
|||
install -Dm0644 -t $out/include Inc/*.h
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Unfree binary release of the TI MSP430 FET debug driver";
|
||||
homepage = "https://www.ti.com/tool/MSPDS";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,10 @@
|
|||
, libusb1 ? null
|
||||
}:
|
||||
|
||||
with lib;
|
||||
assert stdenv.isLinux -> libusb1 != null;
|
||||
|
||||
let
|
||||
hidapiDriver = optionalString stdenv.isLinux "-libusb";
|
||||
hidapiDriver = lib.optionalString stdenv.isLinux "-libusb";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "msp-debug-stack";
|
||||
|
|
@ -33,7 +32,7 @@ in stdenv.mkDerivation {
|
|||
preBuild = ''
|
||||
rm ThirdParty/src/pugixml.cpp
|
||||
rm ThirdParty/include/pugi{config,xml}.hpp
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
makeFlagsArray+=(OUTNAME="-install_name ")
|
||||
'';
|
||||
|
||||
|
|
@ -44,9 +43,9 @@ in stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ boost hidapi pugixml ]
|
||||
++ optional stdenv.isLinux libusb1;
|
||||
++ lib.optional stdenv.isLinux libusb1;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "TI MSP430 FET debug driver";
|
||||
homepage = "https://www.ti.com/tool/MSPDS";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
19
pkgs/development/nim-packages/base45/default.nix
Normal file
19
pkgs/development/nim-packages/base45/default.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, buildNimPackage, fetchFromSourcehut }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "base45";
|
||||
version = "20230124";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ehmry";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9he+14yYVGt2s1IuRLPRsv23xnJzERkWRvIHr3PxFYk=";
|
||||
};
|
||||
doCheck = true;
|
||||
meta = src.meta // {
|
||||
description = "Base45 library for Nim";
|
||||
license = lib.licenses.unlicense;
|
||||
mainProgram = pname;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5"
|
||||
else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
|
||||
}:
|
||||
with lib;
|
||||
|
||||
let fetched = coqPackages.metaFetch ({
|
||||
release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A=";
|
||||
release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";
|
||||
|
|
@ -31,17 +31,17 @@ buildDunePackage rec {
|
|||
pname = "elpi";
|
||||
inherit (fetched) version src;
|
||||
|
||||
patches = lib.optional (versionAtLeast version "1.16" || version == "dev")
|
||||
patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev")
|
||||
./atd_2_10.patch;
|
||||
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
buildInputs = [ perl ncurses ]
|
||||
++ optional (versionAtLeast version "1.15" || version == "dev") menhir
|
||||
++ optional (versionAtLeast version "1.16" || version == "dev") atdgen;
|
||||
++ lib.optional (lib.versionAtLeast version "1.15" || version == "dev") menhir
|
||||
++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;
|
||||
|
||||
propagatedBuildInputs = [ re stdlib-shims ]
|
||||
++ (if versionAtLeast version "1.15" || version == "dev"
|
||||
++ (if lib.versionAtLeast version "1.15" || version == "dev"
|
||||
then [ menhirLib ]
|
||||
else [ camlp5 ]
|
||||
)
|
||||
|
|
@ -50,7 +50,7 @@ buildDunePackage rec {
|
|||
else [ ppxlib_0_15 ppx_deriving_0_15 ]
|
||||
);
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Embeddable λProlog Interpreter";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
|
||||
|
||||
with lib;
|
||||
|
||||
throwIfNot (versionAtLeast ocaml.version "4.08")
|
||||
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
|
||||
"mtime is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -21,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Monotonic wall-clock time for OCaml";
|
||||
homepage = "https://erratique.ch/software/mtime";
|
||||
inherit (ocaml.meta) platforms;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
htmlcBackend ? true # depends on js_of_ocaml
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (lib) optionals versionOlder;
|
||||
|
||||
|
|
@ -38,14 +36,14 @@ stdenv.mkDerivation {
|
|||
strictDeps = true;
|
||||
|
||||
buildPhase = topkg.buildPhase
|
||||
+ " --with-uutf ${boolToString pdfBackend}"
|
||||
+ " --with-otfm ${boolToString pdfBackend}"
|
||||
+ " --with-js_of_ocaml ${boolToString htmlcBackend}"
|
||||
+ " --with-uutf ${lib.boolToString pdfBackend}"
|
||||
+ " --with-otfm ${lib.boolToString pdfBackend}"
|
||||
+ " --with-js_of_ocaml ${lib.boolToString htmlcBackend}"
|
||||
+ " --with-cairo2 false";
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Declarative 2D vector graphics for OCaml";
|
||||
longDescription = ''
|
||||
Vg is an OCaml module for declarative 2D vector graphics. In Vg, images
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
, haversine
|
||||
, mock
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-client";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,8 +23,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g/BlRRBImJihVlAfSMsPIPV0GJns0/pStF8TKSxpDI4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Voc1ME0iGQCMaDfBXDSVnRp8olvId+fLhH8sqHwB2Ak=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
asynctest
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
@ -49,6 +49,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for accessing GeoRSS feeds";
|
||||
homepage = "https://github.com/exxamalte/python-aio-georss-client";
|
||||
changelog = "https://github.com/exxamalte/python-aio-georss-client/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-gdacs";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-gdacs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6z0l0PcFTQgOBj8cBgBMPJIqWG53u7h4WbYkBqU4FNE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1mpOWd4Z2gTQtRewWfZsfEtmS6i5uMPAMTlC8UpawxM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -41,6 +41,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for accessing GeoRSS feeds";
|
||||
homepage = "https://github.com/exxamalte/python-aio-georss-gdacs";
|
||||
changelog = "https://github.com/exxamalte/python-aio-georss-gdacs/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioaladdinconnect";
|
||||
version = "0.1.53";
|
||||
version = "0.1.54";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "AIOAladdinConnect";
|
||||
inherit version;
|
||||
hash = "sha256-aU15T3H98un+ImE0KYbJpYop7mvBtBPSFAEqiTZzigQ=";
|
||||
hash = "sha256-WRHQYWoQQ8EoKOqhIS0PqIWisO4xjUvRJHpomD8f5wA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
41
pkgs/development/python-modules/dicom-numpy/default.nix
Normal file
41
pkgs/development/python-modules/dicom-numpy/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, numpy
|
||||
, pydicom
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dicom-numpy";
|
||||
version = "0.6.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "innolitics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QIPuSFaWgHmcTddZ8H9kgzLYuwGUzy/FVsi/ttSUskA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pydicom
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dicom_numpy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Read DICOM files into Numpy arrays";
|
||||
homepage = "https://github.com/innolitics/dicom-numpy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1XuY1Xf4QwJqEWCv0m2seSpoteDJxWep38lyP2Okk1Q=";
|
||||
hash = "sha256-nVzFxoEIk01fPnybPQ7elFSff9ofSI9Ik6B+P4o41N8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue