Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
ddfcf099b5
@ -3930,6 +3930,12 @@
|
||||
githubId = 1276854;
|
||||
name = "Florian Peter";
|
||||
};
|
||||
fbeffa = {
|
||||
email = "beffa@fbengineering.ch";
|
||||
github = "fedeinthemix";
|
||||
githubId = 7670450;
|
||||
name = "Federico Beffa";
|
||||
};
|
||||
fbrs = {
|
||||
email = "yuuki@protonmail.com";
|
||||
github = "cideM";
|
||||
|
||||
@ -164,8 +164,6 @@ in
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
systemd.services.undervolt = {
|
||||
path = [ pkgs.undervolt ];
|
||||
|
||||
description = "Intel Undervolting Service";
|
||||
|
||||
# Apply undervolt on boot, nixos generation switch and resume
|
||||
@ -175,7 +173,7 @@ in
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
Restart = "no";
|
||||
ExecStart = "${pkgs.undervolt}/bin/undervolt ${toString cliArgs}";
|
||||
ExecStart = "${cfg.package}/bin/undervolt ${toString cliArgs}";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -680,7 +680,7 @@ in
|
||||
(if machine.sshKey != null then machine.sshKey else "-")
|
||||
(toString machine.maxJobs)
|
||||
(toString machine.speedFactor)
|
||||
(concatStringsSep "," machine.supportedFeatures)
|
||||
(concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures))
|
||||
(concatStringsSep "," machine.mandatoryFeatures)
|
||||
]
|
||||
++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-")))
|
||||
|
||||
@ -125,13 +125,18 @@ in
|
||||
virtualisation.memorySize = 2 * 1024;
|
||||
networking.domain = domain;
|
||||
networking.extraHosts = ''
|
||||
${config.networking.primaryIPAddress} meta.${domain}
|
||||
${config.networking.primaryIPAddress} builds.${domain}
|
||||
${config.networking.primaryIPAddress} git.${domain}
|
||||
${config.networking.primaryIPAddress} meta.${domain}
|
||||
'';
|
||||
|
||||
services.sourcehut = {
|
||||
enable = true;
|
||||
services = [ "meta" "builds" ];
|
||||
services = [
|
||||
"builds"
|
||||
"git"
|
||||
"meta"
|
||||
];
|
||||
nginx.enable = true;
|
||||
nginx.virtualHost = {
|
||||
forceSSL = true;
|
||||
@ -148,6 +153,8 @@ in
|
||||
#enableWorker = true;
|
||||
inherit images;
|
||||
};
|
||||
git.enable = true;
|
||||
|
||||
settings."sr.ht" = {
|
||||
global-domain = config.networking.domain;
|
||||
service-key = pkgs.writeText "service-key" "8b327279b77e32a3620e2fc9aabce491cc46e7d821fd6713b2a2e650ce114d01";
|
||||
@ -157,6 +164,10 @@ in
|
||||
oauth-client-secret = pkgs.writeText "buildsrht-oauth-client-secret" "2260e9c4d9b8dcedcef642860e0504bc";
|
||||
oauth-client-id = "299db9f9c2013170";
|
||||
};
|
||||
settings."git.sr.ht" = {
|
||||
oauth-client-secret = pkgs.writeText "gitsrht-oauth-client-secret" "3597288dc2c716e567db5384f493b09d";
|
||||
oauth-client-id = "d07cb713d920702e";
|
||||
};
|
||||
settings.webhooks.private-key = pkgs.writeText "webhook-key" "Ra3IjxgFiwG9jxgp4WALQIZw/BMYt30xWiOsqD0J7EA=";
|
||||
};
|
||||
|
||||
@ -193,5 +204,9 @@ in
|
||||
machine.wait_for_open_port(5002)
|
||||
machine.succeed("curl -sL http://localhost:5002 | grep builds.${domain}")
|
||||
#machine.wait_for_unit("buildsrht-worker.service")
|
||||
|
||||
# Testing gitsrht
|
||||
machine.wait_for_unit("gitsrht.service")
|
||||
machine.succeed("curl -sL http://git.${domain} | grep git.${domain}")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, alsa-lib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.2";
|
||||
version = "0.9.4";
|
||||
pname = "japa";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897";
|
||||
sha256 = "sha256-t9wlZr+pE5u6yTpATWDQseC/rf4TFbtG0X9tnTdkB8I=";
|
||||
};
|
||||
|
||||
buildInputs = [ alsa-lib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ];
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kid3";
|
||||
version = "3.9.0";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-d0Y+swzzGk1FzQ3EK8sN8i1Nf6CRIPMAYgTUYN71FXU=";
|
||||
sha256 = "sha256-N/HDwfJn7Py4y/GZcIDbeoMEqG+SuRGO23ITZMot8cc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,11 +13,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SunVox";
|
||||
version = "1.9.6c";
|
||||
version = "2.0c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
|
||||
sha256 = "10lqbm1grw0sqasx7i6528cishv5ksdf9zbb3ygxd8c1iwaxzhb9";
|
||||
sha256 = "949e5348da9faa92ce17aac943b58027bdb797b65c7f5f365ef0610bb6dd8a3d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snarkos";
|
||||
version = "unstable-2021-01-21";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AleoHQ";
|
||||
repo = "snarkOS";
|
||||
rev = "7068dc0394139c887f5187288ca2af54bc729614";
|
||||
sha256 = "sha256-fgdIJX/Ep3amPAjo00BtNGSXhaItw41S1XliDXk6b7k=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BbCcdz0/oAEA+v9O8yQOpBb0/rXttn94tKS9tzRQ78w=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-bax7cnqVY49rdcWs73+KqW+dzPebKLlsbPvOM1d25zA=";
|
||||
cargoSha256 = "sha256-+N1X3D+XSz3SoZJEy9SNmYWt9yZPdaumWUUYhwbD+0w=";
|
||||
|
||||
# buildAndTestSubdir = "cli";
|
||||
|
||||
|
||||
@ -1,104 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem
|
||||
, nodejs, yarn, electron_7, jre8, tor }:
|
||||
|
||||
let
|
||||
system = stdenv.hostPlatform.system;
|
||||
electron = electron_7;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "whirlpool-gui";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Samourai-Wallet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "ru6WJQRulhnQCPY2E0x9M6xXtFdj/pg2fu4HpQxhImU=";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}-${system}-yarn-cache";
|
||||
inherit src;
|
||||
dontInstall = true;
|
||||
nativeBuildInputs = [ yarn ];
|
||||
buildPhase = ''
|
||||
export HOME=$NIX_BUILD_ROOT
|
||||
|
||||
yarn config set yarn-offline-mirror $out
|
||||
yarn --frozen-lockfile --ignore-scripts --ignore-platform \
|
||||
--ignore-engines --no-progress --non-interactive
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = {
|
||||
x86_64-linux = "6fl4cSwHXWgQcYlqxCae0p1Ppcb9fI5fFrxm7y6wxTo=";
|
||||
}.${system} or (throw "Unsupported platform ${system}");
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper nodejs yarn ];
|
||||
|
||||
configurePhase = ''
|
||||
# Yarn and bundler wants a real home directory to write cache, config, etc to
|
||||
export HOME=$NIX_BUILD_ROOT
|
||||
|
||||
# Make yarn install packages from our offline cache, not the registry
|
||||
yarn config --offline set yarn-offline-mirror ${yarnCache}
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
yarn install --offline --ignore-scripts --frozen-lockfile --no-progress --non-interactive
|
||||
|
||||
patchShebangs node_modules/
|
||||
|
||||
yarn build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share,libexec/whirlpool-gui/app}
|
||||
|
||||
# install production dependencies
|
||||
yarn install \
|
||||
--offline --frozen-lockfile --ignore-scripts \
|
||||
--no-progress --non-interactive \
|
||||
--production --no-bin-links \
|
||||
--modules-folder $out/libexec/whirlpool-gui/node_modules
|
||||
|
||||
# copy application
|
||||
cp -r app/{dist,app.html,main.prod.js,main.prod.js.map,img} $out/libexec/whirlpool-gui/app
|
||||
cp -r package.json resources $out/libexec/whirlpool-gui
|
||||
|
||||
# make desktop item
|
||||
ln -s "${desktopItem}/share/applications" "$out/share/applications"
|
||||
|
||||
# wrap electron
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/whirlpool-gui" \
|
||||
--add-flags "$out/libexec/whirlpool-gui" \
|
||||
--prefix PATH : "${jre8}/bin:${tor}/bin"
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "whirlpool-gui";
|
||||
exec = "whirlpool-gui";
|
||||
icon = "whirlpool-gui";
|
||||
desktopName = "Whirlpool";
|
||||
genericName = "Whirlpool";
|
||||
comment = meta.description;
|
||||
categories = "Network;";
|
||||
extraEntries = ''
|
||||
StartupWMClass=whrilpool-gui
|
||||
'';
|
||||
};
|
||||
|
||||
passthru.prefetchYarnCache = lib.overrideDerivation yarnCache (d: {
|
||||
outputHash = lib.fakeSha256;
|
||||
});
|
||||
|
||||
meta = with lib; {
|
||||
description = "Desktop GUI for Whirlpool by Samourai-Wallet";
|
||||
homepage = "https://www.samouraiwallet.com/whirlpool";
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.offline ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moe";
|
||||
version = "1.11";
|
||||
version = "1.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/moe/${pname}-${version}.tar.lz";
|
||||
sha256 = "sha256-DvvLz1pKjZZlQcbLCZugq2QWeANm286C2f+ZWoWl4vk=";
|
||||
sha256 = "sha256-iohfK+Qm+OBK05yWASvYYJVAhaI3RPJFFmMWiCbXoeg=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
pname = "1password-cli";
|
||||
version = "1.12.2";
|
||||
src =
|
||||
if stdenv.isLinux then
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "index-fm";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "maui";
|
||||
repo = "index-fm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Os/5igKGYBeY/FxO6I+7mpFohuk3yHGLd7vE2GewFpU=";
|
||||
hash = "sha256-F4qgewkPxkbAbeR+MaeRDiw9KIsd/Xx4C0cYEYDkPOE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "megasync";
|
||||
version = "4.6.1.0";
|
||||
version = "4.6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meganz";
|
||||
repo = "MEGAsync";
|
||||
rev = "v${version}_Linux";
|
||||
sha256 = "0v2fvji9hs7valya0wx5qjx01c7yjld6nnp6m9gpxfkr30h5s5wb";
|
||||
sha256 = "1j86vr8n2a17my61vkmx83cay1ibllzjprl5bfwaby5ibh4zclz4";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "navi";
|
||||
version = "2.18.0";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denisidoro";
|
||||
repo = "navi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JG0MZrvpx+cAFcZJK05GUI10PG53UmxjJjveAZA7k/M=";
|
||||
sha256 = "sha256-tbnhbjtrVlxx21L15UocUSwvUesl5D/QoM/2r55rwOo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-S2DBzeir6+JS1jfVxCQ68v4Rl7UBpghbtE+wdu341xw=";
|
||||
cargoSha256 = "sha256-X5t5mJoda8xTIVw3+u6yOvp78lS4rW3Ud6d/4ttsNbc=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -17,17 +17,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notejot";
|
||||
version = "3.3.3"; # make sure to recheck src.rev
|
||||
version = "3.4.9"; # make sure to recheck src.rev
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lainsce";
|
||||
repo = pname;
|
||||
# Note from Fedora spec file:
|
||||
# https://src.fedoraproject.org/rpms/notejot/blob/bbe621cef4d5a2c27eed029063b8e8cfd7c8d400/f/notejot.spec
|
||||
# Upstream confusingly made several bugfix post-releases of version 3.3.3,
|
||||
# tagged as 3.4.x, but with prominent notices like "This is still 3.3.3". We
|
||||
# Upstream confusingly made several bugfix post-releases of version 3.4.9,
|
||||
# tagged as 3.4.x, but with prominent notices like "This is still 3.4.9". We
|
||||
# respect upstream’s wishes (and the version numbers inside the source tarball)
|
||||
# by packaging these releases as 3.3.3 with appropriate snapshot info.
|
||||
# by packaging these releases as 3.4.9 with appropriate snapshot info.
|
||||
# https://github.com/lainsce/notejot/releases/tag/3.4.9
|
||||
#
|
||||
# Note that sometimes upstream don't update their version in meson.build
|
||||
|
||||
@ -87,11 +87,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appgate-sdp";
|
||||
version = "5.5.2";
|
||||
version = "5.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "sha256-8K7RqkxpyRsQ3QHGIfTchLaZ7/+k0hbiJdl7uc++vYs=";
|
||||
sha256 = "sha256-qSo4JX/Jj+JkeetZIMw88MK7SzOgT8aNbQby2kJ91oo=";
|
||||
};
|
||||
|
||||
# just patch interpreter
|
||||
|
||||
@ -32,9 +32,9 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "100.0.4867.0",
|
||||
"sha256": "1ay6p2aky90lf3gk3n87m4mrxyyhg4anr389kl648ijigsg6wlrd",
|
||||
"sha256bin64": "11g8rlw5aahpn4cd2fl4b942g1giv05zcs10y0qrvirnwmp2i3ha",
|
||||
"version": "100.0.4878.0",
|
||||
"sha256": "0ac8fdbh3f66wq3y1l4s1i906zriajff84hpx9df9cwavj6r9svr",
|
||||
"sha256bin64": "1q37q02v6aaqkxwyavljga0h60cclklxj8adr1jc1fqs0irks8a8",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-21",
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ pname, version, meta, updateScript ? null
|
||||
, binaryName ? "firefox", application ? "browser"
|
||||
, src, unpackPhase ? null, patches ? []
|
||||
, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] }:
|
||||
, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? []
|
||||
, extraPostPatch ? "", extraPassthru ? {} }:
|
||||
|
||||
{ lib, stdenv, pkg-config, pango, perl, python3, zip
|
||||
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
|
||||
@ -177,7 +178,7 @@ buildStdenv.mkDerivation ({
|
||||
--replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so'
|
||||
|
||||
patchShebangs mach
|
||||
'';
|
||||
'' + extraPostPatch;
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
@ -374,7 +375,7 @@ buildStdenv.mkDerivation ({
|
||||
inherit applicationName;
|
||||
inherit tests;
|
||||
inherit gtk3;
|
||||
};
|
||||
} // extraPassthru;
|
||||
|
||||
hardeningDisable = [ "format" ]; # -Werror=format-security
|
||||
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
{ callPackage, git }:
|
||||
let
|
||||
src = callPackage ./src.nix { };
|
||||
in
|
||||
rec {
|
||||
|
||||
inherit (src) packageVersion firefox source;
|
||||
|
||||
patches = [ ./verify-telemetry-macros.patch ];
|
||||
|
||||
extraConfigureFlags = [
|
||||
"--with-app-name=librewolf"
|
||||
"--with-app-basename=LibreWolf"
|
||||
"--with-branding=browser/branding/librewolf"
|
||||
"--with-distribution-id=io.gitlab.librewolf-community"
|
||||
"--with-unsigned-addon-scopes=app,system"
|
||||
"--allow-addon-sideload"
|
||||
];
|
||||
|
||||
extraPostPatch = ''
|
||||
while read patch_name; do
|
||||
echo "applying LibreWolf patch: $patch_name"
|
||||
patch -p1 < ${source}/$patch_name
|
||||
done <${source}/assets/patches.txt
|
||||
|
||||
cp -r ${source}/themes/browser .
|
||||
cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json
|
||||
sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure
|
||||
sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure
|
||||
'';
|
||||
|
||||
extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ];
|
||||
|
||||
extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ];
|
||||
|
||||
extraPassthru = {
|
||||
librewolf = { inherit src patches; };
|
||||
inherit extraPrefsFiles extraPoliciesFiles;
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
{
|
||||
"packageVersion": "97.0-2",
|
||||
"source": {
|
||||
"rev": "97.0-2",
|
||||
"sha256": "00fb7xr6hrcyh3s7g52fs6f7a1iggpibj0xafblnl7118fh73g25"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "97.0",
|
||||
"sha512": "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186"
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
{ fetchurl, fetchFromGitLab }:
|
||||
let src = builtins.fromJSON (builtins.readFile ./src.json);
|
||||
in
|
||||
{
|
||||
inherit (src) packageVersion;
|
||||
source = fetchFromGitLab {
|
||||
owner = "librewolf-community";
|
||||
repo = "browser/source";
|
||||
fetchSubmodules = true;
|
||||
inherit (src.source) rev sha256;
|
||||
};
|
||||
firefox = fetchurl {
|
||||
url =
|
||||
"mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz";
|
||||
inherit (src.firefox) sha512;
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
{ writeScript
|
||||
, lib
|
||||
, coreutils
|
||||
, gnused
|
||||
, gnugrep
|
||||
, curl
|
||||
, gnupg
|
||||
, jq
|
||||
, nix-prefetch-git
|
||||
, moreutils
|
||||
, runtimeShell
|
||||
, ...
|
||||
}:
|
||||
|
||||
writeScript "update-librewolf" ''
|
||||
#!${runtimeShell}
|
||||
PATH=${lib.makeBinPath [ coreutils curl gnugrep gnupg gnused jq moreutils nix-prefetch-git ]}
|
||||
set -euo pipefail
|
||||
|
||||
latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name)
|
||||
echo "latestTag=$latestTag"
|
||||
|
||||
srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json
|
||||
localRev=$(jq -r .source.rev < $srcJson)
|
||||
echo "localRev=$localRev"
|
||||
|
||||
if [ "$localRev" == "$latestTag" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
prefetchOut=$(mktemp)
|
||||
repoUrl=https://gitlab.com/librewolf-community/browser/source.git/
|
||||
nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut
|
||||
srcDir=$(jq -r .path < $prefetchOut)
|
||||
srcHash=$(jq -r .sha256 < $prefetchOut)
|
||||
|
||||
ffVersion=$(<$srcDir/version)
|
||||
lwRelease=$(<$srcDir/release)
|
||||
lwVersion="$ffVersion-$lwRelease"
|
||||
echo "lwVersion=$lwVersion"
|
||||
echo "ffVersion=$ffVersion"
|
||||
if [ "$lwVersion" != "$latestTag" ]; then
|
||||
echo "error: Tag name does not match the computed LibreWolf version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
HOME=$(mktemp -d)
|
||||
export GNUPGHOME=$(mktemp -d)
|
||||
gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
|
||||
mozillaUrl=https://archive.mozilla.org/pub/firefox/releases/
|
||||
|
||||
curl --silent --show-error -o "$HOME"/shasums "$mozillaUrl$ffVersion/SHA512SUMS"
|
||||
curl --silent --show-error -o "$HOME"/shasums.asc "$mozillaUrl$ffVersion/SHA512SUMS.asc"
|
||||
gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums
|
||||
|
||||
ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)
|
||||
echo "ffHash=$ffHash"
|
||||
|
||||
jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson
|
||||
jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson
|
||||
jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson
|
||||
jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson
|
||||
jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson
|
||||
''
|
||||
@ -54,4 +54,29 @@ rec {
|
||||
versionSuffix = "esr";
|
||||
};
|
||||
};
|
||||
|
||||
librewolf =
|
||||
let
|
||||
librewolf-src = callPackage ./librewolf { };
|
||||
in
|
||||
(common rec {
|
||||
pname = "librewolf";
|
||||
binaryName = "librewolf";
|
||||
version = librewolf-src.packageVersion;
|
||||
src = librewolf-src.firefox;
|
||||
inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
|
||||
|
||||
meta = {
|
||||
description = "A fork of Firefox, focused on privacy, security and freedom";
|
||||
homepage = "https://librewolf.net/";
|
||||
maintainers = with lib.maintainers; [ squalus ];
|
||||
inherit (firefox.meta) platforms badPlatforms broken maxSilent license;
|
||||
};
|
||||
updateScript = callPackage ./librewolf/update.nix {
|
||||
attrPath = "librewolf-unwrapped";
|
||||
};
|
||||
}).override {
|
||||
crashreporterSupport = false;
|
||||
enableOfficialBranding = false;
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,9 +37,11 @@ let
|
||||
# For more information about anti tracking (german website)
|
||||
# visit https://wiki.kairaven.de/open/app/firefox
|
||||
, extraPrefs ? ""
|
||||
, extraPrefsFiles ? []
|
||||
# For more information about policies visit
|
||||
# https://github.com/mozilla/policy-templates#enterprisepoliciesenabled
|
||||
, extraPolicies ? {}
|
||||
, extraPoliciesFiles ? []
|
||||
, libName ? "firefox" # Important for tor package or the like
|
||||
, nixExtensions ? null
|
||||
}:
|
||||
@ -189,7 +191,7 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper lndir replace ];
|
||||
nativeBuildInputs = [ makeWrapper lndir replace jq ];
|
||||
buildInputs = [ browser.gtk3 ];
|
||||
|
||||
|
||||
@ -325,6 +327,12 @@ let
|
||||
rm -f "$POL_PATH"
|
||||
cat ${policiesJson} >> "$POL_PATH"
|
||||
|
||||
extraPoliciesFiles=(${builtins.toString extraPoliciesFiles})
|
||||
for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do
|
||||
jq -s '.[0] + .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json
|
||||
mv .tmp.json "$POL_PATH"
|
||||
done
|
||||
|
||||
# preparing for autoconfig
|
||||
mkdir -p "$out/lib/${libName}/defaults/pref"
|
||||
|
||||
@ -333,6 +341,11 @@ let
|
||||
|
||||
cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg}
|
||||
|
||||
extraPrefsFiles=(${builtins.toString extraPrefsFiles})
|
||||
for extraPrefsFile in "''${extraPrefsFiles[@]}"; do
|
||||
cat "$extraPrefsFile" >> "$out/lib/${libName}/mozilla.cfg"
|
||||
done
|
||||
|
||||
mkdir -p $out/lib/${libName}/distribution/extensions
|
||||
|
||||
#############################
|
||||
|
||||
@ -87,7 +87,7 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "11.0.4";
|
||||
version = "11.0.6";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
@ -97,7 +97,7 @@ let
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0pz1v5ig031wgnq3191ja08a4brdrbzziqnkpcrlra1wcdnzv985";
|
||||
sha256 = "03c3l720x4c6mfq56fyqspc5sxw0mz1ph48l5wph06dzw8wd5cfz";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@ -105,7 +105,7 @@ let
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0ykdgbm8f5lcv7p54f3ffxsaw2cdzbhk6sv7d2hm7d81fcnhmjq4";
|
||||
sha256 = "0llg1nl7x7y4kp0hr3bbhdfggaf8praizkvcpp88x2i2zc9sp5mx";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2022.1.2";
|
||||
version = "2022.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
hash = "sha256-PdmYOFy6CWMqHlcK0PeHPGCVSLhIJOIDnXOAh/qYt+8=";
|
||||
hash = "sha256-yo4Tu9wSxGdUAr2436lAlaP2U+5m/J4+oNQd/UQk3a0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
@ -18,8 +18,8 @@ buildGoModule rec {
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)";
|
||||
homepage = "https://www.cloudflare.com/products/argo-tunnel";
|
||||
description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)";
|
||||
homepage = "https://www.cloudflare.com/products/tunnel";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bbigras enorris thoughtpolice ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "6.4.7";
|
||||
version = "6.4.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uLzYRfH2wJB/ucYtZGjKi0K5FaiP3CyA85gJ8Ji3WHE=";
|
||||
sha256 = "sha256-3JPnXOpjHjBZMdOtggjSns4cKc7uffJS1RkTAKGxAVI=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.18.5";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudskiff";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Qz/yObF1Df62Hqwl6fPHGkWcsifvgO5EfeiyU3aql3Q=";
|
||||
sha256 = "sha256-8egkz1wXvdNoTkbhOdvoP4hrBPmuiUvd2QaD6tPH2xU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wOk4IXD9qHG8R4iddlc4TLH39jVSof9bwTDU1kyAmuA=";
|
||||
vendorSha256 = "sha256-lftOTcob8l9dUZkH2MMxzD6FZzLOR/PXEXFVdOaguK4=";
|
||||
|
||||
postUnpack = ''
|
||||
# Without this, tests fail to locate aws/3.19.0.json
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flink";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
|
||||
sha256 = "1rm2x66179ybfyc8v3va3svjxrnkslqn3dc84qkglqjaiqciadnr";
|
||||
sha256 = "sha256-dst0Q1AlDdggtOwYROoV6QcBLRNfmGTo7DL2BV/5PB4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.11";
|
||||
version = "0.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-mBPRsLBIwahKm2RR22pNXxJhdLaWHCKx0TKc4H4YIVY=";
|
||||
sha256 = "sha256-zynhDxhZEpLmO8Z8shU8DnJUJ+K0wmf8fkRjMMV35uE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "1.25.0";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "int128";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-orclZtmkdplTRvYkN7VotbynSQ9L2kvAPqP20j8QJ2s=";
|
||||
sha256 = "sha256-BKJ6dZMGW+Md+YUEEgWtPdfiFiOP5Nfb+awx8FXB+bM=";
|
||||
};
|
||||
|
||||
subPackages = ["."];
|
||||
|
||||
vendorSha256 = "sha256-i46G0lsRvh/PmM+pMYuAjoLMHWF1Uzbd8+EkjIId8KE=";
|
||||
vendorSha256 = "sha256-mu4NHeYZBM4C5qpj2wRTLsRNLDvZGNkppKGDw621mp4=";
|
||||
|
||||
# Rename the binary instead of symlinking to avoid conflict with the
|
||||
# Azure version of kubelogin
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "nomad-autoscaler";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -25,7 +25,7 @@ let
|
||||
owner = "hashicorp";
|
||||
repo = "nomad-autoscaler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SmlcQH+K/axl6Gj+bX0Quk6K/usP0c1hWnIdFjS1dn8=";
|
||||
sha256 = "sha256-2d36ddAjbt+nPmsHawgMq1CnKB2VNv8yMKMrPx5L+yw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-g3INNvAQ124kBJSe5cnsIq1y8sWpPYKLwJONgbIUaoM=";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.2.3";
|
||||
sha256 = "0qjj1pnq2yv4r8dv03m08ii4118drjnswf4n1r95dqh8j3bymv5i";
|
||||
vendorSha256 = "0djh2184yg4b656wbhzxg1q1hsdnbrwsk79vc0426d0mqbzyy7dx";
|
||||
version = "1.2.6";
|
||||
sha256 = "1ik8v1jznky9y4m85bzxgyba256zqmm5fs6d5xsvp5rzcylcdwgd";
|
||||
vendorSha256 = "1mbvpssf7haaxzx6ka9qzixm49jck8i89w8ymkaddgmxhlbxjv05";
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatty";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "chatty";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-8haVzRfAZwdTlYu7oKeu8E3uEH87yrHS4j+BWFQ/Nj0=";
|
||||
hash = "sha256-AufxwuOibTx5OvLBVbJqay/mYLmcDpE2BgwVv6Y5IlY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,11 +4,11 @@ let
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.16";
|
||||
ptb = "0.0.27";
|
||||
canary = "0.0.132";
|
||||
canary = "0.0.133";
|
||||
} else {
|
||||
stable = "0.0.264";
|
||||
ptb = "0.0.59";
|
||||
canary = "0.0.280";
|
||||
canary = "0.0.283";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = let
|
||||
@ -31,7 +31,7 @@ let
|
||||
canary = fetchurl {
|
||||
url =
|
||||
"https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "1jjbd9qllgcdpnfxg5alxpwl050vzg13rh17n638wha0vv4mjhyv";
|
||||
sha256 = "0wx8wkgkzvw9094baa3dni834l0n4p6ih024bj1851sgwwnidb0a";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
@ -43,7 +43,7 @@ let
|
||||
canary = fetchurl {
|
||||
url =
|
||||
"https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
sha256 = "0ccchsywry68vv81pqzzxmh1r19lnvxr429iwvgfr9y82lyjvz06";
|
||||
sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l";
|
||||
};
|
||||
};
|
||||
# Only PTB bundles a MachO Universal binary with ARM support.
|
||||
@ -61,24 +61,24 @@ let
|
||||
++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ];
|
||||
};
|
||||
package = if stdenv.isLinux then ./linux.nix else ./darwin.nix;
|
||||
packages = {
|
||||
stable = callPackage package rec {
|
||||
inherit src version meta;
|
||||
pname = "discord";
|
||||
binaryName = "Discord";
|
||||
desktopName = "Discord";
|
||||
};
|
||||
ptb = callPackage package rec {
|
||||
inherit src version meta;
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
desktopName = "Discord PTB";
|
||||
};
|
||||
canary = callPackage package rec {
|
||||
inherit src version meta;
|
||||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
};
|
||||
};
|
||||
packages = (builtins.mapAttrs
|
||||
(_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; }))
|
||||
{
|
||||
stable = rec {
|
||||
pname = "discord";
|
||||
binaryName = "Discord";
|
||||
desktopName = "Discord";
|
||||
};
|
||||
ptb = rec {
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
desktopName = "Discord PTB";
|
||||
};
|
||||
canary = rec {
|
||||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
};
|
||||
}
|
||||
);
|
||||
in packages.${branch}
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "himalaya";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soywod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-giEcVyhreD36SgW5rQsKRjgHHAE022Lffmo0QGy/EkI=";
|
||||
sha256 = "sha256-BZTecYNY8gbGe+r80QWi7FkC56dww9rrtwLfi9ya1mQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Sf4Ze9T8A6n/iuFtQAfW+ORIw2atMt8MgEmpDllnZp8=";
|
||||
cargoSha256 = "sha256-2xkKJqp7uf0gh8g2zzDjSl8foTvPj6MVHfDuSr914HU=";
|
||||
|
||||
nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
|
||||
|
||||
@ -5,13 +5,13 @@ with lib;
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nicotine-plus";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nicotine-Plus";
|
||||
repo = "nicotine-plus";
|
||||
rev = version;
|
||||
hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak=";
|
||||
hash = "sha256-3NXlNd3Zy++efnvcnfIOUP83mdJ5h8BmE4a2uWn5CPQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext wrapGAppsHook ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "last";
|
||||
version = "1256";
|
||||
version = "1260";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mcfrith";
|
||||
repo = "last";
|
||||
rev = version;
|
||||
sha256 = "sha256-lOsU0X4K6jYcbkTzwQV+KAerQh9odE4zCLtSgZrYH6s=";
|
||||
sha256 = "sha256-bJNvoHr2sQYtiC3tr1GA0T0kRhDyx6hU3OOSTvKUSCs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "mosdepth";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
nimBinOnly = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brentp";
|
||||
repo = "mosdepth";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ=";
|
||||
sha256 = "sha256-de3h3SXnXlqjuLT1L66jj/1AoiTuFc3PVJYjm7s8Fj8=";
|
||||
};
|
||||
|
||||
buildInputs = with nimPackages; [ docopt hts-nim pcre ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.26.9";
|
||||
version = "2.26.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "sha256-5e60StDQil9SMR9G6Gs+OPWMjADn96fOpfHDlNoZSGc=";
|
||||
sha256 = "sha256-hKBWRmzyMVXiEmsz/eYbVIUhezZdSJnBvcgv6ShPI5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
182
pkgs/applications/science/electronics/xyce/default.nix
Normal file
182
pkgs/applications/science/electronics/xyce/default.nix
Normal file
@ -0,0 +1,182 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchgit
|
||||
, lib
|
||||
, autoconf
|
||||
, automake
|
||||
, bison
|
||||
, blas
|
||||
, flex
|
||||
, fftw
|
||||
, gfortran
|
||||
, lapack
|
||||
, libtool_2
|
||||
, mpi
|
||||
, suitesparse
|
||||
, trilinos
|
||||
, withMPI ? false
|
||||
# for doc
|
||||
, texlive
|
||||
, pandoc
|
||||
, enableDocs ? true
|
||||
# for tests
|
||||
, bash
|
||||
, bc
|
||||
, openssh # required by MPI
|
||||
, perl
|
||||
, perlPackages
|
||||
, python3
|
||||
, enableTests ? true
|
||||
}:
|
||||
|
||||
assert withMPI -> trilinos.withMPI;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xyce";
|
||||
version = "7.4.0";
|
||||
|
||||
srcs = [
|
||||
# useing fetchurl or fetchFromGitHub doesn't include the manuals
|
||||
# due to .gitattributes files
|
||||
(fetchgit {
|
||||
url = "https://github.com/Xyce/Xyce.git";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-sOHjQEo4FqlDseTtxFVdLa0SI/VAf2OkwQV7QSL7SNM=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "Xyce";
|
||||
repo = "Xyce_Regression";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-kSGUaFarOHDNJ8kA/TAGkmzicm9O7cfJ7mGFZcbqCZM=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "./Xyce";
|
||||
|
||||
preConfigure = "./bootstrap";
|
||||
|
||||
configureFlags = [
|
||||
"CXXFLAGS=-O3"
|
||||
"--enable-xyce-shareable"
|
||||
"--enable-shared"
|
||||
"--enable-stokhos"
|
||||
"--enable-amesos2"
|
||||
] ++ lib.optionals withMPI [
|
||||
"--enable-mpi"
|
||||
"CXX=mpicxx"
|
||||
"CC=mpicc"
|
||||
"F77=mpif77"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
gfortran
|
||||
libtool_2
|
||||
] ++ lib.optionals enableDocs [
|
||||
(texlive.combine {
|
||||
inherit (texlive)
|
||||
scheme-medium
|
||||
koma-script
|
||||
optional
|
||||
framed
|
||||
enumitem
|
||||
multirow
|
||||
preprint;
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bison
|
||||
blas
|
||||
flex
|
||||
fftw
|
||||
lapack
|
||||
suitesparse
|
||||
trilinos
|
||||
] ++ lib.optionals withMPI [ mpi ];
|
||||
|
||||
doCheck = enableTests;
|
||||
|
||||
postPatch = ''
|
||||
pushd ../source
|
||||
find Netlists -type f -regex ".*\.sh\|.*\.pl" -exec chmod ugo+x {} \;
|
||||
# some tests generate new files, some overwrite netlists
|
||||
find . -type d -exec chmod u+w {} \;
|
||||
find . -type f -name "*.cir" -exec chmod u+w {} \;
|
||||
patchShebangs Netlists/ TestScripts/
|
||||
# patch script generating functions
|
||||
sed -i -E 's|/usr/bin/env perl|${lib.escapeRegex perl.outPath}/bin/perl|' \
|
||||
TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh
|
||||
sed -i -E 's|/bin/sh|${lib.escapeRegex bash.outPath}/bin/sh|' \
|
||||
TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh
|
||||
popd
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
bc
|
||||
perl
|
||||
perlPackages.DigestMD5
|
||||
(python3.withPackages (ps: with ps; [ numpy scipy ]))
|
||||
] ++ lib.optionals withMPI [ mpi openssh ];
|
||||
|
||||
checkPhase = ''
|
||||
XYCE_BINARY="$(pwd)/src/Xyce"
|
||||
EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY"
|
||||
TEST_ROOT="$(pwd)/../source"
|
||||
|
||||
# Honor the TMP variable
|
||||
sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh
|
||||
|
||||
EXLUDE_TESTS_FILE=$TMP/exclude_tests.$$
|
||||
# Gold standard has additional ":R" suffix in result column label
|
||||
echo "Output/HB/hb-step-tecplot.cir" >> $EXLUDE_TESTS_FILE
|
||||
# This test makes Xyce access /sys/class/net when run with MPI
|
||||
${lib.optionalString withMPI "echo \"CommandLine/command_line.cir\" >> $EXLUDE_TESTS_FILE"}
|
||||
|
||||
$TEST_ROOT/TestScripts/run_xyce_regression \
|
||||
--output="$(pwd)/Xyce_Test" \
|
||||
--xyce_test="''${TEST_ROOT}" \
|
||||
--taglist="$($TEST_ROOT/TestScripts/suggestXyceTagList.sh "$XYCE_BINARY" | sed -E -e 's/TAGLIST=([^ ]+).*/\1/' -e '2,$d')" \
|
||||
--resultfile="$(pwd)/test_results" \
|
||||
--excludelist="$EXLUDE_TESTS_FILE" \
|
||||
"''${EXECSTRING}"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
postInstall = lib.optionalString enableDocs ''
|
||||
local docFiles=("doc/Users_Guide/Xyce_UG"
|
||||
"doc/Reference_Guide/Xyce_RG"
|
||||
"doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}")
|
||||
|
||||
# Release notes refer to an image not in the repo.
|
||||
sed -i -E 's/\\includegraphics\[height=(0.5in)\]\{snllineblubrd\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/' ''${docFiles[2]}.tex
|
||||
|
||||
install -d $doc/share/doc/${pname}-${version}/
|
||||
for d in ''${docFiles[@]}; do
|
||||
# Use a public document class
|
||||
sed -i -E 's/\\documentclass\[11pt,report\]\{SANDreport\}/\\documentclass\[11pt,letterpaper\]\{scrreprt\}/' $d.tex
|
||||
sed -i -E 's/\\usepackage\[sand\]\{optional\}/\\usepackage\[report\]\{optional\}/' $d.tex
|
||||
pushd $(dirname $d)
|
||||
make
|
||||
install -t $doc/share/doc/${pname}-${version}/ $(basename $d.pdf)
|
||||
popd
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance analog circuit simulator";
|
||||
longDescription = ''
|
||||
Xyce is a SPICE-compatible, high-performance analog circuit simulator,
|
||||
capable of solving extremely large circuit problems by supporting
|
||||
large-scale parallel computing platforms.
|
||||
'';
|
||||
homepage = "https://xyce.sandia.gov";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ fbeffa ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -94,6 +94,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# disable stackprotector on aarch64-darwin for now
|
||||
# https://github.com/NixOS/nixpkgs/issues/158730
|
||||
# see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue
|
||||
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcal";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "bcal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1k8Q+I1Mc196QL+x4yXzRi7WLBf30U4sJyl0rXisW7k=";
|
||||
sha256 = "sha256-PleWU2yyJzkUAZEvEYoCGdpEXqOgRvZK9zXTYrxRtQU=";
|
||||
};
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
, python
|
||||
}:
|
||||
let
|
||||
version = "0.74.17";
|
||||
version = "0.75.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "builds.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-6Yc33lkhozpnx8e6yukUfo+/Qw5mwpJQQKuYbC7uqcU=";
|
||||
sha256 = "sha256-SwyxMzmp9baRQ0vceuEn/OpfIv7z7jwq/l67hdOHXjM=";
|
||||
};
|
||||
|
||||
buildWorker = src: buildGoModule {
|
||||
|
||||
@ -29,12 +29,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srht";
|
||||
version = "0.68.13";
|
||||
version = "0.68.14";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/core.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-LPyEfpNlmod18Fj16xpihKOrsU/hQUfAeOmWMmUeVPQ=";
|
||||
sha256 = "sha256-BY3W2rwrg0mhH3CltgUqg6Xv8Ve5VZNY/lI1cfbAjYM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
, scmsrht
|
||||
}:
|
||||
let
|
||||
version = "0.76.4";
|
||||
version = "0.77.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "git.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-diUkQpB/ivg8JTaoTcSyKr9Q9LZiMo6qVInBDPceklc=";
|
||||
sha256 = "sha256-eJvXCcmdiUzTK0EqNJkLEZsAfr6toD/378HObnMbOWM=";
|
||||
};
|
||||
|
||||
buildShell = src: buildGoModule {
|
||||
@ -48,6 +48,11 @@ buildPythonPackage rec {
|
||||
inherit src version;
|
||||
pname = "gitsrht";
|
||||
|
||||
patches = [
|
||||
# Revert change breaking Unix socket support for Redis
|
||||
patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hgsrht";
|
||||
version = "0.29.3";
|
||||
version = "0.29.4";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "y8gKaamwD5lsYqO1SkxMcn3E2TWidHAo2slvEU+8ovg=";
|
||||
sha256 = "Jn9M/R5tJK/GeJDWGo3LWCK2nwsfI9zh+/yo2M+X6Sk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
@ -12,15 +12,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "listssrht";
|
||||
version = "0.51.0";
|
||||
version = "0.51.7";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "lists.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-iywZ6G5E4AJevg/Q1LoB7JMJxBcsAnbhiND++mFy/bw=";
|
||||
sha256 = "sha256-oNY5A98oVoL2JKO0fU/8YVl8u7ywmHb/RHD8A6z9yIM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Revert change breaking Unix socket support for Redis
|
||||
patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mansrht";
|
||||
version = "0.15.22";
|
||||
version = "0.15.23";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "man.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-curouf+eNCKprDI23blGs4AzJMry6zlCLDt/+0j5c8A=";
|
||||
sha256 = "sha256-xrBptXdwMee+YkPup/BYL/iXBhCzSUQ5htSHIw/1Ncc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
@ -18,19 +18,19 @@
|
||||
, python
|
||||
}:
|
||||
let
|
||||
version = "0.57.2";
|
||||
version = "0.57.5";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "meta.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-+ksfAOuch/fLkFLYU52Ug0Hf0EoERy+oCwa9g+GKuAA=";
|
||||
sha256 = "sha256-qsCwZaCiqvY445U053OCWD98jlIUi9NB2jWVP2oW3Vk=";
|
||||
};
|
||||
|
||||
buildApi = src: buildGoModule {
|
||||
inherit src version;
|
||||
pname = "metasrht-api";
|
||||
vendorSha256 = "sha256-vo+YbMyo/Eal7hbFxP9hwIW2cePJcGFszoDRCCzFYdM=";
|
||||
vendorSha256 = "sha256-8Ubrr9qRlgW2wsLHrPHwulSWLz+gp4VPcTvOZpg8TYM=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pagessrht";
|
||||
version = "0.5.2";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "pages.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-yEM122uhF0MNkMlNXyvBSfkLogRQETeuBl2K66kivac=";
|
||||
sha256 = "sha256-ob0+t9V2o8lhVC6fXbi1rNm0Mnbs+GoyAmhBqVZ13PA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-udr+1y5ApQCSPhs3yQTTi9QfzRbz0A9COYuFMjQGa74=";
|
||||
vendorSha256 = "sha256-b0sHSH0jkKoIVq045N96wszuLJDegkkj0v50nuDFleU=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/sql/
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
From 5ccb5386304c26f25b0a9eb10ce9edb6da32f91a Mon Sep 17 00:00:00 2001
|
||||
From: Julien Moutinho <julm+srht@sourcephile.fr>
|
||||
Date: Sat, 12 Feb 2022 00:11:59 +0100
|
||||
Subject: [PATCH git.sr.ht] Revert "Add webhook queue monitoring"
|
||||
|
||||
This reverts commit 7ea630b776947ab82438d0ffa263b0f9d33ebff3.
|
||||
|
||||
Which has broken Unix socket support for Redis.
|
||||
See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
|
||||
---
|
||||
gitsrht/app.py | 3 ---
|
||||
gitsrht/webhooks.py | 5 +----
|
||||
2 files changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/gitsrht/app.py b/gitsrht/app.py
|
||||
index e9ccb56..4928851 100644
|
||||
--- a/gitsrht/app.py
|
||||
+++ b/gitsrht/app.py
|
||||
@@ -48,9 +48,6 @@ class GitApp(ScmSrhtFlask):
|
||||
self.add_template_filter(url_quote)
|
||||
self.add_template_filter(commit_links)
|
||||
|
||||
- from gitsrht.webhooks import webhook_metrics_collector
|
||||
- self.metrics_registry.register(webhook_metrics_collector)
|
||||
-
|
||||
@self.context_processor
|
||||
def inject():
|
||||
notice = session.get("notice")
|
||||
diff --git a/gitsrht/webhooks.py b/gitsrht/webhooks.py
|
||||
index 8a203fe..6240d50 100644
|
||||
--- a/gitsrht/webhooks.py
|
||||
+++ b/gitsrht/webhooks.py
|
||||
@@ -7,13 +7,10 @@ if not hasattr(db, "session"):
|
||||
db.init()
|
||||
from srht.webhook import Event
|
||||
from srht.webhook.celery import CeleryWebhook, make_worker
|
||||
-from srht.metrics import RedisQueueCollector
|
||||
from scmsrht.webhooks import UserWebhook
|
||||
import sqlalchemy as sa
|
||||
|
||||
-webhook_broker = cfg("git.sr.ht", "webhooks")
|
||||
-worker = make_worker(broker=webhook_broker)
|
||||
-webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length")
|
||||
+worker = make_worker(broker=cfg("git.sr.ht", "webhooks"))
|
||||
|
||||
class RepoWebhook(CeleryWebhook):
|
||||
events = [
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
From 730e090f31b150d42be4b4722751f8e4610835b0 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Moutinho <julm+srht@sourcephile.fr>
|
||||
Date: Sat, 12 Feb 2022 00:38:12 +0100
|
||||
Subject: [PATCH lists.sr.ht] Revert "Add webhook queue monitoring"
|
||||
|
||||
This reverts commit e74e344808e8d523a9786cefcbf64c9a247d7a0e.
|
||||
|
||||
Which has broken Unix socket support for Redis.
|
||||
See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
|
||||
---
|
||||
listssrht/app.py | 3 ---
|
||||
listssrht/webhooks.py | 5 +----
|
||||
2 files changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/listssrht/app.py b/listssrht/app.py
|
||||
index aec59f3..83a355d 100644
|
||||
--- a/listssrht/app.py
|
||||
+++ b/listssrht/app.py
|
||||
@@ -29,9 +29,6 @@ class ListsApp(SrhtFlask):
|
||||
self.register_blueprint(user)
|
||||
self.register_blueprint(gql_blueprint)
|
||||
|
||||
- from listssrht.webhooks import webhook_metrics_collector
|
||||
- self.metrics_registry.register(webhook_metrics_collector)
|
||||
-
|
||||
@self.context_processor
|
||||
def inject():
|
||||
from listssrht.types import ListAccess
|
||||
diff --git a/listssrht/webhooks.py b/listssrht/webhooks.py
|
||||
index ae5b1cb..86421ba 100644
|
||||
--- a/listssrht/webhooks.py
|
||||
+++ b/listssrht/webhooks.py
|
||||
@@ -8,11 +8,8 @@ if not hasattr(db, "session"):
|
||||
db.init()
|
||||
from srht.webhook import Event
|
||||
from srht.webhook.celery import CeleryWebhook, make_worker
|
||||
-from srht.metrics import RedisQueueCollector
|
||||
|
||||
-webhook_broker = cfg("lists.sr.ht", "webhooks")
|
||||
-worker = make_worker(broker=webhook_broker)
|
||||
-webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length")
|
||||
+worker = make_worker(broker=cfg("lists.sr.ht", "webhooks"))
|
||||
|
||||
class ListWebhook(CeleryWebhook):
|
||||
events = [
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
From 42a27ea60d8454552d54e1f51f1b976d1067fc32 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Moutinho <julm+srht@sourcephile.fr>
|
||||
Date: Sat, 12 Feb 2022 00:30:29 +0100
|
||||
Subject: [PATCH todo.sr.ht] Revert "Add webhook queue monitoring"
|
||||
|
||||
This reverts commit 320a5e8f7cd16ca43928c36f0320593f84d986fa.
|
||||
|
||||
Which has broken Unix socket support for Redis.
|
||||
See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
|
||||
---
|
||||
todosrht/flask.py | 3 ---
|
||||
todosrht/webhooks.py | 6 +-----
|
||||
2 files changed, 1 insertion(+), 8 deletions(-)
|
||||
|
||||
diff --git a/todosrht/flask.py b/todosrht/flask.py
|
||||
index 5e8ac66..9d0fd27 100644
|
||||
--- a/todosrht/flask.py
|
||||
+++ b/todosrht/flask.py
|
||||
@@ -43,9 +43,6 @@ class TodoApp(SrhtFlask):
|
||||
self.add_template_filter(urls.tracker_url)
|
||||
self.add_template_filter(urls.user_url)
|
||||
|
||||
- from todosrht.webhooks import webhook_metrics_collector
|
||||
- self.metrics_registry.register(webhook_metrics_collector)
|
||||
-
|
||||
@self.context_processor
|
||||
def inject():
|
||||
return {
|
||||
diff --git a/todosrht/webhooks.py b/todosrht/webhooks.py
|
||||
index eb8e08a..950047f 100644
|
||||
--- a/todosrht/webhooks.py
|
||||
+++ b/todosrht/webhooks.py
|
||||
@@ -7,13 +7,9 @@ if not hasattr(db, "session"):
|
||||
db.init()
|
||||
from srht.webhook import Event
|
||||
from srht.webhook.celery import CeleryWebhook, make_worker
|
||||
-from srht.metrics import RedisQueueCollector
|
||||
import sqlalchemy as sa
|
||||
|
||||
-
|
||||
-webhooks_broker = cfg("todo.sr.ht", "webhooks")
|
||||
-worker = make_worker(broker=webhooks_broker)
|
||||
-webhook_metrics_collector = RedisQueueCollector(webhooks_broker, "srht_webhooks", "Webhook queue length")
|
||||
+worker = make_worker(broker=cfg("todo.sr.ht", "webhooks"))
|
||||
|
||||
import todosrht.tracker_import
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmsrht";
|
||||
version = "0.22.16"; # Untagged version
|
||||
version = "0.22.19"; # Untagged version
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "scm.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-A4Q7wUc4ag7KRWOkdYXCsbzuFHyJJsM15OjrCoVt9UQ=";
|
||||
sha256 = "sha256-/QryPjWJ2S0Ov9DTdrwbM81HYucHiYcLh0oKacflywI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
@ -12,15 +12,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "todosrht";
|
||||
version = "0.66.1";
|
||||
version = "0.67.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "todo.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-P0xaQpK7O9zipGSIa5jL1O0L/fKt51EMNGt7XndYQ+g=";
|
||||
sha256 = "sha256-/QHsMlhzyah85ubZyx8j4GDUoITuWcLDJKosbZGeOZU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Revert change breaking Unix socket support for Redis
|
||||
patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "f1viewer";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoMuchForSubtlety";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "7eXRUG74l9+9nU7EmDvNcHc+2pg5+/amjqtrzT60f94=";
|
||||
sha256 = "sha256-cTXueIOD+OXx4WikhdNv3v/F2/f5aDicyPP7FgTU6AM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "4pQ8NT0mh3w7naHEHh2w6Csop0uitlWClZ95VlYaPW0=";
|
||||
vendorSha256 = "sha256-47uLx4t0N1T3zqZ9o/su/onJEUdGXpq+iVSUaRnwW3I=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-adaptive";
|
||||
namespace = "inputstream.adaptive";
|
||||
version = "19.0.1";
|
||||
version = "19.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.adaptive";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-KMEo7kXyFMEeUR/HRvXpUhwDFlWsuwYZFA6bA3W1AmY=";
|
||||
sha256 = "sha256-YYIPPxM8zVIugqLz0YntVZt1N+dReH+7V1Lkeif2wIY=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ gtest ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-ffmpegdirect";
|
||||
namespace = "inputstream.ffmpegdirect";
|
||||
version = "19.0.0";
|
||||
version = "19.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.ffmpegdirect";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-qdN2tmwS6uD9wrHnKC3iNvHnA2WlJAoNhdwvw16/L0U=";
|
||||
sha256 = "sha256-yVMo3cRsIww1y0jGrqRag2Bc1x98+e86AHlnY1O9klE=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-hts";
|
||||
namespace = "pvr.hts";
|
||||
version = "19.0.4";
|
||||
version = "19.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hts";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-WP/eaE3qO0NqN23dHkFOiOjoeKIglbbHofqnUsfxSfI=";
|
||||
sha256 = "sha256-Lc3B1TdQ4oQIEIyKuQju+5cpInF5i2u4WFe3okFhe+I=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "19.0.3";
|
||||
version = "19.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-LQP+yPHPOjgvW7LQmqrp15NWFBVdnrGOSGm37N8AsHg=";
|
||||
sha256 = "sha256-APRj/Z/GtRXNSVX5kB0o09FTa9me2ESzrZ/Q+QNrw0w=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@ -12,6 +12,10 @@ let
|
||||
sha256 = "TRmul3t//izJRdViTvxFz29JZeGYsWc7WsJjagQ35nw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libqtile/pangocffi.py \
|
||||
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
|
||||
|
||||
22
pkgs/applications/window-managers/qtile/fix-restart.patch
Normal file
22
pkgs/applications/window-managers/qtile/fix-restart.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/libqtile/core/lifecycle.py b/libqtile/core/lifecycle.py
|
||||
index 0d4d119d..c37d1799 100644
|
||||
--- a/libqtile/core/lifecycle.py
|
||||
+++ b/libqtile/core/lifecycle.py
|
||||
@@ -25,7 +25,7 @@ class LifeCycle:
|
||||
|
||||
def _atexit(self) -> None:
|
||||
if self.behavior is Behavior.RESTART:
|
||||
- argv = [sys.executable] + sys.argv
|
||||
+ argv = sys.argv
|
||||
if "--no-spawn" not in argv:
|
||||
argv.append("--no-spawn")
|
||||
argv = [s for s in argv if not s.startswith("--with-state")]
|
||||
@@ -33,7 +33,7 @@ class LifeCycle:
|
||||
argv.append("--with-state=" + self.state_file)
|
||||
logger.warning("Restarting Qtile with os.execv(...)")
|
||||
# No other code will execute after the following line does
|
||||
- os.execv(sys.executable, argv)
|
||||
+ os.execv(sys.argv[0], argv)
|
||||
elif self.behavior is Behavior.TERMINATE:
|
||||
logger.warning("Qtile will now terminate")
|
||||
elif self.behavior is Behavior.NONE:
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.35.5";
|
||||
version = "0.35.8";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "sha256-t9BYV9a/rmEr8nLqcdxg4Z5pWsCefvwI47eSwub41u0=";
|
||||
sha256 = "sha256-22q+FdTh9Dex+tEo/HCBK14ZlJFtFM7SrE6K1/iVBY0=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "closure-compiler";
|
||||
version = "20211107";
|
||||
version = "20220202";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
|
||||
sha256 = "sha256-cz8A8KFlHJ1UCdkWLm+U8KPmFGNiiSXT1u9mvmDsFKY=";
|
||||
sha256 = "sha256-I9kcK9oL6AMStI7eGfruJ+CYQuAsVsixTzkh0JWJrw8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -4,18 +4,18 @@ let
|
||||
|
||||
pkg = buildGoModule rec {
|
||||
pname = "arduino-cli";
|
||||
version = "0.18.1";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EtkONrP/uaetsdC47WsyQOE71Gsz0wKUiTiYThj8Kq8=";
|
||||
sha256 = "sha256-q2uaJTfCcS/kv6xU5NjafzfcM3TixJlH5KzgEpLJKkQ=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-kPIhG6lsH+0IrYfdlzdv/X/cUQb22Xza9Q6ywjKae/4=";
|
||||
vendorSha256 = "sha256-VWoKHIRQfs4dbsOzV3AQpqWsCPDm/rVKGMsc4xZvbhU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "racket";
|
||||
version = "8.3"; # always change at once with ./minimal.nix
|
||||
version = "8.4"; # always change at once with ./minimal.nix
|
||||
|
||||
src = (lib.makeOverridable ({ name, sha256 }:
|
||||
fetchurl {
|
||||
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
}
|
||||
)) {
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-M90MIIRsfF/fhK8twlD3ZRBO0ztQkb4VKp9o8eJUFFc=";
|
||||
sha256 = "sha256-uJ+vL+FtBNILkFbwi7qZ6yBA1Rcr7o886zmZ/tFuatM=";
|
||||
};
|
||||
|
||||
FONTCONFIG_FILE = fontsConf;
|
||||
|
||||
@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
|
||||
name = "racket-minimal-${oldAttrs.version}";
|
||||
src = oldAttrs.src.override {
|
||||
inherit name;
|
||||
sha256 = "sha256-3GdnP1D0XMW34u4mAronxKXe08A3tawM8cpSC7nDfWI=";
|
||||
sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw=";
|
||||
};
|
||||
|
||||
meta = oldAttrs.meta // {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avro-c";
|
||||
version = "1.10.2";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
||||
sha256 = "sha256-rj+zK+xKBon1Rn4JIBGS7cbo80ITTvBq1FLKhw9Wt+I=";
|
||||
sha256 = "sha256-BlJZClStjkqliiuf8fTOcaZKQbCgXEUp0cUYxh52BkM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bctoolbox";
|
||||
version = "5.0.58";
|
||||
version = "5.1.0";
|
||||
|
||||
nativeBuildInputs = [ cmake bcunit ];
|
||||
buildInputs = [ mbedtls ];
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-N7XxGTZkMSL+zyKHteVeRoZ63ZdT5Pq60xi9v6QURxA=";
|
||||
sha256 = "sha256-h+JeyZSXCuV6MtOrWxvpg7v3BXks5T70Cy2gP+If0A8=";
|
||||
};
|
||||
|
||||
# Do not build static libraries
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belcard";
|
||||
version = "4.5.3";
|
||||
version = "5.0.55";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+7vqTbg1QergWPx2LQ2wkVehOma6Ix02IfwnJTJ/E5I=";
|
||||
sha256 = "sha256-5KHmyNplrVADVlD2IBPwEe3vbEjAMNlz+p5aIBHb6kI=";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox belr ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belr";
|
||||
version = "4.5.3";
|
||||
version = "5.0.55";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-TTfBOhnyyAvQe+HXfr2GkuDTx07cHLqcsssW0dA7GlQ=";
|
||||
sha256 = "sha256-P3oDlaT3rN1lRhpKjbGBk7a0hJAQGQcWydFM45GMUU4=";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "double-conversion";
|
||||
version = "3.1.6";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "double-conversion";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Tg8hndib4EYSYDuEYVssv15w4pQyW5Jk+MwGJWOVQXE=";
|
||||
sha256 = "sha256-Vvzjg+UOgegkH8x2vtNU1TS01k5O4ilRJjD7F+BmVmU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,31 +1,33 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost
|
||||
, libevent
|
||||
, cmake
|
||||
, double-conversion
|
||||
, glog
|
||||
, fetchpatch
|
||||
, fmt_8
|
||||
, gflags
|
||||
, glog
|
||||
, libevent
|
||||
, libiberty
|
||||
, libunwind
|
||||
, lz4
|
||||
, xz
|
||||
, zlib
|
||||
, jemalloc
|
||||
, openssl
|
||||
, pkg-config
|
||||
, libunwind
|
||||
, fmt
|
||||
, xz
|
||||
, zlib
|
||||
, zstd
|
||||
, follyMobile ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folly";
|
||||
version = "2021.10.25.00";
|
||||
version = "2022.02.07.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+di8Dzt5NRbqIydBR4sB6bUbQrZZ8URUosdP2JGQMec=";
|
||||
sha256 = "sha256-C/PQBXhOELNxQFfQhgQeU+QmsdtFeBESyWerC+QZBEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -45,11 +47,12 @@ stdenv.mkDerivation (rec {
|
||||
lz4
|
||||
xz
|
||||
zlib
|
||||
jemalloc
|
||||
libunwind
|
||||
fmt
|
||||
fmt_8
|
||||
zstd
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" ];
|
||||
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
|
||||
|
||||
meta = with lib; {
|
||||
@ -57,9 +60,7 @@ stdenv.mkDerivation (rec {
|
||||
homepage = "https://github.com/facebook/folly";
|
||||
license = licenses.asl20;
|
||||
# 32bit is not supported: https://github.com/facebook/folly/issues/103
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [ abbradar pierreis ];
|
||||
};
|
||||
} // lib.optionalAttrs stdenv.isDarwin {
|
||||
LDFLAGS = "-ljemalloc";
|
||||
})
|
||||
}
|
||||
|
||||
@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetds";
|
||||
version = "1.3.3";
|
||||
version = "1.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-26AufwZh/0LcKJ/EHXzefgMIn9Mm8I7ijIcqyf9KHIQ=";
|
||||
sha256 = "sha256-18p+ZaJgwCvjUchel4aaOjIr5jeVPKRNNhW1WljSezM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcyaml";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlsa";
|
||||
repo = "libcyaml";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8Dd6LQovPx+y2957zY8blA0ls10ekGvTCeKmLyHZnOI=";
|
||||
sha256 = "sha256-ntgTgIJ3u1IbR/eYOgwmgR9Jvx28P+l44wAMlBEcbj8=";
|
||||
};
|
||||
|
||||
buildInputs = [ libyaml ];
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfprint";
|
||||
version = "1.94.1";
|
||||
version = "1.94.2";
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "libfprint";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xFmby1x2TRZqXrV9Einqu3002qMAN5tQga2mIAHfC9c=";
|
||||
sha256 = "sha256-FQwjJOgANSmJu9ev1K2oovNGovsbxnWMxNveTmH5fHg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodbus";
|
||||
version = "3.1.6";
|
||||
version = "3.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://libmodbus.org/releases/libmodbus-${version}.tar.gz";
|
||||
sha256 = "05kwz0n5gn9m33cflzv87lz3zp502yp8fpfzbx70knvfl6agmnfp";
|
||||
sha256 = "sha256-ff6VhDHQVwsnHhpbMpt2pljonGFM8RnrWq23Jch/j70=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspng";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "randy408";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JBNFYmmd1UnoIfV6iWeDIw/kgvl8AArxfHK+TKjZ9rk=";
|
||||
sha256 = "sha256-GgrTWC/cesDlEh2J6StCyKiLRk62xfy2+E4lnmJMLGs=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsurvive";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cntools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0m21fnq8pfw2pcvqfgjws531zmalda423q9i65v4qzm8sdb54hl4";
|
||||
sha256 = "sha256-atX7QsCjKGa6OVSApnx3seBvZv/mlpV3jWRB9+v7Emc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -220,12 +220,15 @@ stdenv.mkDerivation rec {
|
||||
binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
|
||||
in
|
||||
''
|
||||
substituteInPlace $out/libexec/libvirt-guests.sh \
|
||||
--replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \
|
||||
--replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
|
||||
--replace "$out/bin" '${gettext}/bin' \
|
||||
--replace 'lock/subsys' 'lock' \
|
||||
--replace 'gettext.sh' 'gettext.sh
|
||||
substituteInPlace $out/bin/virt-xml-validate \
|
||||
--replace xmllint ${libxml2}/bin/xmllint
|
||||
|
||||
substituteInPlace $out/libexec/libvirt-guests.sh \
|
||||
--replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \
|
||||
--replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
|
||||
--replace "$out/bin" '${gettext}/bin' \
|
||||
--replace 'lock/subsys' 'lock' \
|
||||
--replace 'gettext.sh' 'gettext.sh
|
||||
# Added in nixpkgs:
|
||||
gettext() { "${gettext}/bin/gettext" "$@"; }
|
||||
'
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mauikit-filebrowsing";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "maui";
|
||||
repo = "mauikit-filebrowsing";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j6VoNtMkDB5BSET/RUiQlWdL0D1dAHlW929WNCDC+PE=";
|
||||
hash = "sha256-2LzGvjh2t4RVZS9Js7ky3hM51L7bx0SHmDlKKPjl3LM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mauikit";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "maui";
|
||||
repo = "mauikit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dpJQSCog/AZ4ip8NTQMt4g1ntAnL1cjjMzxJz/uCxZA=";
|
||||
hash = "sha256-INvh+J484xkAsNGtYdf8NGGpFGp2AG7s9UYESoem3QY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
100
pkgs/development/libraries/science/math/trilinos/default.nix
Normal file
100
pkgs/development/libraries/science/math/trilinos/default.nix
Normal file
@ -0,0 +1,100 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, blas
|
||||
, boost
|
||||
, cmake
|
||||
, gfortran
|
||||
, lapack
|
||||
, mpi
|
||||
, suitesparse
|
||||
, swig
|
||||
, withMPI ? false
|
||||
}:
|
||||
|
||||
# NOTE: Not all packages are enabled. We specifically enable the ones
|
||||
# required to build Xyce. If the need comes, we can enable more of them.
|
||||
|
||||
let
|
||||
flagsBase = ''
|
||||
-G "Unix Makefiles"
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
-DCMAKE_CXX_FLAGS="-O3 -fPIC"
|
||||
-DCMAKE_C_FLAGS="-O3 -fPIC"
|
||||
-DCMAKE_Fortran_FLAGS="-O3 -fPIC"
|
||||
-DTrilinos_ENABLE_NOX=ON
|
||||
-DNOX_ENABLE_LOCA=ON
|
||||
-DTrilinos_ENABLE_EpetraExt=ON
|
||||
-DEpetraExt_BUILD_BTF=ON
|
||||
-DEpetraExt_BUILD_EXPERIMENTAL=ON
|
||||
-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON
|
||||
-DTrilinos_ENABLE_TrilinosCouplings=ON
|
||||
-DTrilinos_ENABLE_Ifpack=ON
|
||||
-DTrilinos_ENABLE_AztecOO=ON
|
||||
-DTrilinos_ENABLE_Belos=ON
|
||||
-DTrilinos_ENABLE_Teuchos=ON
|
||||
-DTeuchos_ENABLE_COMPLEX=ON
|
||||
-DTrilinos_ENABLE_Amesos=ON
|
||||
-DAmesos_ENABLE_KLU=ON
|
||||
-DTrilinos_ENABLE_Amesos2=ON
|
||||
-DAmesos2_ENABLE_KLU2=ON
|
||||
-DAmesos2_ENABLE_Basker=ON
|
||||
-DTrilinos_ENABLE_Sacado=ON
|
||||
-DTrilinos_ENABLE_Stokhos=ON
|
||||
-DTrilinos_ENABLE_Kokkos=ON
|
||||
-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF
|
||||
-DTrilinos_ENABLE_CXX11=ON
|
||||
-DTPL_ENABLE_AMD=ON
|
||||
-DTPL_ENABLE_BLAS=ON
|
||||
-DTPL_ENABLE_LAPACK=ON
|
||||
'';
|
||||
flagsParallel = ''
|
||||
-DCMAKE_C_COMPILER=mpicc
|
||||
-DCMAKE_CXX_COMPILER=mpic++
|
||||
-DCMAKE_Fortran_COMPILER=mpif77
|
||||
-DTrilinos_ENABLE_Isorropia=ON
|
||||
-DTrilinos_ENABLE_Zoltan=ON
|
||||
-DTPL_ENABLE_MPI=ON
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trilinos";
|
||||
version = "12.12.1"; # Xyce 7.4 requires version 12.12.1
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trilinos";
|
||||
repo = "Trilinos";
|
||||
rev = "${pname}-release-${lib.replaceStrings [ "." ] [ "-" ] version}";
|
||||
sha256 = "sha256-Nqjr7RAlUHm6vs87a1P84Y7BIZEL0Vs/A1Z6dykfv+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gfortran swig ];
|
||||
|
||||
buildInputs = [ blas boost lapack suitesparse ] ++ lib.optionals withMPI [ mpi ];
|
||||
|
||||
preConfigure =
|
||||
if withMPI then ''
|
||||
cmakeFlagsArray+=(${flagsBase} ${flagsParallel})
|
||||
''
|
||||
else ''
|
||||
cmakeFlagsArray+=(${flagsBase})
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit withMPI;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Engineering and scientific problems algorithms";
|
||||
longDescription = ''
|
||||
The Trilinos Project is an effort to develop algorithms and enabling
|
||||
technologies within an object-oriented software framework for the
|
||||
solution of large-scale, complex multi-physics engineering and scientific
|
||||
problems.
|
||||
'';
|
||||
homepage = "https://trilinos.org";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fbeffa ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -9,8 +9,10 @@
|
||||
, gst_all_1
|
||||
, gtk-doc
|
||||
, gtk3
|
||||
, hwdata
|
||||
, json-glib
|
||||
, libcacard
|
||||
, libcap_ng
|
||||
, libdrm
|
||||
, libjpeg_turbo
|
||||
, libopus
|
||||
@ -28,8 +30,8 @@
|
||||
, python3
|
||||
, spice-protocol
|
||||
, usbredir
|
||||
, usbutils
|
||||
, vala
|
||||
, wayland-protocols
|
||||
, zlib
|
||||
, withPolkit ? true
|
||||
}:
|
||||
@ -57,19 +59,23 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spice-gtk";
|
||||
version = "0.37";
|
||||
version = "0.40";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z";
|
||||
url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-I/X/f6gLdWR85zzaXq+LMi80Mtu7f286g5Y0YYrbztM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# get rid of absolute path to helper in store so we can use a setuid wrapper
|
||||
substituteInPlace src/usb-acl-helper.c \
|
||||
--replace 'ACL_HELPER_PATH"/' '"'
|
||||
# don't try to setcap/suid in a nix builder
|
||||
substituteInPlace src/meson.build \
|
||||
--replace "meson.add_install_script('../build-aux/setcap-or-suid'," \
|
||||
"# meson.add_install_script('../build-aux/setcap-or-suid',"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -98,6 +104,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
json-glib
|
||||
libcacard
|
||||
libcap_ng
|
||||
libdrm
|
||||
libjpeg_turbo
|
||||
libopus
|
||||
@ -108,14 +115,15 @@ stdenv.mkDerivation rec {
|
||||
pixman
|
||||
spice-protocol
|
||||
usbredir
|
||||
wayland-protocols
|
||||
zlib
|
||||
] ++ lib.optionals withPolkit [ polkit acl usbutils ] ;
|
||||
] ++ lib.optionals withPolkit [ polkit acl ] ;
|
||||
|
||||
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
|
||||
|
||||
mesonFlags = [
|
||||
"-Dcelt051=disabled"
|
||||
"-Dpulse=disabled" # is deprecated upstream
|
||||
"-Dusb-acl-helper-dir=${placeholder "out"}/bin"
|
||||
"-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -226,6 +226,15 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
near-cli = super.near-cli.override {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
libusb
|
||||
nodePackages.prebuild-install
|
||||
nodePackages.node-gyp-build
|
||||
pkg-config
|
||||
];
|
||||
};
|
||||
|
||||
node-inspector = super.node-inspector.override {
|
||||
buildInputs = [ self.node-pre-gyp ];
|
||||
meta.broken = since "10";
|
||||
|
||||
@ -201,6 +201,7 @@
|
||||
, "mocha"
|
||||
, "multi-file-swagger"
|
||||
, "musescore-downloader"
|
||||
, "near-cli"
|
||||
, "neovim"
|
||||
, "nijs"
|
||||
, "node-gyp"
|
||||
@ -228,6 +229,7 @@
|
||||
, "poor-mans-t-sql-formatter-cli"
|
||||
, "postcss"
|
||||
, "postcss-cli"
|
||||
, "prebuild-install"
|
||||
, "prettier"
|
||||
, "prettier-plugin-toml"
|
||||
, "prisma"
|
||||
|
||||
3059
pkgs/development/node-packages/node-packages.nix
generated
3059
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -5,12 +5,12 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mdx";
|
||||
version = "1.11.1";
|
||||
version = "2.1.0";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
|
||||
sha256 = "sha256:1q6169gmynnbrvlnzlmx7lpd6hwv6vwxg5j8ibc88wgs5s0r0fb0";
|
||||
sha256 = "sha256-ol1zy8LODDYdcnv/jByE0pnqJ5ujQuMALq3v9y7td/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "parmap";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "1wg81slp453jci0gi0rzvdjx74110mlf1n5qpsmxic6fqsyz9d2v";
|
||||
sha256 = "sha256-BTkSEjIK3CVNloJACFo6eQ6Ob9o/cdrA9xuv87NKas4=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiobotocore";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5fd4d7aefa0896fe4dd32815ead8a52ed5ccb8016c7c5743fe8ff71c3c074120";
|
||||
sha256 = "sha256-2+mrmXhRwkWLB6hfaCvizPNdZ51d4Pj1cSKfdArXunE=";
|
||||
};
|
||||
|
||||
# relax version constraints: aiobotocore works with newer botocore versions
|
||||
|
||||
@ -24,11 +24,11 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-kernel";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a59039a1724c0f4f4435316e2ad3383f2328ae61f190e74414a66cc8c4637636";
|
||||
sha256 = "sha256-UJjm9FpmXSznXtaIR2rVv5YJS/H83FvRkNz09vwoe0c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ];
|
||||
|
||||
@ -1,30 +1,56 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, cmake, perl, stdenv, gcc10, CoreFoundation, Security }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cmake
|
||||
, perl
|
||||
, stdenv
|
||||
, gcc10
|
||||
, CoreFoundation
|
||||
, Security
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
format = "setuptools";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1GaKDpOGX/YbM4rByTw0nYgwHYFvOLHZ0GRvanX3vAU=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
Security
|
||||
];
|
||||
|
||||
# Required to suppress -Werror
|
||||
# https://github.com/NixOS/nixpkgs/issues/39687
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
|
||||
hardeningDisable = lib.optionals stdenv.cc.isClang [
|
||||
"strictoverflow"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++
|
||||
# gcc <10 is not supported, LLVM on darwin is just fine
|
||||
lib.optionals (!stdenv.isDarwin && stdenv.isAarch64) [ gcc10 perl ];
|
||||
# gcc <10 is not supported, LLVM on darwin is just fine
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals (!stdenv.isDarwin && stdenv.isAarch64) [
|
||||
gcc10
|
||||
perl
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"awscrt"
|
||||
];
|
||||
|
||||
# Unable to import test module
|
||||
# https://github.com/awslabs/aws-crt-python/issues/281
|
||||
doCheck = false;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2lkx6fDbPAasiT6G/uSudNt+kRU+xJNNo8oTaLde2rQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/awslabs/aws-crt-python";
|
||||
description = "Python bindings for the AWS Common Runtime";
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-applicationinsights";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "6e1839169bb6ffd2d2c21ee3f4afbdd068ea428ad47cf884ea3167ecf7fd0859";
|
||||
sha256 = "sha256-qIRbgDZbfyALrR9xqA0NMfO+wB7f1GfftsE+or1xupY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, attrs
|
||||
, beautifulsoup4
|
||||
, requests
|
||||
, future
|
||||
@ -18,6 +19,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
beautifulsoup4
|
||||
requests
|
||||
future
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasette";
|
||||
version = "0.60.1";
|
||||
version = "0.60.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-x4bqd8hFPNLkDIsuTTy+WbAjuUl6lXsmIZoiRi7ZOm8=";
|
||||
sha256 = "sha256-GehtjukmSVHffAnDeDwjopgnuycD1CLQRHzLtO1iLsE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "frozendict";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jj1HNfmhPRB3Vn5WhHFmPzJE+FrImyP4yzHPIx2+Rbk=";
|
||||
sha256 = "1dd0bqhai4k3fj9ydcwmc9hvbmrsklk349ys21w8x4n5xynk2hns";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -9,12 +9,14 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "furo";
|
||||
version = "2022.1.2";
|
||||
format = "flit";
|
||||
format = "wheel";
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b217f218cbcd423ffbfe69baa79389d4ecebf2d86f0d593c44ef31da7b5aed30";
|
||||
inherit pname version format;
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
sha256 = "sha256-lYAWv+E4fB6N31udcWlracTqpc2K/JSSq/sAirotMAw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -22,6 +24,17 @@ buildPythonPackage rec {
|
||||
beautifulsoup4
|
||||
];
|
||||
|
||||
installCheckPhase = ''
|
||||
# furo was built incorrectly if this directory is empty
|
||||
# Ignore the hidden file .gitignore
|
||||
cd "$out/lib/python"*
|
||||
if [ "$(ls 'site-packages/furo/theme/furo/static/' | wc -l)" -le 0 ]; then
|
||||
echo 'static directory must not be empty'
|
||||
exit 1
|
||||
fi
|
||||
cd -
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "furo" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.28.1";
|
||||
version = "0.32.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zYSJMP/uwgyIHdI8E7NHLaHrpAQeLpaEcXXXlzIO5ns=";
|
||||
sha256 = "sha256-ovllZjVB3R+nAJh4dyGJe/rCPq56522cv1+6q1usNvU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -38,6 +38,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Starting with 0.30 the tests are broken, check with the next major release
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hahomematic"
|
||||
];
|
||||
|
||||
@ -2,20 +2,28 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hijri-converter";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1KENsAnBQXWSu/s96+yt+gTY2NXVG2Spcelp12Gp8+E=";
|
||||
sha256 = "sha256-5xSc7OzKZHv0Bonsib9ZPHJSsx1pnqWHrQvOkbpC04I=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "hijri_converter" ];
|
||||
pythonImportsCheck = [
|
||||
"hijri_converter"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user