Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -923,6 +923,15 @@
|
||||
name = "Anselm Schüler";
|
||||
matrix = "@schuelermine:matrix.org";
|
||||
};
|
||||
anthonyroussel = {
|
||||
email = "anthony@roussel.dev";
|
||||
github = "anthonyroussel";
|
||||
githubId = 220084;
|
||||
name = "Anthony Roussel";
|
||||
keys = [{
|
||||
fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E";
|
||||
}];
|
||||
};
|
||||
antoinerg = {
|
||||
email = "roygobeil.antoine@gmail.com";
|
||||
github = "antoinerg";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@@ -7,10 +7,20 @@ let
|
||||
|
||||
keyboard = {
|
||||
options = {
|
||||
device = mkOption {
|
||||
type = types.str;
|
||||
example = "/dev/input/by-id/usb-0000_0000-event-kbd";
|
||||
description = lib.mdDoc "Path to the keyboard device.";
|
||||
devices = mkOption {
|
||||
type = types.addCheck (types.listOf types.str)
|
||||
(devices: (length devices) > 0);
|
||||
example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ];
|
||||
# TODO replace note with tip, which has not been implemented yet in
|
||||
# nixos/lib/make-options-doc/mergeJSON.py
|
||||
description = mdDoc ''
|
||||
Paths to keyboard devices.
|
||||
|
||||
::: {.note}
|
||||
To avoid unnecessary triggers of the service unit, unplug devices in
|
||||
the order of the list.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
@@ -33,18 +43,32 @@ let
|
||||
;; tap within 100ms for capslk, hold more than 100ms for lctl
|
||||
cap (tap-hold 100 100 caps lctl))
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
Configuration other than defcfg.
|
||||
See <https://github.com/jtroo/kanata> for more information.
|
||||
description = mdDoc ''
|
||||
Configuration other than `defcfg`. See [example config
|
||||
files](https://github.com/jtroo/kanata) for more information.
|
||||
'';
|
||||
};
|
||||
extraDefCfg = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = "danger-enable-cmd yes";
|
||||
description = lib.mdDoc ''
|
||||
Configuration of defcfg other than linux-dev.
|
||||
See <https://github.com/jtroo/kanata> for more information.
|
||||
description = mdDoc ''
|
||||
Configuration of `defcfg` other than `linux-dev`. See [example
|
||||
config files](https://github.com/jtroo/kanata) for more information.
|
||||
'';
|
||||
};
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = mdDoc "Extra command line arguments passed to kanata.";
|
||||
};
|
||||
port = mkOption {
|
||||
type = types.nullOr types.port;
|
||||
default = null;
|
||||
example = 6666;
|
||||
description = mdDoc ''
|
||||
Port to run the notification server on. `null` will not run the
|
||||
server.
|
||||
'';
|
||||
};
|
||||
};
|
||||
@@ -52,16 +76,18 @@ let
|
||||
|
||||
mkName = name: "kanata-${name}";
|
||||
|
||||
mkDevices = devices: concatStringsSep ":" devices;
|
||||
|
||||
mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" ''
|
||||
(defcfg
|
||||
${keyboard.extraDefCfg}
|
||||
linux-dev ${keyboard.device})
|
||||
linux-dev ${mkDevices keyboard.devices})
|
||||
|
||||
${keyboard.config}
|
||||
'';
|
||||
|
||||
mkService = name: keyboard: nameValuePair (mkName name) {
|
||||
description = "kanata for ${keyboard.device}";
|
||||
description = "kanata for ${mkDevices keyboard.devices}";
|
||||
|
||||
# Because path units are used to activate service units, which
|
||||
# will start the old stopped services during "nixos-rebuild
|
||||
@@ -72,10 +98,14 @@ let
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${cfg.package}/bin/kanata \
|
||||
--cfg ${mkConfig name keyboard}
|
||||
--cfg ${mkConfig name keyboard} \
|
||||
--symlink-path ''${RUNTIME_DIRECTORY}/${name} \
|
||||
${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \
|
||||
${utils.escapeSystemdExecArgs keyboard.extraArgs}
|
||||
'';
|
||||
|
||||
DynamicUser = true;
|
||||
RuntimeDirectory = mkName name;
|
||||
SupplementaryGroups = with config.users.groups; [
|
||||
input.name
|
||||
uinput.name
|
||||
@@ -83,15 +113,16 @@ let
|
||||
|
||||
# hardening
|
||||
DeviceAllow = [
|
||||
"/dev/uinput w"
|
||||
"/dev/uinput rw"
|
||||
"char-input r"
|
||||
];
|
||||
CapabilityBoundingSet = "";
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DevicePolicy = "closed";
|
||||
IPAddressDeny = "any";
|
||||
IPAddressAllow = optional (keyboard.port != null) "localhost";
|
||||
IPAddressDeny = [ "any" ];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateNetwork = true;
|
||||
PrivateNetwork = keyboard.port == null;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
@@ -102,10 +133,11 @@ let
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
RestrictAddressFamilies = "none";
|
||||
RestrictAddressFamilies =
|
||||
if (keyboard.port == null) then "none" else [ "AF_INET" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallArchitectures = [ "native" ];
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
@@ -115,13 +147,32 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
mkPath = name: keyboard: nameValuePair (mkName name) {
|
||||
description = "kanata trigger for ${keyboard.device}";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
pathConfig = {
|
||||
PathExists = keyboard.device;
|
||||
mkPathName = i: name: "${mkName name}-${toString i}";
|
||||
|
||||
mkPath = name: n: i: device:
|
||||
nameValuePair (mkPathName i name) {
|
||||
description =
|
||||
"${toString (i+1)}/${toString n} kanata trigger for ${name}, watching ${device}";
|
||||
wantedBy = optional (i == 0) "multi-user.target";
|
||||
pathConfig = {
|
||||
PathExists = device;
|
||||
# (ab)use systemd.path to construct a trigger chain so that the
|
||||
# service unit is only started when all paths exist
|
||||
# however, manual of systemd.path says Unit's suffix is not ".path"
|
||||
Unit =
|
||||
if (i + 1) == n
|
||||
then "${mkName name}.service"
|
||||
else "${mkPathName (i + 1) name}.path";
|
||||
};
|
||||
unitConfig.StopPropagatedFrom = optional (i > 0) "${mkName name}.service";
|
||||
};
|
||||
};
|
||||
|
||||
mkPaths = name: keyboard:
|
||||
let
|
||||
n = length keyboard.devices;
|
||||
in
|
||||
imap0 (mkPath name n) keyboard.devices
|
||||
;
|
||||
in
|
||||
{
|
||||
options.services.kanata = {
|
||||
@@ -131,15 +182,19 @@ in
|
||||
default = pkgs.kanata;
|
||||
defaultText = lib.literalExpression "pkgs.kanata";
|
||||
example = lib.literalExpression "pkgs.kanata-with-cmd";
|
||||
description = lib.mdDoc ''
|
||||
kanata package to use.
|
||||
If you enable danger-enable-cmd, pkgs.kanata-with-cmd should be used.
|
||||
description = mdDoc ''
|
||||
The kanata package to use.
|
||||
|
||||
::: {.note}
|
||||
If `danger-enable-cmd` is enabled in any of the keyboards, the
|
||||
`kanata-with-cmd` package should be used.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
keyboards = mkOption {
|
||||
type = types.attrsOf (types.submodule keyboard);
|
||||
default = { };
|
||||
description = lib.mdDoc "Keyboard configurations.";
|
||||
description = mdDoc "Keyboard configurations.";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -147,7 +202,11 @@ in
|
||||
hardware.uinput.enable = true;
|
||||
|
||||
systemd = {
|
||||
paths = mapAttrs' mkPath cfg.keyboards;
|
||||
paths = trivial.pipe cfg.keyboards [
|
||||
(mapAttrsToList mkPaths)
|
||||
concatLists
|
||||
listToAttrs
|
||||
];
|
||||
services = mapAttrs' mkService cfg.keyboards;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -132,8 +132,9 @@ in {
|
||||
|
||||
systemd.services.yggdrasil = {
|
||||
description = "Yggdrasil Network Service";
|
||||
bindsTo = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
after = [ "network-pre.target" ];
|
||||
wants = [ "network.target" ];
|
||||
before = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
preStart =
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.2.2";
|
||||
version = "4.3.0";
|
||||
|
||||
libsecp256k1_name =
|
||||
if stdenv.isLinux then "libsecp256k1.so.0"
|
||||
@@ -30,6 +30,7 @@ let
|
||||
|
||||
libzbar_name =
|
||||
if stdenv.isLinux then "libzbar.so.0"
|
||||
else if stdenv.isDarwin then "libzbar.0.dylib"
|
||||
else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
||||
# Not provided in official source releases, which are what upstream signs.
|
||||
@@ -37,7 +38,7 @@ let
|
||||
owner = "spesmilo";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo=";
|
||||
sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg=";
|
||||
|
||||
postFetch = ''
|
||||
mv $out ./all
|
||||
@@ -53,7 +54,7 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs=";
|
||||
sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
@@ -90,7 +91,6 @@ python3.pkgs.buildPythonApplication {
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
|
||||
substituteInPlace ./electrum/ecc_fast.py \
|
||||
--replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'' + (if enableQt then ''
|
||||
@@ -101,17 +101,11 @@ python3.pkgs.buildPythonApplication {
|
||||
'');
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
# Despite setting usr_share above, these files are installed under
|
||||
# $out/nix ...
|
||||
mv $out/${python3.sitePackages}/nix/store"/"*/share $out
|
||||
rm -rf $out/${python3.sitePackages}/nix
|
||||
|
||||
substituteInPlace $out/share/applications/electrum.desktop \
|
||||
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \
|
||||
"Exec=$out/bin/electrum %u" \
|
||||
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
|
||||
"Exec=$out/bin/electrum --testnet %u"
|
||||
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString enableQt ''
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, pkg-config
|
||||
, openssl
|
||||
, xorg
|
||||
, libGL
|
||||
, withGui ? false # build GUI version
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rusty-psn";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RainbowCookie32";
|
||||
repo = "rusty-psn";
|
||||
rev = "v${version}";
|
||||
sha256 = "14li5fsaj4l5al6lcxy07g3gzmi0l3cyiczq44q7clq4myhykhhb";
|
||||
};
|
||||
|
||||
cargoSha256 = "0kjaq3ik3lwaz7rjb5jaxavpahzp33j7vln3zyifql7j7sbr300f";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = if withGui then [
|
||||
openssl
|
||||
xorg.libxcb
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
xorg.libXi
|
||||
xorg.libxcb
|
||||
libGL
|
||||
libGL.dev
|
||||
] else [
|
||||
openssl
|
||||
];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ (if withGui then "egui" else "cli") ];
|
||||
|
||||
postFixup = ''
|
||||
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/rusty-psn
|
||||
'' + lib.optionalString withGui ''
|
||||
mv $out/bin/rusty-psn $out/bin/rusty-psn-gui
|
||||
'';
|
||||
|
||||
desktopItem = lib.optionalString withGui (makeDesktopItem {
|
||||
name = "rusty-psn";
|
||||
desktopName = "rusty-psn";
|
||||
exec = "rusty-psn-gui";
|
||||
comment = "A simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API.";
|
||||
categories = [
|
||||
"Network"
|
||||
];
|
||||
keywords = [
|
||||
"psn"
|
||||
"ps3"
|
||||
"sony"
|
||||
"playstation"
|
||||
"update"
|
||||
];
|
||||
});
|
||||
desktopItems = lib.optionals withGui [ desktopItem ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API";
|
||||
homepage = "https://github.com/RainbowCookie32/rusty-psn/";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ AngryAnt ];
|
||||
};
|
||||
}
|
||||
@@ -25,12 +25,19 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
outputs = [ "out" "udev" ];
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
|
||||
buildInputs = [ libappindicator librsvg ];
|
||||
nativeBuildInputs = [
|
||||
gdk-pixbuf
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libappindicator
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
evdev
|
||||
gobject-introspection
|
||||
gtk3
|
||||
psutil
|
||||
pygobject3
|
||||
@@ -47,6 +54,17 @@ python3Packages.buildPythonApplication rec {
|
||||
install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "solaar" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux devices manager for the Logitech Unifying Receiver";
|
||||
longDescription = ''
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "omni-gtk-theme";
|
||||
version = "unstable-2021-03-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getomni";
|
||||
repo = "gtk";
|
||||
rev = "e81b3fbebebf53369cffe1fb662abc400edb04f7";
|
||||
sha256 = "sha256-NSZjkG+rY6h8d7FYq5kipPAjMDAgyaYAgOOOJlfqBCI=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/themes/Omni
|
||||
cp -a {assets,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,metacity-1,unity,xfwm4} $out/share/themes/Omni
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dark theme created by Rocketseat";
|
||||
homepage = "https://github.com/getomni/gtk";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ zoedsoupe ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -451,17 +451,11 @@ unsupported-platforms:
|
||||
hidapi: [ platforms.darwin ]
|
||||
hinotify-bytestring: [ platforms.darwin ]
|
||||
honk: [ platforms.darwin ]
|
||||
HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms
|
||||
HSoM: [ platforms.darwin ]
|
||||
iwlib: [ platforms.darwin ]
|
||||
Jazzkell: [ platforms.darwin ] # depends on Euterpea
|
||||
jsaddle-hello: [ platforms.darwin ] # depends on jsaddle-webkit2gtk
|
||||
jsaddle-webkit2gtk: [ platforms.darwin ]
|
||||
keid-core: [ aarch64-linux ]
|
||||
keid-geometry: [ aarch64-linux ]
|
||||
keid-render-basic: [ aarch64-linux ]
|
||||
keid-sound-openal: [ aarch64-linux ]
|
||||
keid-ui-dearimgui: [ aarch64-linux ]
|
||||
Kulitta: [ platforms.darwin ] # depends on Euterpea
|
||||
LambdaHack: [ platforms.darwin ]
|
||||
large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17
|
||||
@@ -485,8 +479,6 @@ unsupported-platforms:
|
||||
oculus: [ platforms.darwin ]
|
||||
pam: [ platforms.darwin ]
|
||||
parport: [ platforms.darwin ]
|
||||
password: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
|
||||
password-instances: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
|
||||
persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128
|
||||
piyo: [ platforms.darwin ]
|
||||
PortMidi-simple: [ platforms.darwin ]
|
||||
@@ -499,8 +491,6 @@ unsupported-platforms:
|
||||
reflex-localize-dom: [ platforms.darwin, aarch64-linux ]
|
||||
rtlsdr: [ platforms.darwin ]
|
||||
rubberband: [ platforms.darwin ]
|
||||
scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
|
||||
scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8
|
||||
sdl2-mixer: [ platforms.darwin ]
|
||||
sdl2-ttf: [ platforms.darwin ]
|
||||
sensei: [ platforms.darwin ]
|
||||
@@ -545,8 +535,14 @@ supported-platforms:
|
||||
hpapi: [ platforms.linux ] # limited by pkgs.papi
|
||||
hsignal: [ platforms.x86 ] # -msse2
|
||||
HFuse: [ platforms.linux ]
|
||||
HQu: [ platforms.x86 ] # vendored C++ library needs i686/x86_64
|
||||
hw-prim-bits: [ platforms.x86 ] # x86 assembler
|
||||
inline-asm: [ platforms.x86 ] # x86 assembler
|
||||
keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-geometry: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-render-basic: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-sound-openal: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-ui-dearimgui: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
kqueue: [ platforms.netbsd, platforms.freebsd, platforms.openbsd, platforms.darwin ]
|
||||
linux-evdev: [ platforms.linux ]
|
||||
linux-file-extents: [ platforms.linux ]
|
||||
@@ -555,7 +551,12 @@ supported-platforms:
|
||||
linux-namespaces: [ platforms.linux ]
|
||||
lxc: [ platforms.linux ]
|
||||
midi-alsa: [ platforms.linux ]
|
||||
password: [ platforms.x86 ] # uses scrypt, which requries x86
|
||||
password-instances: [ platforms.x86 ] # uses scrypt, which requries x86
|
||||
reactivity: [ platforms.windows ]
|
||||
reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux
|
||||
scat: [ platforms.x86 ] # uses scrypt, which requries x86
|
||||
scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8
|
||||
seqalign: [ platforms.x86 ] # x86 intrinsics
|
||||
udev: [ platforms.linux ]
|
||||
Win32-console: [ platforms.windows ]
|
||||
@@ -569,6 +570,7 @@ supported-platforms:
|
||||
Win32-services: [ platforms.windows ]
|
||||
Win32-services-wrapper: [ platforms.windows ]
|
||||
XInput: [ platforms.windows ]
|
||||
yesod-auth-simple: [ platforms.x86 ] # requires scrypt which only supports x86
|
||||
|
||||
dont-distribute-packages:
|
||||
# Depends on shine, which is a ghcjs project.
|
||||
|
||||
+43
-186
File diff suppressed because it is too large
Load Diff
+92
-504
File diff suppressed because it is too large
Load Diff
@@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.0.21";
|
||||
hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY=";
|
||||
version = "8.0.22";
|
||||
hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw=";
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.8";
|
||||
hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE=";
|
||||
version = "8.1.9";
|
||||
hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8=";
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
# tests
|
||||
, python3
|
||||
, arrow-cpp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -92,6 +93,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.tests = {
|
||||
inherit (python3.pkgs) grpcio-status grpcio-tools;
|
||||
inherit arrow-cpp;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -35,13 +35,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poppler-${suffix}";
|
||||
version = "22.06.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
|
||||
sha256 = "sha256-oPmqo5GLrXgQOfwwemNWUqFNGzkc1Vm2bt7Evtujxdc=";
|
||||
sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
maintainers = [ maintainers.bugworm ];
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtutilities";
|
||||
version = "6.6.2";
|
||||
version = "6.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zt/d6V1/6Kqh0ZdJX3dLkj36NHlvlmFSxPPqcNyC6ZM=";
|
||||
sha256 = "sha256-RjVmrdUHDBelwagWD5Mx+S3tdFO7I0+8RmFR7hwoe8o=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase cpp-utilities ];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.10.1";
|
||||
version = "2.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-f4wMYlmex0QrcJrl33VyOZgbURYnIjeWDR7rz4MzMJw=";
|
||||
hash = "sha256-WI/mUT5UxVkA5h4gndEkTWtxgOXK5LHqmweiRVzb+5A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mediapy";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cM8u27XSN4VzXONk+tQElZgT5XdShWXq0UtDg5JbF9o=";
|
||||
hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipython matplotlib numpy pillow ];
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-concurrency";
|
||||
version = "4.5.1";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.concurrency";
|
||||
inherit version;
|
||||
sha256 = "sha256-aGm5Rrk9lbq/IM0Wvgb8NaXsFNB+osHzFfSsbqXw2hc=";
|
||||
sha256 = "sha256-n0aUbp+KcqBvFP49xBiaTT3TmGKDFSU5OjEZvbvniX4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "4.0.1";
|
||||
version = "4.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iCHXiGKg3ENqw4cX1iNpVZAA944siKbFGKooo+KswsY=";
|
||||
hash = "sha256-B0t9kNl55VsPC8ZXP7/lRDJ0Hfm4uhSEMGX9To4fjAU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.102";
|
||||
version = "2.1.103";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+jTO8IO+3j6kVBNjjCToRpiUmQTvBVmZTnNLbSHeNjw=";
|
||||
hash = "sha256-B7zWM2Jrf9bRjrDWMDrP0KT7yzFpLnN7FXlGJtqJa/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "9.8.0";
|
||||
version = "9.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iILDOpajLdTi+yPBNIr2+Sb1qBl0KCoSow2XBmDpFSI=";
|
||||
hash = "sha256-uvozG1l+aGDs4nzOOjKUPScLLMNVop5u2Y89se8GvtY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyipma";
|
||||
version = "2.1.5";
|
||||
version = "3.0.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Request for GitHub releases, https://github.com/dgomes/pyipma/issues/10
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0hq5dasqpsn64x2sf6a28hdmysygmcdq4in6s08w97jfvwc6xmym";
|
||||
sha256 = "sha256-LfnatA8CimHIXH3f3T4PatDBIEhh6vlQtI080iu8UEg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyskyqremote";
|
||||
version = "0.3.12";
|
||||
version = "0.3.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "RogerSelwyn";
|
||||
repo = "skyq_remote";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-NEdlhp0Bjbb1oRCFf0OPEuFlLE2JjRWYWwnTaHozPr0=";
|
||||
sha256 = "sha256-ps83Jo1H5hkCZ6kmuSSEC+UAdul84JJ7syMJq95Z2wQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvips";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libvips";
|
||||
repo = "pyvips";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw=";
|
||||
sha256 = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig pkg-config ];
|
||||
@@ -42,6 +42,6 @@ buildPythonPackage rec {
|
||||
description = "A python wrapper for libvips";
|
||||
homepage = "https://github.com/libvips/pyvips";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ccellado ];
|
||||
maintainers = with maintainers; [ ccellado anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.101.1";
|
||||
version = "2.103.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-f3bmx8iJkTJ6WSl3RkQ19cbOKB4UrhoAP8pEYEtyr74=";
|
||||
hash = "sha256-0iXIUWvoL6+kT+KaJq7yzdEzYA0orKBbQkGAVUYcSKk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlmap";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-J0USsiCWaysQOir/wpkw6GT1ILckjK7EUiY541aoahA=";
|
||||
sha256 = "sha256-OWIuYAms4SXQXVr0Wx8y7pne13IBclfq0P3VTy91Kz8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "svglib";
|
||||
version = "1.3.0";
|
||||
version = "1.4.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o4mYuV0buZVk3J3/rxXk6UU3YfJ5DS3UFHpK1fusEHg=";
|
||||
sha256 = "sha256-SMJHBsI7tCYhc7b6Seq7EK+hW4QS8UKDEgVJUXzPoxQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-wAhi8TW0rOeJ3QWjmfLqJ3cKnLZShMekyQ6j7I2uwGY=";
|
||||
sha256 = "sha256-BAayVUmp2dsaWzH8dvTjZCKGnpc6uY6Y/6gWYIgaES8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.12.9";
|
||||
version = "3.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rEWMPK07AqFEd/5ax/kIh49QSlbYqjlSxDDS6Q5ZaLU=";
|
||||
sha256 = "sha256-hmfjsyOyFJXw/B08g/ZkdN746vK5ZgmNQqo81gDUQA0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.28.6";
|
||||
version = "2.28.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-zzODu9eTlL8FGgqSAtaDH6li8Yb5I8F498BZ40JL0A4=";
|
||||
sha256 = "sha256-ep97FS1ZShwY3UkyzdJZa4777t/XPKpOSrs3VYBbRoU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "63.2.2";
|
||||
version = "63.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qaoMAdXzRDzVRAJtX/yXuV3a33MdqxNBnDk9Q/2GF8A=";
|
||||
sha256 = "sha256-+VQEQDQGbNPYzszIfi1c6+epbJ+HmW9hw8apLNVsyKQ=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-urllib3";
|
||||
version = "1.26.19";
|
||||
version = "1.26.22";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RbMHvbc9LqwML7E4bal+UcmufxR07zX2ECTDCEtr83E=";
|
||||
hash = "sha256-sFr5DnOInmiAlACKl8qVeI24vzc24ndv1D+2sXFIXZQ=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.14.51";
|
||||
version = "0.14.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IzFjbKX4DoRo57i9ogGCuvZpamk+brkKnsI6Yy843VA=";
|
||||
sha256 = "sha256-o92OVyaiOXtJOAT5WJiclOBt2f1GK3t9vD3cjw1nv+8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@@ -15,13 +15,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janus-gateway";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meetecho";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c+5NvJqrYoG96CPaR4CkC9y/CmpTDxyHUmPr+C0t484=";
|
||||
sha256 = "sha256-1WQo1v5TJPPJjC2lc8k9aWmtRUFITYEuwSfsPzh5320=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spicedb";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "spicedb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X52sf21IMr5muEx9SUoYQmFonXDPeW8NKylPmoAZYjw";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lO4H2DlMfYuV2BYPnMV3Ynx0khFE6KDxf/aXA53pBpU";
|
||||
|
||||
subPackages = [ "cmd/spicedb" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source permission database";
|
||||
longDescription = ''
|
||||
SpiceDB is an open-source permissions database inspired by
|
||||
Google Zanzibar.
|
||||
'';
|
||||
homepage = "https://authzed.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zed";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "zed";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tw8Z8JtmmRLcvFacRDAdIi6TyMtm9FAZvRYNgd49qXg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/BxQiaBFkJsySnQRU870CzvPxtPwvdwx4DwSzhaYYYQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line for managing SpiceDB";
|
||||
longDescription = ''
|
||||
SpiceDB is an open-source permissions database inspired by
|
||||
Google Zanzibar. zed is the command line client for SpiceDB.
|
||||
'';
|
||||
homepage = "https://authzed.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
||||
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dlcdn.apache.org/nifi/${version}/nifi-${version}-bin.tar.gz";
|
||||
url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz";
|
||||
sha256 = "sha256-57ZtgK1Z8G/nX2rtf7osmymvE4RukGi7CIvCvRQNKuE=";
|
||||
};
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "arti";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "core";
|
||||
repo = "arti";
|
||||
rev = "arti-v${version}";
|
||||
sha256 = "sha256-xze8Frxy9Rv01yz0L8GkEaXUoLlpODv3pEat1HnDIOs=";
|
||||
sha256 = "sha256-3zlpmOGCjox8dVItVxyQloPgC0+dYw57pFFBySAXC5g=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-yCQLSLxEziDQGDNtP7pmXlTImSKzr/O/5sITMHVJg8E=";
|
||||
cargoSha256 = "sha256-LvhSgJQyPyTSD1koXBXYaC6I5njZavgQK4WaW5/b9g4=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brutespray";
|
||||
version = "1.7.0";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x90skysn3k";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0lkm3fvx35ml5jh4ykjr2srq8qfajkmxwp4qfcn9xi58khk3asq3";
|
||||
sha256 = "sha256-hlFp2ZQnoydxF2NBCjSKtmNzMj9V14AKrNYKMF/8m70=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, metasploit, curl, inetutils, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "msfpc";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g0tmi1k";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "UIdE0oSaNu16pf+M96x8AnNju88hdzokv86wm8uBYDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 msfpc.sh $out/bin/msfpc
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/msfpc \
|
||||
--prefix PATH : "${lib.makeBinPath [ metasploit curl inetutils openssl ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "MSFvenom Payload Creator";
|
||||
homepage = "https://github.com/g0tmi1k/msfpc";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
{ fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lib
|
||||
, libevdev
|
||||
, pkg-config
|
||||
@@ -8,16 +9,24 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanata";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sL9hP+222i8y0sK3ZEx66yXBTgZp5ewoPUlZS4XnphY=";
|
||||
sha256 = "sha256-0S27dOwtHxQi5ERno040RWZNo5+ao0ULFwHKJz27wWw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uhN1UdwtU0C0/lpxUYoCcMLABFTPNO5wKsIGOBnFpzw=";
|
||||
cargoHash = "sha256-Ge9CiYIl6R8cjfUAY4B9ggjNZv5vpjmQKMPv93wGJwc=";
|
||||
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
name = "update-cargo.lock-for-1.0.6.patch";
|
||||
url = "https://github.com/jtroo/kanata/commit/29a7669ac230571c30c9113e5c82e8440c8b89af.patch";
|
||||
sha256 = "sha256-s4R7vUFlrL1XTNpgXRyIpIq4rDuM5A85ECzbMUX4MAw=";
|
||||
})
|
||||
];
|
||||
|
||||
buildFeatures = lib.optional withCmd "cmd";
|
||||
|
||||
|
||||
@@ -8768,6 +8768,8 @@ with pkgs;
|
||||
|
||||
mscgen = callPackage ../tools/graphics/mscgen { };
|
||||
|
||||
msfpc = callPackage ../tools/security/msfpc { };
|
||||
|
||||
melt = callPackage ../tools/security/melt { };
|
||||
|
||||
metabigor = callPackage ../tools/security/metabigor { };
|
||||
@@ -13532,6 +13534,9 @@ with pkgs;
|
||||
|
||||
remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { };
|
||||
|
||||
spicedb = callPackage ../servers/spicedb { };
|
||||
spicedb-zed = callPackage ../servers/spicedb/zed.nix { };
|
||||
|
||||
tacacsplus = callPackage ../servers/tacacsplus { };
|
||||
|
||||
tamarin-prover =
|
||||
@@ -25325,6 +25330,8 @@ with pkgs;
|
||||
|
||||
oldsindhi = callPackage ../data/fonts/oldsindhi { };
|
||||
|
||||
omni-gtk-theme = callPackage ../data/themes/omni-gtk-theme { };
|
||||
|
||||
onestepback = callPackage ../data/themes/onestepback { };
|
||||
|
||||
open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
|
||||
@@ -30214,6 +30221,10 @@ with pkgs;
|
||||
|
||||
runc = callPackage ../applications/virtualization/runc {};
|
||||
|
||||
rusty-psn = callPackage ../applications/misc/rusty-psn {};
|
||||
|
||||
rusty-psn-gui = rusty-psn.override { withGui = true; };
|
||||
|
||||
rymcast = callPackage ../applications/audio/rymcast {
|
||||
inherit (gnome) zenity;
|
||||
};
|
||||
|
||||
@@ -759,10 +759,10 @@ let
|
||||
|
||||
Appcpm = buildPerlModule {
|
||||
pname = "App-cpm";
|
||||
version = "0.997006";
|
||||
version = "0.997011";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997006.tar.gz";
|
||||
sha256 = "1mh4bg141qbch0vdvir2l9533zzm3k8hnqx36iwciwzhvpd9hl9s";
|
||||
url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997011.tar.gz";
|
||||
sha256 = "sha256-YyECxuZ958nP9R1vqg2dA7/vvtNbXMXZaRn3uSAlAck=";
|
||||
};
|
||||
buildInputs = [ ModuleBuildTiny ];
|
||||
propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ];
|
||||
@@ -3527,13 +3527,13 @@ let
|
||||
|
||||
CommandRunner = buildPerlModule {
|
||||
pname = "Command-Runner";
|
||||
version = "0.103";
|
||||
version = "0.200";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz";
|
||||
sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a";
|
||||
url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.200.tar.gz";
|
||||
sha256 = "sha256-WtJtBhEb/s1TyPW7XeqUvyAl9seOlfbYAS5M+oninyY=";
|
||||
};
|
||||
buildInputs = [ ModuleBuildTiny ];
|
||||
propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ];
|
||||
propagatedBuildInputs = [ CaptureTiny Filepushd StringShellQuote Win32ShellQuote ];
|
||||
meta = {
|
||||
homepage = "https://github.com/skaji/Command-Runner";
|
||||
description = "Run external commands and Perl code refs";
|
||||
|
||||
Reference in New Issue
Block a user