Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3e9e11f99a
45 changed files with 1962 additions and 152 deletions
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
- [mautrix-whatsapp](https://docs.mau.fi/bridges/go/whatsapp/index.html) A Matrix-WhatsApp puppeting bridge
|
||||
|
||||
- [hddfancontrol](https://github.com/desbma/hddfancontrol), a service to regulate fan speeds based on hard drive temperature. Available as [services.hddfancontrol](#opt-services.hddfancontrol.enable).
|
||||
|
||||
- [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable).
|
||||
|
||||
- [Typesense](https://github.com/typesense/typesense), a fast, typo-tolerant search engine for building delightful search experiences. Available as [services.typesense](#opt-services.typesense.enable).
|
||||
|
|
|
|||
|
|
@ -505,6 +505,7 @@
|
|||
./services/hardware/fancontrol.nix
|
||||
./services/hardware/freefall.nix
|
||||
./services/hardware/fwupd.nix
|
||||
./services/hardware/hddfancontrol.nix
|
||||
./services/hardware/illum.nix
|
||||
./services/hardware/interception-tools.nix
|
||||
./services/hardware/irqbalance.nix
|
||||
|
|
|
|||
67
nixos/modules/services/hardware/hddfancontrol.nix
Normal file
67
nixos/modules/services/hardware/hddfancontrol.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.hddfancontrol;
|
||||
types = lib.types;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
|
||||
services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon";
|
||||
|
||||
services.hddfancontrol.disks = lib.mkOption {
|
||||
type = with types; listOf path;
|
||||
default = [];
|
||||
description = lib.mdDoc ''
|
||||
Drive(s) to get temperature from
|
||||
'';
|
||||
example = ["/dev/sda"];
|
||||
};
|
||||
|
||||
services.hddfancontrol.pwmPaths = lib.mkOption {
|
||||
type = with types; listOf path;
|
||||
default = [];
|
||||
description = lib.mdDoc ''
|
||||
PWM filepath(s) to control fan speed (under /sys)
|
||||
'';
|
||||
example = ["/sys/class/hwmon/hwmon2/pwm1"];
|
||||
};
|
||||
|
||||
services.hddfancontrol.smartctl = lib.mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Probe temperature using smartctl instead of hddtemp or hdparm
|
||||
'';
|
||||
};
|
||||
|
||||
services.hddfancontrol.extraArgs = lib.mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
description = lib.mdDoc ''
|
||||
Extra commandline arguments for hddfancontrol
|
||||
'';
|
||||
example = ["--pwm-start-value=32"
|
||||
"--pwm-stop-value=0"
|
||||
"--spin-down-time=900"];
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (
|
||||
let args = lib.concatLists [
|
||||
["-d"] cfg.disks
|
||||
["-p"] cfg.pwmPaths
|
||||
(lib.optional cfg.smartctl "--smartctl")
|
||||
cfg.extraArgs
|
||||
]; in {
|
||||
systemd.packages = [pkgs.hddfancontrol];
|
||||
|
||||
systemd.services.hddfancontrol = {
|
||||
enable = true;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment.HDDFANCONTROL_ARGS = lib.escapeShellArgs args;
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
@ -341,6 +341,7 @@ in {
|
|||
hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; };
|
||||
hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; };
|
||||
hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };
|
||||
hddfancontrol = handleTest ./hddfancontrol.nix {};
|
||||
hedgedoc = handleTest ./hedgedoc.nix {};
|
||||
herbstluftwm = handleTest ./herbstluftwm.nix {};
|
||||
homepage-dashboard = handleTest ./homepage-dashboard.nix {};
|
||||
|
|
|
|||
44
nixos/tests/hddfancontrol.nix
Normal file
44
nixos/tests/hddfancontrol.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "hddfancontrol";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ benley ];
|
||||
};
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
|
||||
services.hddfancontrol.enable = true;
|
||||
services.hddfancontrol.disks = ["/dev/vda"];
|
||||
services.hddfancontrol.pwmPaths = ["/test/hwmon1/pwm1"];
|
||||
services.hddfancontrol.extraArgs = ["--pwm-start-value=32"
|
||||
"--pwm-stop-value=0"];
|
||||
|
||||
systemd.services.hddfancontrol_fixtures = {
|
||||
description = "Install test fixtures for hddfancontrol";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
};
|
||||
script = ''
|
||||
mkdir -p /test/hwmon1
|
||||
echo 255 > /test/hwmon1/pwm1
|
||||
echo 2 > /test/hwmon1/pwm1_enable
|
||||
'';
|
||||
wantedBy = ["hddfancontrol.service"];
|
||||
before = ["hddfancontrol.service"];
|
||||
};
|
||||
|
||||
systemd.services.hddfancontrol.serviceConfig.ReadWritePaths = "/test";
|
||||
};
|
||||
|
||||
# hddfancontrol.service will fail to start because qemu /dev/vda doesn't have
|
||||
# any thermal interfaces, but it should ensure that fans appear to be running
|
||||
# before it aborts.
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("journalctl -eu hddfancontrol.service|grep 'Setting fan speed'")
|
||||
machine.shutdown()
|
||||
|
||||
'';
|
||||
|
||||
})
|
||||
|
|
@ -76,6 +76,7 @@ in {
|
|||
# nixos-rebuild needs must be included in the VM.
|
||||
system.extraDependencies = with pkgs;
|
||||
[
|
||||
bintools
|
||||
brotli
|
||||
brotli.dev
|
||||
brotli.lib
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
, qscintilla-qt6
|
||||
, bison
|
||||
, flex
|
||||
, which
|
||||
, alsa-lib
|
||||
, libsndfile
|
||||
, qt4
|
||||
, qscintilla-qt4
|
||||
, libpulseaudio
|
||||
, libjack2
|
||||
, audioBackend ? "pulse" # "pulse", "alsa", or "jack"
|
||||
|
|
@ -15,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miniaudicle";
|
||||
version = "1.4.2.0";
|
||||
version = "1.5.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccrma";
|
||||
repo = "miniAudicle";
|
||||
rev = "miniAudicle-${finalAttrs.version}";
|
||||
hash = "sha256-NENpqgCCGiVzVE6rYqBu2RwkzWSiGHe7dZVwBfSomEo=";
|
||||
rev = "chuck-${finalAttrs.version}";
|
||||
hash = "sha256-CqsajNLcOp7CS5RsVabWM6APnNh4alSKb2/eoZ7F4Ao=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -37,20 +38,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
bison
|
||||
flex
|
||||
which
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libsndfile
|
||||
qt4
|
||||
qscintilla-qt4
|
||||
qscintilla-qt6
|
||||
] ++ lib.optional (audioBackend == "pulse") libpulseaudio
|
||||
++ lib.optional (audioBackend == "jack") libjack2;
|
||||
|
||||
buildFlags = [ "linux-${audioBackend}" ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A light-weight integrated development environment for the ChucK digital audio programming language";
|
||||
homepage = "https://audicle.cs.princeton.edu/mini/";
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@ let
|
|||
pffft-source = fetchFromBitbucket {
|
||||
owner = "jpommier";
|
||||
repo = "pffft";
|
||||
rev = "988259a41d1522047a9420e6265a6ba8289c1654";
|
||||
sha256 = "Oq5N02UNXsbhcPUfjMtD0cgqAZsGx9ke9A+ArrenzGE=";
|
||||
rev = "38946c766c1afecfa4c5945af77913e38b3cec31";
|
||||
sha256 = "1w6g9v9fy7bavqacb6qw1nxhcik2w36cvl2d7b0bh68w0pd70j5q";
|
||||
};
|
||||
fuzzysearchdatabase-source = fetchFromBitbucket {
|
||||
owner = "j_norberg";
|
||||
repo = "fuzzysearchdatabase";
|
||||
rev = "a3a1bf557b8e6ee58b55fa82ff77ff7a3d141949";
|
||||
sha256 = "13ib72acbxn1cnf66im0v4nlr1464v7j08ra2bprznjmy127xckm";
|
||||
rev = "23122d1ff60d936fd766361a30210c954e0c5449";
|
||||
sha256 = "1s88blx1rn2racmb8n5g0kh1ym7v21573l5m42c4nz266vmrvrvz";
|
||||
};
|
||||
nanovg-source = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
|
|
@ -57,14 +57,14 @@ let
|
|||
nanosvg-source = fetchFromGitHub {
|
||||
owner = "memononen";
|
||||
repo = "nanosvg";
|
||||
rev = "ccdb1995134d340a93fb20e3a3d323ccb3838dd0";
|
||||
sha256 = "ymziU0NgGqxPOKHwGm0QyEdK/8jL/QYk5UdIQ3Tn8jw=";
|
||||
rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1";
|
||||
sha256 = "1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l";
|
||||
};
|
||||
osdialog-source = fetchFromGitHub {
|
||||
owner = "AndrewBelt";
|
||||
repo = "osdialog";
|
||||
rev = "21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9";
|
||||
sha256 = "+4VCBuQvfiuEUdjFu3IB2FwbHFrDJXTb4vcVg6ZFwSM=";
|
||||
rev = "d0f64f0798c2e47f61d90a5505910ff2d63ca049";
|
||||
sha256 = "1d3058x6wgzw7b0wai792flk7s6ffw0z4n9sl016v91yjwv7ds3a";
|
||||
};
|
||||
oui-blendish-source = fetchFromGitHub {
|
||||
owner = "AndrewBelt";
|
||||
|
|
@ -75,20 +75,20 @@ let
|
|||
simde-source = fetchFromGitHub {
|
||||
owner = "simd-everywhere";
|
||||
repo = "simde";
|
||||
rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4";
|
||||
sha256 = "1kxwzdlh21scak7wsbb60vwfvndppidj5fgbi26mmh73zsj02mnv";
|
||||
rev = "b309d8951997201e493380a2fd09198c09ae1b4e";
|
||||
sha256 = "1hz8mfbhbiafvim4qrkyvh1yndlhydqkxwhls7cfqa48wkpxfip8";
|
||||
};
|
||||
tinyexpr-source = fetchFromGitHub {
|
||||
owner = "codeplea";
|
||||
repo = "tinyexpr";
|
||||
rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2";
|
||||
sha256 = "1yxkxsw3bc81cjm2knvyr1z9rlzwmjvq5zd125n34xwq568v904d";
|
||||
rev = "74804b8c5d296aad0866bbde6c27e2bc1d85e5f2";
|
||||
sha256 = "0z3r7wfw7p2wwl6wls2nxacirppr2147yz29whxmjaxy89ic1744";
|
||||
};
|
||||
fundamental-source = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
repo = "Fundamental";
|
||||
rev = "v2.3.1"; # tip of branch v2
|
||||
sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr";
|
||||
rev = "962547d7651260fb6a04f4d8aafd7c27f0221bee"; # tip of branch v2
|
||||
sha256 = "066gcjkni8ba98vv0di59x3f9piir0vyy5sb53cqrbrl51x853cg";
|
||||
};
|
||||
vcv-rtaudio = stdenv.mkDerivation rec {
|
||||
pname = "vcv-rtaudio";
|
||||
|
|
@ -115,7 +115,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "VCV-Rack";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
|
@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "VCVRack";
|
||||
repo = "Rack";
|
||||
rev = "v${version}";
|
||||
sha256 = "1aj7pcvks1da5ydagyxsdksp31rf8dn0bixw55kn34k0g4ky5jiw";
|
||||
sha256 = "0azrqyx5as4jmk9dxb7cj7x9dha81i0mm9pkvdv944qyccqwg55i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@ mapAliases (with prev; {
|
|||
tlib = tlib_vim;
|
||||
tmux-navigator = vim-tmux-navigator;
|
||||
tmuxNavigator = vim-tmux-navigator; # backwards compat, added 2014-10-18
|
||||
todo-nvim = throw "todo-nvim has been removed: abandoned by upstream"; # Added 2023-08-23
|
||||
tslime = tslime-vim;
|
||||
unite = unite-vim;
|
||||
UltiSnips = ultisnips;
|
||||
|
|
|
|||
|
|
@ -9977,18 +9977,6 @@ final: prev:
|
|||
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
|
||||
};
|
||||
|
||||
todo-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "todo.nvim";
|
||||
version = "2022-02-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmeerTaweel";
|
||||
repo = "todo.nvim";
|
||||
rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a";
|
||||
sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b";
|
||||
};
|
||||
meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/";
|
||||
};
|
||||
|
||||
todo-txt-vim = buildVimPluginFrom2Nix {
|
||||
pname = "todo.txt-vim";
|
||||
version = "2021-03-20";
|
||||
|
|
|
|||
|
|
@ -837,7 +837,6 @@ https://github.com/wellle/tmux-complete.vim/,,
|
|||
https://github.com/aserowy/tmux.nvim/,HEAD,
|
||||
https://github.com/edkolev/tmuxline.vim/,,
|
||||
https://github.com/folke/todo-comments.nvim/,,
|
||||
https://github.com/AmeerTaweel/todo.nvim/,,
|
||||
https://github.com/freitass/todo.txt-vim/,,
|
||||
https://github.com/akinsho/toggleterm.nvim/,,
|
||||
https://github.com/folke/tokyonight.nvim/,,
|
||||
|
|
@ -874,6 +873,7 @@ https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
|
|||
https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
|
||||
https://github.com/Konfekt/vim-CtrlXA/,,
|
||||
https://github.com/konfekt/vim-DetectSpellLang/,,
|
||||
https://github.com/fadein/vim-figlet/,HEAD,
|
||||
https://github.com/dpelle/vim-LanguageTool/,,
|
||||
https://github.com/inkarkat/vim-ReplaceWithRegister/,,
|
||||
https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/,,
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "artem";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1_2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "finefindus";
|
||||
repo = pname;
|
||||
repo = "artem";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-liYZloaXN9doNyPO76iCaiZO9ZkNGBm+BxxNX87ZqBM=";
|
||||
hash = "sha256-R7ouOFeLKnTZI6NbAg8SkkSo4zh9AwPiMPNqhPthpCk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fTAuh4jbfNpFaEu1X0LwVA30ghQ6mh5/Afap7gUjzMc=";
|
||||
cargoHash = "sha256-sbIINbuIbu38NrYr87ljJJD7Y9Px0o6Qv/MGX8N54Rc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -36,6 +36,11 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=full_file_compare_html"
|
||||
];
|
||||
|
||||
# Cargo.lock is outdated
|
||||
postConfigure = ''
|
||||
cargo metadata --offline
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage $releaseDir/build/artem-*/out/artem.1
|
||||
installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "uni";
|
||||
|
|
@ -7,17 +10,22 @@ buildGoModule rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "arp242";
|
||||
repo = "uni";
|
||||
rev = "v${version}";
|
||||
sha256 = "kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw=";
|
||||
vendorHash = "sha256-6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/arp242/uni";
|
||||
description = "Query the Unicode database from the commandline, with good support for emojis";
|
||||
changelog = "https://github.com/arp242/uni/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ chvp ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubecfg";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubecfg";
|
||||
repo = "kubecfg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qjXc/2QY0PukvhiudukZGhBkovQMutsLg3Juxg1mgTc=";
|
||||
hash = "sha256-a/2qKiqn9en67uJD/jzU3G1k6gT73DTzjY32mi51xSQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9kVFOEMFjix2WRwGi0jWHPagzXkISucGHmd88vcBJfk=";
|
||||
vendorHash = "sha256-mSYc12pjx34PhMx7jbKD/nPhPaK7jINmUSWxomikx7U=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -36,6 +36,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/kubecfg/kubecfg";
|
||||
changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
maintainers = with maintainers; [ benley qjoly ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergoscf";
|
||||
version = "3.8";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ergoscf.org/source/tarfiles/ergo-${version}.tar.gz";
|
||||
sha256 = "1s50k2gfs3y6r5kddifn4p0wmj0yk85wm5vf9v3swm1c0h43riix";
|
||||
sha256 = "sha256-U0NVREEZ8HI0Q0ZcbwvZsYA76PWMh7bqgDG1uaUc01c=";
|
||||
};
|
||||
|
||||
buildInputs = [ blas lapack ];
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison-code-manager";
|
||||
version = "M5c";
|
||||
version = "M5e";
|
||||
|
||||
src = if stdenv.isDarwin then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz";
|
||||
hash = "sha256-LTpsKwiV0ZxReLcuzoJYuMP1jN6v8M/z6mUqH9s5A+g=";
|
||||
hash = "sha256-jg8/DmIJru2OKZu5WfA7fatKcburPiXnoALifxL26kc=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz";
|
||||
hash = "sha256-6gSX8HOv/K4zFTz1O4VvrpWR9+iQyLOO6vIRv6oVw/c=";
|
||||
hash = "sha256-+2dIxqf9b8DfoTUakxA6Qrpb7cAQKCventxDS1sFxjM=";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2023.06";
|
||||
version = "2023.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakudo";
|
||||
repo = "rakudo";
|
||||
rev = version;
|
||||
hash = "sha256-t+zZEokjcDXp8uuHaOHp1R9LuS0Q3CSDOWhbSFXlNaU=";
|
||||
hash = "sha256-wvHMyXMkI2RarmUeC8lKGgy3TNmVQsZo/3D/eS4FUrI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2023.06";
|
||||
version = "2023.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moarvm";
|
||||
repo = "moarvm";
|
||||
rev = version;
|
||||
hash = "sha256-dMh1KwKh89ZUqIUPHOH9DPgxLWq37kW3hTTwsFe1imM=";
|
||||
hash = "sha256-oYdXzbT+2L/nDySKq8ZYVuVfNgzLDiskwacOM1L4lzw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2023.06";
|
||||
version = "2023.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raku";
|
||||
repo = "nqp";
|
||||
rev = version;
|
||||
hash = "sha256-VfSVNEBRW6Iz3qUeICFXu3pp92NGgAkOrThXF8a/82A=";
|
||||
hash = "sha256-kVNj6zDT0z6eFxtTovpT1grbl0pygsPKkFoVcFW7baI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcerf";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz";
|
||||
sha256 = "sha256-zO7+5G6EzojQdRAzkLT50Ew05Lw7ltczKSw2g21PcGU=";
|
||||
sha256 = "sha256-CAswrlZMPavjuJJkUira9WR+x1QCFXK+5UkpaXsnbNw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchurl
|
||||
, unzip
|
||||
, qtbase
|
||||
, qtmacextras
|
||||
, qtmacextras ? null
|
||||
, qmake
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
|
@ -63,5 +63,7 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ gpl3 ]; # and commercial
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
# ld: library not found for -lcups
|
||||
broken = stdenv.isDarwin && lib.versionAtLeast qtbase.version "6";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,22 +10,18 @@
|
|||
, ounit
|
||||
, ounit2
|
||||
, ocaml-migrate-parsetree
|
||||
, ocaml-migrate-parsetree-2
|
||||
}:
|
||||
|
||||
let params =
|
||||
if lib.versionAtLeast ppxlib.version "0.20" then {
|
||||
version = "5.2.1";
|
||||
sha256 = "11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9";
|
||||
useOMP2 = true;
|
||||
} else if lib.versionAtLeast ppxlib.version "0.15" then {
|
||||
version = "5.1";
|
||||
sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh";
|
||||
useOMP2 = false;
|
||||
} else {
|
||||
version = "5.0";
|
||||
sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3";
|
||||
useOMP2 = false;
|
||||
}
|
||||
; in
|
||||
|
||||
|
|
@ -33,8 +29,6 @@ buildDunePackage rec {
|
|||
pname = "ppx_deriving";
|
||||
inherit (params) version;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz";
|
||||
inherit (params) sha256;
|
||||
|
|
@ -44,10 +38,8 @@ buildDunePackage rec {
|
|||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
buildInputs = [ findlib ppxlib ];
|
||||
propagatedBuildInputs = [
|
||||
(if params.useOMP2
|
||||
then ocaml-migrate-parsetree-2
|
||||
else ocaml-migrate-parsetree)
|
||||
propagatedBuildInputs =
|
||||
lib.optional (lib.versionOlder version "5.2") ocaml-migrate-parsetree ++ [
|
||||
ppx_derivers
|
||||
result
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosomecomfort";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "mkmer";
|
||||
repo = "AIOSomecomfort";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-G7A5XXAElPFkuRM5bEcKqqn14tjJLn2lkYyqBtm5giM=";
|
||||
hash = "sha256-GwnlaPy+pIJOL3szOebH0a0ytVMOeUI4dM8D629RuEU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, sphinxHook
|
||||
, colorzero
|
||||
, mock
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
|
|
@ -13,6 +14,8 @@ buildPythonPackage rec {
|
|||
version = "1.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpiozero";
|
||||
repo = pname;
|
||||
|
|
@ -34,20 +37,25 @@ buildPythonPackage rec {
|
|||
colorzero
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gpiozero"
|
||||
"gpiozero.tools"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gpiozero"
|
||||
"gpiozero.tools"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/gpiozero/gpiozero/issues/1087
|
||||
"test_spi_hardware_write"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple interface to GPIO devices with Raspberry Pi";
|
||||
homepage = "https://github.com/gpiozero/gpiozero";
|
||||
changelog = "https://github.com/gpiozero/gpiozero/blob/v${version}/docs/changelog.rst";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "humanize";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "python-humanize";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ofRdrFVxIxAtv8WopJDX8Te8yaaJTnDbRM56V7pm/NM=";
|
||||
hash = "sha256-bKTzygQtZ/0UB+zM9735a/xwH4KaoU6C8kUGurbHs2Y=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, ruamel-yaml
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -35,5 +35,7 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/speechbrain/HyperPyYAML/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
# hyperpyyaml is not compatible with the too new version of `ruaml-yaml`
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.14.0";
|
||||
version = "4.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wSM8YCKRvwEs7fEjUjOp52PdF2Y1kxnX/Xpf0KdXR2k=";
|
||||
hash = "sha256-JIfMHDMX7N9wr9BTiTh/jsnPLDS3w8Pyp7wS014PyQ0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "rdkit";
|
||||
version = "2023.03.2";
|
||||
version = "2023.03.3";
|
||||
format = "other";
|
||||
|
||||
src =
|
||||
|
|
@ -53,7 +53,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "Release_${versionTag}";
|
||||
hash = "sha256-p1zJLMtIlO+0qKMO7ghDLrONNZFPTuc2QtOtB1LJPtc=";
|
||||
hash = "sha256-5M7nDUWORbepDGaf2G6Cd79Hu0au3DNRc9KuONoCWK0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "speechbrain";
|
||||
version = "0.5.14";
|
||||
version = "0.5.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "speechbrain";
|
||||
repo = "speechbrain";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r1q7JO+H7ynfrzlihRTY0PtMGmvwm98BHUZV534ABXw=";
|
||||
hash = "sha256-d0+3bry69ML65JR8XDppG8RO200ZTTHyd7PrTP7SJkk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-protobuf";
|
||||
version = "4.23.0.2";
|
||||
version = "4.24.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EGawadTw4Jveu2TKTzXMa4rM9S+Ag2gEbM7JZ0SvA3U=";
|
||||
hash = "sha256-kK3qO2k9akDY7wdcWP5rXMbgH+FJYwGn5vxwOY3P+S4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -68,16 +68,15 @@ let
|
|||
pythonImportsCheck = [ "${lib.replaceStrings ["-"] ["_"] pname}" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Python extension to run WebAssembly binaries";
|
||||
homepage = "https://github.com/wasmerio/wasmer-python";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
in
|
||||
rec {
|
||||
{
|
||||
wasmer = common {
|
||||
pname = "wasmer";
|
||||
buildAndTestSubdir = "packages/api";
|
||||
|
|
|
|||
|
|
@ -5,22 +5,26 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bomber-go";
|
||||
version = "0.3.4";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devops-kung-fu";
|
||||
repo = "bomber";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q30wTM8HQURDBUReQsXgKHI4m4sSdHbWPwUld0sAays=";
|
||||
hash = "sha256-vFdXtkz2T6kP/j/j9teHpf4XesqOmKFliZJRyGZKdwg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tkjwnc5EquAuIfYKy8u6ZDFJPl/UTW6x7vvY1QTsBXg=";
|
||||
vendorHash = "sha256-GHzJQVq748kG+X9amsQmqZ2cRzwQDO5LfBqvZwVn6W8=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"-skip=TestEnrich" # Requires network access
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to scans Software Bill of Materials (SBOMs) for vulnerabilities";
|
||||
homepage = "https://github.com/devops-kung-fu/bomber";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.401.3";
|
||||
version = "2.414.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
hash = "sha256-p5igxUgaj/sDINkSH2z0ncV1w2kCjarhek3TmLaeAA0=";
|
||||
hash = "sha256-8lI/m1/lAZn2j2D5a2vvnKEA4YCZ4+PaeppJroxHsBU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "f2c";
|
||||
version = "20200916";
|
||||
version = "20230428";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.netlib.org/f2c/src.tgz";
|
||||
sha256 = "0d8xfbv6dk4dz95qds7sd44b5hvara07f2g2c5g4xiwim9b7916l";
|
||||
sha256 = "sha256-dLpnwyGjtikhbH7VpIoGHD5cNyKshc6wHczmkTdRcFo=";
|
||||
};
|
||||
|
||||
makeFlags = [ "-f" "makefile.u" ];
|
||||
|
|
|
|||
1605
pkgs/development/tools/language-servers/postgres-lsp/Cargo.lock
generated
Normal file
1605
pkgs/development/tools/language-servers/postgres-lsp/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "postgres-lsp";
|
||||
version = "unstable-2023-08-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "postgres_lsp";
|
||||
rev = "1250f5ed14a0e86b2b7fa581214284c67b960621";
|
||||
hash = "sha256-Y43sTgKNcAI3h6McDc0g6o9CX6jOKBfURLWyjJhvmwk=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
# Cargo.lock is ignored
|
||||
# https://github.com/supabase/postgres_lsp/pull/28
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "-p=postgres_lsp" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Language Server for Postgres";
|
||||
homepage = "https://github.com/supabase/postgres_lsp";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "postgres_lsp";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,37 +2,24 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, python3
|
||||
, curl
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osslsigncode";
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtrojnar";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-33uT9PFD1YEIMzifZkpbl2EAoC98IsM72K4rRjDfh8g=";
|
||||
sha256 = "sha256-Lt99RO/pTEtksIuulkKTm48+1xUKZOHrnlbDZGi3VWk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Cygwin patch is prereq for Darwin fix applying -- committed to master after 2.5 release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mtrojnar/osslsigncode/commit/1c678bf926b78c947b14c46c3ce88e06268c738e.patch";
|
||||
sha256 = "sha256-vOBMGIJ3PHJTvmsXRRfAUJRi7P929PcfmrUiRuM0pf4=";
|
||||
})
|
||||
# Fix build on Darwin when clang not identified as Apple (https://github.com/mtrojnar/osslsigncode/pull/247)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/charles-dyfis-net/osslsigncode/commit/b2ed89b35c8a26faa7eb6515fecaff3c4c5f7fed.patch";
|
||||
sha256 = "sha256-FGKZK/IzHbbkTzSoAtpC75z79d5+qQvvJrjEDY31WJ0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
|
||||
buildInputs = [ curl openssl ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "specr-transpile";
|
||||
version = "0.1.20";
|
||||
version = "0.1.21";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-HXqUp80vPFwG0B+f/Zfem0gOHF/igmtxTvS1c8amLmo=";
|
||||
hash = "sha256-tFiCE6UJ7Jl/KJ7efwcHrX511Rs14ck4a7eY4dpusUc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UCIXuVwMDCJkHQJtmRUw6EiGDYCF5DeUVxBrQM4lgxg=";
|
||||
cargoHash = "sha256-zBo1tLyfNSt04TuYP/SYmqC0ov9HmuXF013EqvrvY20=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Converts Specr lang code to Rust";
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ let
|
|||
else llvmPackages.stdenv).mkDerivation;
|
||||
in mkDerivation rec {
|
||||
pname = "clickhouse";
|
||||
version = "23.3.8.21";
|
||||
version = "23.3.10.5";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "ClickHouse";
|
||||
|
|
@ -36,7 +36,7 @@ in mkDerivation rec {
|
|||
rev = "v${version}-lts";
|
||||
fetchSubmodules = true;
|
||||
name = "clickhouse-${rev}.tar.gz";
|
||||
hash = "sha256-bynr196H6g/GmvNTtrfB6QDdAScvYvbe7EIceoOwCKc=";
|
||||
hash = "sha256-xvmZOJqXrGToQRoEl+4AL9ewUhNdKGZFnCdBnSlB+tk=";
|
||||
postFetch = ''
|
||||
# delete files that make the source too big
|
||||
rm -rf $out/contrib/llvm-project/llvm/test
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-7Sk2Fd9u5c1XLTd9vl32TpD10M1JeB9V05yF/dF+Sfk=";
|
||||
hash = "sha256-dWeJ+sLZrnnhXyuPoOCsEiqLabavbXgAUkqZJ5Ff0XY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-08-20";
|
||||
version = "2023-08-22";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Od8iMbHxmQKyP02piWDkeUfIhkwZLFsm6lpSTztCjmA=";
|
||||
hash = "sha256-FgisC2eOQ0sqy+dkUs9RZ6nJQROidEv15Hf1wUwcUPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.17.0";
|
||||
version = "8.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rwTyzXFGn9+2qbWZLhVHGRbHwbTTcosW8TtVKuNlbGI=";
|
||||
hash = "sha256-659wQBv8DuYB4vI+qnBLS9u22kGlg4ne4DyKFoomlOw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sLezh1H5mVgoPl8YsKL41xpGWKEBP5nkKQjtPIE5Zm0=";
|
||||
vendorHash = "sha256-PPEEQ2Bt20UK+mQL59jVnX8HtzCsqW4uRwR3mOdhDis=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -5,33 +5,47 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "wapiti";
|
||||
version = "3.1.7";
|
||||
format = "setuptools";
|
||||
version = "3.1.8";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wapiti-scanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-muAugc0BgVSER2LSRv7ATbCqpXID8/WH+hfhmtoS36o=";
|
||||
hash = "sha256-2ssbczUa4pTA5Fai+sK1hES8skJMIHxa/R2hNIiEVLs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Ignore pinned versions
|
||||
sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" pyproject.toml
|
||||
|
||||
# Remove code coverage checking
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov --cov-report=xml" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiocache
|
||||
aiohttp
|
||||
aiosqlite
|
||||
arsenic
|
||||
beautifulsoup4
|
||||
brotli
|
||||
browser-cookie3
|
||||
cryptography
|
||||
dnspython
|
||||
h11
|
||||
httpcore
|
||||
httpx
|
||||
humanize
|
||||
importlib-metadata
|
||||
httpx-ntlm
|
||||
loguru
|
||||
mako
|
||||
markupsafe
|
||||
mitmproxy
|
||||
pyasn1
|
||||
six
|
||||
sqlalchemy
|
||||
tld
|
||||
|
|
@ -39,21 +53,14 @@ python3.pkgs.buildPythonApplication rec {
|
|||
] ++ httpx.optional-dependencies.brotli
|
||||
++ httpx.optional-dependencies.socks;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
respx
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Ignore pinned versions
|
||||
sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov --cov-report=xml" ""
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
|
@ -114,6 +121,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
"test_xxe"
|
||||
# Requires a PHP installation
|
||||
"test_cookies"
|
||||
"test_fallback_to_html_injection"
|
||||
"test_loknop_lfi_to_rce"
|
||||
"test_redirect"
|
||||
"test_timesql"
|
||||
|
|
@ -121,6 +129,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
"test_xss_inside_src_iframe"
|
||||
# TypeError: Expected bytes or bytes-like object got: <class 'str'>
|
||||
"test_persister_upload"
|
||||
# Requires creating a socket to an external URL
|
||||
"test_attack_unifi"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
|
|||
34
pkgs/tools/system/hddfancontrol/default.nix
Normal file
34
pkgs/tools/system/hddfancontrol/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib, python3Packages, fetchFromGitHub, hddtemp, hdparm, smartmontools }:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hddfancontrol";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desbma";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0b2grf98qnikayn18xll01dkm5pjpcjxdffgx1nyw9s0gqig8dg0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.python-daemon
|
||||
hddtemp
|
||||
hdparm
|
||||
smartmontools
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/systemd/system
|
||||
substitute systemd/hddfancontrol.service $out/etc/systemd/system/hddfancontrol.service \
|
||||
--replace /usr/bin/hddfancontrol $out/bin/hddfancontrol
|
||||
sed -i -e '/EnvironmentFile=.*/d' $out/etc/systemd/system/hddfancontrol.service
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dynamically control fan speed according to hard drive temperature on Linux";
|
||||
homepage = "https://github.com/desbma/hddfancontrol";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9032,6 +9032,8 @@ with pkgs;
|
|||
|
||||
hdaps-gl = callPackage ../tools/misc/hdaps-gl { };
|
||||
|
||||
hddfancontrol = callPackage ../tools/system/hddfancontrol { };
|
||||
|
||||
hddtemp = callPackage ../tools/misc/hddtemp { };
|
||||
|
||||
hdf4 = callPackage ../tools/misc/hdf4 { };
|
||||
|
|
@ -12376,6 +12378,8 @@ with pkgs;
|
|||
|
||||
qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
|
||||
|
||||
qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { };
|
||||
|
||||
qrcp = callPackage ../tools/networking/qrcp { };
|
||||
|
||||
qrscan = callPackage ../tools/misc/qrscan { };
|
||||
|
|
@ -18458,6 +18462,8 @@ with pkgs;
|
|||
|
||||
openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { };
|
||||
|
||||
postgres-lsp = callPackage ../development/tools/language-servers/postgres-lsp { };
|
||||
|
||||
pylyzer = callPackage ../development/tools/language-servers/pylyzer { };
|
||||
|
||||
rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp {
|
||||
|
|
@ -33722,7 +33728,7 @@ with pkgs;
|
|||
|
||||
mikmod = callPackage ../applications/audio/mikmod { };
|
||||
|
||||
miniaudicle = callPackage ../applications/audio/miniaudicle { };
|
||||
miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { };
|
||||
|
||||
minidsp = callPackage ../applications/audio/minidsp {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
|
||||
|
|
|
|||
Loading…
Reference in a new issue