Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e81177a147
2
COPYING
2
COPYING
@ -1,4 +1,4 @@
|
||||
Copyright (c) 2003-2021 Eelco Dolstra and the Nixpkgs/NixOS contributors
|
||||
Copyright (c) 2003-2022 Eelco Dolstra and the Nixpkgs/NixOS contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
||||
@ -3435,6 +3435,12 @@
|
||||
githubId = 4742;
|
||||
name = "Aaron Bull Schaefer";
|
||||
};
|
||||
elatov = {
|
||||
email = "elatov@gmail.com";
|
||||
github = "elatov";
|
||||
githubId = 7494394;
|
||||
name = "Karim Elatov";
|
||||
};
|
||||
eleanor = {
|
||||
email = "dejan@proteansec.com";
|
||||
github = "proteansec";
|
||||
@ -4116,12 +4122,6 @@
|
||||
githubId = 7551358;
|
||||
name = "Frede Emil";
|
||||
};
|
||||
freepotion = {
|
||||
email = "42352817+freepotion@users.noreply.github.com";
|
||||
github = "freepotion";
|
||||
githubId = 42352817;
|
||||
name = "Free Potion";
|
||||
};
|
||||
freezeboy = {
|
||||
email = "freezeboy@users.noreply.github.com";
|
||||
github = "freezeboy";
|
||||
@ -6374,7 +6374,7 @@
|
||||
};
|
||||
|
||||
kmein = {
|
||||
email = "kieran.meinhardt@gmail.com";
|
||||
email = "kmein@posteo.de";
|
||||
name = "Kierán Meinhardt";
|
||||
github = "kmein";
|
||||
githubId = 10352507;
|
||||
|
||||
23
nixos/modules/hardware/hackrf.nix
Normal file
23
nixos/modules/hardware/hackrf.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.hardware.hackrf;
|
||||
|
||||
in
|
||||
{
|
||||
options.hardware.hackrf = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enables hackrf udev rules and ensures 'plugdev' group exists.
|
||||
This is a prerequisite to using HackRF devices without being root, since HackRF USB descriptors will be owned by plugdev through udev.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.hackrf ];
|
||||
users.groups.plugdev = { };
|
||||
};
|
||||
}
|
||||
@ -5,10 +5,14 @@ let
|
||||
|
||||
in {
|
||||
options.hardware.rtl-sdr = {
|
||||
enable = lib.mkEnableOption ''
|
||||
Enables rtl-sdr udev rules, ensures 'plugdev' group exists, and blacklists DVB kernel modules.
|
||||
This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev.
|
||||
'';
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enables rtl-sdr udev rules, ensures 'plugdev' group exists, and blacklists DVB kernel modules.
|
||||
This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
@ -53,6 +53,7 @@
|
||||
./hardware/flirc.nix
|
||||
./hardware/gpgsmartcards.nix
|
||||
./hardware/i2c.nix
|
||||
./hardware/hackrf.nix
|
||||
./hardware/sensor/hddtemp.nix
|
||||
./hardware/sensor/iio.nix
|
||||
./hardware/keyboard/teck.nix
|
||||
|
||||
@ -25,6 +25,9 @@ let
|
||||
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
|
||||
)) + "\n";
|
||||
|
||||
knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" "/etc/ssh/ssh_known_hosts2" ]
|
||||
++ map pkgs.copyPathToStore cfg.knownHostsFiles;
|
||||
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
@ -177,7 +180,9 @@ in
|
||||
You can fetch a public key file from a running SSH server
|
||||
with the <command>ssh-keyscan</command> command. The content
|
||||
of the file should follow the same format as described for
|
||||
the <literal>publicKey</literal> option.
|
||||
the <literal>publicKey</literal> option. Only a single key
|
||||
is supported. If a host has multiple keys, use
|
||||
<option>programs.ssh.knownHostsFiles</option> instead.
|
||||
'';
|
||||
};
|
||||
};
|
||||
@ -202,6 +207,28 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
knownHostsFiles = mkOption {
|
||||
default = [];
|
||||
type = with types; listOf path;
|
||||
description = ''
|
||||
Files containing SSH host keys to set as global known hosts.
|
||||
<literal>/etc/ssh/ssh_known_hosts</literal> (which is
|
||||
generated by <option>programs.ssh.knownHosts</option>) and
|
||||
<literal>/etc/ssh/ssh_known_hosts2</literal> are always
|
||||
included.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[
|
||||
./known_hosts
|
||||
(writeText "github.keys" '''
|
||||
github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
|
||||
github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
|
||||
github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
|
||||
''')
|
||||
]
|
||||
'';
|
||||
};
|
||||
|
||||
kexAlgorithms = mkOption {
|
||||
type = types.nullOr (types.listOf types.str);
|
||||
default = null;
|
||||
@ -258,6 +285,7 @@ in
|
||||
# Generated options from other settings
|
||||
Host *
|
||||
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
|
||||
GlobalKnownHostsFile ${concatStringsSep " " knownHostsFiles}
|
||||
|
||||
${optionalString cfg.setXAuthLocation ''
|
||||
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
|
||||
|
||||
@ -204,7 +204,7 @@ in
|
||||
postStart = ''
|
||||
# Make sure elasticsearch is up and running before dependents
|
||||
# are started
|
||||
while ! ${pkgs.curl}/bin/curl -sS -f http://localhost:${toString cfg.port} 2>/dev/null; do
|
||||
while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.listenAddress}:${toString cfg.port} 2>/dev/null; do
|
||||
sleep 1
|
||||
done
|
||||
'';
|
||||
|
||||
@ -27,6 +27,7 @@ in
|
||||
message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}";
|
||||
} ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "mptspi" ];
|
||||
boot.initrd.kernelModules = [ "vmw_pvscsi" ];
|
||||
|
||||
environment.systemPackages = [ open-vm-tools ];
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "svkbd";
|
||||
version = "0.4";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz";
|
||||
sha256 = "sha256-j9RW5/4cb8l3FK9jpFf206l1rQhCR5H/WMiu7I6rzV8=";
|
||||
sha256 = "sha256-+8Jh/D4dgULhRXtC1tZQg6AK4POh9czyRyrMi0auD1o=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.17.3.0";
|
||||
version = "0.17.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rc1p0k16icgfhc7yvkvb8p6570zz0cvigs648l05fcm3mf787rp";
|
||||
sha256 = "sha256-RrchaqFmL4W9F8DhZfvxm7mHMkx/OX8K9e8uNFXWubo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
{ lib, stdenv, pkgs, fetchurl, makeWrapper, nodePackages }:
|
||||
|
||||
let
|
||||
|
||||
uiEnv = pkgs.callPackage ./env.nix { };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "parity-ui";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
|
||||
sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73";
|
||||
name = "${pname}-${version}.deb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper nodePackages.asar ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/usr/
|
||||
ar p $src data.tar.xz | tar -C $out -xJ .
|
||||
substituteInPlace $out/usr/share/applications/parity-ui.desktop \
|
||||
--replace "/opt/Parity UI" $out/bin
|
||||
mv $out/usr/* $out/
|
||||
mv "$out/opt/Parity UI" $out/share/parity-ui
|
||||
rm -r $out/usr/
|
||||
rm -r $out/opt/
|
||||
|
||||
fixupPhase
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \
|
||||
$out/share/parity-ui/parity-ui
|
||||
|
||||
find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \;
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "UI for Parity. Fast, light, robust Ethereum implementation";
|
||||
homepage = "http://parity.io";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.sorpaas ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk2, atk, pango, freetype, fontconfig
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
|
||||
, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
|
||||
|
||||
let
|
||||
packages = [
|
||||
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
xorg.libxcb libsecret gnome2.GConf
|
||||
];
|
||||
|
||||
libPathNative = lib.makeLibraryPath packages;
|
||||
libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
|
||||
libPath = "${libPathNative}:${libPath64}";
|
||||
|
||||
in { inherit packages libPath; }
|
||||
@ -371,7 +371,8 @@ let
|
||||
--replace 'defcustom telega-server-command "telega-server"' \
|
||||
"defcustom telega-server-command \"$out/bin/telega-server\""
|
||||
|
||||
substituteInPlace telega-sticker.el --replace '"dwebp"' '"${pkgs.libwebp}/bin/dwebp"'
|
||||
substituteInPlace telega-sticker.el --replace '"dwebp' '"${pkgs.libwebp}/bin/dwebp'
|
||||
substituteInPlace telega-sticker.el --replace '"ffmpeg' '"${pkgs.ffmpeg}/bin/ffmpeg'
|
||||
|
||||
substituteInPlace telega-vvnote.el --replace '"ffmpeg' '"${pkgs.ffmpeg}/bin/ffmpeg'
|
||||
'';
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imgbrd-grabber";
|
||||
version = "7.5.1";
|
||||
version = "7.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bionus";
|
||||
repo = "imgbrd-grabber";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-40JCdtRhAQpz2lBGmYh2MgA9rRzHmOZx7lWW0IbfjP4=";
|
||||
sha256 = "sha256-Mym/fuV9YVyj5w8U9KlZ/wuwnnC3K5TGNo9RrAFHI5g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
|
||||
, cmake, ninja, libGLU, libGL, zlib, python2, expat, libxml2, libsigcxx, libuuid, freetype
|
||||
, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff
|
||||
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.0.6";
|
||||
pname = "k3d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "K-3D";
|
||||
repo = "k3d";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch { /* glibmm 2.50 fix */
|
||||
url = "https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch";
|
||||
sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DK3D_BUILD_DOCS=false"
|
||||
"-DK3D_BUILD_GUIDE=false"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ];
|
||||
|
||||
buildInputs = [
|
||||
libGLU libGL zlib python2 expat libxml2 libsigcxx libuuid freetype libpng
|
||||
boost cairomm libjpeg libtiff
|
||||
ftgl glew gtkmm2 glibmm gtkglext libXmu
|
||||
];
|
||||
|
||||
#doCheck = false;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A 3D editor with support for procedural editing";
|
||||
homepage = "http://www.k-3d.org/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kondo";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tbillington";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kl2zn6ir3w75ny25ksgxl93vlyb13gzx2795zyimqqnsrdpbbrf";
|
||||
sha256 = "sha256-TTgsfoJ3TEK7wyRJfBIxvPA53wZbq7KJ4LxjUbrHE4Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0sddsm0jys1bsj2bsr39lcyx8k2hzw17nlsv6aql0v82x8qbsiv4";
|
||||
cargoSha256 = "sha256-s5e997I7YiDKF6rOB0XwcxbnHR8AifYPX9ctvdz8VTw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Save disk space by cleaning unneeded files from software projects";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
sha256 = "sha256-K8ID8cetzCaMc/PVRNMyIhrshtEUiD6U/jI4e0TcOO4=";
|
||||
sha256 = "sha256-nf0FSaUi8qX1f4Luo0cP4ZLoOKbyvgmpilMOWXbzzIM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "moolticute";
|
||||
version = "0.53.2";
|
||||
version = "0.53.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mooltipass";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CJVOmFX2wqftQt8j9Tlw93YBiTWE8l1RLprG0cmHeUE=";
|
||||
sha256 = "sha256-1hVvpfrfL/+DIeiPW5iVBEnoc8dy8vVWim4JjhsBlzM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "udev" ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-embedded";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = "moonlight-embedded";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wn6yjpqyjv52278xsx1ivnqrwca4fnk09a01fwzk4adpry1q9ck";
|
||||
sha256 = "sha256-YZEPm+k0YzJB8OQAiFUOPc0QR2C0AkSgpNYdoh8jX8E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
26
pkgs/applications/misc/ratt/default.nix
Normal file
26
pkgs/applications/misc/ratt/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ buildGoModule, fetchFromSourcehut, lib }:
|
||||
buildGoModule rec {
|
||||
pname = "ratt";
|
||||
version = "unstable-2022-01-11";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ghost08";
|
||||
repo = "ratt";
|
||||
rev = "eac7e14b15ad4e916e7d072780397c414c740630";
|
||||
hash = "sha256-/WzPF98MovNg4t5NJhL2Z1bAFDG/3I56M9YgRJF7Wjk=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-NW5B9oO/LJqPigvOcMeL4hQLKmAL01I2Ff41y169BTQ=";
|
||||
|
||||
# tests try to access the internet to scrape websites
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for converting websites to rss/atom feeds";
|
||||
homepage = "https://git.sr.ht/~ghost08/ratt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kmein ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.17";
|
||||
version = "0.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudskiff";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JloeRoW+1tepSJzhcOQu38TDQfY10NtG2EyeVhP26BQ=";
|
||||
sha256 = "sha256-JD3T0dCRg0UQlG0pWnI8RJZuRrIFfSMVHMoaEIymdWE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aaJ5fpS+BiVq1K8OxN+/CBD96wy3flGDhch8O2ACIh8=";
|
||||
vendorSha256 = "sha256-g3+g+mPXEO2ZcVraKuVYZCMBD5zEr1l8ogcYt3r4UjU=";
|
||||
|
||||
postUnpack = ''
|
||||
# Without this, tests fail to locate aws/3.19.0.json
|
||||
|
||||
27
pkgs/applications/networking/feedreaders/photon/default.nix
Normal file
27
pkgs/applications/networking/feedreaders/photon/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ buildGoModule, fetchFromSourcehut, lib, xorg }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "photon";
|
||||
version = "unstable-2022-01-11";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ghost08";
|
||||
repo = "photon";
|
||||
rev = "5d1f7dd8d0d526096886b03c7bc0ef56cbdd6d79";
|
||||
sha256 = "sha256-2RSGLWfthcChd5YhDSBfLSch6wuTUv1Sh1f7flgzQwc=";
|
||||
};
|
||||
|
||||
buildInputs = [ xorg.libX11 ];
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorSha256 = "sha256-MLNgaxxvPGRzBEWRuKTDskl0J2IVushW11E5prpYsE4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy";
|
||||
homepage = "https://sr.ht/~ghost08/photon";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kmein ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -38,14 +38,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kalendar";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "pim";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-foG8j/MRbDZyzM9KmxEARfWUQXMz8ylQgersE1/gtnQ=";
|
||||
sha256 = "sha256-j383I40lChsI/VOgceaHYGhE61p3SpvInUrkUV5HnHY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glab";
|
||||
version = "1.21.1";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "profclems";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-naCCJ9s63UPDxRWbVjVikXtGUlM4Lp7vyDHlESEtXeI=";
|
||||
sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rciT4UcsLu/vI0PqdTlMjbYXVumzo3ASsopkgiHGM60=";
|
||||
vendorSha256 = "sha256-P7gHCyFafjWOYLEtK9Eh2S2KA0e2hzc1G/ZqVaEWWB0=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
||||
@ -174,6 +174,9 @@ runCommand drvName
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
mkdir -p $out/bin/cache/
|
||||
ln -sf ${dart} $out/bin/cache/dart-sdk
|
||||
|
||||
echo -n "$startScript" > $out/bin/${pname}
|
||||
chmod +x $out/bin/${pname}
|
||||
''
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
|
||||
{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, xlibsWrapper, libXmu, libXi
|
||||
, OpenGL
|
||||
, enableEGL ? false
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glew";
|
||||
version = "2.2.0";
|
||||
@ -13,48 +12,46 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
buildInputs = optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ];
|
||||
propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|lib64|lib|' config/Makefile.linux
|
||||
substituteInPlace config/Makefile.darwin --replace /usr/local "$out"
|
||||
${optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
|
||||
''}
|
||||
'';
|
||||
|
||||
buildFlags = [ "all" ];
|
||||
installFlags = [ "install.all" ];
|
||||
|
||||
preInstall = ''
|
||||
makeFlagsArray+=(GLEW_DEST=$out BINDIR=$bin/bin INCDIR=$dev/include/GL)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -pv $out/share/doc/glew
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cp glew*.pc $out/lib/pkgconfig
|
||||
cp -r README.md LICENSE.txt doc $out/share/doc/glew
|
||||
rm $out/lib/*.a
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"LD=${stdenv.cc.targetPrefix}cc"
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
patches = [
|
||||
# https://github.com/nigels-com/glew/pull/342
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nigels-com/glew/commit/966e53fa153175864e151ec8a8e11f688c3e752d.diff";
|
||||
sha256 = "sha256-xsSwdAbdWZA4KVoQhaLlkYvO711i3QlHGtv6v1Omkhw=";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ];
|
||||
propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h
|
||||
|
||||
cmakeDir = "cmake";
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
] ++ lib.optional enableEGL "-DGLEW_EGL=ON";
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput lib/cmake "''${!outputDev}"
|
||||
moveToOutput lib/pkgconfig "''${!outputDev}"
|
||||
|
||||
cat >> "''${!outputDev}"/lib/cmake/glew/glew-config.cmake <<EOF
|
||||
# nixpkg's workaround for a cmake bug
|
||||
# https://discourse.cmake.org/t/the-findglew-cmake-module-does-not-set-glew-libraries-in-some-cases/989/3
|
||||
set(GLEW_VERSION "$version")
|
||||
set(GLEW_LIBRARIES GLEW::glew\''${_glew_target_postfix})
|
||||
get_target_property(GLEW_INCLUDE_DIRS GLEW::glew\''${_glew_target_postfix} INTERFACE_INCLUDE_DIRECTORIES)
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OpenGL extension loading library for C(++)";
|
||||
description = "An OpenGL extension loading library for C/C++";
|
||||
homepage = "http://glew.sourceforge.net/";
|
||||
license = licenses.free; # different files under different licenses
|
||||
#["BSD" "GLX" "SGI-B" "GPL2"]
|
||||
platforms = platforms.mesaPlatforms;
|
||||
license = with licenses; [ /* modified bsd */ free mit gpl2Only ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing
|
||||
platforms = with platforms;
|
||||
if enableEGL then
|
||||
subtractLists darwin mesaPlatforms
|
||||
else
|
||||
mesaPlatforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -33,10 +33,11 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
backports-zoneinfo
|
||||
holidays
|
||||
tzdata
|
||||
async-timeout
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
backports-zoneinfo
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
||||
38
pkgs/development/python-modules/amaranth-boards/default.nix
Normal file
38
pkgs/development/python-modules/amaranth-boards/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, amaranth
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amaranth-boards";
|
||||
version = "unstable-2021-12-17";
|
||||
# python setup.py --version
|
||||
realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaranth-lang";
|
||||
repo = "amaranth-boards";
|
||||
rev = "8e2615765e255144403431ca95c5cdf6c78eb638";
|
||||
sha256 = "3EOG8SO5xBNevshXMRrxKWoJUbeaVi8ckbkmqd6Tw70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ setuptools amaranth ];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Board definitions for Amaranth HDL";
|
||||
homepage = "https://github.com/amaranth-lang/amaranth-boards";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ emily thoughtpolice ];
|
||||
};
|
||||
}
|
||||
35
pkgs/development/python-modules/amaranth-soc/default.nix
Normal file
35
pkgs/development/python-modules/amaranth-soc/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, amaranth
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amaranth-soc";
|
||||
version = "unstable-2021-12-10";
|
||||
# python setup.py --version
|
||||
realVersion = "0.1.dev49+g${lib.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaranth-lang";
|
||||
repo = "amaranth-soc";
|
||||
rev = "217d4ea76ad3b3bbf146980d168bc7b3b9d95a18";
|
||||
sha256 = "dMip82L7faUn16RDeG3NgMv0nougpwTwDWLX0doD2YA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ setuptools amaranth ];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "System on Chip toolkit for Amaranth HDL";
|
||||
homepage = "https://github.com/amaranth-lang/amaranth-soc";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ emily thoughtpolice ];
|
||||
};
|
||||
}
|
||||
@ -18,17 +18,17 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nmigen";
|
||||
version = "unstable-2021-02-09";
|
||||
pname = "amaranth";
|
||||
version = "0.3";
|
||||
# python setup.py --version
|
||||
realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}";
|
||||
realVersion = "0.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nmigen";
|
||||
repo = "nmigen";
|
||||
rev = "f7c2b9419f9de450be76a0e9cf681931295df65f";
|
||||
sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1";
|
||||
owner = "amaranth-lang";
|
||||
repo = "amaranth";
|
||||
rev = "39a83f4d995d16364cc9b99da646ff8db6394166";
|
||||
sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}";
|
||||
@ -59,12 +59,12 @@ buildPythonPackage rec {
|
||||
--replace "pyvcd~=0.2.2" "pyvcd"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "nmigen" ];
|
||||
pythonImportsCheck = [ "amaranth" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A refreshed Python toolbox for building complex digital hardware";
|
||||
homepage = "https://nmigen.info/nmigen";
|
||||
description = "A modern hardware definition language and toolchain based on Python";
|
||||
homepage = "https://amaranth-lang.org/docs/amaranth";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ emily ];
|
||||
maintainers = with maintainers; [ emily thoughtpolice ];
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux-led";
|
||||
version = "0.27.45";
|
||||
version = "0.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = version;
|
||||
sha256 = "sha256-0MKcPDn9Jtp7bEbusOHforEBOkM+y0TUG72Ynt5rdfg=";
|
||||
sha256 = "sha256-6IJxOQIRUfmf+tE5CxIlu7EZBp6j8BeVO2mKKW0VWBY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, setuptools-scm
|
||||
, pythonOlder
|
||||
, sdcc
|
||||
, nmigen
|
||||
, amaranth
|
||||
, fx2
|
||||
, libusb1
|
||||
, aiohttp
|
||||
@ -19,23 +19,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glasgow";
|
||||
version = "unstable-2021-03-02";
|
||||
version = "unstable-2021-12-12";
|
||||
disabled = pythonOlder "3.7";
|
||||
# python software/setup.py --version
|
||||
realVersion = "0.1.dev1660+g${lib.substring 0 7 src.rev}";
|
||||
realVersion = "0.1.dev1679+g${lib.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GlasgowEmbedded";
|
||||
repo = "glasgow";
|
||||
rev = "41c48bbcee284d024e4249a81419fbbae674cf40";
|
||||
sha256 = "1fg8ps228930d70bczwmcwnrd1gvm02a58mxbpn8pyakwbwwa6hq";
|
||||
rev = "e640a778c446b7e9812727e73c560d12aeb41d7c";
|
||||
sha256 = "EsQ9ZjalKDQ54JOonra4yPDI56cF5n86y/Rd798cZsU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm sdcc ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
nmigen
|
||||
amaranth
|
||||
fx2
|
||||
libusb1
|
||||
aiohttp
|
||||
@ -72,6 +72,6 @@ buildPythonPackage rec {
|
||||
description = "Software for Glasgow, a digital interface multitool";
|
||||
homepage = "https://github.com/GlasgowEmbedded/Glasgow";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ emily ];
|
||||
maintainers = with maintainers; [ emily thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -35,25 +35,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
pytest-tornasync
|
||||
ruamel-yaml
|
||||
strict-rfc3339
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "--pyargs" "jupyterlab_server" ];
|
||||
|
||||
disabledTests = [
|
||||
# AttributeError: 'SpecPath' object has no attribute 'paths'
|
||||
"test_get_listing"
|
||||
"test_get_settings"
|
||||
"test_get_federated"
|
||||
"test_listing"
|
||||
"test_patch"
|
||||
"test_patch_unicode"
|
||||
"test_get_theme"
|
||||
"test_delete"
|
||||
"test_get_non_existant"
|
||||
"test_get"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.2.52";
|
||||
version = "1.2.53";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-PSacL0ze+TvNBHj+HIpaoy8GxnklFwFrNztEso6lwqU=";
|
||||
sha256 = "sha256-UJ0bq/xBE+qyd//tk/xlI3wtUcE0+PLCIVGmjFMZ+VQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbsphinx";
|
||||
version = "0.8.7";
|
||||
version = "0.8.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ff91b5b14ceb1a9d44193b5fc3dd3617e7b8ab59c788f7710049ce5faff2750c";
|
||||
sha256 = "b5090c824b330b36c2715065a1a179ad36526bff208485a9865453d1ddfc34ec";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nmigen
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nmigen-boards";
|
||||
version = "unstable-2021-02-09";
|
||||
# python setup.py --version
|
||||
realVersion = "0.1.dev173+g${lib.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nmigen";
|
||||
repo = "nmigen-boards";
|
||||
rev = "a35d870a994c2919116b2c06166dc127febb1512";
|
||||
sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ setuptools nmigen ];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Board and connector definitions for nMigen";
|
||||
homepage = "https://github.com/nmigen/nmigen-boards";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ emily ];
|
||||
};
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nmigen
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nmigen-soc";
|
||||
version = "unstable-2021-02-09";
|
||||
# python setup.py --version
|
||||
realVersion = "0.1.dev43+g${lib.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nmigen";
|
||||
repo = "nmigen-soc";
|
||||
rev = "ecfad4d9abacf903a525f0a252c38844eda0d2dd";
|
||||
sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ setuptools nmigen ];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "System on Chip toolkit for nMigen";
|
||||
homepage = "https://github.com/nmigen/nmigen-soc";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ emily ];
|
||||
};
|
||||
}
|
||||
@ -66,6 +66,8 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# TypeError: Unexpected keyword arguments passed to pytest.raises: message
|
||||
"test_string_format_invalid_value"
|
||||
# Needs a fix for new PyYAML
|
||||
"test_django_rest_framework_apiview"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.14.11";
|
||||
version = "0.14.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "Ey1B3tx6UufxZs8I64vaoPSNC+4LGdcPuyKrLBHxZa8=";
|
||||
sha256 = "80v1kuiYL3OdtDVJj0EvgrO9x1eN8xxUyRuI4Wb4giI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "57.4.6";
|
||||
version = "57.4.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "65ef8946fc31aed946177629e681861217aceb8fc9b75a44ba987d7eea9388aa";
|
||||
sha256 = "sha256-lnfZabAOwcFFUvW+KytHpvvqTQ7U3g/c7hir2qDMkmc=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -52,6 +52,9 @@ buildPythonPackage rec {
|
||||
|
||||
# Flaky test. Fails with AssertionError sometimes.
|
||||
"test_sparse_hellinger"
|
||||
|
||||
# tensorflow maybe incompatible? https://github.com/lmcinnes/umap/issues/821
|
||||
"test_save_load"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -22,13 +22,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.708";
|
||||
version = "2.0.710";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-qnRYxbw42vN0w+x1ARRz60e8q9LCPWglprOBm7rkxsE=";
|
||||
hash = "sha256-8cvnCGqfS4ToDhjMsCpMf+d6V8gSmSJeGsoL4Q5hgFM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
@ -54,6 +54,8 @@ buildPythonApplication rec {
|
||||
dpath
|
||||
GitPython
|
||||
jmespath
|
||||
jsonpath-ng
|
||||
jsonschema
|
||||
junit-xml
|
||||
networkx
|
||||
packaging
|
||||
@ -77,6 +79,11 @@ buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "jsonschema==3.0.2" "jsonschema>=3.0.2"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# No API key available
|
||||
"api_key"
|
||||
|
||||
@ -99,6 +99,10 @@ in newPython.pkgs.buildPythonApplication rec {
|
||||
# Not enabled right now due to time constraints/failing tests that I didn't have time to track down
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace conans/requirements.txt --replace 'PyYAML>=3.11, <6.0' 'PyYAML>=3.11'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://conan.io";
|
||||
description = "Decentralized and portable C/C++ package manager";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.9.11";
|
||||
version = "0.9.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
sha256 = "sha256-qYwCt7+//GJHJyDrZ8rcGCKLshKebIDBQCyn6rLOhJQ=";
|
||||
sha256 = "sha256-ct4SsIs6ErWl2XbxfqX3FTOU9K9tTKo8YWu1QT83iTI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.lihaoyi.com/mill";
|
||||
homepage = "https://com-lihaoyi.github.io/mill/";
|
||||
license = licenses.mit;
|
||||
description = "A build tool for Scala, Java and more";
|
||||
longDescription = ''
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dprint";
|
||||
version = "0.18.2";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5vWkIQtbeQzPgc1BDjxfWCmCYseOUiV0LXapypcLItI=";
|
||||
sha256 = "sha256-mTurSfYyLDmHCiza/noToRFtQL0zsdzib69PCtUseSI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ezfVDgZs0QemYHm/o3aX2QGO2WuMweE8LuNZaX4whhw=";
|
||||
cargoSha256 = "sha256-B4b6RSegtS3FQ4BHFVmw9+jlA/oKEmB5i/kdb6nuzkQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minify";
|
||||
version = "2.9.22";
|
||||
version = "2.9.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdewolff";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ph5PrM917qGwp7SLg6Ujfk5YJWFSlUBdW/JJRiwq7fw=";
|
||||
sha256 = "sha256-4M7Oj/hHFH2OUz0y64GIEnv0Kk0+zAje3kHA2e4RQS0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0GKIGIVtMywpKxopsVrUZMgeXP/l76U2As8FiG2Niqw=";
|
||||
vendorSha256 = "sha256-oYZZ9DzpY544QTWDGz/wkHA9aP0riEXLUTWvzV1KxQc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://attnam.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [freepotion];
|
||||
maintainers = with maintainers; [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,7 +37,8 @@ stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook perl groff util-linux texinfo ] ++ lib.optionals stdenv.isLinux [ yodl ];
|
||||
nativeBuildInputs = [ autoreconfHook perl groff texinfo ]
|
||||
++ lib.optionals stdenv.isLinux [ util-linux yodl ];
|
||||
|
||||
buildInputs = [ ncurses pcre ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geekbench";
|
||||
version = "5.4.3";
|
||||
version = "5.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
|
||||
sha256 = "sha256-A/+XnLusceJXik86EiYeVFi4iplp4+izbYpWNp8QPiM=";
|
||||
sha256 = "sha256-2kiaP7V/dGDHiYTqvVEwAaAMrSoLzYtvR4hgtG6iUoQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "macchina";
|
||||
version = "5.0.5";
|
||||
version = "6.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Macchina-CLI";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-si+5LvRUIWp48vsD1WxGWl2O/2bpaBX+ArkZPbBqtME=";
|
||||
sha256 = "sha256-x13ldPUr2PkrweDKyyQWMwd3PL4lsY11TIKrmBV5vkA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CN7PxPUkfyDGxVaf879Sp6w0UbqwL/is15xcfH2fm1w=";
|
||||
cargoSha256 = "sha256-y6UMpzt8uiN4jfYnDmwNFGQ1opUsQz8n870XY775qZo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "yubikey-manager";
|
||||
version = "4.0.7";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "yubikey-manager";
|
||||
@ -12,12 +13,12 @@ python3Packages.buildPythonPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'cryptography = "^2.1 || ^3.0"' 'cryptography = "*"'
|
||||
substituteInPlace "ykman/pcsc/__init__.py" \
|
||||
--replace '/usr/bin/pkill' '${procps}/bin/pkill'
|
||||
--replace 'pkill' '${procps}/bin/pkill'
|
||||
'';
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-gsasl"
|
||||
"--with-mysql"
|
||||
"--with-path-sendmail=${system-sendmail}/bin/sendmail"
|
||||
"--with-mail-rc=/etc/mail.rc"
|
||||
];
|
||||
|
||||
readmsg-tests = let
|
||||
|
||||
26
pkgs/tools/security/fwbuilder/default.nix
Normal file
26
pkgs/tools/security/fwbuilder/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, qtbase, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fwbuilder";
|
||||
version = "6.0.0-rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwbuilder";
|
||||
repo = "fwbuilder";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j5HjGcIqq93Ca9OBqEgSotoSXyw+q6Fqxa3hKk1ctwQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI Firewall Management Application";
|
||||
homepage = "https://github.com/fwbuilder/fwbuilder";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.elatov ];
|
||||
};
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "log4j-sniffer";
|
||||
version = "1.0.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "palantir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2scESCuENM4m3YrxPjoXcPKEkBPTMWOGJR3WenkTNBA=";
|
||||
sha256 = "sha256-q9PwUzHmcTYKMl0dVR5owB/UXYv5ZgmvRK0S6vOBFT8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "log4j-vuln-scanner";
|
||||
version = "0.11";
|
||||
version = "0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hillu";
|
||||
repo = "local-log4j-vuln-scanner";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YGo2dhfqLPNP8O9gdRJfxKmEK/pKd17WNTXQ2cq78qg=";
|
||||
sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.23"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.24"
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 7682d9ab9c404b55cfc4a221db22f74a740a6f7f
|
||||
ref: refs/tags/6.1.23
|
||||
revision: 0991344df7a2b343b99e83507bf217137f11801d
|
||||
ref: refs/tags/6.1.24
|
||||
specs:
|
||||
metasploit-framework (6.1.23)
|
||||
metasploit-framework (6.1.24)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
@ -19,11 +19,12 @@ GIT
|
||||
em-http-request
|
||||
eventmachine
|
||||
faker
|
||||
faraday
|
||||
faraday (= 1.8.0)
|
||||
faye-websocket
|
||||
filesize
|
||||
hrr_rb_ssh-ed25519
|
||||
http-cookie
|
||||
io-console (= 0.5.9)
|
||||
irb
|
||||
jsobfu
|
||||
json
|
||||
@ -129,12 +130,12 @@ GEM
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.547.0)
|
||||
aws-sdk-core (3.125.1)
|
||||
aws-sdk-core (3.125.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.290.0)
|
||||
aws-sdk-ec2 (1.291.0)
|
||||
aws-sdk-core (~> 3, >= 3.125.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.65.0)
|
||||
@ -175,33 +176,29 @@ GEM
|
||||
eventmachine (1.2.7)
|
||||
faker (2.19.0)
|
||||
i18n (>= 1.6, < 2)
|
||||
faraday (1.9.3)
|
||||
faraday (1.8.0)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-httpclient (~> 1.0.1)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.1)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.2)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
faye-websocket (0.11.1)
|
||||
eventmachine (>= 0.12.0)
|
||||
websocket-driver (>= 0.5.1)
|
||||
ffi (1.15.4)
|
||||
ffi (1.15.5)
|
||||
filesize (0.2.0)
|
||||
gssapi (1.3.1)
|
||||
ffi (>= 1.0.1)
|
||||
@ -218,10 +215,10 @@ GEM
|
||||
httpclient (2.8.3)
|
||||
i18n (1.8.11)
|
||||
concurrent-ruby (~> 1.0)
|
||||
io-console (0.5.11)
|
||||
io-console (0.5.9)
|
||||
irb (1.3.6)
|
||||
reline (>= 0.2.5)
|
||||
jmespath (1.4.0)
|
||||
jmespath (1.5.0)
|
||||
jsobfu (0.4.2)
|
||||
rkelly-remix
|
||||
json (2.6.1)
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.23";
|
||||
version = "6.1.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-um2WDbc7SHhbPSTamOTB0tRWl0tkkNGnY0lm+dU7iIA=";
|
||||
sha256 = "sha256-eCnudckLCiE6L2EC/IHqbXdOrGBkSmWZHyHFvvFUqQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -114,20 +114,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17v517dkrazxs9n64c8qdkwhb5fj9flnc2lp99gph6307ciz47w1";
|
||||
sha256 = "1jp8nz18r9skri118haqy0slqmr5bwjw7xvrghcmj9lx409f0m6p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.125.1";
|
||||
version = "3.125.2";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "147z6prv5cj5scnd3rpjqw0pvbj7yvp9b7lzl786c0jil1pvjm0p";
|
||||
sha256 = "1awg6wdq5nqlxq5zqj2h06898d9b24ci3jnczpss9pqgis4g0w0n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.290.0";
|
||||
version = "1.291.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
@ -344,10 +344,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
|
||||
sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.3";
|
||||
version = "1.8.0";
|
||||
};
|
||||
faraday-em_http = {
|
||||
groups = ["default"];
|
||||
@ -389,16 +389,6 @@
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
faraday-multipart = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ih6nkjx4ph00iybicn0ssjkjnhnjd2xsl9g83lkg64w8q5s0i87";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.2";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -439,16 +429,6 @@
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-retry = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
faye-websocket = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -464,10 +444,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
|
||||
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.4";
|
||||
version = "1.15.5";
|
||||
};
|
||||
filesize = {
|
||||
groups = ["default"];
|
||||
@ -574,10 +554,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0r9kxrf9jccrr329pa3s37rf16vy426cbqmfwxkav1fidwvih93y";
|
||||
sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.11";
|
||||
version = "0.5.9";
|
||||
};
|
||||
irb = {
|
||||
groups = ["default"];
|
||||
@ -594,10 +574,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
|
||||
sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
jsobfu = {
|
||||
groups = ["default"];
|
||||
@ -684,12 +664,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "7682d9ab9c404b55cfc4a221db22f74a740a6f7f";
|
||||
sha256 = "10487gazjrj9cfkx34349fbmdm6jq7j9ini47mdphj1vnw6rcvds";
|
||||
rev = "0991344df7a2b343b99e83507bf217137f11801d";
|
||||
sha256 = "03m9akqvxi913ycnajk4c2n4wxvdxa0zq0k15wx222hbr5sywabq";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.23";
|
||||
version = "6.1.24";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gptman";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cecton";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MWrTwVXlV2B8GzYRgI3np6NqqSGPbRZCKpLU7aC1mX0=";
|
||||
sha256 = "sha256-hI3F1E1vdbNDEeJ4FrU0EvR0t64svzUIpI6zaf0CquM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-dVvZTYk17fyurtrJxjUgkxU37rxJubiTAQ1AWMnFP4s=";
|
||||
cargoSha256 = "sha256-3PRGPZGymccRo9dtQZgMMEL29x+GiUkTzgc8uAB/ocQ=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "java-service-wrapper";
|
||||
version = "3.5.46";
|
||||
version = "3.5.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
|
||||
sha256 = "sha256-guHQyFSI0TidAuOr4zWaf3WRGeNW4+Or1sbWdhWuWtg=";
|
||||
sha256 = "sha256-woANhwLOhvTnq+Bnc8zCIDZEJOv3swNfeI/3nQ7Y1SM=";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mark";
|
||||
version = "6.5.1";
|
||||
version = "6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovetskiy";
|
||||
repo = "mark";
|
||||
rev = version;
|
||||
sha256 = "sha256-NTe7J08Lu4uVI/mLj4m87n1BZXiUPDvi5OtjJfddJw8=";
|
||||
sha256 = "sha256-ZPKYZbWrR69V4SkXTiAK59Q2xpxkOC6KyAuspjzERwQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Yp47FBS8JN/idBfZG0z0f2A1bzob8KTPtZ7u0cNCrM8=";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "html-xml-utils";
|
||||
version = "8.0";
|
||||
version = "8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-dJBZkGwzHCx/us7uAkZiRaI3uRvUCN/485bQc0oGCuI=";
|
||||
sha256 = "sha256-23SCNQpo0udPbCpuF9hxugbJQQHs4edKNX6nghu0Ges=";
|
||||
};
|
||||
|
||||
buildInputs = [curl libiconv];
|
||||
|
||||
@ -420,6 +420,7 @@ mapAliases ({
|
||||
julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15
|
||||
julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13
|
||||
julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02
|
||||
k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # added 2022-01-04
|
||||
kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11
|
||||
kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28
|
||||
kdiff3-qt5 = kdiff3; # added 2017-02-18
|
||||
@ -671,6 +672,7 @@ mapAliases ({
|
||||
packet-cli = metal-cli; # added 2021-10-25
|
||||
paperless = paperless-ng; # added 2021-06-06
|
||||
parity = openethereum; # added 2020-08-01
|
||||
parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # added 2022-01-10
|
||||
parquet-cpp = arrow-cpp; # added 2018-09-08
|
||||
pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
|
||||
pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22
|
||||
|
||||
@ -1011,6 +1011,8 @@ with pkgs;
|
||||
|
||||
godspeed = callPackage ../tools/networking/godspeed { };
|
||||
|
||||
fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
|
||||
|
||||
ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
|
||||
|
||||
linux-router = callPackage ../tools/networking/linux-router { };
|
||||
@ -8711,6 +8713,8 @@ with pkgs;
|
||||
|
||||
phodav = callPackage ../tools/networking/phodav { };
|
||||
|
||||
photon-rss = callPackage ../applications/networking/feedreaders/photon { };
|
||||
|
||||
pim6sd = callPackage ../servers/pim6sd { };
|
||||
|
||||
phosh = callPackage ../applications/window-managers/phosh { };
|
||||
@ -9124,6 +9128,8 @@ with pkgs;
|
||||
|
||||
ratools = callPackage ../tools/networking/ratools { };
|
||||
|
||||
ratt = callPackage ../applications/misc/ratt { };
|
||||
|
||||
rc = callPackage ../shells/rc { };
|
||||
|
||||
rcon = callPackage ../tools/networking/rcon { };
|
||||
@ -16624,10 +16630,10 @@ with pkgs;
|
||||
glew110 = callPackage ../development/libraries/glew/1.10.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AGL OpenGL;
|
||||
};
|
||||
glew-egl = glew.overrideAttrs (oldAttrs: {
|
||||
pname = "glew-egl";
|
||||
makeFlags = oldAttrs.makeFlags ++ [ "SYSTEM=linux-egl" ];
|
||||
});
|
||||
glew-egl = callPackage ../development/libraries/glew {
|
||||
inherit (darwin.apple_sdk.frameworks) OpenGL;
|
||||
enableEGL = true;
|
||||
};
|
||||
|
||||
glfw = glfw3;
|
||||
glfw-wayland = glfw.override {
|
||||
@ -26504,19 +26510,6 @@ with pkgs;
|
||||
|
||||
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
|
||||
|
||||
k3d = callPackage ../applications/graphics/k3d {
|
||||
inherit (gnome2) gtkglext;
|
||||
stdenv = gcc6Stdenv;
|
||||
boost = boost155.override {
|
||||
enablePython = true;
|
||||
python = python2;
|
||||
stdenv = gcc6Stdenv;
|
||||
buildPackages = buildPackages // {
|
||||
stdenv = gcc6Stdenv;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
k3s = callPackage ../applications/networking/cluster/k3s {};
|
||||
|
||||
kconf = callPackage ../applications/networking/cluster/kconf { };
|
||||
@ -30197,8 +30190,6 @@ with pkgs;
|
||||
|
||||
openethereum = callPackage ../applications/blockchains/openethereum { };
|
||||
|
||||
parity-ui = callPackage ../applications/blockchains/parity-ui { };
|
||||
|
||||
polkadot = callPackage ../applications/blockchains/polkadot { };
|
||||
|
||||
particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; };
|
||||
|
||||
@ -5374,11 +5374,11 @@ in {
|
||||
|
||||
nmapthon2 = callPackage ../development/python-modules/nmapthon2 { };
|
||||
|
||||
nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
|
||||
amaranth-boards = callPackage ../development/python-modules/amaranth-boards { };
|
||||
|
||||
nmigen = callPackage ../development/python-modules/nmigen { };
|
||||
amaranth = callPackage ../development/python-modules/amaranth { };
|
||||
|
||||
nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };
|
||||
amaranth-soc = callPackage ../development/python-modules/amaranth-soc { };
|
||||
|
||||
nocasedict = callPackage ../development/python-modules/nocasedict { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user