Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
79f291cd13
|
|
@ -160,6 +160,7 @@
|
|||
./programs/darling.nix
|
||||
./programs/dconf.nix
|
||||
./programs/digitalbitbox/default.nix
|
||||
./programs/direnv.nix
|
||||
./programs/dmrconfig.nix
|
||||
./programs/droidcam.nix
|
||||
./programs/environment.nix
|
||||
|
|
|
|||
147
nixos/modules/programs/direnv.nix
Normal file
147
nixos/modules/programs/direnv.nix
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.programs.direnv;
|
||||
in {
|
||||
options.programs.direnv = {
|
||||
|
||||
enable = lib.mkEnableOption (lib.mdDoc ''
|
||||
direnv integration. Takes care of both installation and
|
||||
setting up the sourcing of the shell. Additionally enables nix-direnv
|
||||
integration. Note that you need to logout and login for this change to apply.
|
||||
'');
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "direnv" {};
|
||||
|
||||
direnvrcExtra = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
export FOO="foo"
|
||||
echo "loaded direnv!"
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
Extra lines to append to the sourced direnvrc
|
||||
'';
|
||||
};
|
||||
|
||||
silent = lib.mkEnableOption (lib.mdDoc ''
|
||||
the hiding of direnv logging
|
||||
'');
|
||||
|
||||
persistDerivations =
|
||||
(lib.mkEnableOption (lib.mdDoc ''
|
||||
setting keep-derivations and keep-outputs to true
|
||||
to prevent shells from getting garbage collected
|
||||
''))
|
||||
// {
|
||||
default = true;
|
||||
};
|
||||
|
||||
loadInNixShell =
|
||||
lib.mkEnableOption (lib.mdDoc ''
|
||||
loading direnv in `nix-shell` `nix shell` or `nix develop`
|
||||
'')
|
||||
// {
|
||||
default = true;
|
||||
};
|
||||
|
||||
nix-direnv = {
|
||||
enable =
|
||||
(lib.mkEnableOption (lib.mdDoc ''
|
||||
a faster, persistent implementation of use_nix and use_flake, to replace the built-in one
|
||||
''))
|
||||
// {
|
||||
default = true;
|
||||
};
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "nix-direnv" {};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
programs = {
|
||||
zsh.interactiveShellInit = ''
|
||||
if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then
|
||||
eval "$(${lib.getExe cfg.package} hook zsh)"
|
||||
fi
|
||||
'';
|
||||
|
||||
#$NIX_GCROOT for "nix develop" https://github.com/NixOS/nix/blob/6db66ebfc55769edd0c6bc70fcbd76246d4d26e0/src/nix/develop.cc#L530
|
||||
#$IN_NIX_SHELL for "nix-shell"
|
||||
bash.interactiveShellInit = ''
|
||||
if ${lib.boolToString cfg.loadInNixShell} || [ -z "$IN_NIX_SHELL$NIX_GCROOT$(printenv PATH | grep '/nix/store')" ] ; then
|
||||
eval "$(${lib.getExe cfg.package} hook bash)"
|
||||
fi
|
||||
'';
|
||||
|
||||
fish.interactiveShellInit = ''
|
||||
if ${lib.boolToString cfg.loadInNixShell};
|
||||
or printenv PATH | grep -vqc '/nix/store';
|
||||
${lib.getExe cfg.package} hook fish | source
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
||||
nix.settings = lib.mkIf cfg.persistDerivations {
|
||||
keep-outputs = true;
|
||||
keep-derivations = true;
|
||||
};
|
||||
|
||||
environment = {
|
||||
systemPackages =
|
||||
if cfg.loadInNixShell then [cfg.package]
|
||||
else [
|
||||
#direnv has a fish library which sources direnv for some reason
|
||||
(cfg.package.overrideAttrs (old: {
|
||||
installPhase =
|
||||
(old.installPhase or "")
|
||||
+ ''
|
||||
rm -rf $out/share/fish
|
||||
'';
|
||||
}))
|
||||
];
|
||||
|
||||
variables = {
|
||||
DIRENV_CONFIG = "/etc/direnv";
|
||||
DIRENV_LOG_FORMAT = lib.mkIf cfg.silent "";
|
||||
};
|
||||
|
||||
etc = {
|
||||
"direnv/direnvrc".text = ''
|
||||
${lib.optionalString cfg.nix-direnv.enable ''
|
||||
#Load nix-direnv
|
||||
source ${cfg.nix-direnv.package}/share/nix-direnv/direnvrc
|
||||
''}
|
||||
|
||||
#Load direnvrcExtra
|
||||
${cfg.direnvrcExtra}
|
||||
|
||||
#Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc)
|
||||
direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"
|
||||
if [[ -f $direnv_config_dir_home/direnvrc ]]; then
|
||||
source "$direnv_config_dir_home/direnvrc" >&2
|
||||
elif [[ -f $HOME/.direnvrc ]]; then
|
||||
source "$HOME/.direnvrc" >&2
|
||||
fi
|
||||
|
||||
unset direnv_config_dir_home
|
||||
'';
|
||||
|
||||
"direnv/lib/zz-user.sh".text = ''
|
||||
direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"
|
||||
|
||||
for lib in "$direnv_config_dir_home/lib/"*.sh; do
|
||||
source "$lib"
|
||||
done
|
||||
|
||||
unset direnv_config_dir_home
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -334,7 +334,8 @@ in
|
|||
systemd.services.nitter = {
|
||||
description = "Nitter (An alternative Twitter front-end)";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
StateDirectory = "nitter";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ let
|
|||
daemonConf = ''
|
||||
# generated by nixos/modules/services/security/usbguard.nix
|
||||
RuleFile=${ruleFile}
|
||||
ImplicitPolicyTarget=${cfg.implictPolicyTarget}
|
||||
ImplicitPolicyTarget=${cfg.implicitPolicyTarget}
|
||||
PresentDevicePolicy=${cfg.presentDevicePolicy}
|
||||
PresentControllerPolicy=${cfg.presentControllerPolicy}
|
||||
InsertedDevicePolicy=${cfg.insertedDevicePolicy}
|
||||
|
|
@ -73,7 +73,7 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
implictPolicyTarget = mkOption {
|
||||
implicitPolicyTarget = mkOption {
|
||||
type = policy;
|
||||
default = "block";
|
||||
description = lib.mdDoc ''
|
||||
|
|
@ -251,5 +251,6 @@ in
|
|||
(mkRemovedOptionModule [ "services" "usbguard" "ruleFile" ] "The usbguard module now uses ${defaultRuleFile} as ruleFile. Alternatively, use services.usbguard.rules to configure rules.")
|
||||
(mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d.")
|
||||
(mkRemovedOptionModule [ "services" "usbguard" "auditFilePath" ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.")
|
||||
(mkRenamedOptionModule [ "services" "usbguard" "implictPolicyTarget" ] [ "services" "usbguard" "implicitPolicyTarget" ])
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "open-stage-control";
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jean-emmanuel";
|
||||
repo = "open-stage-control";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mbd+fknSzokFt5dPlZrZIpDox/NzMbvyFp2fNPelv3c=";
|
||||
hash = "sha256-7D3C1W2Y7FJnLxbXKXFFPDf+EXhLgPEj0APc2ZFYUlM=";
|
||||
};
|
||||
|
||||
# Remove some Electron stuff from package.json
|
||||
|
|
|
|||
|
|
@ -4,12 +4,14 @@ import json
|
|||
import pathlib
|
||||
import logging
|
||||
import requests
|
||||
import subprocess
|
||||
import sys
|
||||
import xmltodict
|
||||
from packaging import version
|
||||
|
||||
updates_url = "https://www.jetbrains.com/updates/updates.xml"
|
||||
versions_file_path = pathlib.Path(__file__).parent.joinpath("versions.json").resolve()
|
||||
current_path = pathlib.Path(__file__).parent
|
||||
versions_file_path = current_path.joinpath("versions.json").resolve()
|
||||
|
||||
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
|
||||
|
||||
|
|
@ -98,3 +100,7 @@ for products in versions.values():
|
|||
with open(versions_file_path, "w") as versions_file:
|
||||
json.dump(versions, versions_file, indent=2)
|
||||
versions_file.write("\n")
|
||||
|
||||
logging.info("#### Updating plugins ####")
|
||||
plugin_script = current_path.joinpath("plugins/update_plugins.py").resolve()
|
||||
subprocess.call(plugin_script)
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/stenzek/duckstation";
|
||||
description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = "duckstation-qt";
|
||||
maintainers = with maintainers; [ guibou AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.28.9-2";
|
||||
version = "0.28.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yBBzJceYHuqYhYvZHpL22uFsOz1TKZFwdzuUQOC4wQw=";
|
||||
hash = "sha256-CDaLKBDm4slUMZ8OWm/wNub4P8LY26P8G8oIxwzJyXY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upwork";
|
||||
version = "5.8.0.24";
|
||||
version = "5.8.0.31";
|
||||
|
||||
src = requireFile {
|
||||
name = "${pname}_${version}_amd64.deb";
|
||||
url = "https://www.upwork.com/ab/downloads/os/linux/";
|
||||
sha256 = "sha256-9X1U/ImI8GfCiYLpLD+jICYAYsAr1NJLlOMvecXK7hc=";
|
||||
sha256 = "sha256-tQV6v0U6xxqBl7nQaBhXSrc9iv+7SPHfABTiJJQDnPI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
|
|||
libPath = lib.makeLibraryPath buildInputs;
|
||||
|
||||
dontWrapGApps = true;
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kluctl";
|
||||
version = "2.20.7";
|
||||
version = "2.20.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kluctl";
|
||||
repo = "kluctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NcvPo+6f2EYhitzOl2VPz8MtFIsYBuOA7EJnD4TJdmI=";
|
||||
hash = "sha256-F4vEHzN44+d0EtfJukEq5WVm8aLVWqmT5Xcpa/DBPng=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x5Zy8H7DzxU+uBCUL6edv8x2LwiIjXl5UrRUMDtUEk8=";
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ stdenv.mkDerivation {
|
|||
|
||||
# qt.conf is not working, so override everything using environment variables
|
||||
wrapProgram $out/opt/viber/Viber \
|
||||
--set QT_QPA_PLATFORM "xcb" \
|
||||
--set QT_PLUGIN_PATH "$out/opt/viber/plugins" \
|
||||
--set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
|
||||
--set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RF/3eICbqYXSuOWTvRBImiLPWIh4Oip37S5gqoSmDzE=";
|
||||
hash = "sha256-7n+T+y60RjmZC7bE96Ljg0xVg4bSzV/LFgezTld4zfI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wawlqnPYCLEkR9XpTQRZqG+wsqN/Nd5Q1IXpE6ikmY4=";
|
||||
cargoHash = "sha256-hcuZ4hqGJT/O7vFefKPGZlkqhdsAl5LGAcSRQAEopnM=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,21 +9,21 @@
|
|||
let
|
||||
appName = "LibreOffice.app";
|
||||
scriptName = "soffice";
|
||||
version = "7.4.3";
|
||||
version = "7.4.7";
|
||||
|
||||
dist = {
|
||||
aarch64-darwin = rec {
|
||||
arch = "aarch64";
|
||||
archSuffix = arch;
|
||||
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
|
||||
sha256 = "cf95f9ecd4451d27e8304cea3ba116675267bdf75f08fbb60e0d8917f86edc04";
|
||||
sha256 = "d02513c6a58f35cb0da6880f76be3f4b3a620daaa9ce5c244d6efc40ed26a273";
|
||||
};
|
||||
|
||||
x86_64-darwin = rec {
|
||||
arch = "x86_64";
|
||||
archSuffix = "x86-64";
|
||||
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
|
||||
sha256 = "fe569ba23bb74eb3e86974537dd80e504debe5fd8526a00edbad6be4da18986a";
|
||||
sha256 = "c8ae0cbaa043b30718a4ac0ca93369e887fe6a46bb3618cea054bffaafd8b8e2";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -52,6 +52,11 @@ mkDerivation rec {
|
|||
"APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata"
|
||||
];
|
||||
|
||||
env = {
|
||||
# Fix build due to missing `std::option`.
|
||||
NIX_CFLAGS_COMPILE = "-std=c++17";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tabbed document viewer";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -38,18 +38,20 @@ in
|
|||
assert assertXWayland;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LPih0Q//p8IurXG9kGRVGAqV4AUKVYj9xkk3sYYAj6I=";
|
||||
hash = "sha256-mEKF6Wcx+wSF/eos/91A7LxhFLDYhSnQnLpwZF13ntg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# make meson use the provided dependencies instead of the git submodules
|
||||
"${finalAttrs.src}/nix/meson-build.patch"
|
||||
# look into $XDG_DESKTOP_PORTAL_DIR instead of /usr; runtime checks for conflicting portals
|
||||
"${finalAttrs.src}/nix/portals.patch"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
|
|||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "6830bfc17fd94709e2cdd4da0af989f102a26e59";
|
||||
hash = "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=";
|
||||
rev = "7e7633abf09b362d0bad9e3fc650fd692369291d";
|
||||
hash = "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=";
|
||||
};
|
||||
|
||||
pname =
|
||||
|
|
|
|||
|
|
@ -4,20 +4,21 @@
|
|||
, makeWrapper
|
||||
, python3
|
||||
, which
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erg";
|
||||
version = "0.6.15";
|
||||
version = "0.6.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erg-lang";
|
||||
repo = "erg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nADppxyIwvugnMR4d99NhK5wrhuShdKYgBu49dRPxtQ=";
|
||||
hash = "sha256-HBi9QDSrAkBORswoNXDGZaABQYFDQGC8WKdzhk4KKhw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-El90KhNf+UrEIE3xlJwTRgCWsXiDIrBHHnPWdvWvoG8=";
|
||||
cargoHash = "sha256-YQYyH+iypORcAEyVhHqYw0aHi1QtCgNuwyg/SnmGVIE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
@ -29,6 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
env = {
|
||||
BUILD_DATE = "1970/01/01 00:00:00";
|
||||
CASE_SENSITIVE = lib.boolToString (!stdenv.isDarwin);
|
||||
GIT_HASH_SHORT = src.rev;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
sourceRoot = "jasmin-compiler-v${version}/compiler";
|
||||
|
||||
# Released tarball contains extraneous `dune` files
|
||||
# See https://github.com/jasmin-lang/jasmin/pull/495
|
||||
preBuild = ''
|
||||
rm -rf tests
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_3 menhir camlidl cmdliner ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -18,21 +24,23 @@ stdenv.mkDerivation rec {
|
|||
ppl
|
||||
] ++ (with ocamlPackages; [
|
||||
apron
|
||||
yojson
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = with ocamlPackages; [
|
||||
batteries
|
||||
menhirLib
|
||||
yojson
|
||||
zarith
|
||||
]);
|
||||
];
|
||||
|
||||
outputs = [ "bin" "lib" "out" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
for p in jasminc jazz2tex
|
||||
do
|
||||
cp _build/default/entry/$p.exe $out/bin/$p
|
||||
done
|
||||
mkdir -p $out/lib/jasmin/easycrypt
|
||||
cp ../eclib/*.ec $out/lib/jasmin/easycrypt
|
||||
dune build @install
|
||||
dune install --prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib
|
||||
mkdir -p $lib/lib/jasmin/easycrypt
|
||||
cp ../eclib/*.ec $lib/lib/jasmin/easycrypt
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, cmake
|
||||
, clang
|
||||
, libclang
|
||||
, libxml2
|
||||
, zlib
|
||||
, openexr
|
||||
, openimageio
|
||||
|
|
@ -67,6 +68,8 @@ in stdenv.mkDerivation rec {
|
|||
python3.pkgs.pybind11
|
||||
util-linux # needed just for hexdump
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libxml2
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -79,6 +82,6 @@ in stdenv.mkDerivation rec {
|
|||
homepage = "https://opensource.imageworks.com/osl.html";
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libei";
|
||||
version = "0.99.2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "libinput";
|
||||
repo = "libei";
|
||||
rev = version;
|
||||
hash = "sha256-hxWWOvqenHHnzrvRwSwNT1GFVx9NR+Mm1XK9nisF8fA=";
|
||||
hash = "sha256-Xt4mhZMAohdQWsqfZCaP3+Tsauxv3GhlceiqgxdfNWo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -35,11 +35,18 @@ buildPecl rec {
|
|||
nativeBuildInputs = [
|
||||
cargo
|
||||
rustc
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
rustPlatform.bindgenHook
|
||||
rustPlatform.cargoSetupHook
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.rustPlatform.bindgenHook
|
||||
darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
buildInputs = [ curl pcre2 ] ++ lib.optionals stdenv.isDarwin [
|
||||
buildInputs = [
|
||||
curl
|
||||
pcre2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.CoreFoundation
|
||||
darwin.apple_sdk_11_0.frameworks.Security
|
||||
darwin.apple_sdk_11_0.Libsystem
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-stubs-ext";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JpbW99hTg0GwYM/6lWXHLqeX6GZofgQLhtKcrYeZ5f4=";
|
||||
hash = "sha256-xp0cxG8cTDt4lLaFpQIsKbKjbHz7UuI3YurzV+v8LJg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
, redis
|
||||
, prometheus-client
|
||||
, polib
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -69,7 +70,7 @@ buildPythonPackage rec {
|
|||
postInstall = ''
|
||||
# expose static files to be able to serve them via web-server
|
||||
mkdir -p $out/share/libretranslate
|
||||
ln -s $out/lib/python*/site-packages/libretranslate/static $out/share/libretranslate/static
|
||||
ln -s $out/${python.sitePackages}/libretranslate/static $out/share/libretranslate/static
|
||||
'';
|
||||
|
||||
doCheck = false; # needs network access
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mf2py";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microformats";
|
||||
repo = "mf2py";
|
||||
rev = version;
|
||||
hash = "sha256-9pAD/eCmc/l7LGmKixDhZy3hhj1jCmcyo9wbqgtz/wI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ya8DND1Dqbygbf1hjIGMlPwyc/MYIWIj+KnWB6Bqu1k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.27.2";
|
||||
version = "0.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8JeQvvCxKAmFy8kiXVD+l1EBv5mO1rWYoAg+iLjapRw=";
|
||||
hash = "sha256-S/arFxM+9VZECqUzPijTxclBQ6oeiOxdRXQLb+uhkfM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,51 +1,68 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, writeText
|
||||
, isPy27
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, pytest-mpl
|
||||
, numpy
|
||||
, scipy
|
||||
, scikit-learn
|
||||
, pandas
|
||||
, transformers
|
||||
, opencv4
|
||||
, lightgbm
|
||||
, pythonOlder
|
||||
, writeText
|
||||
, catboost
|
||||
, pyspark
|
||||
, sentencepiece
|
||||
, tqdm
|
||||
, slicer
|
||||
, numba
|
||||
, matplotlib
|
||||
, nose
|
||||
, lime
|
||||
, cloudpickle
|
||||
, ipython
|
||||
, lightgbm
|
||||
, lime
|
||||
, matplotlib
|
||||
, nose
|
||||
, numba
|
||||
, numpy
|
||||
, opencv4
|
||||
, pandas
|
||||
, pyspark
|
||||
, pytest-mpl
|
||||
, scikit-learn
|
||||
, scipy
|
||||
, sentencepiece
|
||||
, setuptools
|
||||
, slicer
|
||||
, tqdm
|
||||
, transformers
|
||||
, xgboost
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shap";
|
||||
version = "0.41.0";
|
||||
disabled = isPy27;
|
||||
version = "0.42.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slundberg";
|
||||
repo = pname;
|
||||
repo = "shap";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rYVWQ3VRvIObSQPwDRsxhTOGOKNkYkLtiHzVwoB3iJ0=";
|
||||
hash = "sha256-VGlswr9ywHk4oKSmmAzEC7+E0V2XEFlg19zXVktUdhc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-circular-import-error.patch";
|
||||
url = "https://github.com/slundberg/shap/commit/ce118526b19b4a206cf8b496c2cd2b215ef7a91b.patch";
|
||||
hash = "sha256-n2yFjFgc2VSFKb4ZJx775HblULWfnQSEnqjfPa8AOt0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
scikit-learn
|
||||
pandas
|
||||
tqdm
|
||||
slicer
|
||||
numba
|
||||
cloudpickle
|
||||
numba
|
||||
numpy
|
||||
pandas
|
||||
scikit-learn
|
||||
scipy
|
||||
slicer
|
||||
tqdm
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
@ -58,7 +75,7 @@ buildPythonPackage rec {
|
|||
# tests that try to access the network will raise, get caught, be marked as skipped and tagged as xfailed.
|
||||
conftestSkipNetworkErrors = writeText "conftest.py" ''
|
||||
from _pytest.runner import pytest_runtest_makereport as orig_pytest_runtest_makereport
|
||||
import urllib, requests
|
||||
import urllib, requests, transformers
|
||||
|
||||
class NetworkAccessDeniedError(RuntimeError): pass
|
||||
def deny_network_access(*a, **kw):
|
||||
|
|
@ -68,6 +85,7 @@ buildPythonPackage rec {
|
|||
requests.get = deny_network_access
|
||||
urllib.request.urlopen = deny_network_access
|
||||
urllib.request.Request = deny_network_access
|
||||
transformers.AutoTokenizer.from_pretrained = deny_network_access
|
||||
|
||||
def pytest_runtest_makereport(item, call):
|
||||
tr = orig_pytest_runtest_makereport(item, call)
|
||||
|
|
@ -81,54 +99,40 @@ buildPythonPackage rec {
|
|||
# when importing the local copy the extension is not found
|
||||
rm -r shap
|
||||
|
||||
# coverage testing is a waste considering how much we have to skip
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--cov=shap --cov-report=term-missing" ""
|
||||
|
||||
# Add pytest hook skipping tests that access network.
|
||||
# These tests are marked as "Expected fail" (xfail)
|
||||
cat ${conftestSkipNetworkErrors} >> tests/conftest.py
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mpl
|
||||
ipython
|
||||
matplotlib
|
||||
nose
|
||||
ipython
|
||||
pytest-mpl
|
||||
pytestCheckHook
|
||||
# optional dependencies, which only serve to enable more tests:
|
||||
opencv4
|
||||
#pytorch # we already skip all its tests due to slowness, adding it does nothing
|
||||
transformers
|
||||
#xgboost # numerically unstable? xgboost tests randomly fails pending on nixpkgs revision
|
||||
lightgbm
|
||||
catboost
|
||||
lightgbm
|
||||
opencv4
|
||||
pyspark
|
||||
sentencepiece
|
||||
#torch # we already skip all its tests due to slowness, adding it does nothing
|
||||
transformers
|
||||
xgboost
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# takes forever without GPU acceleration
|
||||
"tests/explainers/test_deep.py"
|
||||
"tests/explainers/test_gradient.py"
|
||||
# requires GPU. We skip here instead of having pytest repeatedly check for GPU
|
||||
"tests/explainers/test_gpu_tree.py"
|
||||
# The resulting plots look sane, but does not match pixel-perfectly with the baseline.
|
||||
# Likely due to a matplotlib version mismatch, different backend, or due to missing fonts.
|
||||
"tests/plots/test_summary.py" # FIXME: enable
|
||||
# 100% of the tests in these paths require network
|
||||
"tests/explainers/test_explainer.py"
|
||||
"tests/explainers/test_exact.py"
|
||||
"tests/explainers/test_partition.py"
|
||||
"tests/maskers/test_fixed_composite.py"
|
||||
"tests/maskers/test_text.py"
|
||||
"tests/models/test_teacher_forcing_logits.py"
|
||||
"tests/models/test_text_generation.py"
|
||||
];
|
||||
disabledTests = [
|
||||
# unstable. A xgboost-enabled test. possibly related: https://github.com/slundberg/shap/issues/2480
|
||||
"test_provided_background_tree_path_dependent"
|
||||
];
|
||||
|
||||
#pytestFlagsArray = ["-x" "-W" "ignore"]; # uncomment this to debug
|
||||
disabledTests = [
|
||||
# The same reason as above test_summary.py
|
||||
"test_simple_bar_with_cohorts_dict"
|
||||
"test_random_summary_violin_with_data2"
|
||||
"test_random_summary_layered_violin_with_data2"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"shap"
|
||||
|
|
@ -149,9 +153,5 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/slundberg/shap/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ evax ];
|
||||
platforms = platforms.unix;
|
||||
# No support for scikit-learn > 1.2
|
||||
# https://github.com/slundberg/shap/issues/2866
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dos2unix
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pandas
|
||||
, torch
|
||||
, scipy
|
||||
|
|
@ -11,13 +13,38 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "slicer";
|
||||
version = "0.0.7";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec";
|
||||
hash = "sha256-9dX3tF+Y0VW5wLplVPqXcMaybVeTo+d6EDD7VpEOvuw=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
dos2unix slicer/*
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# these patches add support for numpy>=1.24
|
||||
(fetchpatch {
|
||||
url = "https://github.com/interpretml/slicer/commit/028e09e639c4a3c99abe1d537cce30af2eebb081.patch";
|
||||
hash = "sha256-jh/cbz7cx2ks6jMNh1gI1n5RS/OHBtSIDZRxUGyrl/I=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/interpretml/slicer/commit/d4bb09f136d7e1f64711633c16a37e7bee738696.patch";
|
||||
hash = "sha256-9rh99s4JWF4iKClZ19jvqSeRulL32xB5Use8PGkh/SA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/interpretml/slicer/commit/74b3683a5a7bd982f9eaaf8d8d665dfdaf2c6604.patch";
|
||||
hash = "sha256-R3zsC3udYPFUT93eRhb6wyc9S5n2wceiOunWJ8K+648=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
dos2unix
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook pandas torch scipy ];
|
||||
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -28,6 +28,12 @@ buildPythonApplication {
|
|||
sha256 = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# These should be proper Requires, using the header needs their headers
|
||||
substituteInPlace lib/click/click-*.pc.in \
|
||||
--replace 'Requires.private' 'Requires'
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.43.1";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "conftest";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5eMl6dvEW5CCSIgz/o3T7iwk1EuKMuGMifX8ECHf9Oc=";
|
||||
hash = "sha256-tYF9zMDSzGSscsqHTA26FoAGNl7E9AV/8LMTzYcDOI4=";
|
||||
};
|
||||
vendorHash = "sha256-pP9Rv23ra3Cv5ZzL8E4/B/T2FQd2vRqIjKmWrINwUjc=";
|
||||
vendorHash = "sha256-Q0bV6ePjQiIzYXB7sEiAYZ9kIbErPsoAXQqdMt8Xd10=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "1.9.9";
|
||||
version = "1.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GNZvrn0aTunzpd5XUXjgEzpXAW2h6TNdqlI/Sso+lxs=";
|
||||
hash = "sha256-A5l5ZCKkDqVHy7DWd2Tb75g21t+WnLMiJuUxAYVTTUM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ECVKofvmLuFAFvncq63hYUaYW8/2+F4gZr8wIGQyrdU=";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-PR3JRA2Dme/KbU59QV0G3VzmTByynnDL9y33wHsX3PI=";
|
||||
hash = "sha256-GDOp6gmkRXwUJ0x+o1VzwCR0PZ6nmG0/FGstBhwU8OY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-UEMFHRP9XKxg1wa3JYJ522yuyrPTDhyVCdQdSpDi6Cg=";
|
||||
vendorHash = "sha256-HgGqCCcIv/sE51GnUTsOpblZZAfp31BpU+u4JFfYiLU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
}:
|
||||
mkDerivation rec {
|
||||
pname = "vaultenv";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "channable";
|
||||
repo = "vaultenv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yoYkAypH+HQSVTvd/qKNFkL5krbB5mZw3ec9ojvy+Pw=";
|
||||
sha256 = "sha256-EPu4unzXIg8naFUEZwbJ2VJXD/TeCiKzPHCXnRkdyBE=";
|
||||
};
|
||||
|
||||
buildTools = [ hpack ];
|
||||
|
|
|
|||
|
|
@ -67,16 +67,15 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conky";
|
||||
version = "1.18.0";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brndnmtthws";
|
||||
repo = "conky";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a0RGgX325NztDcQwg9+ibxOstU0MSS3eSTaljgt9qPQ=";
|
||||
hash = "sha256-AKU2kHYwhSmNrqZQWLmY82U+WQiuYiZKCJC5c0jG3KQ=";
|
||||
};
|
||||
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
|
||||
cmake/ConkyPlatformChecks.cmake
|
||||
|
|
@ -139,7 +138,8 @@ stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://conky.sourceforge.net/";
|
||||
homepage = "https://conky.cc";
|
||||
changelog = "https://github.com/brndnmtthws/conky/releases/tag/v${version}";
|
||||
description = "Advanced, highly configurable system monitor based on torsmo";
|
||||
maintainers = [ maintainers.guibert ];
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuxedo-keyboard-${kernel.version}";
|
||||
version = "3.2.5";
|
||||
version = "3.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuxedocomputers";
|
||||
repo = "tuxedo-keyboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pSGshUyim06Sqkp5QFzhUjeIz/N3aORvVt6DEyzQLaU=";
|
||||
hash = "sha256-Q0wnejeLGLSDS0GPxQuYUKCAdzbYA66KT0DuWsEKIRs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dgraph";
|
||||
version = "22.0.1";
|
||||
version = "23.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgraph-io";
|
||||
repo = "dgraph";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c4gNkT1N1yPotDhRjZvuVvO5TTaL2bqR5I+Z2PcvW10=";
|
||||
sha256 = "sha256-FB+bgrv6KojbuXDB4FKKe7eW4d9lcm9x4gA6Ceop734=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-K2Q2QBP6fJ3E2LEmZO2U/0DiQifrJVG0lcs4pO5yqrY=";
|
||||
vendorHash = "sha256-HoZpxY+xT1gRHgEpkscPXogVq2eDKGlKE6KTMIQ+mMI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, nodejs
|
||||
, python3
|
||||
|
|
@ -8,8 +9,8 @@
|
|||
, fetchNpmDeps
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mailpit";
|
||||
let
|
||||
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -19,23 +20,45 @@ buildGoModule rec {
|
|||
hash = "sha256-jT9QE0ikp9cJlT8qtfPPjKOUuqWyQk94D3UbkyaGXa8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XBYIO7fdo5EahJB7EcAuY9SGKZb8dsvoJHp/D5LO5Qo=";
|
||||
# Separate derivation, because if we mix this in buildGoModule, the separate
|
||||
# go-modules build inherits specific attributes and fails. Getting that to
|
||||
# work is hackier than just splitting the build.
|
||||
ui = stdenv.mkDerivation {
|
||||
pname = "mailpit-ui";
|
||||
inherit src version;
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-6VCs8125fTJkZW+eZgK56j7ccK8tcGhIXiq2HkYp4XM=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-6VCs8125fTJkZW+eZgK56j7ccK8tcGhIXiq2HkYp4XM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ];
|
||||
|
||||
buildPhase = ''
|
||||
npm run package
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mv server/ui/dist $out
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ];
|
||||
in
|
||||
|
||||
preBuild = ''
|
||||
npm run package
|
||||
'';
|
||||
buildGoModule {
|
||||
pname = "mailpit";
|
||||
inherit src version;
|
||||
|
||||
vendorHash = "sha256-XBYIO7fdo5EahJB7EcAuY9SGKZb8dsvoJHp/D5LO5Qo=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/axllent/mailpit/config.Version=${version}" ];
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${ui} server/ui/dist
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An email and SMTP testing tool with API for developers";
|
||||
homepage = "https://github.com/axllent/mailpit";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
, config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "drawterm";
|
||||
version = "unstable-2023-06-27";
|
||||
|
||||
|
|
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "ebqw1jqeRC0FWeUIO/HaEovuwzU6+B48TjZbVJXByvA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ installShellFiles ] ++ {
|
||||
linux = [ pkg-config wayland-scanner ];
|
||||
unix = [ makeWrapper ];
|
||||
|
|
@ -47,12 +49,11 @@ stdenv.mkDerivation rec {
|
|||
mv drawterm drawterm.bin
|
||||
install -Dm755 -t $out/bin/ drawterm.bin
|
||||
makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin
|
||||
'';
|
||||
}."${config}" or (throw "unsupported CONF") + ''
|
||||
installManPage drawterm.1
|
||||
'';
|
||||
}."${config}" or (throw "unsupported CONF") + ''
|
||||
installManPage drawterm.1
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Connect to Plan 9 CPU servers from other operating systems.";
|
||||
homepage = "https://drawterm.9front.org/";
|
||||
|
|
|
|||
|
|
@ -6,19 +6,19 @@ buildGoModule rec {
|
|||
pname = "pulumi-language-go";
|
||||
inherit (pulumi) version src;
|
||||
|
||||
sourceRoot = "${src.name}/sdk";
|
||||
sourceRoot = "${src.name}/sdk/go/pulumi-language-go";
|
||||
|
||||
vendorHash = pulumi.sdkVendorHash;
|
||||
|
||||
subPackages = [
|
||||
"go/pulumi-language-go"
|
||||
];
|
||||
vendorHash = "sha256-6/umLzw7HMplP/cJknBsWmiwAnc+YM4tIz4Zl2QMTOQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}"
|
||||
];
|
||||
|
||||
# go: inconsistent vendoring in ...
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Golang language host plugin for Pulumi";
|
||||
homepage = "https://github.com/pulumi/pulumi/tree/master/sdk/go";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
{ buildGoModule
|
||||
, pulumi
|
||||
, nodejs
|
||||
}:
|
||||
|
|
@ -8,13 +7,9 @@ buildGoModule rec {
|
|||
|
||||
pname = "pulumi-language-nodejs";
|
||||
|
||||
sourceRoot = "${src.name}/sdk";
|
||||
sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs";
|
||||
|
||||
vendorHash = sdkVendorHash;
|
||||
|
||||
subPackages = [
|
||||
"nodejs/cmd/pulumi-language-nodejs"
|
||||
];
|
||||
vendorHash = "sha256-3kDWb+1aebV2D+Nm5bkhKrJZMe/lD0ltFQ7p+Bfk644=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -25,9 +20,4 @@ buildGoModule rec {
|
|||
nativeCheckInputs = [
|
||||
nodejs
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp nodejs/dist/pulumi-resource-pulumi-nodejs $out/bin
|
||||
cp nodejs/dist/pulumi-analyzer-policy $out/bin
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "unflac";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ft";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vlwlm895mcvmxaxcid3vfji1zi9wjchz7divm096na4whj35cc4";
|
||||
sha256 = "sha256-gDgmEEOvsudSYdLUodTuE50+2hZpMqlnaVGanv/rg+U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QqLjz1X4uVpxhYXb/xIBwuLUhRaqwz2GDUPjBTS4ut0=";
|
||||
vendorSha256 = "sha256-X3cMhzaf1t+x7D8BVBfQy00rAACDEPmIOezIhKzqOZ8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -3,27 +3,30 @@
|
|||
, fetchurl
|
||||
, libtool
|
||||
, ncurses
|
||||
, withLibrary ? false
|
||||
, unicodeSupport ? true
|
||||
, enableShared ? !stdenv.isDarwin
|
||||
, unicodeSupport ? true
|
||||
, withLibrary ? false
|
||||
}:
|
||||
|
||||
assert withLibrary -> libtool != null;
|
||||
assert unicodeSupport -> ncurses != null && ncurses.unicodeSupport;
|
||||
assert unicodeSupport -> ncurses.unicodeSupport;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dialog";
|
||||
version = "1.3-20220728";
|
||||
version = "1.3-20230209";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.invisible-island.net/dialog/dialog-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-VEGJc9VZpGGwBpX6/mjfYvK8c9UGtDaCHXfKPfRUGQs=";
|
||||
url = "https://invisible-island.net/archives/dialog/dialog-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-DCYoIwUmS+IhfzNfN5j0ix3OPPEsWgdr8jHK33em1qg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional withLibrary libtool;
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-rpath-hacks"
|
||||
"--${if withLibrary then "with" else "without"}-libtool"
|
||||
|
|
@ -35,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"install${lib.optionalString withLibrary "-full"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://invisible-island.net/dialog/dialog.html";
|
||||
description = "Display dialog boxes from shell";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres spacefrogg ];
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres spacefrogg ];
|
||||
inherit (ncurses.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh-dash";
|
||||
version = "3.7.9";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-loAtRXns7plBeVOM+d/euyRS86MG+NRhGB4WpHT7KlM=";
|
||||
hash = "sha256-QaKrn/22wrRCMJLzCVRnxBRxAhnUBjkESSRg4YQCHoc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0ySTcQDM7Dole6ojnhr7vwUWOM4p6kFN69VqMP0jAY0=";
|
||||
vendorHash = "sha256-lOIONv+7cUUC0mGCwYkOkDn3zHreYpFeqmTbp2Ob3yM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gping";
|
||||
version = "1.12.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orf";
|
||||
repo = "gping";
|
||||
rev = "gping-v${version}";
|
||||
hash = "sha256-0+qSBnWewWg+PE5y9tTLLaB/uxUy+9uQkR1dnsk7MIY=";
|
||||
hash = "sha256-EkoOHyHYcbyqtT1zCq0kmXND1eSADE7QD3QQ01RJtvM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-N2V6Wwb2YB2YlBjyHZrh73RujTAmgsFOBLiN/SILP1k=";
|
||||
cargoHash = "sha256-iDB3ZIlSLEBf+nSxLeQcE93nqMjH29w+z7kwCNksuSk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jumppad";
|
||||
version = "0.5.28";
|
||||
version = "0.5.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jumppad-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j1m95RiT4cymSK9PuJuNc+ixia4DNj+8lZ0KloB+kWo=";
|
||||
hash = "sha256-2BdhJ11Mwd2w8VZfGcGJc6GuaKrVKjCqXLDggiiwyt0=";
|
||||
};
|
||||
vendorHash = "sha256-OtixGeQY1wPqs3WU6gKvrzEgxnMORxr4BWCpn/VYxRc=";
|
||||
vendorHash = "sha256-LneL4SzvcThfqqWdKpAU3mFAW1FVRTU9/T3l+yKBSME=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X main.version=${version}"
|
||||
|
|
|
|||
Loading…
Reference in a new issue