Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
+1
-1
@@ -108,7 +108,7 @@ let
|
||||
makeScope makeScopeWithSplicing;
|
||||
inherit (self.meta) addMetaAttrs dontDistribute setName updateName
|
||||
appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
|
||||
hiPrioSet getLicenseFromSpdxId;
|
||||
hiPrioSet getLicenseFromSpdxId getExe;
|
||||
inherit (self.sources) pathType pathIsDirectory cleanSourceFilter
|
||||
cleanSource sourceByRegex sourceFilesBySuffices
|
||||
commitIdFromGitRepo cleanSourceWith pathHasContext
|
||||
|
||||
@@ -126,4 +126,18 @@ rec {
|
||||
lib.warn "getLicenseFromSpdxId: No license matches the given SPDX ID: ${licstr}"
|
||||
{ shortName = licstr; }
|
||||
);
|
||||
|
||||
/* Get the path to the main program of a derivation with either
|
||||
meta.mainProgram or pname or name
|
||||
|
||||
Type: getExe :: derivation -> string
|
||||
|
||||
Example:
|
||||
getExe pkgs.hello
|
||||
=> "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello"
|
||||
getExe pkgs.mustache-go
|
||||
=> "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
|
||||
*/
|
||||
getExe = x:
|
||||
"${lib.getBin x}/bin/${x.meta.mainProgram or (lib.getName x)}";
|
||||
}
|
||||
|
||||
+7
-1
@@ -113,6 +113,10 @@ rec {
|
||||
args ? {}
|
||||
, # This would be remove in the future, Prefer _module.check option instead.
|
||||
check ? true
|
||||
# Internal variable to avoid `_key` collisions regardless
|
||||
# of `extendModules`. Used in `submoduleWith`.
|
||||
# Test case: lib/tests/modules, "168767"
|
||||
, extensionOffset ? 0
|
||||
}:
|
||||
let
|
||||
withWarnings = x:
|
||||
@@ -338,15 +342,17 @@ rec {
|
||||
modules ? [],
|
||||
specialArgs ? {},
|
||||
prefix ? [],
|
||||
extensionOffset ? length modules,
|
||||
}:
|
||||
evalModules (evalModulesArgs // {
|
||||
modules = regularModules ++ modules;
|
||||
specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
|
||||
prefix = extendArgs.prefix or evalModulesArgs.prefix;
|
||||
inherit extensionOffset;
|
||||
});
|
||||
|
||||
type = lib.types.submoduleWith {
|
||||
inherit modules specialArgs;
|
||||
inherit modules specialArgs extensionOffset;
|
||||
};
|
||||
|
||||
result = withWarnings {
|
||||
|
||||
@@ -293,7 +293,7 @@ checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix
|
||||
|
||||
# moduleType
|
||||
checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput '^"a b y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix
|
||||
|
||||
## emptyValue's
|
||||
@@ -327,6 +327,10 @@ checkConfigError 'The option .theOption.nested. in .other.nix. is already declar
|
||||
# Test that types.optionType leaves types untouched as long as they don't need to be merged
|
||||
checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix
|
||||
|
||||
# Anonymous submodules don't get nixed by import resolution/deduplication
|
||||
# because of an `extendModules` bug, issue 168767.
|
||||
checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-imports.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, extendModules
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
{
|
||||
imports = [
|
||||
|
||||
{
|
||||
options.sub = mkOption {
|
||||
default = { };
|
||||
type = types.submodule (
|
||||
{ config
|
||||
, extendModules
|
||||
, ...
|
||||
}:
|
||||
{
|
||||
options.value = mkOption {
|
||||
type = types.int;
|
||||
};
|
||||
|
||||
options.specialisation = mkOption {
|
||||
default = { };
|
||||
inherit
|
||||
(extendModules {
|
||||
modules = [{
|
||||
specialisation = mkOverride 0 { };
|
||||
}];
|
||||
})
|
||||
type;
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
{ config.sub.value = 1; }
|
||||
|
||||
|
||||
];
|
||||
}
|
||||
+8
-2
@@ -568,6 +568,11 @@ rec {
|
||||
{ modules
|
||||
, specialArgs ? {}
|
||||
, shorthandOnlyDefinesConfig ? false
|
||||
|
||||
# Internal variable to avoid `_key` collisions regardless
|
||||
# of `extendModules`. Wired through by `evalModules`.
|
||||
# Test case: lib/tests/modules, "168767"
|
||||
, extensionOffset ? 0
|
||||
}@attrs:
|
||||
let
|
||||
inherit (lib.modules) evalModules;
|
||||
@@ -579,11 +584,11 @@ rec {
|
||||
allModules = defs: imap1 (n: { value, file }:
|
||||
if isFunction value
|
||||
then setFunctionArgs
|
||||
(args: lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (value args))
|
||||
(args: lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (value args))
|
||||
(functionArgs value)
|
||||
else if isAttrs value
|
||||
then
|
||||
lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (shorthandToModule value)
|
||||
lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (shorthandToModule value)
|
||||
else value
|
||||
) defs;
|
||||
|
||||
@@ -620,6 +625,7 @@ rec {
|
||||
(base.extendModules {
|
||||
modules = [ { _module.args.name = last loc; } ] ++ allModules defs;
|
||||
prefix = loc;
|
||||
extensionOffset = extensionOffset + length defs;
|
||||
}).config;
|
||||
emptyValue = { value = {}; };
|
||||
getSubOptions = prefix: (base.extendModules
|
||||
|
||||
@@ -11323,6 +11323,12 @@
|
||||
githubId = 307899;
|
||||
name = "Gurkan Gur";
|
||||
};
|
||||
serge = {
|
||||
email = "sb@canva.com";
|
||||
github = "serge-belov";
|
||||
githubId = 38824235;
|
||||
name = "Serge Belov";
|
||||
};
|
||||
sersorrel = {
|
||||
email = "ash@sorrel.sh";
|
||||
github = "sersorrel";
|
||||
|
||||
@@ -1018,7 +1018,7 @@ in
|
||||
inherit configIniOfService;
|
||||
mainService = mkMerge [ baseService {
|
||||
serviceConfig.StateDirectory = [ "sourcehut/gitsrht" "sourcehut/gitsrht/repos" ];
|
||||
preStart = mkIf (!versionAtLeast config.system.stateVersion "22.05") (mkBefore ''
|
||||
preStart = mkIf (versionOlder config.system.stateVersion "22.05") (mkBefore ''
|
||||
# Fix Git hooks of repositories pre-dating https://github.com/NixOS/nixpkgs/pull/133984
|
||||
(
|
||||
set +f
|
||||
|
||||
@@ -15,14 +15,14 @@ in
|
||||
|
||||
boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !boot.initrd.systemd.enable)
|
||||
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/fsck.xfs
|
||||
copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/xfs_repair
|
||||
'';
|
||||
|
||||
# Trick just to set 'sh' after the extraUtils nuke-refs.
|
||||
boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !boot.initrd.systemd.enable)
|
||||
boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
|
||||
''
|
||||
sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs
|
||||
'';
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ./generic.nix (rec {
|
||||
version = "28.1";
|
||||
sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=";
|
||||
sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY=";
|
||||
patches = _: [ ];
|
||||
})
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
, sigtool, jansson, harfbuzz, sqlite, nixosTests
|
||||
, dontRecurseIntoAttrs, emacsPackagesFor
|
||||
, libgccjit, targetPlatform, makeWrapper # native-comp params
|
||||
, fetchFromSavannah
|
||||
, systemd ? null
|
||||
, withX ? !stdenv.isDarwin
|
||||
, withNS ? stdenv.isDarwin
|
||||
@@ -23,7 +24,7 @@
|
||||
, withSQLite3 ? false
|
||||
, withCsrc ? true
|
||||
, withWebP ? false
|
||||
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
|
||||
, srcRepo ? true, autoreconfHook ? null, texinfo ? null
|
||||
, siteStart ? ./site-start.el
|
||||
, nativeComp ? false
|
||||
, withAthena ? false
|
||||
@@ -59,8 +60,9 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
||||
|
||||
patches = patches fetchpatch;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.xz";
|
||||
src = fetchFromSavannah {
|
||||
repo = "emacs";
|
||||
rev = version;
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
||||
@@ -67,6 +67,18 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
adpyke.codesnap = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "codesnap";
|
||||
publisher = "adpyke";
|
||||
version = "1.3.4";
|
||||
sha256 = "sha256-dR6qODSTK377OJpmUqG9R85l1sf9fvJJACjrYhSRWgQ=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
alefragnani.project-manager = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "project-manager";
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
|
||||
openssl, wrapGAppsHook,
|
||||
avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
|
||||
avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; },
|
||||
fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@@ -15,6 +16,16 @@ mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch can be removed when a new version of barrier (greater than 2.4.0)
|
||||
# is released, which will contain this commit.
|
||||
(fetchpatch {
|
||||
name = "add-missing-cstddef-header.patch";
|
||||
url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch";
|
||||
sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ];
|
||||
nativeBuildInputs = [ cmake wrapGAppsHook ];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "git://anongit.freedesktop.org/${pname}";
|
||||
rev = "refs/tags/${pname}-${version}";
|
||||
sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g";
|
||||
sha256 = "sha256-0UGcoGkNF/19aSTWNEFAmZP7seL/yObXsOLlZLiyG2Q=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "masterpdfeditor";
|
||||
version = "5.8.33";
|
||||
version = "5.8.46";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
|
||||
sha256 = "sha256-sgLF/NpaNlkL5iA1l7QzMiYKwRcMDu2DHdTIaeHOtfI=";
|
||||
sha256 = "sha256-xms4aqIxYXR6v226RMf+abrFU1xz2aDIL6iQ+Yfff1k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "pure-maps";
|
||||
version = "2.9.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "pure-maps";
|
||||
rev = version;
|
||||
hash = "sha256-pMPjY6OXR6THiSQZ4mw9Kz+tAXJaOwzJEcpPOyZ+YKI=";
|
||||
hash = "sha256-r36/Vpt4ZIWV1+VhqRBuo4uT7nmEGiFGIt3QGG3ijjs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -37,6 +37,7 @@ mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Display vector and raster maps, places, routes, and provide navigation instructions with a flexible selection of data and service providers";
|
||||
homepage = "https://github.com/rinigus/pure-maps";
|
||||
changelog = "https://github.com/rinigus/pure-maps/blob/${src.rev}/NEWS.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.Thra11 ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ lib, fetchFromGitHub, python3Packages, file, less, highlight
|
||||
, imagePreviewSupport ? true, w3m }:
|
||||
{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m
|
||||
, imagePreviewSupport ? true
|
||||
, neoVimSupport ? true
|
||||
, improvedEncodingDetection ? true
|
||||
, rightToLeftTextSupport ? false
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ranger";
|
||||
@@ -15,8 +19,13 @@ python3Packages.buildPythonApplication rec {
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [ file ]
|
||||
++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ];
|
||||
propagatedBuildInputs = [
|
||||
less
|
||||
file
|
||||
] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ]
|
||||
++ lib.optionals neoVimSupport [ python3Packages.pynvim ]
|
||||
++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ]
|
||||
++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ];
|
||||
|
||||
preConfigure = ''
|
||||
${lib.optionalString (highlight != null) ''
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "c14-cli";
|
||||
version = "0.3";
|
||||
|
||||
goPackagePath = "github.com/online-net/c14-cli";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "online-net";
|
||||
repo = "c14-cli";
|
||||
rev = version;
|
||||
sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "C14 is designed for data archiving & long-term backups";
|
||||
homepage = "https://www.online.net/en/storage/c14-cold-storage";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ apeyroux ];
|
||||
};
|
||||
}
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-docs";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norwoodj";
|
||||
repo = "helm-docs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TXwEVyRYRiVqCDL7IR+DIu1iKqaq81W5xkvz+laxVek=";
|
||||
sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XTV0gyUWe6G5gxucsXOaDOUQoKMCfhrWzlKwUOaA6y4=";
|
||||
vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw=";
|
||||
|
||||
subPackages = [ "cmd/helm-docs" ];
|
||||
ldflags = [
|
||||
|
||||
@@ -1,19 +1,24 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "kompose";
|
||||
version = "1.21.0";
|
||||
|
||||
goPackagePath = "github.com/kubernetes/kompose";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "kubernetes";
|
||||
repo = "kompose";
|
||||
sha256 = "15a1alf6ywwfc4z5kdcnv64fp3cfy3qrcw62ny6xyn1kh1w24vkh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NfzqGG5ZwPpmjhvcvXN1AA+kfZG/oujbAEtXkm1mzeU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash zsh; do
|
||||
$out/bin/kompose completion $shell > kompose.$shell
|
||||
@@ -21,6 +26,11 @@ buildGoPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
package = kompose;
|
||||
command = "kompose version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to help users who are familiar with docker-compose move to Kubernetes";
|
||||
homepage = "https://kompose.io";
|
||||
|
||||
@@ -162,6 +162,15 @@
|
||||
"vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"buildkite": {
|
||||
"owner": "buildkite",
|
||||
"provider-source-address": "registry.terraform.io/buildkite/buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v0.8.0",
|
||||
"sha256": "1v4kzsvzkzf0bb6vpyjh0n2kbcfrqa193idvm4jgbcrdb0y3xzn5",
|
||||
"vendorSha256": "12kqjpyy80pfrasicmdi1f43mr846rad3c6xaa4dvzn7hq640q5j",
|
||||
"version": "0.8.0"
|
||||
},
|
||||
"checkly": {
|
||||
"owner": "checkly",
|
||||
"provider-source-address": "registry.terraform.io/checkly/checkly",
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-electron";
|
||||
version = "2022.1.1";
|
||||
version = "2022.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
|
||||
sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l";
|
||||
sha256 = "sha256-/5WpjmTLwQN73m7nHg4DKPbXIbD9WyJ+YBbFMD4ZDfg=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
||||
+2
-2
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.7.9";
|
||||
version = "1.8.4";
|
||||
pname = "session-desktop-appimage";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef";
|
||||
sha256 = "Az9NEsqU4ZcmuSno38zflT4M4lI6/4ShEh3FVTcyRJg=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
||||
+1
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
./kf594.patch
|
||||
./shortcuts-binary-path.patch
|
||||
# let it build with nixpkgs 10.12 sdk
|
||||
./kotato-10.12-sdk.patch
|
||||
|
||||
+57
@@ -0,0 +1,57 @@
|
||||
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
index 7641579aa..3c195e397 100644
|
||||
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
|
||||
#include "base/platform/base_platform_info.h"
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
-#include <surface.h>
|
||||
-#include <plasmashell.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
+#include <KWayland/Client/surface.h>
|
||||
+#include <KWayland/Client/plasmashell.h>
|
||||
|
||||
using namespace KWayland::Client;
|
||||
|
||||
Submodule Telegram/lib_base contains modified content
|
||||
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
index 32f0de6..30a087f 100644
|
||||
--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtGui/QWindow>
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
-#include <surface.h>
|
||||
-#include <xdgforeign.h>
|
||||
-#include <idleinhibit.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
+#include <KWayland/Client/surface.h>
|
||||
+#include <KWayland/Client/xdgforeign.h>
|
||||
+#include <KWayland/Client/idleinhibit.h>
|
||||
|
||||
using namespace KWayland::Client;
|
||||
|
||||
Submodule Telegram/lib_ui contains modified content
|
||||
diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
index 01f1e80..163cb6a 100644
|
||||
--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <private/qwaylandwindow_p.h>
|
||||
#include <private/qwaylandshellsurface_p.h>
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
|
||||
Q_DECLARE_METATYPE(QMargins);
|
||||
|
||||
+3
-6
@@ -63,12 +63,9 @@ stdenv.mkDerivation {
|
||||
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
|
||||
--replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"'
|
||||
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
|
||||
--replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"'
|
||||
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
|
||||
--replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"'
|
||||
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
|
||||
--replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \
|
||||
--replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \
|
||||
--replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \
|
||||
--replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"'
|
||||
'';
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
, lib
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, xar
|
||||
, cpio
|
||||
# Dynamic libraries
|
||||
, alsa-lib
|
||||
, atk
|
||||
@@ -28,8 +30,27 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.9.6.2225";
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
# Zoom versions are released at different times for each platform and linux
|
||||
# is stuck on 5.9.6 until https://github.com/NixOS/nixpkgs/pull/166085 is
|
||||
# resolved
|
||||
version = {
|
||||
aarch64-darwin = "5.10.4.6592";
|
||||
x86_64-darwin = "5.10.4.6592";
|
||||
x86_64-linux = "5.9.6.2225";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
|
||||
sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/Zoom.pkg";
|
||||
sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53";
|
||||
@@ -69,23 +90,41 @@ stdenv.mkDerivation rec {
|
||||
pname = "zoom";
|
||||
inherit version;
|
||||
|
||||
src = srcs.${stdenv.hostPlatform.system};
|
||||
src = srcs.${system} or throwSystem;
|
||||
|
||||
dontUnpack = true;
|
||||
dontUnpack = stdenv.isLinux;
|
||||
unpackPhase = lib.optionalString stdenv.isDarwin ''
|
||||
xar -xf $src
|
||||
zcat < zoomus.pkg/Payload | cpio -i
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
xar
|
||||
cpio
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir $out
|
||||
tar -C $out -xf $src
|
||||
mv $out/usr/* $out/
|
||||
${rec {
|
||||
aarch64-darwin = ''
|
||||
mkdir -p $out/Applications/zoom.us.app
|
||||
cp -R . $out/Applications/zoom.us.app
|
||||
'';
|
||||
# darwin steps same on both architectures
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
x86_64-linux = ''
|
||||
mkdir $out
|
||||
tar -C $out -xf $src
|
||||
mv $out/usr/* $out/
|
||||
'';
|
||||
}.${system} or throwSystem}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
# Desktop File
|
||||
substituteInPlace $out/share/applications/Zoom.desktop \
|
||||
--replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom"
|
||||
|
||||
@@ -46,11 +46,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.44.0";
|
||||
version = "3.44.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "3yHT31Ik36hC6ikO/82QKv1LFBhgik37aQejt9TZlPk=";
|
||||
sha256 = "dEx+CK0R4bYQPO60u/2Jo7Yo4SbOOGe7AI80F8wEnqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -52,13 +52,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U=";
|
||||
sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -138,7 +138,7 @@ python3Packages.buildPythonApplication rec {
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts
|
||||
version=$(list-git-tags https://gitlab.gnome.org/World/OpenPaperwork/paperwork.git | sed 's/^v//' | sort -V | tail -n1)
|
||||
version=$(list-git-tags | sed 's/^v//' | sort -V | tail -n1)
|
||||
update-source-version paperwork "$version" --file=pkgs/applications/office/paperwork/src.nix
|
||||
docs_version="$(curl https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/raw/$version/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh | grep TEST_DOCS_TAG= | cut -d'"' -f2)"
|
||||
update-source-version paperwork.sample_docs "$docs_version" --file=pkgs/applications/office/paperwork/src.nix --version-key=rev
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "stellarium";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stellarium";
|
||||
repo = "stellarium";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-scG/SS9emEmrZunv6n3Vzcchoh0Cf9rDOkuxAMnxNk4=";
|
||||
sha256 = "sha256-zDYZBV/76BDWWfiug0fFvMe3pdE4xfKgSmVJJd3Qu9Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
|
||||
|
||||
@@ -56,8 +56,8 @@ let
|
||||
args.version;
|
||||
version = fetched.version;
|
||||
coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev");
|
||||
versionAtLeast = v: (coq-version == "dev") || (lib.versionAtLeast coq-version v);
|
||||
ideFlags = optionalString (buildIde && !versionAtLeast "8.10")
|
||||
coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v;
|
||||
ideFlags = optionalString (buildIde && !coqAtLeast "8.10")
|
||||
"-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt";
|
||||
csdpPatch = if csdp != null then ''
|
||||
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
|
||||
@@ -71,11 +71,11 @@ let
|
||||
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
|
||||
] ocamlPackages_4_12;
|
||||
ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
|
||||
++ optional (versionAtLeast "8.14") ocamlPackages.dune_2;
|
||||
++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
|
||||
ocamlBuildInputs = []
|
||||
++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5
|
||||
++ optional (!versionAtLeast "8.13") ocamlPackages.num
|
||||
++ optional (versionAtLeast "8.13") ocamlPackages.zarith;
|
||||
++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
|
||||
++ optional (!coqAtLeast "8.13") ocamlPackages.num
|
||||
++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
|
||||
self = stdenv.mkDerivation {
|
||||
pname = "coq";
|
||||
inherit (fetched) version src;
|
||||
@@ -134,11 +134,11 @@ self = stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ ocamlNativeBuildInputs
|
||||
++ optional buildIde copyDesktopItems
|
||||
++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook
|
||||
++ optional (!versionAtLeast "8.6") gnumake42;
|
||||
++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook
|
||||
++ optional (!coqAtLeast "8.6") gnumake42;
|
||||
buildInputs = [ ncurses ] ++ ocamlBuildInputs
|
||||
++ optionals buildIde
|
||||
(if versionAtLeast "8.10"
|
||||
(if coqAtLeast "8.10"
|
||||
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ]
|
||||
else [ ocamlPackages.lablgtk ])
|
||||
;
|
||||
@@ -147,7 +147,7 @@ self = stdenv.mkDerivation {
|
||||
UNAME=$(type -tp uname)
|
||||
RM=$(type -tp rm)
|
||||
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
|
||||
${if !versionAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""}
|
||||
${if !coqAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""}
|
||||
${csdpPatch}
|
||||
'';
|
||||
|
||||
@@ -161,7 +161,7 @@ self = stdenv.mkDerivation {
|
||||
addEnvHooks "$targetOffset" addCoqPath
|
||||
'';
|
||||
|
||||
preConfigure = if versionAtLeast "8.10" then ''
|
||||
preConfigure = if coqAtLeast "8.10" then ''
|
||||
patchShebangs dev/tools/
|
||||
'' else ''
|
||||
configureFlagsArray=(
|
||||
@@ -171,7 +171,7 @@ self = stdenv.mkDerivation {
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!versionAtLeast "8.14") "bin/votour";
|
||||
buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!coqAtLeast "8.14") "bin/votour";
|
||||
enableParallelBuilding = true;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
@@ -185,10 +185,10 @@ self = stdenv.mkDerivation {
|
||||
categories = [ "Development" "Science" "Math" "IDE" "GTK" ];
|
||||
});
|
||||
|
||||
postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in ''
|
||||
postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in ''
|
||||
cp bin/votour $out/bin/
|
||||
ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix}
|
||||
'' + optionalString (versionAtLeast "8.14") ''
|
||||
'' + optionalString (coqAtLeast "8.14") ''
|
||||
ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server
|
||||
'' + optionalString buildIde ''
|
||||
mkdir -p "$out/share/pixmaps"
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "MAVProxy";
|
||||
version = "1.8.48";
|
||||
version = "1.8.49";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BigJdAz52D8hg2bQs7tngFqnITut/wENGZ0+gLlAeoY=";
|
||||
sha256 = "sha256-eJ/QxtMUq7DN/cH9qUHNIJv48r0NJrbZfML74DpYamQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oPLnc3Fv8oGbfQMujcVIwKJrQ3vCV9yIB4rUtjeVOV0=";
|
||||
sha256 = "sha256-k8td9YKtlkit3YzpAncocZE7+Cl8v9ZNyPD4ZysCFRI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ=";
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, common-updater-scripts
|
||||
, genericUpdater
|
||||
, gitUpdater
|
||||
, writers
|
||||
, makeWrapper
|
||||
, bash
|
||||
@@ -130,8 +129,7 @@ let
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
common-updater-scripts
|
||||
genericUpdater
|
||||
gitUpdater
|
||||
writers
|
||||
jq
|
||||
yq;
|
||||
|
||||
@@ -2,19 +2,17 @@
|
||||
, version
|
||||
, homepage
|
||||
, lib
|
||||
, common-updater-scripts
|
||||
, genericUpdater
|
||||
, gitUpdater
|
||||
, writers
|
||||
, jq
|
||||
, yq
|
||||
}:
|
||||
|
||||
let
|
||||
updater = genericUpdater {
|
||||
updater = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = lib.toLower pname;
|
||||
rev-prefix = "v";
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags --url=${homepage}";
|
||||
};
|
||||
updateScript = builtins.elemAt updater 0;
|
||||
updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
|
||||
|
||||
@@ -6,9 +6,8 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, bash
|
||||
, common-updater-scripts
|
||||
, fetchFromGitHub
|
||||
, genericUpdater
|
||||
, gitUpdater
|
||||
, jq
|
||||
, makeWrapper
|
||||
, mkYarnPackage
|
||||
@@ -80,8 +79,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
common-updater-scripts
|
||||
genericUpdater
|
||||
gitUpdater
|
||||
writers
|
||||
jq
|
||||
yarn
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
, version
|
||||
, homepage
|
||||
, lib
|
||||
, common-updater-scripts
|
||||
, genericUpdater
|
||||
, gitUpdater
|
||||
, writers
|
||||
, jq
|
||||
, yarn
|
||||
@@ -11,15 +10,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
updater = genericUpdater {
|
||||
updater = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = lib.toLower pname;
|
||||
|
||||
# exclude prerelease versions
|
||||
versionLister = writers.writeBash "list-mirakurun-versions" ''
|
||||
${common-updater-scripts}/bin/list-git-tags --url=${homepage} \
|
||||
| grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$'
|
||||
'';
|
||||
ignoredVersions = "-";
|
||||
};
|
||||
updateScript = builtins.elemAt updater 0;
|
||||
updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which
|
||||
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "2823";
|
||||
version = "hg-2012-12-09";
|
||||
pname = "wmii";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip";
|
||||
sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz";
|
||||
};
|
||||
|
||||
# for dlopen-ing
|
||||
patchPhase = ''
|
||||
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2"
|
||||
substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which"
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
for file in $(grep -lr '#!.*sh'); do
|
||||
sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file
|
||||
done
|
||||
|
||||
cat <<EOF >> config.mk
|
||||
PREFIX = $out
|
||||
LIBIXP = ${libixp_hg}/lib/libixp.a
|
||||
BINSH = ${dash}/bin/dash
|
||||
EOF
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ];
|
||||
buildInputs = [ libixp_hg txt2tags dash python2 which
|
||||
libX11 libXrender libXext libXinerama libXrandr libXft ];
|
||||
|
||||
# For some reason including mercurial in buildInputs did not help
|
||||
makeFlags = [ "WMII_HGVERSION=hg${rev}" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore
|
||||
description = "A small window manager controlled by a 9P filesystem";
|
||||
maintainers = with lib.maintainers; [ kovirobi ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, dash
|
||||
, libX11
|
||||
, libXext
|
||||
, libXft
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libixp
|
||||
, pkg-config
|
||||
, txt2tags
|
||||
, unzip
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wmii";
|
||||
version = "unstable-2022-04-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0intro";
|
||||
repo = "wmii";
|
||||
rev = "ff120c7fee6e1b3a30a4a800074394327fb1da9d";
|
||||
hash = "sha256-KEmWnobpT/5TdgT2HGPCpG1duz9Q6Z6PFSEBs2Ce+7g=";
|
||||
};
|
||||
|
||||
# for dlopen-ing
|
||||
postPatch = ''
|
||||
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2"
|
||||
substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
for file in $(grep -lr '#!.*sh'); do
|
||||
sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file
|
||||
done
|
||||
|
||||
cat <<EOF >> config.mk
|
||||
PREFIX = $out
|
||||
LIBIXP = ${libixp}/lib/libixp.a
|
||||
BINSH = ${dash}/bin/dash
|
||||
EOF
|
||||
'';
|
||||
|
||||
# Remove optional python2 functionality
|
||||
postInstall = ''
|
||||
rm -rf $out/lib/python* $out/etc/wmii-hg/python
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ];
|
||||
buildInputs = [
|
||||
dash
|
||||
libX11
|
||||
libXext
|
||||
libXft
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libixp
|
||||
txt2tags
|
||||
which
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/0intro/wmii";
|
||||
description = "A small, scriptable window manager, with a 9P filesystem interface and an acme-like layout";
|
||||
maintainers = with lib.maintainers; [ kovirobi ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@@ -7,8 +7,8 @@ let Dune =
|
||||
{ "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}"
|
||||
; in
|
||||
|
||||
if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) ||
|
||||
(args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion)
|
||||
if (args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion) ||
|
||||
(args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion)
|
||||
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
}@args:
|
||||
|
||||
if args ? minimumOCamlVersion &&
|
||||
! lib.versionAtLeast ocaml.version args.minimumOCamlVersion
|
||||
lib.versionOlder ocaml.version args.minimumOCamlVersion
|
||||
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
, rev-prefix ? ""
|
||||
, odd-unstable ? false
|
||||
, patchlevel-unstable ? false
|
||||
# explicit url is useful when git protocol is used only for tags listing
|
||||
# while actual release is referred by tarball
|
||||
# an explicit url is needed when src.meta.homepage or src.url don't
|
||||
# point to a git repo (eg. when using fetchurl, fetchzip, ...)
|
||||
, url ? null
|
||||
}:
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ done
|
||||
# By default we set url to src.url or src.meta.homepage
|
||||
if [[ -z "$url" ]]; then
|
||||
url="$(nix-instantiate $systemArg --eval -E \
|
||||
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \
|
||||
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.meta.homepage or $UPDATE_NIX_ATTR_PATH.src.url" \
|
||||
| tr -d '"')"
|
||||
fi
|
||||
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{ fetchzip, lib }:
|
||||
|
||||
let
|
||||
version = "2.01";
|
||||
in
|
||||
fetchzip {
|
||||
name = "kacst-${version}";
|
||||
url = "mirror://debian/pool/main/f/fonts-kacst/fonts-kacst_${version}+mry.orig.tar.bz2";
|
||||
sha256 = "sha256-pIO58CXfmKYRKYJ1oI+tjTwlKBRnkZ/CpIM2Xa0CDA4=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
tar xjf $downloadedFile --strip-components=1 -C $out/share/fonts
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "KACST Latin-Arabic TrueType fonts";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ serge ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -24,7 +24,7 @@ in rebar3Relx rec {
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sort -V | tail -1)
|
||||
latest=$(list-git-tags | sort -V | tail -1)
|
||||
if [ "$latest" != "${version}" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_path="$nixpkgs/pkgs/development/beam-modules/elvis-erlang"
|
||||
|
||||
@@ -51,7 +51,7 @@ rebar3Relx {
|
||||
#! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"
|
||||
|
||||
set -ox errexit
|
||||
latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
|
||||
latest=$(list-git-tags | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
|
||||
if [[ "$latest" != "${version}" ]]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_path="$nixpkgs/pkgs/development/beam-modules/erlang-ls"
|
||||
|
||||
@@ -7,7 +7,7 @@ let
|
||||
in
|
||||
|
||||
{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch
|
||||
, libX11, xorgproto, useX11 ? safeX11 stdenv && !lib.versionAtLeast version "4.09"
|
||||
, libX11, xorgproto, useX11 ? safeX11 stdenv && lib.versionOlder version "4.09"
|
||||
, aflSupport ? false
|
||||
, flambdaSupport ? false
|
||||
, spaceTimeSupport ? false
|
||||
@@ -87,14 +87,14 @@ stdenv.mkDerivation (args // {
|
||||
buildFlags = if useNativeCompilers
|
||||
then ["nixpkgs_world_bootstrap_world_opt"]
|
||||
else ["nixpkgs_world"];
|
||||
buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses
|
||||
buildInputs = optional (lib.versionOlder version "4.07") ncurses
|
||||
++ optionals useX11 [ libX11 xorgproto ];
|
||||
propagatedBuildInputs = optional spaceTimeSupport libunwind;
|
||||
installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
|
||||
preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
|
||||
preConfigure = optionalString (lib.versionOlder version "4.04") ''
|
||||
CAT=$(type -tp cat)
|
||||
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
|
||||
'' + optionalString (stdenv.isDarwin && !lib.versionAtLeast version "4.13") ''
|
||||
'' + optionalString (stdenv.isDarwin && lib.versionOlder version "4.13") ''
|
||||
# Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176
|
||||
# This is required for aarch64-darwin, everything else works as is.
|
||||
AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c"
|
||||
@@ -137,7 +137,7 @@ stdenv.mkDerivation (args // {
|
||||
'';
|
||||
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
broken = stdenv.isAarch64 && !lib.versionAtLeast version "4.06";
|
||||
broken = stdenv.isAarch64 && lib.versionOlder version "4.06";
|
||||
};
|
||||
|
||||
})
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
let
|
||||
major = "11";
|
||||
minor = "0";
|
||||
update = "12";
|
||||
build = "7";
|
||||
update = "15";
|
||||
build = "10";
|
||||
|
||||
openjdk = stdenv.mkDerivation rec {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
@@ -22,7 +22,7 @@ let
|
||||
owner = "openjdk";
|
||||
repo = "jdk${major}u";
|
||||
rev = "jdk-${version}";
|
||||
sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli";
|
||||
sha256 = "le2JDxPJPSuga4JxLJNRZwCaodptSb2kh4TsJXumTXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
@@ -40,7 +40,6 @@ let
|
||||
./currency-date-range-jdk10.patch
|
||||
./increase-javadoc-heap.patch
|
||||
./fix-library-path-jdk11.patch
|
||||
./fix-glibc-2.34.patch
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk10.patch
|
||||
];
|
||||
@@ -61,13 +60,17 @@ let
|
||||
"--with-zlib=system"
|
||||
"--with-lcms=system"
|
||||
"--with-stdc++lib=dynamic"
|
||||
"--disable-warnings-as-errors"
|
||||
] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
|
||||
++ lib.optional headless "--enable-headless-only"
|
||||
++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
# Workaround for
|
||||
# `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
|
||||
# when building jtreg
|
||||
NIX_CFLAGS_COMPILE = "-Wformat";
|
||||
|
||||
NIX_LDFLAGS = toString (lib.optionals (!headless) [
|
||||
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
let
|
||||
version = {
|
||||
feature = "17";
|
||||
interim = ".0.1";
|
||||
build = "12";
|
||||
interim = ".0.3";
|
||||
build = "7";
|
||||
};
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
@@ -23,7 +23,7 @@ let
|
||||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
sha256 = "1l1jgbz8q7zq66npfg88r0l5xga427vrz35iys09j44b6qllrldd";
|
||||
sha256 = "qxiKz8HCNZXFdfgfiA16q5z0S65cZE/u7e+QxLlplWo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
|
||||
@@ -1,16 +1,31 @@
|
||||
From 83f97773ea99fe2191a49e551ea43d51c9a765cd Mon Sep 17 00:00:00 2001
|
||||
Subject: [PATCH] strip some hard-coded default paths for libs and extensions
|
||||
|
||||
---
|
||||
src/hotspot/os/linux/os_linux.cpp | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
|
||||
index 0dbe03349e..847d56778d 100644
|
||||
index 476b1c2175..2695ed2301 100644
|
||||
--- a/src/hotspot/os/linux/os_linux.cpp
|
||||
+++ b/src/hotspot/os/linux/os_linux.cpp
|
||||
@@ -326,13 +326,13 @@ void os::init_system_properties_values() {
|
||||
@@ -417,20 +417,20 @@ void os::init_system_properties_values() {
|
||||
// ...
|
||||
// 7: The default directories, normally /lib and /usr/lib.
|
||||
#if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390)
|
||||
- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
|
||||
+ #define DEFAULT_LIBPATH ""
|
||||
#else
|
||||
#if defined(AARCH64)
|
||||
// Use 32-bit locations first for AARCH64 (a 64-bit architecture), since some systems
|
||||
// might not adhere to the FHS and it would be a change in behaviour if we used
|
||||
// DEFAULT_LIBPATH of other 64-bit architectures which prefer the 64-bit paths.
|
||||
- #define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib64:/lib64"
|
||||
+ #define DEFAULT_LIBPATH ""
|
||||
#else
|
||||
- #define DEFAULT_LIBPATH "/lib:/usr/lib"
|
||||
+ #define DEFAULT_LIBPATH ""
|
||||
#endif // AARCH64
|
||||
#endif
|
||||
|
||||
// Base path of extensions installed on the system.
|
||||
@@ -19,7 +34,7 @@ index 0dbe03349e..847d56778d 100644
|
||||
#define EXTENSIONS_DIR "/lib/ext"
|
||||
|
||||
// Buffer that fits several sprintfs.
|
||||
@@ -392,13 +392,13 @@ void os::init_system_properties_values() {
|
||||
@@ -490,13 +490,13 @@ void os::init_system_properties_values() {
|
||||
strlen(v) + 1 +
|
||||
sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
|
||||
mtInternal);
|
||||
@@ -35,3 +50,6 @@ index 0dbe03349e..847d56778d 100644
|
||||
Arguments::set_ext_dirs(buf);
|
||||
|
||||
FREE_C_HEAP_ARRAY(char, buf);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
@@ -10,11 +10,12 @@ mkCoqDerivation {
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z";
|
||||
release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.12" "8.14") (isGe "1.12") ]; out = "1.0"; }
|
||||
{ cases = [ (range "8.12" "8.15") (isGe "1.12") ]; out = "1.1"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "0.18.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "sha256-Iia4sl8lRTpek5aZvQW/yy+TnMq5KNJH+pBnksqL/G0=";
|
||||
sha256 = "sha256-SlkhxALJwrZ/DOuBbqjb+wHEfT5mhd3lSD6E0geFP4Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";
|
||||
|
||||
@@ -272,7 +272,7 @@ let
|
||||
export EXTENSION_DIR=$out/lib/php/extensions
|
||||
''
|
||||
# PKG_CONFIG need not be a relative path
|
||||
+ lib.optionalString (!lib.versionAtLeast version "7.4") ''
|
||||
+ lib.optionalString (lib.versionOlder version "7.4") ''
|
||||
for i in $(find . -type f -name "*.m4"); do
|
||||
substituteInPlace $i \
|
||||
--replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
|
||||
|
||||
@@ -32,7 +32,7 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
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" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69"));
|
||||
assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69";
|
||||
|
||||
with lib;
|
||||
let
|
||||
@@ -143,7 +143,7 @@ stdenv.mkDerivation {
|
||||
stripLen = 1;
|
||||
extraPrefix = "libs/context/";
|
||||
})
|
||||
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
|
||||
++ 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 {
|
||||
url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";
|
||||
|
||||
@@ -20,11 +20,14 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0"
|
||||
"-D_CL_HAVE_NAMESPACES_EXITCODE=0"
|
||||
"-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT="
|
||||
"-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
|
||||
"-D_CL_HAVE_NO_SNWPRINTF_BUG_EXITCODE=0"
|
||||
"-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT="
|
||||
"-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0"
|
||||
"-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT="
|
||||
"-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0"
|
||||
"-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0"
|
||||
"-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT="
|
||||
];
|
||||
|
||||
patches = # From debian
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, catch2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jarowinkler-cpp";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "jarowinkler-cpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6dIyCyoPs/2wHyGqlE+NC0pwz5ggS5edhN4Jbltx0jg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals doCheck [
|
||||
"-DRAPIDFUZZ_BUILD_TESTING=ON"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
catch2
|
||||
];
|
||||
|
||||
# uses unreleased Catch2 version 3
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Fast Jaro and Jaro-Winkler distance";
|
||||
homepage = "https://github.com/maxbachmann/jarowinkler-cpp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, unzip, txt2tags }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "148";
|
||||
version = "hg-2012-12-02";
|
||||
pname = "libixp";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip";
|
||||
sha256 = "0kcdvdcrkw6q39v563ncis6d7ini64xbgn5fd3b4aa95fp9sj3is";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ txt2tags ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp
|
||||
description = "Portable, simple C-language 9P client and server libary";
|
||||
maintainers = with lib.maintainers; [ kovirobi ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = with lib.platforms; unix;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub, unzip, txt2tags }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libixp";
|
||||
version = "unstable-2022-04-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0intro";
|
||||
repo = "libixp";
|
||||
rev = "ca2acb2988e4f040022f0e2094c69ab65fa6ec53";
|
||||
hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ txt2tags ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/0intro/libixp";
|
||||
description = "Portable, simple C-language 9P client and server libary";
|
||||
maintainers = with lib.maintainers; [ kovirobi ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = with lib.platforms; unix;
|
||||
};
|
||||
}
|
||||
@@ -6,31 +6,28 @@
|
||||
, curl
|
||||
, qtbase
|
||||
, qtlocation
|
||||
, mapbox-gl-native
|
||||
, maplibre-gl-native
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mapbox-gl-qml";
|
||||
version = "1.7.7.1";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "mapbox-gl-qml";
|
||||
rev = version;
|
||||
hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI=";
|
||||
hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ curl qtlocation mapbox-gl-native ];
|
||||
buildInputs = [ curl qtlocation maplibre-gl-native ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}"
|
||||
'';
|
||||
|
||||
# Package expects qt5 subdirectory of mapbox-gl-native to be in the include path
|
||||
NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial Mapbox GL Native bindings for Qt QML";
|
||||
homepage = "https://github.com/rinigus/mapbox-gl-qml";
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, curl
|
||||
, libuv
|
||||
, glfw3
|
||||
, rapidjson
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "maplibre-gl-native";
|
||||
version = "unstable-2022-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maplibre";
|
||||
repo = "maplibre-gl-native";
|
||||
rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "skip-license-check.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e";
|
||||
sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# don't use vendored rapidjson
|
||||
rm -r vendor/mapbox-base/extras/rapidjson
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libuv
|
||||
glfw3
|
||||
qtbase
|
||||
rapidjson
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMBGL_WITH_QT=ON"
|
||||
"-DMBGL_WITH_QT_LIB_ONLY=ON"
|
||||
"-DMBGL_WITH_QT_HEADLESS=OFF"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source alternative to Mapbox GL Native";
|
||||
homepage = "https://maplibre.org/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
platforms = platforms.linux;
|
||||
broken = lib.versionOlder qtbase.version "5.15";
|
||||
};
|
||||
}
|
||||
@@ -71,6 +71,7 @@ mkDerivation rec {
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "libsForQt5.mlt";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfst";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A=";
|
||||
sha256 = "sha256-3ph782JHIcXVujIa+VdRiY5PS7Qcijbi1k8GJ2Vti0I=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -13,8 +13,6 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/plugin*
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, catch2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rapidfuzz-cpp";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "rapidfuzz-cpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-331iW0nu5MlxuKNTgMkRSASnglxn+hEWBhRMnw0lY2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals doCheck [
|
||||
"-DRAPIDFUZZ_BUILD_TESTING=ON"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
catch2
|
||||
];
|
||||
|
||||
# uses unreleased Catch2 version 3
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";
|
||||
homepage = "https://github.com/maxbachmann/rapidfuzz-cpp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
|
||||
pname = "simpleitk";
|
||||
version = "2.1.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimpleITK";
|
||||
repo = "SimpleITK";
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, doctest
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taskflow";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taskflow";
|
||||
repo = "taskflow";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UfXGupxgtowIt3BnIVWwim3rTE57TT1C9TCx9LVyN34=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./unvendor-doctest.patch;
|
||||
inherit doctest;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r 3rd-party
|
||||
|
||||
# tries to use x86 intrinsics on aarch64-darwin
|
||||
sed -i '/^#if __has_include (<immintrin\.h>)/,/^#endif/d' taskflow/utility/os.hpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "General-purpose Parallel and Heterogeneous Task Programming System";
|
||||
homepage = "https://taskflow.github.io/";
|
||||
changelog = let
|
||||
release = lib.replaceStrings ["."] ["-"] version;
|
||||
in "https://taskflow.github.io/taskflow/release-${release}.html";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
|
||||
index 3397d798..8277191e 100644
|
||||
--- a/unittests/CMakeLists.txt
|
||||
+++ b/unittests/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
enable_testing()
|
||||
|
||||
-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake)
|
||||
+include(@doctest@/lib/cmake/doctest/doctest.cmake)
|
||||
|
||||
list(APPEND TF_UNITTESTS
|
||||
utility
|
||||
@@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS
|
||||
foreach(unittest IN LISTS TF_UNITTESTS)
|
||||
add_executable(${unittest} ${unittest}.cpp)
|
||||
target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings)
|
||||
- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
|
||||
+ target_include_directories(${unittest} PRIVATE @doctest@/include/doctest)
|
||||
doctest_discover_tests(${unittest})
|
||||
endforeach()
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
, ApplicationServices
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vapoursynth";
|
||||
version = "R58";
|
||||
version = "58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vapoursynth";
|
||||
repo = "vapoursynth";
|
||||
rev = version;
|
||||
rev = "R${version}";
|
||||
sha256 = "sha256-LIjNfyfpyvE+Ec6f4aGzRA4ZGoWPFhjtUw4yrenDsUQ=";
|
||||
};
|
||||
|
||||
@@ -25,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
zimg libass
|
||||
(python3.withPackages (ps: with ps; [ sphinx cython ]))
|
||||
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ];
|
||||
] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -58,5 +56,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.x86_64;
|
||||
maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
, z3
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.08"
|
||||
if lib.versionOlder ocaml.version "4.08"
|
||||
then throw "BAP is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "batteries is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, ounit
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ppxlib.version "0.18.0"
|
||||
if lib.versionOlder ppxlib.version "0.18.0"
|
||||
then throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, which, ocaml, findlib }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "bitv is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitLab, ocaml, findlib, bzip2, autoreconfHook }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "bz2 is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.10"
|
||||
if lib.versionOlder ocaml.version "4.10"
|
||||
then throw "camlpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.10"
|
||||
if lib.versionOlder ocaml.version "4.10"
|
||||
then throw "cpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, buildDunePackage, cstruct, lwt }:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, buildDunePackage, ocaml, alcotest, cstruct, sexplib }:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, buildDunePackage, cstruct }:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, buildDunePackage, ocaml, csv, ocaml_lwt }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "csv-lwt is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "ctypes is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "erm_xml is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = !lib.versionAtLeast ocaml.version "4.06";
|
||||
doCheck = lib.versionOlder ocaml.version "4.06";
|
||||
checkTarget = "testall";
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, faraday
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.3"
|
||||
if lib.versionOlder ocaml.version "4.3"
|
||||
then throw "farfadet is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.05"
|
||||
if lib.versionOlder ocaml.version "4.05"
|
||||
then throw "fmt is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "fpath is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
, extlib
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.04"
|
||||
if lib.versionOlder ocaml.version "4.04"
|
||||
then throw "javalib is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut } :
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "lablgl is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitLab, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
|| lib.versionAtLeast ocaml.version "4.13"
|
||||
then throw "lablgtk-extras is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
@@ -8,7 +8,7 @@ let
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
in
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "logs is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
if lib.versionOlder ocaml.version "4.07"
|
||||
then throw "lua-ml is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, ocaml-syntax-shims
|
||||
}:
|
||||
|
||||
let inherit (lib) optional versionAtLeast; in
|
||||
let inherit (lib) optional versionOlder; in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lwt";
|
||||
@@ -22,9 +22,9 @@ buildDunePackage rec {
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config cppo ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims;
|
||||
++ optional (versionOlder ocaml.version "4.08") ocaml-syntax-shims;
|
||||
buildInputs = [ dune-configurator ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
|
||||
++ optional (versionOlder ocaml.version "4.07") ncurses;
|
||||
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
'';
|
||||
in
|
||||
|
||||
if !versionAtLeast ocaml.version "4.08"
|
||||
if versionOlder ocaml.version "4.08"
|
||||
then throw "nocrypto is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
with lib;
|
||||
|
||||
if !versionAtLeast ocaml.version "4.05"
|
||||
if versionOlder ocaml.version "4.05"
|
||||
then throw "notty is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, astring, pprint }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, num
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "ocsigen-deriving is not available of OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ let param = {
|
||||
}."${version}"; in
|
||||
|
||||
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
|
||||
|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version
|
||||
|| param ? min_version && lib.versionOlder ocaml.version param.min_version
|
||||
then throw "ppxlib-${version} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, react, opaline }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.04"
|
||||
if lib.versionOlder ocaml.version "4.04"
|
||||
then throw "reactiveData is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ let
|
||||
version = "1.5.11";
|
||||
in
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
if lib.versionOlder ocaml.version "4.07"
|
||||
then throw "${pname} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user