Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
db256a18b5
|
|
@ -169,6 +169,12 @@
|
|||
githubId = 12578560;
|
||||
name = "Quinn Bohner";
|
||||
};
|
||||
_9999years = {
|
||||
email = "rbt@fastmail.com";
|
||||
github = "9999years";
|
||||
githubId = 15312184;
|
||||
name = "Rebecca Turner";
|
||||
};
|
||||
a1russell = {
|
||||
email = "adamlr6+pub@gmail.com";
|
||||
github = "a1russell";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,21 @@
|
|||
# Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs.
|
||||
#
|
||||
# This script produces an attr set mapping of email addresses to GitHub handles:
|
||||
#
|
||||
# ```nix
|
||||
# > import ./maintainer-handles.nix
|
||||
# { "cdep.illabout@gmail.com" = "cdepillabout"; "john@smith.com" = "johnsmith"; ... }
|
||||
# ```
|
||||
#
|
||||
# This mapping contains all maintainers in ../../mainatainer-list.nix, but it
|
||||
# ignores maintainers who don't have a GitHub account or an email address.
|
||||
let
|
||||
pkgs = import ../../.. {};
|
||||
maintainers = import ../../maintainer-list.nix;
|
||||
inherit (pkgs) lib;
|
||||
mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {};
|
||||
mkMailGithubPair = _: maintainer:
|
||||
if (maintainer ? email) && (maintainer ? github) then
|
||||
{ "${maintainer.email}" = maintainer.github; }
|
||||
else
|
||||
{};
|
||||
in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ let
|
|||
basePackage = cfg.package;
|
||||
localConfig = dokuwikiLocalConfig hostName cfg;
|
||||
pluginsConfig = dokuwikiPluginsLocalConfig hostName cfg;
|
||||
aclConfig = if cfg.aclUse && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null;
|
||||
aclConfig = if cfg.settings.useacl && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null;
|
||||
};
|
||||
|
||||
aclOpts = { ... }: {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ with lib;
|
|||
services.openssh = {
|
||||
enable = true;
|
||||
|
||||
permitRootLogin = "prohibit-password";
|
||||
passwordAuthentication = mkDefault false;
|
||||
settings.PermitRootLogin = "prohibit-password";
|
||||
settings.PasswordAuthentication = mkDefault false;
|
||||
};
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "3.144.3",
|
||||
"version": "3.148.0",
|
||||
"appimage": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.144.3/standard-notes-3.144.3-linux-x86_64.AppImage",
|
||||
"hash": "sha512-NHuabqi8pjCnSI6EwhPLgWjyytW/ZnGvGCjb/hXscRVcJgJiQZ7FNZnnepFtZ3c0z0F4bM6AYcH+eWmt0ySgXw=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-x86_64.AppImage",
|
||||
"hash": "sha512-Nzvzl3O7/AXj/Sr5CMfmLktx+w9OUHPZmHH8pxx5GYhmjAgYCh2V0w1iPe5G7/nJpx+jSBJXSKq3jR3wYCeXWA=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.144.3/standard-notes-3.144.3-linux-arm64.AppImage",
|
||||
"hash": "sha512-EaCq/0IgrSPWCkWtOBzMISfuajgGZKborPO4SoWi2QgMmwZXgLc/RBCVzVBT9C2EQLmc506IVrjOdAzkuQM5TQ=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-arm64.AppImage",
|
||||
"hash": "sha512-Owwc0WRlATTYZYrUtW6iZK8gXktHstDclqHmo5GZ1AAqB7/W9qTuQ2LNMjfL0kAzIQw/JCBfxvDCG9DjEM6eYA=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1b1xk4f736lxg7vsqhnra0x1vvb3x9fj7ijxqk5liz5pap18k1c8";
|
||||
x86_64-darwin = "1pi2kspq162aaj42ssmrf67bbdk4n0vx618z8avxnbx3wbcrsnap";
|
||||
aarch64-linux = "1j6qim8k94a2baj8w098l6x3i94n34g62c1brfmhha8fr48jzlir";
|
||||
aarch64-darwin = "0agl2n6ljd5rc5shypn5j1292pf673nhqhmwhg5bg9qsawar0ksf";
|
||||
armv7l-linux = "10k4pzp9lyn5g8frgixcx9jyixwckr1481d1npdzrgcdwfwrmf20";
|
||||
x86_64-linux = "0661qkcljxdpi5f6cyfqr8vyf87p94amzdspcg8hjrz18j1adb0h";
|
||||
x86_64-darwin = "0781ad52vcqgam3iprm56kvcv5v12pba0i5spazr5zssnn3w3ym0";
|
||||
aarch64-linux = "0fwl12yngq3z2f18hp43q7nmnjdikly05q9rar9vcjc63h2pzfc5";
|
||||
aarch64-darwin = "1nldkg14zvk6nc72l50w4lv9k490vn34ms6z9x2b9zkx15d09v7x";
|
||||
armv7l-linux = "0mhriqi6hzn7wwfzl98dvcghkpkfa4rbbxvmyvzzc5ycgbs6r1mx";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.75.0";
|
||||
version = "1.75.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KuEuWZSxh04NefkkJBYClnKs+UP7VwlyPElACjNZ5k8=";
|
||||
sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jYDe/3PDGCweNgHb+8i9az7J7BATlRjd3yha0nOc/gc=";
|
||||
cargoSha256 = "sha256-xqWDWN3xkzBwgW0f64QhYHfsOS3Ed50jlQFuHG81/KY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.145.2";
|
||||
version = "0.150.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helmfile";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI=";
|
||||
sha256 = "sha256-7wCt+JAuozsd+LifLArfPNwiKK/tDvgwpIwVCW4nU3Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q=";
|
||||
vendorSha256 = "sha256-vLLS+/Xfnlt6cvkNvXKX3DVLku1Q4bRCiv2vMTfOnfw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -23,8 +23,9 @@ buildGoModule rec {
|
|||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd helmfile \
|
||||
--bash ./autocomplete/helmfile_bash_autocomplete \
|
||||
--zsh ./autocomplete/helmfile_zsh_autocomplete
|
||||
--bash <($out/bin/helmfile completion bash) \
|
||||
--fish <($out/bin/helmfile completion fish) \
|
||||
--zsh <($out/bin/helmfile completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -467,13 +467,13 @@
|
|||
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
||||
},
|
||||
"grafana": {
|
||||
"hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=",
|
||||
"hash": "sha256-4K0Pk7tgnOjFdHpe6SZNSt/wU8OBzdB/y99nibW5bAY=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.34.0",
|
||||
"rev": "v1.35.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic="
|
||||
"vendorHash": "sha256-oSpAq2834Nt+E8l64YhvuXdfUsoTU5rBr2I8+Yz9tkc="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.21";
|
||||
version = "3.5.22";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
|
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8=";
|
||||
hash = "sha256-I+7fTSyw5oKrad6HMxhex2wI4JLXDtoxHL4pxO3w2l8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "2.9.38";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "juju-${version}";
|
||||
sha256 = "sha256-QTO6MHiFx3nDXDaaVy7rCiR0ttBXt5oAw94/ZDTICOM=";
|
||||
sha256 = "sha256-n0OtugTjGXk4zCjGPhifY8VinXM6SYkbmX13jBfmV+o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QOu1azw3OUWaz7MRFGZ5CGX4bVegbFYp76/XpesnaUM=";
|
||||
vendorHash = "sha256-vDjBmBLrJNRwcre2OmlIuOcxxQuN6b2eYOXLQap3F/U=";
|
||||
|
||||
# Disable tests because it attempts to use a mongodb instance
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
pname = "synology-drive-client";
|
||||
baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient";
|
||||
version = "3.2.0-13258";
|
||||
version = "3.2.1-13272";
|
||||
buildNumber = with lib; last (splitString "-" version);
|
||||
meta = with lib; {
|
||||
description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server.";
|
||||
|
|
@ -29,7 +29,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb";
|
||||
sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w=";
|
||||
sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg ];
|
||||
|
|
@ -59,7 +59,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";
|
||||
sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy";
|
||||
sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cpio xar undmg ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,18 @@
|
|||
{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }:
|
||||
{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "invidious";
|
||||
namespace = "plugin.video.invidious";
|
||||
version = "0.1.0+matrix.1";
|
||||
version = "unstable-2022-11-28";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM=";
|
||||
# video search doesn't work for the version on kodi.tv
|
||||
# if the result contains channels
|
||||
# https://github.com/TheAssassin/kodi-invidious-plugin/issues/17
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheAssassin";
|
||||
repo = "kodi-invidious-plugin";
|
||||
rev = "85b66525632d94630c9301d9c490fc002a335d77";
|
||||
hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -18,9 +23,6 @@ buildKodiAddon rec {
|
|||
|
||||
passthru = {
|
||||
pythonPath = "resources/lib";
|
||||
updateScript = addonUpdateScript {
|
||||
attrPath = "kodi.packages.invidious";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz",
|
||||
"sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l",
|
||||
"msg": "Update from Hackage at 2023-01-12T12:18:29Z"
|
||||
"commit": "307653b893cc53ffa71d6931c33101d352e3ead1",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/307653b893cc53ffa71d6931c33101d352e3ead1.tar.gz",
|
||||
"sha256": "0mgmmzdlb9j4drkjjdrp2da8z4can7gg8zd007ya2jw17rz270hz",
|
||||
"msg": "Update from Hackage at 2023-01-29T01:30:53Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.29.0";
|
||||
version = "1.30.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
sha256 = "sha256-HsXwh98RZuXvK/KkZ2NAGwWNLxUAQVj+WKzZXd4C4Is=";
|
||||
sha256 = "sha256-VP1QwY/gA8wxjpzbAlEV5r2Q8sTt3K2sGdKmxr6ndB8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -122,6 +122,7 @@ let
|
|||
# instead of `libtinfo.so.*.`
|
||||
{ nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; }
|
||||
];
|
||||
isHadrian = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -420,6 +421,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
} // lib.optionalAttrs (binDistUsed.isHadrian or false) {
|
||||
# Normal GHC derivations expose the hadrian derivation used to build them
|
||||
# here. In the case of bindists we just make sure that the attribute exists,
|
||||
# as it is used for checking if a GHC derivation has been built with hadrian.
|
||||
# The isHadrian mechanism will become obsolete with GHCs that use hadrian
|
||||
# exclusively, i.e. 9.6 (and 9.4?).
|
||||
hadrian = null;
|
||||
};
|
||||
|
||||
meta = rec {
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ let
|
|||
# instead of `libtinfo.so.*.`
|
||||
{ nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; }
|
||||
];
|
||||
isHadrian = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -416,6 +417,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
} // lib.optionalAttrs (binDistUsed.isHadrian or false) {
|
||||
# Normal GHC derivations expose the hadrian derivation used to build them
|
||||
# here. In the case of bindists we just make sure that the attribute exists,
|
||||
# as it is used for checking if a GHC derivation has been built with hadrian.
|
||||
# The isHadrian mechanism will become obsolete with GHCs that use hadrian
|
||||
# exclusively, i.e. 9.6 (and 9.4?).
|
||||
hadrian = null;
|
||||
};
|
||||
|
||||
meta = rec {
|
||||
|
|
|
|||
|
|
@ -94,6 +94,7 @@ let
|
|||
{ nixPackage = ncurses6; fileToCheckFor = null; }
|
||||
{ nixPackage = libiconv; fileToCheckFor = null; }
|
||||
];
|
||||
isHadrian = true;
|
||||
};
|
||||
aarch64-darwin = {
|
||||
variantSuffix = "";
|
||||
|
|
@ -107,6 +108,7 @@ let
|
|||
{ nixPackage = ncurses6; fileToCheckFor = null; }
|
||||
{ nixPackage = libiconv; fileToCheckFor = null; }
|
||||
];
|
||||
isHadrian = true;
|
||||
};
|
||||
};
|
||||
# Binary distributions for the musl libc for the respective system.
|
||||
|
|
@ -118,6 +120,7 @@ let
|
|||
sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481";
|
||||
};
|
||||
isStatic = true;
|
||||
isHadrian = true;
|
||||
# We can't check the RPATH for statically linked executable
|
||||
exePathForLibraryCheck = null;
|
||||
archSpecificLibraries = [
|
||||
|
|
@ -400,6 +403,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
} // lib.optionalAttrs (binDistUsed.isHadrian or false) {
|
||||
# Normal GHC derivations expose the hadrian derivation used to build them
|
||||
# here. In the case of bindists we just make sure that the attribute exists,
|
||||
# as it is used for checking if a GHC derivation has been built with hadrian.
|
||||
# The isHadrian mechanism will become obsolete with GHCs that use hadrian
|
||||
# exclusively, i.e. 9.6 (and 9.4?).
|
||||
hadrian = null;
|
||||
};
|
||||
|
||||
meta = rec {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ self: super: {
|
|||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "052ld021yvjbnx1sbj1ryflsyn0v1y1ygx1zv0ql6fk3cysw5lxf";
|
||||
sha256 = "0f2nnszfiqwdgfky3190prkhcndp0mva3jk7a6cl461w8kp1jspa";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
|
|
@ -138,6 +138,8 @@ self: super: {
|
|||
# https://github.com/techtangents/ablist/issues/1
|
||||
ABList = dontCheck super.ABList;
|
||||
|
||||
pandoc-cli = throwIfNot (versionOlder super.pandoc.version "3.0.0") "pandoc-cli contains the pandoc executable starting with 3.0, this needs to be considered now." (markBroken (dontDistribute super.pandoc-cli));
|
||||
|
||||
# sse2 flag due to https://github.com/haskell/vector/issues/47.
|
||||
# Jailbreak is necessary for QuickCheck dependency.
|
||||
vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector);
|
||||
|
|
@ -171,6 +173,9 @@ self: super: {
|
|||
# Fails no apparent reason. Upstream has been notified by e-mail.
|
||||
assertions = dontCheck super.assertions;
|
||||
|
||||
# 2023-01-29: Restrictive base bound already loosened on master but not released: https://github.com/sebastiaanvisser/clay/commit/4483bdf7a452903f177220958f1610030ab7f28a
|
||||
clay = throwIfNot (super.clay.version == "0.14.0") "Remove clay jailbreak in configuration-common.nix when you see this eval error." (doJailbreak super.clay);
|
||||
|
||||
# These packages try to execute non-existent external programs.
|
||||
cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw
|
||||
dbmigrations = dontCheck super.dbmigrations;
|
||||
|
|
@ -197,9 +202,15 @@ self: super: {
|
|||
HerbiePlugin = dontCheck super.HerbiePlugin;
|
||||
wai-cors = dontCheck super.wai-cors;
|
||||
|
||||
# 2022-01-29: Tests fail: https://github.com/psibi/streamly-bytestring/issues/27
|
||||
streamly-bytestring = dontCheck super.streamly-bytestring;
|
||||
|
||||
# base bound
|
||||
digit = doJailbreak super.digit;
|
||||
|
||||
# 2022-01-29: Tests require package to be in ghc-db.
|
||||
aeson-schemas = dontCheck super.aeson-schemas;
|
||||
|
||||
# matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0
|
||||
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
|
||||
brick = self.brick_0_70_1;
|
||||
|
|
@ -747,9 +758,9 @@ self: super: {
|
|||
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
|
||||
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
|
||||
}) (super.sensei.override {
|
||||
hspec = self.hspec_2_10_8;
|
||||
hspec = self.hspec_2_10_9;
|
||||
hspec-wai = super.hspec-wai.override {
|
||||
hspec = self.hspec_2_10_8;
|
||||
hspec = self.hspec_2_10_9;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -920,12 +931,9 @@ self: super: {
|
|||
'';
|
||||
}) super.hpack;
|
||||
|
||||
# hslua has tests that appear to break when using musl.
|
||||
# hslua has tests that break when using musl.
|
||||
# https://github.com/hslua/hslua/issues/106
|
||||
# Note that hslua is currently version 1.3. However, in the latest version
|
||||
# (>= 2.0), hslua has been split into multiple packages and this override
|
||||
# will likely need to be moved to the hslua-core package.
|
||||
hslua = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua else super.hslua;
|
||||
hslua-core = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua-core else super.hslua-core;
|
||||
|
||||
# The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate.
|
||||
prettyprinter = dontCheck super.prettyprinter;
|
||||
|
|
@ -1436,14 +1444,14 @@ self: super: {
|
|||
servant-openapi3 = dontCheck super.servant-openapi3;
|
||||
|
||||
# Give hspec 2.10.* correct dependency versions without overrideScope
|
||||
hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override {
|
||||
hspec-discover = self.hspec-discover_2_10_8;
|
||||
hspec-core = self.hspec-core_2_10_8;
|
||||
hspec_2_10_9 = doDistribute (super.hspec_2_10_9.override {
|
||||
hspec-discover = self.hspec-discover_2_10_9;
|
||||
hspec-core = self.hspec-core_2_10_9;
|
||||
});
|
||||
hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override {
|
||||
hspec-discover_2_10_9 = super.hspec-discover_2_10_9.override {
|
||||
hspec-meta = self.hspec-meta_2_10_5;
|
||||
};
|
||||
hspec-core_2_10_8 = super.hspec-core_2_10_8.override {
|
||||
hspec-core_2_10_9 = super.hspec-core_2_10_9.override {
|
||||
hspec-meta = self.hspec-meta_2_10_5;
|
||||
};
|
||||
|
||||
|
|
@ -2026,9 +2034,6 @@ self: super: {
|
|||
# https://github.com/kuribas/mfsolve/issues/8
|
||||
mfsolve = dontCheck super.mfsolve;
|
||||
|
||||
# https://github.com/peti/hopenssl/issues/5
|
||||
hopenssl = super.hopenssl.override { openssl = pkgs.openssl_1_1; };
|
||||
|
||||
# Fixes compilation with GHC 9.0 and above
|
||||
# https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3
|
||||
regex-compat-tdfa = appendPatches [
|
||||
|
|
|
|||
|
|
@ -311,6 +311,8 @@ self: super: ({
|
|||
# https://github.com/NixOS/nixpkgs/issues/149692
|
||||
Agda = removeConfigureFlag "-foptimise-heavily" super.Agda;
|
||||
|
||||
heystone = addBuildTool pkgs.fixDarwinDylibNames super.heystone;
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin
|
||||
|
||||
# tests appear to be failing to link or something:
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@ self: super: {
|
|||
process = self.process_1_6_16_0;
|
||||
});
|
||||
|
||||
# weeder == 2.5.* requires GHC 9.4
|
||||
weeder = doDistribute self.weeder_2_4_1;
|
||||
|
||||
# Jailbreaks & Version Updates
|
||||
hashable-time = doJailbreak super.hashable-time;
|
||||
|
||||
|
|
|
|||
|
|
@ -105,16 +105,16 @@ in {
|
|||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0;
|
||||
shake-cabal = doDistribute self.shake-cabal_0_2_2_3;
|
||||
|
||||
libmpd = doJailbreak super.libmpd;
|
||||
base-orphans = dontCheck super.base-orphans;
|
||||
|
||||
# Note: Any compilation fixes need to be done on the versioned attributes,
|
||||
# since those are used for the internal dependencies between the versioned
|
||||
# hspec packages in configuration-common.nix.
|
||||
hspec = self.hspec_2_10_8;
|
||||
hspec-core = self.hspec-core_2_10_8;
|
||||
hspec = self.hspec_2_10_9;
|
||||
hspec-core = self.hspec-core_2_10_9;
|
||||
hspec-meta = self.hspec-meta_2_10_5;
|
||||
hspec-discover = self.hspec-discover_2_10_8;
|
||||
hspec-discover = self.hspec-discover_2_10_9;
|
||||
|
||||
# the dontHaddock is due to a GHC panic. might be this bug, not sure.
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/21619
|
||||
|
|
@ -184,26 +184,34 @@ in {
|
|||
})
|
||||
self.ghc-exactprint_1_6_1_1;
|
||||
|
||||
# 2022-10-06: plugins disabled for hls 1.8.0.0 based on
|
||||
# 2023-02-01: plugins disabled for hls 1.9.0.0 based on
|
||||
# https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers
|
||||
haskell-language-server = super.haskell-language-server.override {
|
||||
hls-refactor-plugin = null;
|
||||
hls-eval-plugin = null;
|
||||
hls-floskell-plugin = null;
|
||||
hls-ormolu-plugin = null;
|
||||
hls-rename-plugin = null;
|
||||
hls-ormolu-plugin = null; # This plugin is supposed to work, but fails to compile.
|
||||
hls-floskell-plugin = null; # This plugin is supposed to work, but fails to compile.
|
||||
hls-rename-plugin = null; # This plugin is supposed to work, but fails to compile.
|
||||
hls-stylish-haskell-plugin = null;
|
||||
};
|
||||
|
||||
# https://github.com/tweag/ormolu/issues/941
|
||||
ormolu = overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.ormolu);
|
||||
ormolu = doDistribute self.ormolu_0_5_2_0;
|
||||
fourmolu = overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0);
|
||||
|
||||
# The Haskell library has additional dependencies when compiled with ghc-9.4.x.
|
||||
X11-xft = addExtraLibraries [pkgs.xorg.libXau pkgs.xorg.libXdmcp pkgs.expat] super.X11-xft;
|
||||
# Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455
|
||||
# by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so
|
||||
# the GHC 9.6 configuration may need similar overrides eventually.
|
||||
X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft;
|
||||
# Jailbreaks for https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309
|
||||
glib = __CabalEagerPkgConfigWorkaround (doJailbreak super.glib);
|
||||
cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo);
|
||||
pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango);
|
||||
|
||||
# The gtk2hs setup hook provided by this package lacks the ppOrdering field that
|
||||
# recent versions of Cabal require. This leads to builds like cairo and glib
|
||||
# failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323.
|
||||
gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ broken-packages:
|
|||
- aeson-parsec-picky
|
||||
- aeson-prefix
|
||||
- aeson-schema
|
||||
- aeson-schemas
|
||||
- aeson-smart
|
||||
- aeson-streams
|
||||
- aeson-t
|
||||
|
|
@ -511,7 +510,6 @@ broken-packages:
|
|||
- byline
|
||||
- by-other-names
|
||||
- bytearray-parsing
|
||||
- bytepatch
|
||||
- bytestring-aeson-orphans
|
||||
- bytestring-arbitrary
|
||||
- bytestring-class
|
||||
|
|
@ -705,7 +703,6 @@ broken-packages:
|
|||
- classy-parallel
|
||||
- classyplate
|
||||
- ClassyPrelude
|
||||
- clay
|
||||
- clckwrks-plugin-bugs
|
||||
- clckwrks-plugin-mailinglist
|
||||
- clckwrks-theme-clckwrks
|
||||
|
|
@ -927,6 +924,7 @@ broken-packages:
|
|||
- credential-store
|
||||
- critbit
|
||||
- criterion-cmp
|
||||
- criterion-compare
|
||||
- criterion-plus
|
||||
- criterion-to-html
|
||||
- criu-rpc-types
|
||||
|
|
@ -1106,6 +1104,7 @@ broken-packages:
|
|||
- derive-monoid
|
||||
- derive-trie
|
||||
- deriving-openapi3
|
||||
- deriving-trans
|
||||
- derp-lib
|
||||
- describe
|
||||
- descriptive
|
||||
|
|
@ -1437,6 +1436,7 @@ broken-packages:
|
|||
- extensible-effects-concurrent
|
||||
- extensible-skeleton
|
||||
- external-sort
|
||||
- extism
|
||||
- extractelf
|
||||
- ez3
|
||||
- ez-couch
|
||||
|
|
@ -1446,7 +1446,6 @@ broken-packages:
|
|||
- fadno-braids
|
||||
- fadno-xml
|
||||
- failable-list
|
||||
- FailT
|
||||
- failure-detector
|
||||
- fake
|
||||
- fake-type
|
||||
|
|
@ -1822,7 +1821,6 @@ broken-packages:
|
|||
- gloss-banana
|
||||
- gloss-export
|
||||
- gloss-game
|
||||
- glpk-headers
|
||||
- gltf-codec
|
||||
- glue
|
||||
- g-npm
|
||||
|
|
@ -2485,7 +2483,6 @@ broken-packages:
|
|||
- hslogger-template
|
||||
- hs-logo
|
||||
- hslua-examples
|
||||
- hslua-list
|
||||
- hsluv-haskell
|
||||
- hsmagick
|
||||
- hsmodetweaks
|
||||
|
|
@ -2921,6 +2918,7 @@ broken-packages:
|
|||
- khph
|
||||
- kickass-torrents-dump-parser
|
||||
- kickchan
|
||||
- kind-generics-deriving
|
||||
- kleene-list
|
||||
- kmn-programming
|
||||
- kmonad
|
||||
|
|
@ -3068,6 +3066,7 @@ broken-packages:
|
|||
- libpafe
|
||||
- libpq
|
||||
- librandomorg
|
||||
- libsecp256k1
|
||||
- libsystemd-daemon
|
||||
- libtagc
|
||||
- libxls
|
||||
|
|
@ -3248,7 +3247,6 @@ broken-packages:
|
|||
- math-grads
|
||||
- math-interpolate
|
||||
- math-metric
|
||||
- math-programming
|
||||
- matrix-as-xyz
|
||||
- matrix-lens
|
||||
- matrix-market
|
||||
|
|
@ -3359,6 +3357,8 @@ broken-packages:
|
|||
- ml-w
|
||||
- mm2
|
||||
- mmsyn2
|
||||
- mmsyn7l
|
||||
- mmsyn7ukr-array
|
||||
- mmtf
|
||||
- mmtl
|
||||
- Mobile-Legends-Hack-Cheats
|
||||
|
|
@ -3807,10 +3807,12 @@ broken-packages:
|
|||
- pandoc-filter-indent
|
||||
- pandoc-include
|
||||
- pandoc-lens
|
||||
- pandoc-lua-engine
|
||||
- pandoc-markdown-ghci-filter
|
||||
- pandoc-placetable
|
||||
- pandoc-plantuml-diagrams
|
||||
- pandoc-pyplot
|
||||
- pandoc-server
|
||||
- pandoc-unlit
|
||||
- pandoc-utils
|
||||
- pandora
|
||||
|
|
@ -3956,7 +3958,13 @@ broken-packages:
|
|||
- phone-numbers
|
||||
- phone-push
|
||||
- phonetic-languages-constaints
|
||||
- phonetic-languages-constraints-array
|
||||
- phonetic-languages-filters-array
|
||||
- phonetic-languages-permutations-array
|
||||
- phonetic-languages-phonetics-basics
|
||||
- phonetic-languages-plus
|
||||
- phonetic-languages-simplified-properties-array-old
|
||||
- phonetic-languages-ukrainian-array
|
||||
- phonetic-languages-vector
|
||||
- phraskell
|
||||
- Phsu
|
||||
|
|
@ -4694,10 +4702,12 @@ broken-packages:
|
|||
- servant-router
|
||||
- servant-scotty
|
||||
- servant-seo
|
||||
- servant-serf
|
||||
- servant-smsc-ru
|
||||
- servant-stache
|
||||
- servant-static-th
|
||||
- servant-streaming
|
||||
- servant-streamly
|
||||
- servant-tracing
|
||||
- servant-typed-error
|
||||
- servant-wasm
|
||||
|
|
@ -4870,6 +4880,7 @@ broken-packages:
|
|||
- snake-game
|
||||
- snap-accept
|
||||
- snap-auth-cli
|
||||
- snap-blaze-clay
|
||||
- snap-configuration-utilities
|
||||
- snap-error-collector
|
||||
- snap-language
|
||||
|
|
@ -5052,7 +5063,6 @@ broken-packages:
|
|||
- streaming-sort
|
||||
- streamly-archive
|
||||
- streamly-binary
|
||||
- streamly-bytestring
|
||||
- streamly-cassava
|
||||
- streamly-examples
|
||||
- streamly-lmdb
|
||||
|
|
@ -5311,6 +5321,7 @@ broken-packages:
|
|||
- threadscope
|
||||
- threepenny-editors
|
||||
- threepenny-gui-contextmenu
|
||||
- threepenny-gui-flexbox
|
||||
- thrift
|
||||
- Thrift
|
||||
- throttled-io-loop
|
||||
|
|
@ -5490,6 +5501,7 @@ broken-packages:
|
|||
- type-indexed-queues
|
||||
- type-int
|
||||
- type-interpreter
|
||||
- typelet
|
||||
- type-level-bst
|
||||
- type-level-natural-number-induction
|
||||
- type-level-natural-number-operations
|
||||
|
|
@ -5522,6 +5534,8 @@ broken-packages:
|
|||
- uhexdump
|
||||
- uhttpc
|
||||
- ui-command
|
||||
- ukrainian-phonetics-basic-array
|
||||
- ukrainian-phonetics-basic-array-bytestring
|
||||
- unamb-custom
|
||||
- unbeliever
|
||||
- unbounded-delays-units
|
||||
|
|
@ -5756,6 +5770,7 @@ broken-packages:
|
|||
- webkit-javascriptcore
|
||||
- webmention
|
||||
- web-output
|
||||
- web-page
|
||||
- web-push
|
||||
- Webrexp
|
||||
- web-routes-quasi
|
||||
|
|
@ -5795,6 +5810,7 @@ broken-packages:
|
|||
- wol
|
||||
- word24
|
||||
- word2vec-model
|
||||
- wordchoice
|
||||
- wordify
|
||||
- Wordlint
|
||||
- wordn
|
||||
|
|
@ -5975,6 +5991,7 @@ broken-packages:
|
|||
- yoda
|
||||
- Yogurt
|
||||
- youtube
|
||||
- yu-auth
|
||||
- yu-core
|
||||
- yuiGrid
|
||||
- yu-tool
|
||||
|
|
|
|||
|
|
@ -86,6 +86,8 @@ default-package-overrides:
|
|||
- implicit-hie < 0.1.3
|
||||
# latest version requires Cabal >= 3.8
|
||||
- shake-cabal < 0.2.2.3
|
||||
# needed as long as we have pandoc < 3.0, i.e. stackage lts 20
|
||||
- pandoc-crossref < 0.3.15.0
|
||||
|
||||
extra-packages:
|
||||
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
||||
|
|
@ -96,6 +98,7 @@ extra-packages:
|
|||
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
|
||||
- aeson < 2 # required by pantry-0.5.2
|
||||
- apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2
|
||||
- apply-refact == 0.11.* # 2023-02-02: needed for hls-hlint-plugin on GHC 9.2
|
||||
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
|
||||
- base16-bytestring < 1 # required for cabal-install etc.
|
||||
- basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10
|
||||
|
|
@ -157,6 +160,7 @@ extra-packages:
|
|||
- vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1
|
||||
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
|
||||
- weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
|
||||
- weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.*
|
||||
- commonmark-extensions < 0.2.3.3 # 2022-12-17: required by emanote 1.0.0.0 (to avoid a bug in 0.2.3.3)
|
||||
- ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3
|
||||
- retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2
|
||||
|
|
@ -292,11 +296,12 @@ package-maintainers:
|
|||
- sensei
|
||||
maralorn:
|
||||
- cabal-fmt
|
||||
- clay
|
||||
- ema
|
||||
- emanote
|
||||
- generic-optics
|
||||
- ghcid
|
||||
- ghcide
|
||||
- graphql-client
|
||||
- haskell-language-server
|
||||
- hedgehog
|
||||
- hledger
|
||||
|
|
@ -309,6 +314,8 @@ package-maintainers:
|
|||
- matrix-client
|
||||
- optics
|
||||
- pandoc
|
||||
- pandoc-cli
|
||||
- pandoc-crossref
|
||||
- paths
|
||||
- postgresql-simple
|
||||
- purebred-email
|
||||
|
|
@ -322,6 +329,7 @@ package-maintainers:
|
|||
- snap
|
||||
- stm-containers
|
||||
- streamly
|
||||
- streamly-bytestring
|
||||
- taskwarrior
|
||||
- tz
|
||||
- weeder
|
||||
|
|
@ -461,6 +469,7 @@ unsupported-platforms:
|
|||
bindings-directfb: [ platforms.darwin ]
|
||||
bindings-sane: [ platforms.darwin ]
|
||||
bustle: [ platforms.darwin ] # uses glibc-specific ptsname_r
|
||||
bytelog: [ platforms.darwin ] # due to posix-api
|
||||
camfort: [ aarch64-linux ]
|
||||
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
|
||||
cut-the-crap: [ platforms.darwin ]
|
||||
|
|
@ -564,6 +573,7 @@ supported-platforms:
|
|||
bindings-parport: [ platforms.linux ] # parport is a linux kernel component
|
||||
blake3: [ platforms.x86 ] # uses x86 intrinsics
|
||||
btrfs: [ platforms.linux ] # depends on linux
|
||||
bytepatch: [ platforms.x86 ] # due to blake3
|
||||
cpuid: [ platforms.x86 ] # needs to be i386 compatible (IA-32)
|
||||
crc32c: [ platforms.x86 ] # uses x86 intrinsics
|
||||
d3d11binding: [ platforms.windows ]
|
||||
|
|
@ -607,6 +617,7 @@ supported-platforms:
|
|||
scat: [ platforms.x86 ] # uses scrypt, which requries x86
|
||||
scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8
|
||||
seqalign: [ platforms.x86 ] # x86 intrinsics
|
||||
tasty-papi: [ platforms.linux ] # limited by pkgs.papi
|
||||
udev: [ platforms.linux ]
|
||||
Win32-console: [ platforms.windows ]
|
||||
Win32-dhcp-server: [ platforms.windows ]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Stackage LTS 20.6
|
||||
# Stackage LTS 20.8
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
|
|
@ -123,9 +123,9 @@ default-package-overrides:
|
|||
- aura ==3.2.9
|
||||
- authenticate ==1.3.5.1
|
||||
- authenticate-oauth ==1.7
|
||||
- autodocodec ==0.2.0.1
|
||||
- autodocodec ==0.2.0.2
|
||||
- autodocodec-openapi3 ==0.2.1.1
|
||||
- autodocodec-schema ==0.1.0.2
|
||||
- autodocodec-schema ==0.1.0.3
|
||||
- autodocodec-yaml ==0.2.0.3
|
||||
- autoexporter ==2.0.0.2
|
||||
- auto-update ==0.1.6
|
||||
|
|
@ -188,7 +188,7 @@ default-package-overrides:
|
|||
- binary-instances ==1.0.3
|
||||
- binary-list ==1.1.1.2
|
||||
- binary-orphans ==1.0.3
|
||||
- binary-parser ==0.5.7.2
|
||||
- binary-parser ==0.5.7.3
|
||||
- binary-search ==2.0.0
|
||||
- binary-shared ==0.8.3
|
||||
- binary-tagged ==0.3.1
|
||||
|
|
@ -232,7 +232,7 @@ default-package-overrides:
|
|||
- boots ==0.2.0.1
|
||||
- bordacount ==0.1.0.0
|
||||
- boring ==0.2
|
||||
- bound ==2.0.5
|
||||
- bound ==2.0.6
|
||||
- BoundedChan ==1.0.3.0
|
||||
- bounded-queue ==1.0.0
|
||||
- boundingboxes ==0.2.3
|
||||
|
|
@ -301,7 +301,7 @@ default-package-overrides:
|
|||
- calligraphy ==0.1.3
|
||||
- call-plantuml ==0.0.1.1
|
||||
- call-stack ==0.4.0
|
||||
- can-i-haz ==0.3.1.0
|
||||
- can-i-haz ==0.3.1.1
|
||||
- capability ==0.5.0.1
|
||||
- ca-province-codes ==1.0.0.0
|
||||
- cardano-coin-selection ==1.0.1
|
||||
|
|
@ -340,7 +340,7 @@ default-package-overrides:
|
|||
- cheapskate-lucid ==0.1.0.0
|
||||
- check-email ==1.0.2
|
||||
- checkers ==0.6.0
|
||||
- checksum ==0.0
|
||||
- checksum ==0.0.0.1
|
||||
- chimera ==0.3.3.0
|
||||
- choice ==0.2.2
|
||||
- chronologique ==0.3.1.3
|
||||
|
|
@ -350,7 +350,7 @@ default-package-overrides:
|
|||
- cipher-rc4 ==0.1.4
|
||||
- circle-packing ==0.1.0.6
|
||||
- circular ==0.4.0.3
|
||||
- citeproc ==0.8.0.2
|
||||
- citeproc ==0.8.1
|
||||
- classy-prelude ==1.5.0.2
|
||||
- classy-prelude-conduit ==1.5.0
|
||||
- classy-prelude-yesod ==1.5.0
|
||||
|
|
@ -385,7 +385,7 @@ default-package-overrides:
|
|||
- comfort-graph ==0.0.3.2
|
||||
- commonmark ==0.2.2
|
||||
- commonmark-extensions ==0.2.3.3
|
||||
- commonmark-pandoc ==0.2.1.2
|
||||
- commonmark-pandoc ==0.2.1.3
|
||||
- commutative ==0.0.2
|
||||
- comonad ==5.0.8
|
||||
- comonad-extras ==4.0.1
|
||||
|
|
@ -406,7 +406,7 @@ default-package-overrides:
|
|||
- concise ==0.1.0.1
|
||||
- concurrency ==1.11.0.2
|
||||
- concurrent-extra ==0.7.0.12
|
||||
- concurrent-output ==1.10.16
|
||||
- concurrent-output ==1.10.17
|
||||
- concurrent-split ==0.0.1.1
|
||||
- cond ==0.4.1.1
|
||||
- conduino ==0.2.2.0
|
||||
|
|
@ -506,9 +506,9 @@ default-package-overrides:
|
|||
- cyclotomic ==1.1.1
|
||||
- czipwith ==1.0.1.4
|
||||
- d10 ==1.0.1.2
|
||||
- data-accessor ==0.2.3
|
||||
- data-accessor-mtl ==0.2.0.4
|
||||
- data-accessor-transformers ==0.2.1.7
|
||||
- data-accessor ==0.2.3.1
|
||||
- data-accessor-mtl ==0.2.0.5
|
||||
- data-accessor-transformers ==0.2.1.8
|
||||
- data-array-byte ==0.1.0.1
|
||||
- data-binary-ieee754 ==0.4.4
|
||||
- data-bword ==0.1.0.2
|
||||
|
|
@ -574,7 +574,7 @@ default-package-overrides:
|
|||
- deque ==0.4.4
|
||||
- deriveJsonNoPrefix ==0.1.0.1
|
||||
- derive-topdown ==0.0.3.0
|
||||
- deriving-aeson ==0.2.8
|
||||
- deriving-aeson ==0.2.9
|
||||
- deriving-compat ==0.6.2
|
||||
- detour-via-sci ==1.0.0
|
||||
- df1 ==0.4
|
||||
|
|
@ -669,10 +669,10 @@ default-package-overrides:
|
|||
- edit-distance ==0.2.2.1
|
||||
- edit-distance-vector ==1.0.0.4
|
||||
- editor-open ==0.6.0.0
|
||||
- effectful ==2.2.1.0
|
||||
- effectful-core ==2.2.1.0
|
||||
- effectful ==2.2.2.0
|
||||
- effectful-core ==2.2.2.1
|
||||
- effectful-plugin ==1.0.0.0
|
||||
- effectful-th ==1.0.0.0
|
||||
- effectful-th ==1.0.0.1
|
||||
- either ==5.0.2
|
||||
- either-both ==0.1.1.1
|
||||
- either-unwrap ==1.1
|
||||
|
|
@ -684,12 +684,12 @@ default-package-overrides:
|
|||
- elm-bridge ==0.8.1
|
||||
- elm-core-sources ==1.0.0
|
||||
- elm-export ==0.6.0.1
|
||||
- elynx ==0.7.0.1
|
||||
- elynx-markov ==0.7.0.1
|
||||
- elynx-nexus ==0.7.0.1
|
||||
- elynx-seq ==0.7.0.1
|
||||
- elynx-tools ==0.7.0.1
|
||||
- elynx-tree ==0.7.0.1
|
||||
- elynx ==0.7.1.0
|
||||
- elynx-markov ==0.7.1.0
|
||||
- elynx-nexus ==0.7.1.0
|
||||
- elynx-seq ==0.7.1.0
|
||||
- elynx-tools ==0.7.1.0
|
||||
- elynx-tree ==0.7.1.0
|
||||
- emacs-module ==0.1.1.1
|
||||
- email-validate ==2.3.2.18
|
||||
- emojis ==0.1.2
|
||||
|
|
@ -736,7 +736,7 @@ default-package-overrides:
|
|||
- experimenter ==0.1.0.14
|
||||
- expiring-cache-map ==0.0.6.1
|
||||
- explainable-predicates ==0.1.2.3
|
||||
- explicit-exception ==0.1.10
|
||||
- explicit-exception ==0.1.10.1
|
||||
- exp-pairs ==0.2.1.0
|
||||
- express ==1.0.10
|
||||
- extended-reals ==0.2.4.0
|
||||
|
|
@ -809,7 +809,7 @@ default-package-overrides:
|
|||
- fn ==0.3.0.2
|
||||
- focus ==1.0.3
|
||||
- focuslist ==0.1.1.0
|
||||
- foldl ==1.4.13
|
||||
- foldl ==1.4.14
|
||||
- folds ==0.7.8
|
||||
- follow-file ==0.0.3
|
||||
- FontyFruity ==0.5.3.5
|
||||
|
|
@ -1103,7 +1103,7 @@ default-package-overrides:
|
|||
- hkd-default ==1.1.0.0
|
||||
- hkgr ==0.4.2
|
||||
- hledger ==1.27.1
|
||||
- hledger-interest ==1.6.4
|
||||
- hledger-interest ==1.6.5
|
||||
- hledger-lib ==1.27.1
|
||||
- hledger-stockquotes ==0.1.2.1
|
||||
- hledger-ui ==1.27.1
|
||||
|
|
@ -1123,7 +1123,7 @@ default-package-overrides:
|
|||
- hnock ==0.4.0
|
||||
- hoauth2 ==2.6.0
|
||||
- hoogle ==5.0.18.3
|
||||
- hopenssl ==2.2.4
|
||||
- hopenssl ==2.2.5
|
||||
- hopfli ==0.2.2.1
|
||||
- horizontal-rule ==0.5.0.0
|
||||
- hosc ==0.19.1
|
||||
|
|
@ -1416,7 +1416,7 @@ default-package-overrides:
|
|||
- lame ==0.2.0
|
||||
- language-avro ==0.1.4.0
|
||||
- language-bash ==0.9.2
|
||||
- language-c ==0.9.1
|
||||
- language-c ==0.9.2
|
||||
- language-c-quote ==0.13
|
||||
- language-docker ==12.0.0
|
||||
- language-dot ==0.1.1
|
||||
|
|
@ -1429,7 +1429,7 @@ default-package-overrides:
|
|||
- lapack-carray ==0.0.3
|
||||
- lapack-comfort-array ==0.0.1
|
||||
- lapack-ffi ==0.0.3
|
||||
- lapack-ffi-tools ==0.1.3
|
||||
- lapack-ffi-tools ==0.1.3.1
|
||||
- largeword ==1.2.5
|
||||
- latex ==0.1.0.4
|
||||
- lattices ==2.0.3
|
||||
|
|
@ -1481,7 +1481,7 @@ default-package-overrides:
|
|||
- ListLike ==4.7.8
|
||||
- list-predicate ==0.1.0.1
|
||||
- listsafe ==0.1.0.1
|
||||
- list-t ==1.0.5.3
|
||||
- list-t ==1.0.5.6
|
||||
- list-transformer ==1.0.9
|
||||
- ListTree ==0.2.3
|
||||
- ListZipper ==1.2.0.2
|
||||
|
|
@ -1490,7 +1490,7 @@ default-package-overrides:
|
|||
- little-rio ==1.0.1
|
||||
- lmdb ==0.2.5
|
||||
- load-env ==0.2.1.0
|
||||
- loc ==0.1.4.0
|
||||
- loc ==0.1.4.1
|
||||
- locators ==0.3.0.3
|
||||
- loch-th ==0.2.2
|
||||
- lockfree-queue ==0.2.4
|
||||
|
|
@ -1547,7 +1547,7 @@ default-package-overrides:
|
|||
- matrix-market-attoparsec ==0.1.1.3
|
||||
- matrix-static ==0.3
|
||||
- maximal-cliques ==0.1.1
|
||||
- mcmc ==0.8.0.1
|
||||
- mcmc ==0.8.1.0
|
||||
- mcmc-types ==1.0.3
|
||||
- median-stream ==0.7.0.0
|
||||
- med-module ==0.1.2.2
|
||||
|
|
@ -1579,9 +1579,9 @@ default-package-overrides:
|
|||
- microlens-process ==0.2.0.2
|
||||
- microlens-th ==0.4.3.11
|
||||
- microspec ==0.2.1.3
|
||||
- microstache ==1.0.2.2
|
||||
- microstache ==1.0.2.3
|
||||
- midair ==0.2.0.1
|
||||
- midi ==0.2.2.3
|
||||
- midi ==0.2.2.4
|
||||
- midi-music-box ==0.0.1.2
|
||||
- mighty-metropolis ==2.0.0
|
||||
- mime-mail ==0.5.1
|
||||
|
|
@ -1808,7 +1808,7 @@ default-package-overrides:
|
|||
- options ==1.2.1.1
|
||||
- optparse-applicative ==0.17.0.0
|
||||
- optparse-enum ==1.0.0.0
|
||||
- optparse-generic ==1.4.8
|
||||
- optparse-generic ==1.4.9
|
||||
- optparse-simple ==0.1.1.4
|
||||
- optparse-text ==0.1.1.0
|
||||
- OrderedBits ==0.0.2.0
|
||||
|
|
@ -1844,7 +1844,7 @@ default-package-overrides:
|
|||
- partial-handler ==1.0.3
|
||||
- partial-isomorphisms ==0.2.3.0
|
||||
- partial-order ==0.2.0.0
|
||||
- partial-semigroup ==0.6.0.0
|
||||
- partial-semigroup ==0.6.0.1
|
||||
- password ==3.0.2.0
|
||||
- password-instances ==3.0.0.0
|
||||
- password-types ==1.0.0.0
|
||||
|
|
@ -1858,7 +1858,7 @@ default-package-overrides:
|
|||
- path-io ==1.7.0
|
||||
- path-like ==0.2.0.2
|
||||
- path-pieces ==0.2.1
|
||||
- path-text-utf8 ==0.0.1.10
|
||||
- path-text-utf8 ==0.0.1.11
|
||||
- pathtype ==0.8.1.1
|
||||
- path-utils ==0.1.1.0
|
||||
- pathwalk ==0.3.1.2
|
||||
|
|
@ -2361,7 +2361,7 @@ default-package-overrides:
|
|||
- skylighting-format-latex ==0.1
|
||||
- slack-progressbar ==0.1.0.1
|
||||
- slave-thread ==1.1.0.2
|
||||
- slynx ==0.7.0.1
|
||||
- slynx ==0.7.1.0
|
||||
- smallcheck ==1.2.1
|
||||
- smtp-mail ==0.3.0.0
|
||||
- snowflake ==0.1.1.1
|
||||
|
|
@ -2374,7 +2374,7 @@ default-package-overrides:
|
|||
- sort ==1.0.0.0
|
||||
- sorted-list ==0.2.1.0
|
||||
- sourcemap ==0.1.7
|
||||
- sox ==0.2.3.1
|
||||
- sox ==0.2.3.2
|
||||
- spacecookie ==1.0.0.2
|
||||
- sparse-linear-algebra ==0.3.1
|
||||
- spdx ==1.0.0.3
|
||||
|
|
@ -2393,7 +2393,7 @@ default-package-overrides:
|
|||
- Spock-lucid ==0.4.0.1
|
||||
- Spock-worker ==0.3.1.0
|
||||
- spoon ==0.3.1
|
||||
- spreadsheet ==0.1.3.8
|
||||
- spreadsheet ==0.1.3.9
|
||||
- sqlcli ==0.2.2.0
|
||||
- sqlcli-odbc ==0.2.0.1
|
||||
- sqlite-simple ==0.4.18.2
|
||||
|
|
@ -2487,7 +2487,7 @@ default-package-overrides:
|
|||
- swish ==0.10.3.0
|
||||
- syb ==0.7.2.2
|
||||
- syb-with-class ==0.6.1.14
|
||||
- sydtest ==0.13.0.0
|
||||
- sydtest ==0.13.0.1
|
||||
- sydtest-aeson ==0.1.0.0
|
||||
- sydtest-amqp ==0.1.0.0
|
||||
- sydtest-autodocodec ==0.0.0.0
|
||||
|
|
@ -2540,7 +2540,7 @@ default-package-overrides:
|
|||
- tasty-golden ==2.3.5
|
||||
- tasty-hedgehog ==1.3.1.0
|
||||
- tasty-hslua ==1.0.2
|
||||
- tasty-hspec ==1.2.0.1
|
||||
- tasty-hspec ==1.2.0.2
|
||||
- tasty-html ==0.4.1.4
|
||||
- tasty-hunit ==0.10.0.3
|
||||
- tasty-hunit-compat ==0.2.0.1
|
||||
|
|
@ -2585,7 +2585,7 @@ default-package-overrides:
|
|||
- test-fun ==0.1.0.0
|
||||
- testing-feat ==1.1.1.1
|
||||
- testing-type-modifiers ==0.1.0.1
|
||||
- texmath ==0.12.5.4
|
||||
- texmath ==0.12.5.5
|
||||
- text-ansi ==0.2.1
|
||||
- text-binary ==0.2.1.1
|
||||
- text-builder ==0.6.7
|
||||
|
|
@ -2611,7 +2611,7 @@ default-package-overrides:
|
|||
- th-bang-compat ==0.0.1.0
|
||||
- th-compat ==0.1.4
|
||||
- th-constraint-compat ==0.0.1.0
|
||||
- th-data-compat ==0.1.1.0
|
||||
- th-data-compat ==0.1.2.0
|
||||
- th-desugar ==1.13.1
|
||||
- th-env ==0.1.1
|
||||
- these ==1.1.1.1
|
||||
|
|
@ -2663,7 +2663,7 @@ default-package-overrides:
|
|||
- tls ==1.5.8
|
||||
- tls-debug ==0.4.8
|
||||
- tls-session-manager ==0.0.4
|
||||
- tlynx ==0.7.0.1
|
||||
- tlynx ==0.7.1.0
|
||||
- tmapchan ==0.0.3
|
||||
- tmapmvar ==0.0.4
|
||||
- tmp-postgres ==1.34.1.0
|
||||
|
|
@ -2754,7 +2754,7 @@ default-package-overrides:
|
|||
- uniplate ==1.6.13
|
||||
- uniq-deep ==1.2.1
|
||||
- unique ==0.0.1
|
||||
- unique-logic ==0.4
|
||||
- unique-logic ==0.4.0.1
|
||||
- unique-logic-tf ==0.5.1
|
||||
- unit-constraint ==0.0.0
|
||||
- units-parser ==0.1.1.4
|
||||
|
|
@ -2827,10 +2827,10 @@ default-package-overrides:
|
|||
- vector-extras ==0.2.8
|
||||
- vector-instances ==3.4
|
||||
- vector-mmap ==0.0.3
|
||||
- vector-rotcev ==0.1.0.1
|
||||
- vector-rotcev ==0.1.0.2
|
||||
- vector-sized ==1.5.0
|
||||
- vector-space ==0.16
|
||||
- vector-split ==1.0.0.2
|
||||
- vector-split ==1.0.0.3
|
||||
- vector-stream ==0.1.0.0
|
||||
- vector-th-unbox ==0.2.2
|
||||
- verbosity ==0.4.0.0
|
||||
|
|
@ -2942,7 +2942,7 @@ with-compiler: ghc-9.2.5
|
|||
- xlsx ==1.0.0.1
|
||||
- xlsx-tabular ==0.2.2.1
|
||||
- xml ==1.3.14
|
||||
- xml-basic ==0.1.3.1
|
||||
- xml-basic ==0.1.3.2
|
||||
- xmlbf ==0.6.2
|
||||
- xmlbf-xeno ==0.2.1
|
||||
- xmlbf-xmlhtml ==0.2
|
||||
|
|
|
|||
|
|
@ -247,6 +247,7 @@ dont-distribute-packages:
|
|||
- KiCS-debugger
|
||||
- KiCS-prophecy
|
||||
- LDAPv3
|
||||
- LPFP
|
||||
- LPPaver
|
||||
- LambdaHack
|
||||
- LambdaINet
|
||||
|
|
@ -463,7 +464,9 @@ dont-distribute-packages:
|
|||
- algebra-sql
|
||||
- algebraic
|
||||
- algolia
|
||||
- algorithmic-composition-basic
|
||||
- algorithmic-composition-frequency-shift
|
||||
- algorithmic-composition-overtones
|
||||
- align-audio
|
||||
- alms
|
||||
- alpha
|
||||
|
|
@ -676,7 +679,7 @@ dont-distribute-packages:
|
|||
- ascii-superset_1_2_5_0
|
||||
- ascii-table
|
||||
- ascii-th_1_2_0_0
|
||||
- ascii_1_5_1_0
|
||||
- ascii_1_5_2_0
|
||||
- asic
|
||||
- asil
|
||||
- assert4hs-hspec
|
||||
|
|
@ -811,6 +814,7 @@ dont-distribute-packages:
|
|||
- bitcoin-types
|
||||
- bitcoind-regtest
|
||||
- bitcoind-rpc
|
||||
- bitfield
|
||||
- bitly-cli
|
||||
- bitmaps
|
||||
- bittorrent
|
||||
|
|
@ -1116,7 +1120,6 @@ dont-distribute-packages:
|
|||
- crf-chain1-constrained
|
||||
- crf-chain2-generic
|
||||
- crf-chain2-tiers
|
||||
- criterion-compare
|
||||
- criu-rpc
|
||||
- crockford
|
||||
- cron-compat
|
||||
|
|
@ -1394,6 +1397,7 @@ dont-distribute-packages:
|
|||
- eventuo11y
|
||||
- eventuo11y-batteries
|
||||
- eventuo11y-json
|
||||
- eventuo11y-otel
|
||||
- every-bit-counts
|
||||
- ewe
|
||||
- exference
|
||||
|
|
@ -1858,12 +1862,12 @@ dont-distribute-packages:
|
|||
- graph-visit
|
||||
- graphicsFormats
|
||||
- graphicstools
|
||||
- graphql-client
|
||||
- graphtype
|
||||
- greencard-lib
|
||||
- grenade
|
||||
- gridbounds
|
||||
- gridland
|
||||
- grisette
|
||||
- groot
|
||||
- gross
|
||||
- groundhog-converters
|
||||
|
|
@ -2201,8 +2205,6 @@ dont-distribute-packages:
|
|||
- hpaco-lib
|
||||
- hpage
|
||||
- hpaste
|
||||
- hpath-directory
|
||||
- hpath-io
|
||||
- hpc-tracer
|
||||
- hplayground
|
||||
- hpqtypes-effectful
|
||||
|
|
@ -2252,7 +2254,6 @@ dont-distribute-packages:
|
|||
- hsfacter
|
||||
- hsinspect-lsp
|
||||
- hslogstash
|
||||
- hslua-module-zip
|
||||
- hsndfile-storablevector
|
||||
- hspec-expectations-pretty
|
||||
- hspec-pg-transact
|
||||
|
|
@ -2369,6 +2370,7 @@ dont-distribute-packages:
|
|||
- instant-deepseq
|
||||
- instant-hashable
|
||||
- instant-zipper
|
||||
- instrument-cloudwatch
|
||||
- integreat
|
||||
- intel-aes
|
||||
- interpolatedstring-qq
|
||||
|
|
@ -2543,6 +2545,7 @@ dont-distribute-packages:
|
|||
- lapack
|
||||
- lapack-comfort-array
|
||||
- lapack-hmatrix
|
||||
- large-anon
|
||||
- lat
|
||||
- latex-formulae-hakyll
|
||||
- latex-formulae-pandoc
|
||||
|
|
@ -2724,8 +2727,6 @@ dont-distribute-packages:
|
|||
- marvin
|
||||
- masakazu-bot
|
||||
- matchers
|
||||
- math-programming-glpk
|
||||
- math-programming-tests
|
||||
- mathblog
|
||||
- mathlink
|
||||
- matsuri
|
||||
|
|
@ -2767,6 +2768,7 @@ dont-distribute-packages:
|
|||
- mkbndl
|
||||
- mlist
|
||||
- mmsyn6ukr
|
||||
- mmsyn6ukr-array
|
||||
- mmsyn7h
|
||||
- mmsyn7s
|
||||
- mmsyn7ukr
|
||||
|
|
@ -3000,6 +3002,7 @@ dont-distribute-packages:
|
|||
- padKONTROL
|
||||
- pairing
|
||||
- panda
|
||||
- pandoc-crossref_0_3_15_0
|
||||
- pandoc-highlighting-extensions
|
||||
- pandoc-japanese-filters
|
||||
- pandora-io
|
||||
|
|
@ -3050,6 +3053,8 @@ dont-distribute-packages:
|
|||
- persistable-record
|
||||
- persistable-types-HDBC-pg
|
||||
- persistent-audit
|
||||
- persistent-event-source
|
||||
- persistent-eventsource
|
||||
- persistent-hssqlppp
|
||||
- persistent-map
|
||||
- persistent-mtl
|
||||
|
|
@ -3066,8 +3071,15 @@ dont-distribute-packages:
|
|||
- phonetic-languages-general
|
||||
- phonetic-languages-permutations
|
||||
- phonetic-languages-properties
|
||||
- phonetic-languages-simplified-base
|
||||
- phonetic-languages-simplified-common
|
||||
- phonetic-languages-simplified-examples-array
|
||||
- phonetic-languages-simplified-examples-common
|
||||
- phonetic-languages-simplified-generalized-examples-array
|
||||
- phonetic-languages-simplified-generalized-examples-common
|
||||
- phonetic-languages-simplified-generalized-properties-array
|
||||
- phonetic-languages-simplified-lists-examples
|
||||
- phonetic-languages-simplified-properties-array
|
||||
- phonetic-languages-simplified-properties-lists
|
||||
- phonetic-languages-simplified-properties-lists-double
|
||||
- phonetic-languages-ukrainian
|
||||
|
|
@ -3467,6 +3479,7 @@ dont-distribute-packages:
|
|||
- satchmo-funsat
|
||||
- satchmo-toysat
|
||||
- sauron
|
||||
- sbv-program
|
||||
- sbvPlugin
|
||||
- sc2-lowlevel
|
||||
- sc2-support
|
||||
|
|
@ -3550,7 +3563,6 @@ dont-distribute-packages:
|
|||
- servant-streaming-client
|
||||
- servant-streaming-docs
|
||||
- servant-streaming-server
|
||||
- servant-streamly
|
||||
- servant-swagger-tags
|
||||
- servant-to-elm
|
||||
- servant-util
|
||||
|
|
@ -3629,7 +3641,6 @@ dont-distribute-packages:
|
|||
- smtlib2-quickcheck
|
||||
- smtlib2-timing
|
||||
- smtp2mta
|
||||
- snap-blaze-clay
|
||||
- snap-elm
|
||||
- snap-extras
|
||||
- snaplet-actionlog
|
||||
|
|
@ -3741,12 +3752,12 @@ dont-distribute-packages:
|
|||
- streamed
|
||||
- streaming-fft
|
||||
- streaming-process
|
||||
- streamly-posix
|
||||
- strelka
|
||||
- strelka-wai
|
||||
- strict-containers-lens
|
||||
- strict-containers-serialise
|
||||
- strict-data
|
||||
- string-interpreter
|
||||
- string-typelits
|
||||
- stripe-haskell
|
||||
- stripe-http-client
|
||||
|
|
@ -3883,7 +3894,6 @@ dont-distribute-packages:
|
|||
- theoremquest-client
|
||||
- thimk
|
||||
- threaded
|
||||
- threepenny-gui-flexbox
|
||||
- thumbnail-polish
|
||||
- tic-tac-toe
|
||||
- tickle
|
||||
|
|
@ -4127,7 +4137,6 @@ dont-distribute-packages:
|
|||
- weatherhs
|
||||
- web-inv-route
|
||||
- web-mongrel2
|
||||
- web-page
|
||||
- web-rep
|
||||
- web-routes-regular
|
||||
- web-routing
|
||||
|
|
|
|||
|
|
@ -199,7 +199,8 @@ let
|
|||
defaultConfigureFlags = [
|
||||
"--verbose"
|
||||
"--prefix=$out"
|
||||
"--libdir=\\$prefix/lib/\\$compiler"
|
||||
# Note: This must be kept in sync manually with mkGhcLibdir
|
||||
("--libdir=\\$prefix/lib/\\$compiler" + lib.optionalString (ghc ? hadrian) "/lib")
|
||||
"--libsubdir=\\$abi/\\$libname"
|
||||
(optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}")
|
||||
(optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
|
||||
|
|
@ -207,7 +208,7 @@ let
|
|||
"--with-gcc=$CC" # Clang won't work without that extra information.
|
||||
] ++ [
|
||||
"--package-db=$packageConfDir"
|
||||
(optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghcNameWithPrefix}/${pname}-${version}")
|
||||
(optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}")
|
||||
(optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
|
||||
(optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}")
|
||||
(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
|
||||
|
|
@ -284,10 +285,13 @@ let
|
|||
ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
|
||||
|
||||
ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}";
|
||||
mkGhcLibdir = ghc: "lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"
|
||||
+ lib.optionalString (ghc ? hadrian) "/lib";
|
||||
ghcLibdir = mkGhcLibdir ghc;
|
||||
|
||||
nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
|
||||
|
||||
buildPkgDb = ghcName: packageConfDir: ''
|
||||
buildPkgDb = thisGhc: packageConfDir: ''
|
||||
# If this dependency has a package database, then copy the contents of it,
|
||||
# unless it is one of our GHCs. These can appear in our dependencies when
|
||||
# we are doing native builds, and they have package databases in them, but
|
||||
|
|
@ -297,8 +301,8 @@ let
|
|||
# we compile with it, and doing so can result in having multiple copies of
|
||||
# e.g. Cabal in the database with the same name and version, which is
|
||||
# ambiguous.
|
||||
if [ -d "$p/lib/${ghcName}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then
|
||||
cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/
|
||||
if [ -d "$p/${mkGhcLibdir thisGhc}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then
|
||||
cp -f "$p/${mkGhcLibdir thisGhc}/package.conf.d/"*.conf ${packageConfDir}/
|
||||
continue
|
||||
fi
|
||||
'';
|
||||
|
|
@ -363,14 +367,14 @@ stdenv.mkDerivation ({
|
|||
# pkgs* arrays defined in stdenv/setup.hs
|
||||
+ ''
|
||||
for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
|
||||
${buildPkgDb "${nativeGhcCommand}-${nativeGhc.version}" "$setupPackageConfDir"}
|
||||
${buildPkgDb nativeGhc "$setupPackageConfDir"}
|
||||
done
|
||||
${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache
|
||||
''
|
||||
# For normal components
|
||||
+ ''
|
||||
for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
|
||||
${buildPkgDb ghcNameWithPrefix "$packageConfDir"}
|
||||
${buildPkgDb ghc "$packageConfDir"}
|
||||
if [ -d "$p/include" ]; then
|
||||
configureFlags+=" --extra-include-dirs=$p/include"
|
||||
fi
|
||||
|
|
@ -510,7 +514,7 @@ stdenv.mkDerivation ({
|
|||
# just the target specified; "install" will error here, since not all targets have been built.
|
||||
else ''
|
||||
${setupCommand} copy ${buildTarget}
|
||||
local packageConfDir="$out/lib/${ghcNameWithPrefix}/package.conf.d"
|
||||
local packageConfDir="$out/${ghcLibdir}/package.conf.d"
|
||||
local packageConfFile="$packageConfDir/${pname}-${version}.conf"
|
||||
mkdir -p "$packageConfDir"
|
||||
${setupCommand} register --gen-pkg-config=$packageConfFile
|
||||
|
|
@ -539,7 +543,7 @@ stdenv.mkDerivation ({
|
|||
${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
|
||||
${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") ''
|
||||
for exe in "${binDir}/"* ; do
|
||||
install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
|
||||
install_name_tool -add_rpath "$out/${ghcLibdir}/${pname}-${version}" "$exe"
|
||||
done
|
||||
''}
|
||||
|
||||
|
|
@ -675,7 +679,7 @@ stdenv.mkDerivation ({
|
|||
"NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
|
||||
"NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
|
||||
then "${ghcEnv}/lib/HaLVM-${ghc.version}"
|
||||
else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}";
|
||||
else "${ghcEnv}/${ghcLibdir}";
|
||||
});
|
||||
|
||||
env = envFunc { };
|
||||
|
|
|
|||
3175
pkgs/development/haskell-modules/hackage-packages.nix
generated
3175
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -464,4 +464,44 @@ rec {
|
|||
allowInconsistentDependencies = overrideCabal (drv: {
|
||||
allowInconsistentDependencies = true;
|
||||
});
|
||||
|
||||
# Work around a Cabal bug requiring pkg-config --static --libs to work even
|
||||
# when linking dynamically, affecting Cabal 3.8 and 3.9.
|
||||
# https://github.com/haskell/cabal/issues/8455
|
||||
#
|
||||
# For this, we treat the runtime system/pkg-config dependencies of a Haskell
|
||||
# derivation as if they were propagated from their dependencies which allows
|
||||
# pkg-config --static to work in most cases.
|
||||
#
|
||||
# Warning: This function may change or be removed at any time, e.g. if we find
|
||||
# a different workaround, upstream fixes the bug or we patch Cabal.
|
||||
__CabalEagerPkgConfigWorkaround =
|
||||
let
|
||||
# Take list of derivations and return list of the transitive dependency
|
||||
# closure, only taking into account buildInputs. Loosely based on
|
||||
# closePropagationFast.
|
||||
propagatedPlainBuildInputs = drvs:
|
||||
builtins.map (i: i.val) (
|
||||
builtins.genericClosure {
|
||||
startSet = builtins.map (drv:
|
||||
{ key = drv.outPath; val = drv; }
|
||||
) drvs;
|
||||
operator = { val, ... }:
|
||||
if !lib.isDerivation val
|
||||
then [ ]
|
||||
else
|
||||
builtins.concatMap (drv:
|
||||
if !lib.isDerivation drv
|
||||
then [ ]
|
||||
else [ { key = drv.outPath; val = drv; } ]
|
||||
) (val.buildInputs or [ ] ++ val.propagatedBuildInputs or [ ]);
|
||||
}
|
||||
);
|
||||
in
|
||||
overrideCabal (old: {
|
||||
benchmarkPkgconfigDepends = propagatedPlainBuildInputs old.benchmarkPkgconfigDepends or [ ];
|
||||
executablePkgconfigDepends = propagatedPlainBuildInputs old.executablePkgconfigDepends or [ ];
|
||||
libraryPkgconfigDepends = propagatedPlainBuildInputs old.libraryPkgconfigDepends or [ ];
|
||||
testPkgconfigDepends = propagatedPlainBuildInputs old.testPkgconfigDepends or [ ];
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/src/Gtk2HsSetup.hs b/src/Gtk2HsSetup.hs
|
||||
index 598048f..b652b76 100644
|
||||
--- a/src/Gtk2HsSetup.hs
|
||||
+++ b/src/Gtk2HsSetup.hs
|
||||
@@ -300,6 +300,7 @@ ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
|
||||
ourC2hs bi lbi = PreProcessor {
|
||||
#endif
|
||||
platformIndependent = False,
|
||||
+ ppOrdering = (\ _ _ ms -> return ms),
|
||||
runPreProcessor = runC2HS bi lbi
|
||||
}
|
||||
|
||||
|
|
@ -49,11 +49,12 @@ let
|
|||
isHaLVM = ghc.isHaLVM or false;
|
||||
ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version;
|
||||
packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf";
|
||||
ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
|
||||
ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
|
||||
ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
|
||||
ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
|
||||
ghcCommandCaps= lib.toUpper ghcCommand';
|
||||
libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}"
|
||||
else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}";
|
||||
else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"
|
||||
+ lib.optionalString (ghc ? hadrian) "/lib";
|
||||
docDir = "$out/share/doc/ghc/html";
|
||||
packageCfgDir = "${libDir}/package.conf.d";
|
||||
paths = lib.concatLists (
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, python, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lhapdf";
|
||||
|
|
@ -9,6 +9,22 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# avoid silent compilation failures
|
||||
(fetchpatch {
|
||||
name = "lhapdf-propagate_returncode.patch";
|
||||
url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff";
|
||||
hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k=";
|
||||
})
|
||||
|
||||
# workaround "ld: -stack_size option can only be used when linking a main executable" on darwin
|
||||
(fetchpatch {
|
||||
name = "lhapdf-Wl_stack_size.patch";
|
||||
url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff";
|
||||
hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU=";
|
||||
})
|
||||
];
|
||||
|
||||
# The Apple SDK only exports locale_t from xlocale.h whereas glibc
|
||||
# had decided that xlocale.h should be a part of locale.h
|
||||
postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) ''
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ buildDunePackage rec {
|
|||
pname = "lsp";
|
||||
inherit (jsonrpc) version src;
|
||||
duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2";
|
||||
minimumOCamlVersion =
|
||||
minimalOCamlVersion =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
"4.12"
|
||||
else
|
||||
|
|
@ -74,7 +74,6 @@ buildDunePackage rec {
|
|||
[ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ]
|
||||
else
|
||||
[
|
||||
cppo
|
||||
ppx_yojson_conv_lib
|
||||
ocaml-syntax-shims
|
||||
octavius
|
||||
|
|
@ -83,6 +82,8 @@ buildDunePackage rec {
|
|||
cmdliner
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
csexp
|
||||
jsonrpc
|
||||
|
|
|
|||
|
|
@ -3,31 +3,43 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, msgpack
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiocache";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aioredis
|
||||
msgpack
|
||||
];
|
||||
passthru.optional-dependencies = {
|
||||
redis = [
|
||||
aioredis
|
||||
];
|
||||
msgpack = [
|
||||
msgpack
|
||||
];
|
||||
};
|
||||
|
||||
# aiomcache would be required but last release was in 2017
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "aiocache" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiocache"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API Rate Limit Decorator";
|
||||
homepage = "https://github.com/tomasbasham/ratelimit";
|
||||
homepage = "https://github.com/aio-libs/aiocache";
|
||||
changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "13.1.0";
|
||||
version = "13.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-slPYf7H8vwgSlqm7H7JnJnU17nL2Hwg9hHO0le33IqU=";
|
||||
hash = "sha256-ACO5vp5ZMxzfY4RBvZ+vbk+fsj43Q896bar0+HNYHwE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asteval";
|
||||
version = "0.9.28";
|
||||
version = "0.9.29";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "newville";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-J35AqVSFpIsw0XThbLCJjS9NFRFeyYV/YrwdfcOrFhk=";
|
||||
hash = "sha256-cJIrb0lo/FmeyZd8L6nlCEt6MP7Fdv3rr5C6xvplN6c=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4g97cqMwtSLhDOVwBrunsq+JQ33BfeKcP0fJP4N48d8=";
|
||||
hash = "sha256-QOARAT1XSoW/PJli6BzNOZZJjiSubz8zqndEHZCCqag=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastbencode";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wal451pQSLuoM9kNbnSKVZUMqLWfEukXwqLI58p+tvU=";
|
||||
hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.2.24";
|
||||
version = "0.2.25";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "marcelblijleven";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-dcz9IEPr5n86NHne9lEDB0kERY8o+jUEqPmz6QMEF4Q=";
|
||||
sha256 = "sha256-RT8fkFHiqUaahowk6EDpaf8s4JUuHSHPNT0iEr/pDVg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "govee-ble";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HAUHNxO7dfocazGhcvvcqbZot/RkAP50DrsEkocOugI=";
|
||||
hash = "sha256-/uv4P7wB/5QQW2IA+PT6VMPWd91Aoyxsez+8ptrIa5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, msgpack
|
||||
, ujson
|
||||
}:
|
||||
|
|
@ -27,13 +28,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"'
|
||||
'';
|
||||
pythonRelaxDeps = [
|
||||
"aiocache"
|
||||
"ujson"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.3017";
|
||||
version = "0.20.3035";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha512-Hc4EzHqydcBGbiQkr4Hhnfjly9CwaCJXau7WwBb/T+qYdCkOKwrGeuNr3UEMP2x4dth+713HQRrgXviQo+jJlw==";
|
||||
hash = "sha512-t9wMlKKeM3eP9ZJY7uXmWEQrpCXwmE7Tuxsx9ajh3p09ko265YiSQRSC7mPEBLSV7eVRBqh8rlVKCE2rm5Rglw==";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
in
|
||||
import ./node-packages.nix {
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
||||
|
|
@ -1,19 +1,17 @@
|
|||
{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, nixosTests, iputils, nodejs, makeWrapper }:
|
||||
let
|
||||
deps = import ./composition.nix { inherit pkgs; };
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
{ pkgs, lib, fetchFromGitHub, buildNpmPackage, python3, nodejs, nixosTests }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "uptime-kuma";
|
||||
version = "1.19.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
rev = finalAttrs.version;
|
||||
rev = version;
|
||||
sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8=";
|
||||
};
|
||||
|
||||
uiSha256 = "sha256-oeXklGxAPsUoLRT6DAVRgWm0kvKbLFW4IBc0Rh3j5V4=";
|
||||
npmDepsHash = "sha256-lVMPxUe+W/FlFQS2L+/UfpC21pIKJE89clmJywSv7w4=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
|
@ -21,35 +19,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
./fix-database-permissions.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/
|
||||
cp -r server $out/share/
|
||||
cp -r db $out/share/
|
||||
cp -r src $out/share/
|
||||
cp package.json $out/share/
|
||||
ln -s ${deps.package}/lib/node_modules/uptime-kuma/node_modules/ $out/share/
|
||||
ln -s ${finalAttrs.passthru.ui} $out/share/dist
|
||||
CYPRESS_INSTALL_BINARY = 0; # Stops Cypress from trying to download binaries
|
||||
|
||||
postInstall = ''
|
||||
cp -r dist $out/lib/node_modules/uptime-kuma/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${nodejs}/bin/node $out/bin/uptime-kuma-server \
|
||||
--add-flags $out/share/server/server.js \
|
||||
--chdir $out/share/
|
||||
--add-flags $out/lib/node_modules/uptime-kuma/server/server.js \
|
||||
--chdir $out/lib/node_modules/uptime-kuma
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.uptime-kuma = nixosTests.uptime-kuma;
|
||||
|
||||
updateScript = ./update.sh;
|
||||
|
||||
ui = fetchzip {
|
||||
name = "uptime-kuma-dist-${finalAttrs.version}";
|
||||
url = "https://github.com/louislam/uptime-kuma/releases/download/${finalAttrs.version}/dist.tar.gz";
|
||||
sha256 = finalAttrs.uiSha256;
|
||||
};
|
||||
};
|
||||
passthru.tests.uptime-kuma = nixosTests.uptime-kuma;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fancy self-hosted monitoring tool";
|
||||
|
|
@ -57,5 +41,4 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ julienmalka ];
|
||||
};
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,686 +0,0 @@
|
|||
# This file originates from node2nix
|
||||
|
||||
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
|
||||
|
||||
let
|
||||
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
|
||||
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
|
||||
|
||||
python = if nodejs ? python then nodejs.python else python2;
|
||||
|
||||
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
|
||||
tarWrapper = runCommand "tarWrapper" {} ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
cat > $out/bin/tar <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
$(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/tar
|
||||
'';
|
||||
|
||||
# Function that generates a TGZ file from a NPM project
|
||||
buildNodeSourceDist =
|
||||
{ name, version, src, ... }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "node-tarball-${name}-${version}";
|
||||
inherit src;
|
||||
buildInputs = [ nodejs ];
|
||||
buildPhase = ''
|
||||
export HOME=$TMPDIR
|
||||
tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/tarballs
|
||||
mv $tgzFile $out/tarballs
|
||||
mkdir -p $out/nix-support
|
||||
echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
|
||||
'';
|
||||
};
|
||||
|
||||
# Common shell logic
|
||||
installPackage = writeShellScript "install-package" ''
|
||||
installPackage() {
|
||||
local packageName=$1 src=$2
|
||||
|
||||
local strippedName
|
||||
|
||||
local DIR=$PWD
|
||||
cd $TMPDIR
|
||||
|
||||
unpackFile $src
|
||||
|
||||
# Make the base dir in which the target dependency resides first
|
||||
mkdir -p "$(dirname "$DIR/$packageName")"
|
||||
|
||||
if [ -f "$src" ]
|
||||
then
|
||||
# Figure out what directory has been unpacked
|
||||
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
|
||||
|
||||
# Restore write permissions to make building work
|
||||
find "$packageDir" -type d -exec chmod u+x {} \;
|
||||
chmod -R u+w "$packageDir"
|
||||
|
||||
# Move the extracted tarball into the output folder
|
||||
mv "$packageDir" "$DIR/$packageName"
|
||||
elif [ -d "$src" ]
|
||||
then
|
||||
# Get a stripped name (without hash) of the source directory.
|
||||
# On old nixpkgs it's already set internally.
|
||||
if [ -z "$strippedName" ]
|
||||
then
|
||||
strippedName="$(stripHash $src)"
|
||||
fi
|
||||
|
||||
# Restore write permissions to make building work
|
||||
chmod -R u+w "$strippedName"
|
||||
|
||||
# Move the extracted directory into the output folder
|
||||
mv "$strippedName" "$DIR/$packageName"
|
||||
fi
|
||||
|
||||
# Change to the package directory to install dependencies
|
||||
cd "$DIR/$packageName"
|
||||
}
|
||||
'';
|
||||
|
||||
# Bundle the dependencies of the package
|
||||
#
|
||||
# Only include dependencies if they don't exist. They may also be bundled in the package.
|
||||
includeDependencies = {dependencies}:
|
||||
lib.optionalString (dependencies != []) (
|
||||
''
|
||||
mkdir -p node_modules
|
||||
cd node_modules
|
||||
''
|
||||
+ (lib.concatMapStrings (dependency:
|
||||
''
|
||||
if [ ! -e "${dependency.packageName}" ]; then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
''
|
||||
) dependencies)
|
||||
+ ''
|
||||
cd ..
|
||||
''
|
||||
);
|
||||
|
||||
# Recursively composes the dependencies of a package
|
||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
|
||||
installPackage "${packageName}" "${src}"
|
||||
${includeDependencies { inherit dependencies; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
'';
|
||||
|
||||
pinpointDependencies = {dependencies, production}:
|
||||
let
|
||||
pinpointDependenciesFromPackageJSON = writeTextFile {
|
||||
name = "pinpointDependencies.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
function resolveDependencyVersion(location, name) {
|
||||
if(location == process.env['NIX_STORE']) {
|
||||
return null;
|
||||
} else {
|
||||
var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
|
||||
|
||||
if(fs.existsSync(dependencyPackageJSON)) {
|
||||
var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
|
||||
|
||||
if(dependencyPackageObj.name == name) {
|
||||
return dependencyPackageObj.version;
|
||||
}
|
||||
} else {
|
||||
return resolveDependencyVersion(path.resolve(location, ".."), name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function replaceDependencies(dependencies) {
|
||||
if(typeof dependencies == "object" && dependencies !== null) {
|
||||
for(var dependency in dependencies) {
|
||||
var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
|
||||
|
||||
if(resolvedVersion === null) {
|
||||
process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
|
||||
} else {
|
||||
dependencies[dependency] = resolvedVersion;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Read the package.json configuration */
|
||||
var packageObj = JSON.parse(fs.readFileSync('./package.json'));
|
||||
|
||||
/* Pinpoint all dependencies */
|
||||
replaceDependencies(packageObj.dependencies);
|
||||
if(process.argv[2] == "development") {
|
||||
replaceDependencies(packageObj.devDependencies);
|
||||
}
|
||||
else {
|
||||
packageObj.devDependencies = {};
|
||||
}
|
||||
replaceDependencies(packageObj.optionalDependencies);
|
||||
replaceDependencies(packageObj.peerDependencies);
|
||||
|
||||
/* Write the fixed package.json file */
|
||||
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
|
||||
'';
|
||||
};
|
||||
in
|
||||
''
|
||||
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
||||
|
||||
${lib.optionalString (dependencies != [])
|
||||
''
|
||||
if [ -d node_modules ]
|
||||
then
|
||||
cd node_modules
|
||||
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
||||
cd ..
|
||||
fi
|
||||
''}
|
||||
'';
|
||||
|
||||
# Recursively traverses all dependencies of a package and pinpoints all
|
||||
# dependencies in the package.json file to the versions that are actually
|
||||
# being used.
|
||||
|
||||
pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
|
||||
''
|
||||
if [ -d "${packageName}" ]
|
||||
then
|
||||
cd "${packageName}"
|
||||
${pinpointDependencies { inherit dependencies production; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
fi
|
||||
'';
|
||||
|
||||
# Extract the Node.js source code which is used to compile packages with
|
||||
# native bindings
|
||||
nodeSources = runCommand "node-sources" {} ''
|
||||
tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
|
||||
mv node-* $out
|
||||
'';
|
||||
|
||||
# Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
|
||||
addIntegrityFieldsScript = writeTextFile {
|
||||
name = "addintegrityfields.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
function augmentDependencies(baseDir, dependencies) {
|
||||
for(var dependencyName in dependencies) {
|
||||
var dependency = dependencies[dependencyName];
|
||||
|
||||
// Open package.json and augment metadata fields
|
||||
var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
|
||||
var packageJSONPath = path.join(packageJSONDir, "package.json");
|
||||
|
||||
if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
|
||||
console.log("Adding metadata fields to: "+packageJSONPath);
|
||||
var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
|
||||
|
||||
if(dependency.integrity) {
|
||||
packageObj["_integrity"] = dependency.integrity;
|
||||
} else {
|
||||
packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
|
||||
}
|
||||
|
||||
if(dependency.resolved) {
|
||||
packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
|
||||
} else {
|
||||
packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
|
||||
}
|
||||
|
||||
if(dependency.from !== undefined) { // Adopt from property if one has been provided
|
||||
packageObj["_from"] = dependency.from;
|
||||
}
|
||||
|
||||
fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
|
||||
}
|
||||
|
||||
// Augment transitive dependencies
|
||||
if(dependency.dependencies !== undefined) {
|
||||
augmentDependencies(packageJSONDir, dependency.dependencies);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(fs.existsSync("./package-lock.json")) {
|
||||
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
|
||||
|
||||
if(![1, 2].includes(packageLock.lockfileVersion)) {
|
||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if(packageLock.dependencies !== undefined) {
|
||||
augmentDependencies(".", packageLock.dependencies);
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
|
||||
reconstructPackageLock = writeTextFile {
|
||||
name = "reconstructpackagelock.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
var packageObj = JSON.parse(fs.readFileSync("package.json"));
|
||||
|
||||
var lockObj = {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
lockfileVersion: 2,
|
||||
requires: true,
|
||||
packages: {
|
||||
"": {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
license: packageObj.license,
|
||||
bin: packageObj.bin,
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
}
|
||||
},
|
||||
dependencies: {}
|
||||
};
|
||||
|
||||
function augmentPackageJSON(filePath, packages, dependencies) {
|
||||
var packageJSON = path.join(filePath, "package.json");
|
||||
if(fs.existsSync(packageJSON)) {
|
||||
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
|
||||
packages[filePath] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
};
|
||||
dependencies[packageObj.name] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: {}
|
||||
};
|
||||
processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
|
||||
}
|
||||
}
|
||||
|
||||
function processDependencies(dir, packages, dependencies) {
|
||||
if(fs.existsSync(dir)) {
|
||||
var files = fs.readdirSync(dir);
|
||||
|
||||
files.forEach(function(entry) {
|
||||
var filePath = path.join(dir, entry);
|
||||
var stats = fs.statSync(filePath);
|
||||
|
||||
if(stats.isDirectory()) {
|
||||
if(entry.substr(0, 1) == "@") {
|
||||
// When we encounter a namespace folder, augment all packages belonging to the scope
|
||||
var pkgFiles = fs.readdirSync(filePath);
|
||||
|
||||
pkgFiles.forEach(function(entry) {
|
||||
if(stats.isDirectory()) {
|
||||
var pkgFilePath = path.join(filePath, entry);
|
||||
augmentPackageJSON(pkgFilePath, packages, dependencies);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
augmentPackageJSON(filePath, packages, dependencies);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
|
||||
|
||||
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
|
||||
'';
|
||||
};
|
||||
|
||||
# Script that links bins defined in package.json to the node_modules bin directory
|
||||
# NPM does not do this for top-level packages itself anymore as of v7
|
||||
linkBinsScript = writeTextFile {
|
||||
name = "linkbins.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
var packageObj = JSON.parse(fs.readFileSync("package.json"));
|
||||
|
||||
var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
|
||||
|
||||
if(packageObj.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
if(typeof packageObj.bin == "object") {
|
||||
Object.keys(packageObj.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(packageObj.bin[exe])) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin[exe]),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
else {
|
||||
if(fs.existsSync(packageObj.bin)) {
|
||||
console.log("linking bin '" + packageObj.bin + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin),
|
||||
path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + packageObj.bin + "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.directories.bin, exe),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
|
||||
let
|
||||
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
|
||||
in
|
||||
''
|
||||
# Pinpoint the versions of all dependencies to the ones that are actually being used
|
||||
echo "pinpointing versions of dependencies..."
|
||||
source $pinpointDependenciesScriptPath
|
||||
|
||||
# Patch the shebangs of the bundled modules to prevent them from
|
||||
# calling executables outside the Nix store as much as possible
|
||||
patchShebangs .
|
||||
|
||||
# Deploy the Node.js package by running npm install. Since the
|
||||
# dependencies have been provided already by ourselves, it should not
|
||||
# attempt to install them again, which is good, because we want to make
|
||||
# it Nix's responsibility. If it needs to install any dependencies
|
||||
# anyway (e.g. because the dependency parameters are
|
||||
# incomplete/incorrect), it fails.
|
||||
#
|
||||
# The other responsibilities of NPM are kept -- version checks, build
|
||||
# steps, postprocessing etc.
|
||||
|
||||
export HOME=$TMPDIR
|
||||
cd "${packageName}"
|
||||
runHook preRebuild
|
||||
|
||||
${lib.optionalString bypassCache ''
|
||||
${lib.optionalString reconstructLock ''
|
||||
if [ -f package-lock.json ]
|
||||
then
|
||||
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
||||
echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
|
||||
rm package-lock.json
|
||||
else
|
||||
echo "No package-lock.json file found, reconstructing..."
|
||||
fi
|
||||
|
||||
node ${reconstructPackageLock}
|
||||
''}
|
||||
|
||||
node ${addIntegrityFieldsScript}
|
||||
''}
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
|
||||
|
||||
runHook postRebuild
|
||||
|
||||
if [ "''${dontNpmInstall-}" != "1" ]
|
||||
then
|
||||
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
||||
rm -f npm-shrinkwrap.json
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
|
||||
fi
|
||||
|
||||
# Link executables defined in package.json
|
||||
node ${linkBinsScript}
|
||||
'';
|
||||
|
||||
# Builds and composes an NPM package including all its dependencies
|
||||
buildNodePackage =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, preRebuild ? ""
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, meta ? {}
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "${name}${if version == null then "" else "-${version}"}";
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
++ lib.optional (stdenv.isDarwin) libtool
|
||||
++ buildInputs;
|
||||
|
||||
inherit nodejs;
|
||||
|
||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||
inherit dontNpmInstall preRebuild unpackPhase buildPhase;
|
||||
|
||||
compositionScript = composePackage args;
|
||||
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
|
||||
|
||||
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
# Create and enter a root node_modules/ folder
|
||||
mkdir -p $out/lib/node_modules
|
||||
cd $out/lib/node_modules
|
||||
|
||||
# Compose the package and all its dependencies
|
||||
source $compositionScriptPath
|
||||
|
||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||
|
||||
# Create symlink to the deployed executable folder, if applicable
|
||||
if [ -d "$out/lib/node_modules/.bin" ]
|
||||
then
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
|
||||
# Patch the shebang lines of all the executables
|
||||
ls $out/bin/* | while read i
|
||||
do
|
||||
file="$(readlink -f "$i")"
|
||||
chmod u+rwx "$file"
|
||||
patchShebangs "$file"
|
||||
done
|
||||
fi
|
||||
|
||||
# Create symlinks to the deployed manual page folders, if applicable
|
||||
if [ -d "$out/lib/node_modules/${packageName}/man" ]
|
||||
then
|
||||
mkdir -p $out/share
|
||||
for dir in "$out/lib/node_modules/${packageName}/man/"*
|
||||
do
|
||||
mkdir -p $out/share/man/$(basename "$dir")
|
||||
for page in "$dir"/*
|
||||
do
|
||||
ln -s $page $out/share/man/$(basename "$dir")
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
||||
# Run post install hook, if provided
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# default to Node.js' platforms
|
||||
platforms = nodejs.meta.platforms;
|
||||
} // meta;
|
||||
} // extraArgs);
|
||||
|
||||
# Builds a node environment (a node_modules folder and a set of binaries)
|
||||
buildNodeDependencies =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
++ lib.optional (stdenv.isDarwin) libtool
|
||||
++ buildInputs;
|
||||
|
||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||
inherit dontNpmInstall unpackPhase buildPhase;
|
||||
|
||||
includeScript = includeDependencies { inherit dependencies; };
|
||||
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
|
||||
|
||||
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
mkdir -p $out/${packageName}
|
||||
cd $out/${packageName}
|
||||
|
||||
source $includeScriptPath
|
||||
|
||||
# Create fake package.json to make the npm commands work properly
|
||||
cp ${src}/package.json .
|
||||
chmod 644 package.json
|
||||
${lib.optionalString bypassCache ''
|
||||
if [ -f ${src}/package-lock.json ]
|
||||
then
|
||||
cp ${src}/package-lock.json .
|
||||
chmod 644 package-lock.json
|
||||
fi
|
||||
''}
|
||||
|
||||
# Go to the parent folder to make sure that all packages are pinpointed
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
|
||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||
|
||||
# Expose the executables that were installed
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
|
||||
mv ${packageName} lib
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
'';
|
||||
} // extraArgs);
|
||||
|
||||
# Builds a development shell
|
||||
buildNodeShell =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
nodeDependencies = buildNodeDependencies args;
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/shell <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
$shellHook
|
||||
exec ${stdenv.shell}
|
||||
EOF
|
||||
chmod +x $out/bin/shell
|
||||
'';
|
||||
|
||||
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
||||
inherit nodeDependencies;
|
||||
shellHook = lib.optionalString (dependencies != []) ''
|
||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||
export PATH="${nodeDependencies}/bin:$PATH"
|
||||
'';
|
||||
} // extraArgs);
|
||||
in
|
||||
{
|
||||
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||
buildNodePackage = lib.makeOverridable buildNodePackage;
|
||||
buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
|
||||
buildNodeShell = lib.makeOverridable buildNodeShell;
|
||||
}
|
||||
5099
pkgs/servers/monitoring/uptime-kuma/node-packages.nix
generated
5099
pkgs/servers/monitoring/uptime-kuma/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,178 +0,0 @@
|
|||
{
|
||||
"name": "uptime-kuma",
|
||||
"version": "1.19.6",
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/louislam/uptime-kuma.git"
|
||||
},
|
||||
"engines": {
|
||||
"node": "14.* || >=16.*"
|
||||
},
|
||||
"scripts": {
|
||||
"install-legacy": "npm install",
|
||||
"update-legacy": "npm update",
|
||||
"lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
|
||||
"lint-fix:js": "eslint --ext \".js,.vue\" --fix --ignore-path .gitignore .",
|
||||
"lint:style": "stylelint \"**/*.{vue,css,scss}\" --ignore-path .gitignore",
|
||||
"lint-fix:style": "stylelint \"**/*.{vue,css,scss}\" --fix --ignore-path .gitignore",
|
||||
"lint": "npm run lint:js && npm run lint:style",
|
||||
"dev": "concurrently -k -r \"wait-on tcp:3000 && npm run start-server-dev \" \"npm run start-frontend-dev\"",
|
||||
"start-frontend-dev": "cross-env NODE_ENV=development vite --host --config ./config/vite.config.js",
|
||||
"start": "npm run start-server",
|
||||
"start-server": "node server/server.js",
|
||||
"start-server-dev": "cross-env NODE_ENV=development node server/server.js",
|
||||
"build": "vite build --config ./config/vite.config.js",
|
||||
"test": "node test/prepare-test-server.js && npm run jest-backend",
|
||||
"test-with-build": "npm run build && npm test",
|
||||
"jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js",
|
||||
"tsc": "tsc",
|
||||
"vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
|
||||
"build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine",
|
||||
"build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push",
|
||||
"build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push",
|
||||
"build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push",
|
||||
"build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push",
|
||||
"build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push",
|
||||
"build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
|
||||
"build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
|
||||
"build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
|
||||
"build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
|
||||
"upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
|
||||
"setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist",
|
||||
"download-dist": "node extra/download-dist.js",
|
||||
"mark-as-nightly": "node extra/mark-as-nightly.js",
|
||||
"reset-password": "node extra/reset-password.js",
|
||||
"remove-2fa": "node extra/remove-2fa.js",
|
||||
"compile-install-script": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./extra/compile-install-script.ps1",
|
||||
"test-install-script-centos7": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/centos7.dockerfile .",
|
||||
"test-install-script-alpine3": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/alpine3.dockerfile .",
|
||||
"test-install-script-ubuntu": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu.dockerfile .",
|
||||
"test-install-script-ubuntu1604": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu1604.dockerfile .",
|
||||
"test-nodejs16": "docker build --progress plain -f test/ubuntu-nodejs16.dockerfile .",
|
||||
"simple-dns-server": "node extra/simple-dns-server.js",
|
||||
"simple-mqtt-server": "node extra/simple-mqtt-server.js",
|
||||
"update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix",
|
||||
"ncu-patch": "npm-check-updates -u -t patch",
|
||||
"release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
|
||||
"release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts",
|
||||
"git-remove-tag": "git tag -d",
|
||||
"build-dist-and-restart": "npm run build && npm run start-server-dev",
|
||||
"start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev",
|
||||
"cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e",
|
||||
"cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js",
|
||||
"cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js",
|
||||
"cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"",
|
||||
"build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go"
|
||||
},
|
||||
"dependencies": {
|
||||
"@grpc/grpc-js": "~1.7.3",
|
||||
"@louislam/ping": "~0.4.2-mod.1",
|
||||
"@louislam/sqlite3": "15.1.2",
|
||||
"args-parser": "~1.3.0",
|
||||
"axios": "~0.27.0",
|
||||
"axios-ntlm": "1.3.0",
|
||||
"badge-maker": "~3.3.1",
|
||||
"bcryptjs": "~2.4.3",
|
||||
"bree": "~7.1.5",
|
||||
"cacheable-lookup": "~6.0.4",
|
||||
"chardet": "~1.4.0",
|
||||
"check-password-strength": "^2.0.5",
|
||||
"cheerio": "~1.0.0-rc.12",
|
||||
"chroma-js": "~2.4.2",
|
||||
"command-exists": "~1.2.9",
|
||||
"compare-versions": "~3.6.0",
|
||||
"compression": "~1.7.4",
|
||||
"dayjs": "~1.11.5",
|
||||
"express": "~4.17.3",
|
||||
"express-basic-auth": "~1.2.1",
|
||||
"express-static-gzip": "~2.1.7",
|
||||
"form-data": "~4.0.0",
|
||||
"http-graceful-shutdown": "~3.1.7",
|
||||
"http-proxy-agent": "~5.0.0",
|
||||
"https-proxy-agent": "~5.0.1",
|
||||
"iconv-lite": "~0.6.3",
|
||||
"jsesc": "~3.0.2",
|
||||
"jsonwebtoken": "~9.0.0",
|
||||
"jwt-decode": "~3.1.2",
|
||||
"limiter": "~2.1.0",
|
||||
"mqtt": "~4.3.7",
|
||||
"mssql": "~8.1.4",
|
||||
"mysql2": "~2.3.3",
|
||||
"node-cloudflared-tunnel": "~1.0.9",
|
||||
"node-radius-client": "~1.0.0",
|
||||
"nodemailer": "~6.6.5",
|
||||
"notp": "~2.0.3",
|
||||
"password-hash": "~1.2.2",
|
||||
"pg": "~8.8.0",
|
||||
"pg-connection-string": "~2.5.0",
|
||||
"prom-client": "~13.2.0",
|
||||
"prometheus-api-metrics": "~3.2.1",
|
||||
"protobufjs": "~7.1.1",
|
||||
"redbean-node": "~0.2.0",
|
||||
"socket.io": "~4.5.3",
|
||||
"socket.io-client": "~4.5.3",
|
||||
"socks-proxy-agent": "6.1.1",
|
||||
"tar": "~6.1.11",
|
||||
"tcp-ping": "~0.1.1",
|
||||
"thirty-two": "~1.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@actions/github": "~5.0.1",
|
||||
"@babel/eslint-parser": "~7.17.0",
|
||||
"@babel/preset-env": "^7.15.8",
|
||||
"@fortawesome/fontawesome-svg-core": "~1.2.36",
|
||||
"@fortawesome/free-regular-svg-icons": "~5.15.4",
|
||||
"@fortawesome/free-solid-svg-icons": "~5.15.4",
|
||||
"@fortawesome/vue-fontawesome": "~3.0.0-5",
|
||||
"@popperjs/core": "~2.10.2",
|
||||
"@types/bootstrap": "~5.1.9",
|
||||
"@vitejs/plugin-legacy": "~2.1.0",
|
||||
"@vitejs/plugin-vue": "~3.1.0",
|
||||
"@vue/compiler-sfc": "~3.2.36",
|
||||
"@vuepic/vue-datepicker": "~3.4.8",
|
||||
"aedes": "^0.46.3",
|
||||
"babel-plugin-rewire": "~1.2.0",
|
||||
"bootstrap": "5.1.3",
|
||||
"chart.js": "~3.6.2",
|
||||
"chartjs-adapter-dayjs": "~1.0.0",
|
||||
"concurrently": "^7.1.0",
|
||||
"core-js": "~3.26.1",
|
||||
"cross-env": "~7.0.3",
|
||||
"cypress": "^10.1.0",
|
||||
"delay": "^5.0.0",
|
||||
"dns2": "~2.0.1",
|
||||
"eslint": "~8.14.0",
|
||||
"eslint-plugin-vue": "~8.7.1",
|
||||
"favico.js": "~0.3.10",
|
||||
"jest": "~27.2.5",
|
||||
"postcss-html": "~1.5.0",
|
||||
"postcss-rtlcss": "~3.7.2",
|
||||
"postcss-scss": "~4.0.4",
|
||||
"prismjs": "~1.29.0",
|
||||
"qrcode": "~1.5.0",
|
||||
"rollup-plugin-visualizer": "^5.6.0",
|
||||
"sass": "~1.42.1",
|
||||
"stylelint": "~14.7.1",
|
||||
"stylelint-config-standard": "~25.0.0",
|
||||
"terser": "~5.15.0",
|
||||
"timezones-list": "~3.0.1",
|
||||
"typescript": "~4.4.4",
|
||||
"v-pagination-3": "~0.1.7",
|
||||
"vite": "~3.1.0",
|
||||
"vite-plugin-compression": "^0.5.1",
|
||||
"vue": "next",
|
||||
"vue-chart-3": "3.0.9",
|
||||
"vue-confirm-dialog": "~1.0.2",
|
||||
"vue-contenteditable": "~3.0.4",
|
||||
"vue-i18n": "~9.2.2",
|
||||
"vue-image-crop-upload": "~3.0.3",
|
||||
"vue-multiselect": "~3.0.0-alpha.2",
|
||||
"vue-prism-editor": "~2.0.0-alpha.2",
|
||||
"vue-qrcode": "~1.0.0",
|
||||
"vue-router": "~4.0.14",
|
||||
"vue-toastification": "~2.0.0-rc.5",
|
||||
"vuedraggable": "~4.1.0",
|
||||
"wait-on": "^6.0.1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/louislam/uptime-kuma/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; uptime-kuma.version or (lib.getVersion uptime-kuma)" | tr -d '"')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "uptime-kuma is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version uptime-kuma 0 0000000000000000000000000000000000000000000000000000000000000000
|
||||
update-source-version uptime-kuma "$latestVersion"
|
||||
|
||||
store_src="$(command nix-build . -A uptime-kuma.src --no-out-link)"
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
node2nix \
|
||||
--nodejs-16 \
|
||||
--lock "$store_src/package-lock.json" \
|
||||
--composition ./composition.nix
|
||||
|
||||
|
||||
27
pkgs/shells/nix-your-shell/default.nix
Normal file
27
pkgs/shells/nix-your-shell/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-your-shell";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MercuryTechnologies";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kdZFwMHatnhdXGSIItuE3g27qqUKqT/Hkbz13Ba5eq4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-U4nN/N345XFRj0L9cLJAjRuND0W3OE6XEB/z3zXaUiQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A `nix` and `nix-shell` wrapper for shells other than `bash`";
|
||||
homepage = "https://github.com/MercuryTechnologies/nix-your-shell";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = [ maintainers._9999years ];
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
}
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.48.6";
|
||||
version = "0.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y6dhp5CUq9fJq7Vjib1g1P0TMCeBIcR32LHqNvMgjZI=";
|
||||
hash = "sha256-O5JUWD7Wbe/5BM5fr6z76Re7PpRwFJV++lze+pv5el0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9BXuxeLL3MwefhtV2SLplAgY/KQI1crWrTNSSC4hUXw=";
|
||||
vendorHash = "sha256-Hb4bqOK4h68ZCN/bTPQLd4hC7oZUrj21DupVA4GrlNA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "age-plugin-yubikey";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "str4d";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-x4J8lE4Peenu3I7bZ3yoLpyukkMHD2re63GCni0cfnI=";
|
||||
sha256 = "sha256-b7/65mfUr4p8tP4uU/BFonW0DqTTMIhEgB2xIwIxQVg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Qp7AXy044G17FxR2sopN00cgX91A8TAydrwvJrAfhns=";
|
||||
cargoSha256 = "sha256-LnHpinNZZHrIEWrVW0t1ja5WN57/fmiSmZlB0ylau8Y=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.2.6";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XGKz4Y04EpfJGkEfUE20Egv9dFiSEHOpDcQ2OfJ9wu8=";
|
||||
hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PsASCNHR52E4TSIK5s0ReJptKcondq39Dn2PsMQ8laA=";
|
||||
vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.26.0";
|
||||
version = "3.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cjggYIc/xy7w8Q8yXd26QWr1ky4gMuwRAmxrEObVlx0=";
|
||||
hash = "sha256-zhzYBub5TnJvInMAcAzvh78o4MWHD4EJNn8PbtvHies=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z2na/CO/YqIYEAYJ9ATQ/wbOOBFt0Kr+ERN5TCFbZbA=";
|
||||
vendorHash = "sha256-IiMFSYZ7kdb5HHPFuRJKi+WXLdERSwyph1vSEQ/7RRk=";
|
||||
|
||||
# Test cases run git clone and require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -13841,6 +13841,8 @@ with pkgs;
|
|||
|
||||
any-nix-shell = callPackage ../shells/any-nix-shell { };
|
||||
|
||||
nix-your-shell = callPackage ../shells/nix-your-shell { };
|
||||
|
||||
bash = lowPrio (callPackage ../shells/bash/5.nix {
|
||||
binutils = stdenv.cc.bintools;
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue