Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b74b591fbe
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
|
|
@ -118,7 +118,7 @@
|
|||
|
||||
# Rust
|
||||
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
|
||||
/pkgs/build-support/rust @andir @zowoq
|
||||
/pkgs/build-support/rust @zowoq
|
||||
|
||||
# Darwin-related
|
||||
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ in
|
|||
"""
|
||||
Sends a message as Alice to Bob
|
||||
"""
|
||||
bob.execute("nc -lu ::0 1234 >/tmp/msg >&2 &")
|
||||
bob.execute("nc -lu ::0 1234 >/tmp/msg &")
|
||||
alice.sleep(1)
|
||||
alice.succeed(f"echo '{msg}' | nc -uw 0 bob 1234")
|
||||
bob.succeed(f"grep '{msg}' /tmp/msg")
|
||||
|
|
@ -100,7 +100,7 @@ in
|
|||
Starts eavesdropping on Alice and Bob
|
||||
"""
|
||||
match = "src host alice and dst host bob"
|
||||
eve.execute(f"tcpdump -i br0 -c 1 -Avv {match} >/tmp/log >&2 &")
|
||||
eve.execute(f"tcpdump -i br0 -c 1 -Avv {match} >/tmp/log &")
|
||||
|
||||
|
||||
start_all()
|
||||
|
|
|
|||
|
|
@ -40,15 +40,16 @@ in {
|
|||
|
||||
services.mysql = {
|
||||
enable = true;
|
||||
bind = "127.0.0.1";
|
||||
settings.mysqld = {
|
||||
bind-address = "127.0.0.1";
|
||||
|
||||
# FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6,
|
||||
# this is a workaround.
|
||||
# See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22
|
||||
innodb_read_only_compressed = 0;
|
||||
};
|
||||
package = pkgs.mariadb;
|
||||
|
||||
# FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6,
|
||||
# this is a workaround.
|
||||
# See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22
|
||||
extraOptions = ''
|
||||
innodb_read_only_compressed=0
|
||||
'';
|
||||
initialScript = pkgs.writeText "mysql-init" ''
|
||||
CREATE USER 'nextcloud'@'localhost' IDENTIFIED BY 'hunter2';
|
||||
CREATE DATABASE IF NOT EXISTS nextcloud;
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "picard";
|
||||
version = "2.6.4";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "0lm7s9jy7z4an3xxj3gnxxf2xx045i157qaxysbdhcq5lwlmznc7";
|
||||
sha256 = "1f589nc2zxl9cjw0qh164z9sfq4xl052ihf2gn2dgr35g3ny16kh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
|
||||
|
|
@ -45,6 +45,9 @@ pythonPackages.buildPythonApplication rec {
|
|||
fasteners
|
||||
mutagen
|
||||
pyqt5
|
||||
markdown
|
||||
pyjwt
|
||||
pyyaml
|
||||
];
|
||||
|
||||
# In order to spare double wrapping, we use:
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sfizz";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sfztools";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1gzpbns89j6ggzfjjvyhgigynsv20synrs7lmc32hwp4g73l0j7n";
|
||||
sha256 = "sha256-biHsB49Ym9NU4tMOVnUNuIxPtpcIi6oCAS7JBPhxwec=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20211016";
|
||||
version = "20220107";
|
||||
pname = "x42-plugins";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Z2lXaJweOPB9hWOuy2cx1P9/CAJ+IMc7JtPDKAg2boU=";
|
||||
sha256 = "sha256-+lzgkRQHe6moid3h6az/iqt2XL5vbyM0BjSTwMBvd3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,15 +2,10 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, gtk2
|
||||
, glib
|
||||
, pkg-config
|
||||
, libgnome
|
||||
, libgnomeui
|
||||
, vte
|
||||
, curl
|
||||
, cdparanoia
|
||||
, libid3tag
|
||||
, ncurses
|
||||
, libtool
|
||||
}:
|
||||
|
||||
|
|
@ -26,14 +21,9 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config libtool ];
|
||||
buildInputs = [
|
||||
gtk2
|
||||
glib
|
||||
libgnome
|
||||
libgnomeui
|
||||
vte
|
||||
curl
|
||||
cdparanoia
|
||||
libid3tag
|
||||
ncurses
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
|
|||
"--with-libxslt=${libxslt.dev}"
|
||||
];
|
||||
|
||||
# starting with C++11 narrowing became an error
|
||||
# and not just a warning. With the current c++ compiler
|
||||
# pgadmin3 will fail with several "narrowing" errors.
|
||||
# see https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html#index-Wno-narrowing
|
||||
makeFlags = "CXXFLAGS=-Wno-narrowing" ;
|
||||
|
||||
meta = with lib; {
|
||||
description = "PostgreSQL administration GUI tool";
|
||||
homepage = "https://www.pgadmin.org";
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
, gtk-layer-shell
|
||||
, howard-hinnant-date
|
||||
, libxkbcommon
|
||||
, runTests ? true, catch2
|
||||
, traySupport ? true, libdbusmenu-gtk3
|
||||
, pulseSupport ? true, libpulseaudio
|
||||
, sndioSupport ? true, sndio
|
||||
|
|
@ -29,13 +30,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waybar";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = version;
|
||||
sha256 = "sha256-XOguhbvlO3iUyk5gWOvimipXV8yqnia0LKoSA1wiKoE=";
|
||||
sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -60,6 +61,9 @@ stdenv.mkDerivation rec {
|
|||
++ optional swaySupport sway
|
||||
++ optional mpdSupport libmpdclient;
|
||||
|
||||
checkInputs = [ catch2 ];
|
||||
doCheck = runTests;
|
||||
|
||||
mesonFlags = (lib.mapAttrsToList
|
||||
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
|
||||
{
|
||||
|
|
@ -70,6 +74,7 @@ stdenv.mkDerivation rec {
|
|||
libudev = udevSupport;
|
||||
mpd = mpdSupport;
|
||||
rfkill = rfkillSupport;
|
||||
tests = runTests;
|
||||
}
|
||||
) ++ [
|
||||
"-Dsystemd=disabled"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
|
||||
, alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
|
||||
, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
|
||||
, libkrb5, libdrm, mesa
|
||||
, libkrb5, libdrm, libglvnd, mesa
|
||||
, libxkbcommon, pipewire, wayland # ozone/wayland
|
||||
|
||||
# Command line programs
|
||||
|
|
@ -66,7 +66,7 @@ let
|
|||
liberation_ttf curl util-linux xdg-utils wget
|
||||
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
|
||||
bzip2 libcap at-spi2-atk at-spi2-core
|
||||
libkrb5 libdrm mesa coreutils
|
||||
libkrb5 libdrm libglvnd mesa coreutils
|
||||
libxkbcommon pipewire wayland
|
||||
] ++ optional pulseSupport libpulseaudio
|
||||
++ optional libvaSupport libva
|
||||
|
|
@ -119,12 +119,6 @@ in stdenv.mkDerivation {
|
|||
cp -a opt/* $out/share
|
||||
cp -a usr/share/* $out/share
|
||||
|
||||
# To fix --use-gl=egl:
|
||||
test -e $out/share/google/$appname/libEGL.so
|
||||
ln -s libEGL.so $out/share/google/$appname/libEGL.so.1
|
||||
test -e $out/share/google/$appname/libGLESv2.so
|
||||
ln -s libGLESv2.so $out/share/google/$appname/libGLESv2.so.2
|
||||
|
||||
substituteInPlace $out/share/applications/google-$appname.desktop \
|
||||
--replace /usr/bin/google-chrome-$dist $exe
|
||||
substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ let
|
|||
special-providers =
|
||||
{
|
||||
# Packages that don't fit the default model
|
||||
gandi = callPackage ./gandi { };
|
||||
|
||||
# mkisofs needed to create ISOs holding cloud-init data,
|
||||
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
|
||||
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-gandi";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gandi";
|
||||
repo = "terraform-provider-gandi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PI7cujatzmljyxosGMaqg3Jizee9Py7ffq9gKdehlvo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-dASIvZ3d7xTYMfvqeTcSJt+kaswGNRNqjHDcgoRVxNk=";
|
||||
deleteVendor = true;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
# Terraform allow checking the provider versions, but this breaks
|
||||
# if the versions are not provided via file paths.
|
||||
postBuild = "mv $NIX_BUILD_TOP/go/bin/terraform-provider-gandi{,_v${version}}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terraform provider for the Gandi LiveDNS service.";
|
||||
homepage = "https://github.com/tiramiseb/terraform-provider-gandi";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ manveru ];
|
||||
};
|
||||
}
|
||||
|
|
@ -370,6 +370,15 @@
|
|||
"vendorSha256": null,
|
||||
"version": "1.13.2"
|
||||
},
|
||||
"gandi": {
|
||||
"owner": "go-gandi",
|
||||
"provider-source-address": "registry.terraform.io/go-gandi/gandi",
|
||||
"repo": "terraform-provider-gandi",
|
||||
"rev": "v2.0.0",
|
||||
"sha256": "0xvdnjadcddrrfhhp198mraf2bm01xfy7gapjay441dbzffynw1m",
|
||||
"vendorSha256": "1yccjnz6xw3b51xqmiaw78m87y2xmlp9z5z3gx5dbzz0lkj1k523",
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"github": {
|
||||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
|
|
|
|||
|
|
@ -184,8 +184,8 @@ rec {
|
|||
};
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.1.3";
|
||||
sha256 = "sha256-dvAuzVmwnM2PQcILzw3xNacBwuRY7cZEU3nv4/DzOKE=";
|
||||
version = "1.1.4";
|
||||
sha256 = "sha256-PzBdo4zqWB9ma+uYFGmZtJNCXlRnAHxQmzWxZFPzHH0=";
|
||||
vendorSha256 = "sha256-Rk2hHtJfaS553MJIea6n51irMas3qcBrWAD+adzTi1Y=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.9.8",
|
||||
"version": "1.9.9",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"lint": "yarn lint:types && yarn lint:js",
|
||||
"lint:js": "eslint --max-warnings 0 src scripts hak",
|
||||
"lint:js-fix": "eslint --fix src scripts hak",
|
||||
"lint:types": "tsc --noEmit",
|
||||
"lint:types": "tsc --noEmit && tsc -p scripts/hak/tsconfig.json --noEmit && tsc -p hak/tsconfig.json --noEmit",
|
||||
"build:native": "yarn run hak",
|
||||
"build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
|
||||
"build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
"docker:install": "scripts/in-docker.sh yarn install",
|
||||
"debrepo": "scripts/mkrepo.sh",
|
||||
"clean": "rimraf webapp.asar dist packages deploys lib",
|
||||
"hak": "node scripts/hak/index.js"
|
||||
"hak": "ts-node scripts/hak/index.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"auto-launch": "^5.0.5",
|
||||
|
|
@ -52,6 +52,9 @@
|
|||
"@types/auto-launch": "^5.0.1",
|
||||
"@types/counterpart": "^0.18.1",
|
||||
"@types/minimist": "^1.2.1",
|
||||
"@types/mkdirp": "^1.0.2",
|
||||
"@types/pacote": "^11.1.1",
|
||||
"@types/rimraf": "^3.0.2",
|
||||
"@typescript-eslint/eslint-plugin": "^5.6.0",
|
||||
"@typescript-eslint/parser": "^5.6.0",
|
||||
"allchange": "^1.0.6",
|
||||
|
|
@ -76,6 +79,7 @@
|
|||
"pacote": "^11.3.5",
|
||||
"rimraf": "^3.0.2",
|
||||
"tar": "^6.1.2",
|
||||
"ts-node": "^10.4.0",
|
||||
"typescript": "^4.5.3"
|
||||
},
|
||||
"hakDependencies": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.9.8",
|
||||
"desktopSrcHash": "o6SICu7QDdBv9WXDconkypQRj3TbrU4ZAxayO9yemvc=",
|
||||
"desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18",
|
||||
"webHash": "141fqvh4d5lwm692yc8mfwrlvqnfixvc7vlbfis86qi557vq6ljq"
|
||||
"version": "1.9.9",
|
||||
"desktopSrcHash": "IMqco5HeAgsh1LMBXFH1/HnlIEFEQU0xqnHbTKwHGL4=",
|
||||
"desktopYarnHash": "0zzr14fcyc5q2562x50nvxxda10yr5ihbr12nykzg4j534rgb55y",
|
||||
"webHash": "1i3zka9cfn14rv5wzz969w6dz5dbkw87clrgajs8p1s2l62ac1jf"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,22 +47,24 @@ mkDerivation rec {
|
|||
] ++ pythonPath;
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
pillow
|
||||
aiofiles
|
||||
appdirs
|
||||
blist
|
||||
cairosvg
|
||||
filetype
|
||||
html-sanitizer
|
||||
hsluv
|
||||
matrix-nio
|
||||
lxml
|
||||
mistune
|
||||
plyer
|
||||
pymediainfo
|
||||
pyotherside
|
||||
plyer
|
||||
sortedcontainers
|
||||
watchgod
|
||||
redbaron
|
||||
hsluv
|
||||
simpleaudio
|
||||
setuptools
|
||||
watchgod
|
||||
dbus-python
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
|
|
@ -84,6 +86,6 @@ mkDerivation rec {
|
|||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ colemickens AndersonTorres ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
broken = stdenv.isDarwin;
|
||||
broken = stdenv.isDarwin || python3Packages.isPy37 || python3Packages.isPy38;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/afewmail/afew";
|
||||
description = "An initial tagging script for notmuch mail";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ andir flokli ];
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://github.com/flokli/mlarchive2maildir";
|
||||
description = "Imports mail from (pipermail) archives into a maildir";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andir flokli ];
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ let
|
|||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "1.18.5";
|
||||
version = "1.18.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qGPAfNsl20+k5Gn0w6aY8VFSOmpPk7S5u4FHPrSCz80=";
|
||||
sha256 = "sha256-fkIHHyhwZV0/aB/JFwz3XrYVOaCn5ZK3ihY3GVoOAHg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M=";
|
||||
vendorSha256 = "sha256-D16jlzP1amkiHW+/BqQV/DISf/H9MlZgvMJmlGtvrhg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
{ lib, stdenv, fetchgit, makeWrapper, pkg-config,
|
||||
gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
|
||||
configH ? ""
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "evilvte";
|
||||
version = "0.5.2-20140827";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/caleb-/evilvte.git";
|
||||
rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a";
|
||||
sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11
|
||||
xorg.xorgproto xorg.libXext makeWrapper pkg-config
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
cat >src/config.h <<EOF
|
||||
${configH}
|
||||
EOF
|
||||
make
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "VTE based, highly customizable terminal emulator";
|
||||
homepage = "http://www.calno.com/evilvte";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.bodil ];
|
||||
platforms = platforms.linux;
|
||||
knownVulnerabilities = [
|
||||
"https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854585"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
{ stdenv, lib, fetchurl, fetchFromGitHub
|
||||
, pkg-config
|
||||
, autoconf, automake, intltool, gettext
|
||||
, gtk, vte
|
||||
, flavour ? "stable"
|
||||
}:
|
||||
|
||||
assert lib.assertOneOf "flavour" flavour [ "stable" "git" ];
|
||||
|
||||
let
|
||||
pname = "lilyterm";
|
||||
stuff =
|
||||
if flavour == "stable"
|
||||
then rec {
|
||||
version = "0.9.9.4";
|
||||
src = fetchurl {
|
||||
url = "https://lilyterm.luna.com.tw/file/${pname}-${version}.tar.gz";
|
||||
sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp";
|
||||
};
|
||||
}
|
||||
else {
|
||||
version = "2019-07-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tetralet";
|
||||
repo = pname;
|
||||
rev = "faf1254f46049edfb1fd6e9191e78b1b23b9c51d";
|
||||
sha256 = "054450gk237c62b677365bcwrijr63gd9xm8pv68br371wdzylz7";
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
|
||||
inherit (stuff) src version;
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf automake intltool gettext ];
|
||||
buildInputs = [ gtk vte ];
|
||||
|
||||
preConfigure = "sh autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--enable-nls"
|
||||
"--enable-safe-mode"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast, lightweight terminal emulator";
|
||||
longDescription = ''
|
||||
LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight.
|
||||
'';
|
||||
homepage = "https://lilyterm.luna.com.tw/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ AndersonTorres Profpatsch ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -45,6 +45,6 @@ buildGoPackage {
|
|||
homepage = "https://github.com/rgburke/grv";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2wNC3APKbJ3Ug8M3w4nllfWlKTd10W7W/Csq/3xbXAI=";
|
||||
sha256 = "sha256-c6rwRFJ/9moukd56qrmHxOeULhSPHCU0Cj+vw4TQ8+Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tBm4yPeH02kie77A8KvylfH/wI2OsLyAlUb1zBJgT0g=";
|
||||
vendorSha256 = "sha256-W+bcjUXPZjldjhgaGsUKS1vSvS3yP/kH0QqwyvhL7Ww=";
|
||||
|
||||
ldflags = ["-X github.com/docker/compose/v2/internal.Version=${version}"];
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
doCheck = false;
|
||||
installPhase = ''
|
||||
|
|
@ -22,7 +22,8 @@ buildGoModule rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Docker CLI plugin to define and run multi-container applications with Docker";
|
||||
homepage = "https://github.com/docker/compose";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.babariviere ];
|
||||
maintainers = with maintainers; [ babariviere SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -650,7 +650,7 @@ let
|
|||
name = "buildRustCrate-tests";
|
||||
meta = {
|
||||
description = "Test cases for buildRustCrate";
|
||||
maintainers = [ lib.maintainers.andir ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
constituents = builtins.attrValues tests;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
homepage = "https://curl.haxx.se/docs/caextract.html";
|
||||
description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ andir fpletz lukegb ];
|
||||
maintainers = with maintainers; [ fpletz lukegb ];
|
||||
license = licenses.mpl20;
|
||||
};
|
||||
certdata = stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -62,8 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
autoreconfHook = pkgs.autoreconfHook269;
|
||||
};
|
||||
|
||||
vte = callPackage ./desktop/vte { };
|
||||
|
||||
#### BINDINGS
|
||||
|
||||
libglademm = callPackage ./bindings/libglademm { };
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Sat, 12 May 2012 18:48:05 +0200
|
||||
Subject: [PATCH] keymap: Treat ALT as META
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=663779
|
||||
---
|
||||
src/vte.c | 23 ++++++++++++++---------
|
||||
1 files changed, 14 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/vte.c b/src/vte.c
|
||||
index dd27e9a..0657921 100644
|
||||
--- a/src/vte.c
|
||||
+++ b/src/vte.c
|
||||
@@ -5170,19 +5170,24 @@ static void
|
||||
vte_terminal_read_modifiers (VteTerminal *terminal,
|
||||
GdkEvent *event)
|
||||
{
|
||||
+ GdkKeymap *keymap;
|
||||
GdkModifierType modifiers;
|
||||
|
||||
/* Read the modifiers. */
|
||||
- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
|
||||
- GdkKeymap *keymap;
|
||||
-#if GTK_CHECK_VERSION (2, 90, 8)
|
||||
- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
|
||||
-#else
|
||||
- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
|
||||
+ if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
|
||||
+ return;
|
||||
+
|
||||
+ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
|
||||
+
|
||||
+ gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
|
||||
+
|
||||
+#if 1
|
||||
+ /* HACK! Treat ALT as META; see bug #663779. */
|
||||
+ if (modifiers & GDK_MOD1_MASK)
|
||||
+ modifiers |= VTE_META_MASK;
|
||||
#endif
|
||||
- gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
|
||||
- terminal->pvt->modifiers = modifiers;
|
||||
- }
|
||||
+
|
||||
+ terminal->pvt->modifiers = modifiers;
|
||||
}
|
||||
|
||||
/* Read and handle a keypress event. */
|
||||
--
|
||||
1.7.5.1.217.g4e3aa.dirty
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
Index: vte-0.26.0/src/vte.c
|
||||
===================================================================
|
||||
--- vte-0.26.0.orig/src/vte.c 2010-11-30 23:04:53.000000000 -0800
|
||||
+++ vte-0.26.0/src/vte.c 2010-12-07 20:05:07.865548000 -0800
|
||||
@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
|
||||
long wcount, start, delta;
|
||||
gboolean leftovers, modified, bottom, again;
|
||||
gboolean invalidated_text;
|
||||
+ gboolean in_scroll_region;
|
||||
GArray *unichars;
|
||||
struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
|
||||
|
||||
@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
|
||||
cursor = screen->cursor_current;
|
||||
cursor_visible = terminal->pvt->cursor_visible;
|
||||
|
||||
+ in_scroll_region = screen->scrolling_restricted
|
||||
+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
|
||||
+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
|
||||
+
|
||||
/* We should only be called when there's data to process. */
|
||||
g_assert(terminal->pvt->incoming ||
|
||||
(terminal->pvt->pending->len > 0));
|
||||
@@ -3979,6 +3984,8 @@ skip_chunk:
|
||||
* points to the first character which isn't part of this
|
||||
* sequence. */
|
||||
if ((match != NULL) && (match[0] != '\0')) {
|
||||
+ gboolean new_in_scroll_region;
|
||||
+
|
||||
/* Call the right sequence handler for the requested
|
||||
* behavior. */
|
||||
_vte_terminal_handle_sequence(terminal,
|
||||
@@ -3989,12 +3996,20 @@ skip_chunk:
|
||||
start = (next - wbuf);
|
||||
modified = TRUE;
|
||||
|
||||
- /* if we have moved during the sequence handler, restart the bbox */
|
||||
+ new_in_scroll_region = screen->scrolling_restricted
|
||||
+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
|
||||
+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
|
||||
+
|
||||
+ delta = screen->scroll_delta; /* delta may have changed from sequence. */
|
||||
+
|
||||
+ /* if we have moved greatly during the sequence handler, or moved into a scroll_region
|
||||
+ * from outside it, restart the bbox */
|
||||
if (invalidated_text &&
|
||||
- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
|
||||
- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
|
||||
- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
|
||||
- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
|
||||
+ ((new_in_scroll_region && !in_scroll_region) ||
|
||||
+ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
|
||||
+ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
|
||||
+ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
|
||||
+ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
|
||||
/* Clip off any part of the box which isn't already on-screen. */
|
||||
bbox_topleft.x = MAX(bbox_topleft.x, 0);
|
||||
bbox_topleft.y = MAX(bbox_topleft.y, delta);
|
||||
@@ -4014,6 +4029,8 @@ skip_chunk:
|
||||
bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
|
||||
bbox_topleft.x = bbox_topleft.y = G_MAXINT;
|
||||
}
|
||||
+
|
||||
+ in_scroll_region = new_in_scroll_region;
|
||||
} else
|
||||
/* Second, we have a NULL match, and next points to the very
|
||||
* next character in the buffer. Insert the character which
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, intltool, pkg-config, glib, gtk2, ncurses
|
||||
, pythonSupport ? false, python27Packages}:
|
||||
|
||||
let
|
||||
inherit (python27Packages) python pygtk;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "vte-0.28.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
|
||||
sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./alt.patch
|
||||
./change-scroll-region.patch
|
||||
# CVE-2012-2738
|
||||
# fixed in upstream version 0.32.2
|
||||
(fetchpatch{
|
||||
name = "CVE-2012-2738-1.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch";
|
||||
sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n";
|
||||
})
|
||||
(fetchpatch{
|
||||
name = "CVE-2012-2738-2.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch";
|
||||
sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool glib gtk2 ncurses ] ++
|
||||
lib.optionals pythonSupport [python pygtk];
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature pythonSupport "python")
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString pythonSupport ''
|
||||
cd $(toPythonPath $out)/gtk-2.0
|
||||
for n in *; do
|
||||
ln -s "gtk-2.0/$n" "../$n"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnome.org/";
|
||||
description = "A library implementing a terminal emulator widget for GTK";
|
||||
longDescription = ''
|
||||
VTE is a library (libvte) implementing a terminal emulator widget for
|
||||
GTK, and a minimal sample application (vte) using that. Vte is
|
||||
mainly used in gnome-terminal, but can also be used to embed a
|
||||
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
|
||||
character set conversion, as well as emulating any terminal known to
|
||||
the system's terminfo database.
|
||||
'';
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = with lib.maintainers; [ astsmtl ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -113,6 +113,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://luajit.org";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ thoughtpolice smironov vcunat andir lblasc ];
|
||||
maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ];
|
||||
} // extraMeta;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/google/crc32c";
|
||||
description = "CRC32C implementation with support for CPU-specific acceleration instructions";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ andir cpcloud ];
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "3.3.2";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fla3EMDmuW0+vmmU0sgtLsGfO7dDApLQ2EoKJeR/1IM=";
|
||||
sha256 = "11rjdaxmsp9n3r9xhmgd7ksy8bh5fazwsxdj0xvl4hsy6bcn4n97";
|
||||
};
|
||||
|
||||
sourceRoot = "source/gdal";
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
expat
|
||||
libxml2
|
||||
postgresql
|
||||
] ++ (with pythonPackages; [ python numpy wrapPython ])
|
||||
] ++ (with pythonPackages; [ python setuptools numpy wrapPython ])
|
||||
++ lib.optional stdenv.isDarwin libiconv
|
||||
++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,18 +12,19 @@
|
|||
, libepoxy
|
||||
, libGL
|
||||
, xorg
|
||||
, libunwind
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplacebo";
|
||||
version = "4.157.0";
|
||||
version = "4.192.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h";
|
||||
sha256 = "19i7p9z8mmki5yq26059dp9055cccgxs0vfdlx0w1qak7pmv1vpm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
|
|||
libepoxy
|
||||
libGL
|
||||
xorg.libX11
|
||||
libunwind
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A YAML parser and emitter for C++";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A YAML parser and emitter for C++";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
|||
description = "C++/Boost Asio based websocket client/server library";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,18 @@
|
|||
{ stdenv, ocaml, findlib, zarith, z3 }:
|
||||
{ stdenv, lib, ocaml, findlib, zarith, z3 }:
|
||||
|
||||
let z3-with-ocaml = z3.override {
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
then throw "z3 is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let z3-with-ocaml = (z3.override {
|
||||
ocamlBindings = true;
|
||||
inherit ocaml findlib zarith;
|
||||
}; in
|
||||
}).overrideAttrs (o: {
|
||||
patches = (o.patches or []) ++ [
|
||||
# Fix build; see: https://github.com/Z3Prover/z3/issues/5776
|
||||
./ocamlfind.patch
|
||||
];
|
||||
}); in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
|
|
|
|||
13
pkgs/development/ocaml-modules/z3/ocamlfind.patch
Normal file
13
pkgs/development/ocaml-modules/z3/ocamlfind.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/scripts/mk_util.py b/scripts/mk_util.py
|
||||
index 042e6af46..1e105b002 100644
|
||||
--- a/scripts/mk_util.py
|
||||
+++ b/scripts/mk_util.py
|
||||
@@ -1995,7 +1995,7 @@ class MLComponent(Component):
|
||||
|
||||
LIBZ3 = LIBZ3 + ' ' + ' '.join(map(lambda x: '-cclib ' + x, LDFLAGS.split()))
|
||||
|
||||
- stubs_install_path = '$$(%s printconf path)/stublibs' % OCAMLFIND
|
||||
+ stubs_install_path = '$$(%s printconf destdir)/stublibs' % OCAMLFIND
|
||||
if not STATIC_LIB:
|
||||
loadpath = '-ccopt -L' + stubs_install_path
|
||||
dllpath = '-dllpath ' + stubs_install_path
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.19.2";
|
||||
version = "3.19.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-zsnv3Lw+CWhNQ9ovXAuIujAXfkjiiWm797ncHIN3y/E=";
|
||||
sha256 = "sha256-kjXHEXC+xTaQ7bEDROpqM/fNwacXlbVbhxRs2o62W20=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adjusttext";
|
||||
version = "0.7.3";
|
||||
version = "0.7.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Phlya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw";
|
||||
sha256 = "1a6hizx1cnplj0irn8idgda2lacsb61dw464cwx798pjr1gd401n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aenum";
|
||||
version = "3.1.5";
|
||||
version = "3.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LrrYWQtqAYPA2Yk1I7RY7c6YeuRTMznFrBhc+sMtrxo=";
|
||||
sha256 = "3ba2c25dd03fbf3992353595be18152e2fb6042f47b526ea66cd5838bb9f1fb6";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,22 +6,29 @@
|
|||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "afsapi";
|
||||
version = "0.0.4";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhelev";
|
||||
owner = "wlcrs";
|
||||
repo = "python-afsapi";
|
||||
rev = version;
|
||||
sha256 = "aevxhHuRedDs0JxeMlYSKHDQwcIs7miRm4FCtssdE0w=";
|
||||
hash = "sha256-9cExuVFbESOUol10DUj9Bt6evtXi1ctBeAsGitrSDqc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
lxml
|
||||
|
|
@ -42,7 +49,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of the Frontier Silicon API";
|
||||
homepage = "https://github.com/zhelev/python-afsapi";
|
||||
homepage = "https://github.com/wlcrs/python-afsapi";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,20 +7,25 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.1.10913";
|
||||
version = "9.1.11508";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S+ntSC9KySj2njkxEkr7p2TDsBqY0Gf+zzwomnGwSEk=";
|
||||
hash = "sha256-ZT3rMzWwMG1tpPcpOqGvlFt0nuiPD0d3nECVDC7XDv8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyvex ];
|
||||
propagatedBuildInputs = [
|
||||
pyvex
|
||||
];
|
||||
|
||||
# Tests depend on angr (possibly a circular dependency)
|
||||
doCheck = false;
|
||||
|
||||
#pythonImportsCheck = [ "ailment" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohwenergy";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "DCSBL";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "Rs7kD+jN/z0j4KmkitquB+cm2UcYG87YHczZR0A4axI=";
|
||||
sha256 = "006q2kgc28dn43skk2x76d13fp51sy073nm8f2hrxn4wqwkccsx3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioswitcher";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomerFi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zgfgM3orhm2ZPp3Cf803adNzPeMOdRGX+sN6rhK1OT4=";
|
||||
sha256 = "05m5jgn8g3kwrp92x3mdfpnpga1jc4whlxx9vlymg0r9s5y84lz5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
, pycparser
|
||||
, pythonOlder
|
||||
, pyvex
|
||||
, sympy
|
||||
, sqlalchemy
|
||||
, rpyc
|
||||
, sortedcontainers
|
||||
|
|
@ -45,18 +46,18 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.1.10913";
|
||||
version = "9.1.11508";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AZlqSalTOQh3QR959ZuanFuTZVKi9valKJ3snsquC/A=";
|
||||
hash = "sha256-8Cuh+QxKU3wYRRDYrMXPrzp4yg1pyH4QbJeEsTHDZqA=";
|
||||
};
|
||||
|
||||
setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ailment
|
||||
archinfo
|
||||
|
|
@ -75,20 +76,24 @@ buildPythonPackage rec {
|
|||
progressbar2
|
||||
protobuf
|
||||
psutil
|
||||
sqlalchemy
|
||||
pycparser
|
||||
pyvex
|
||||
sqlalchemy
|
||||
rpyc
|
||||
sortedcontainers
|
||||
sqlalchemy
|
||||
sympy
|
||||
unicorn'
|
||||
];
|
||||
|
||||
setupPyBuildFlags = lib.optionals stdenv.isLinux [
|
||||
"--plat-name"
|
||||
"linux"
|
||||
];
|
||||
|
||||
# Tests have additional requirements, e.g., pypcode and angr binaries
|
||||
# cle is executing the tests with the angr binaries
|
||||
doCheck = false;
|
||||
|
||||
# See http://angr.io/api-doc/
|
||||
pythonImportsCheck = [
|
||||
"angr"
|
||||
"claripy"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "fmagin";
|
||||
repo = "angr-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
|
||||
hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.1.10913";
|
||||
version = "9.1.11508";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8M3d8lG7jDNgICjzjFRi9Wl2I7aYI5b5IvjEhixsk9k=";
|
||||
hash = "sha256-lAPruvMLCQD1TwQBlKZnLrCEkrKf676dK++e7fBmPQA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -28,7 +30,10 @@ buildPythonPackage rec {
|
|||
# Tests have additional requirements, e.g., angr binaries
|
||||
# cle is executing the tests with the angr binaries already and is a requirement of angr
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "angrop" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"angrop"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ROP gadget finder and chain builder";
|
||||
|
|
|
|||
|
|
@ -3,17 +3,21 @@
|
|||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, nose
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.1.10913";
|
||||
version = "9.1.11508";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VLFbjKX7WXWoJCS9hYwtEikGC48gRg7E24D9Un+/gdc=";
|
||||
hash = "sha256-r21n0rbHxb/e34PGpbA5KpnILFtmkXThBWbASChvVs0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -21,7 +25,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "archinfo" ];
|
||||
pythonImportsCheck = [
|
||||
"archinfo"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Classes with architecture-specific information";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asteval";
|
||||
version = "0.9.25";
|
||||
version = "0.9.26";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newville";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Jy+4NifItCGI1Jj25VakwoJcrpZw0Ng4cArf2M31WGs=";
|
||||
sha256 = "0l2iv51yclqn52w3yvyz3brpbca076ivv70h4gd6bkhwjbax1i2b";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blist";
|
||||
version = "1.3.6";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is";
|
||||
};
|
||||
|
||||
|
||||
patches = [
|
||||
# Fix compatibility for Python 3.7 https://github.com/DanielStutzbach/blist/pull/78
|
||||
(fetchpatch {
|
||||
url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch";
|
||||
sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y";
|
||||
})
|
||||
|
||||
# Fixes compatibility for Python 3.9 https://github.com/DanielStutzbach/blist/pull/91
|
||||
(fetchpatch {
|
||||
url = "https://github.com/DanielStutzbach/blist/pull/91/commits/e63514f805e42dc6a5708e629e4153d91bc90bff.patch";
|
||||
sha256 = "1prx8znk7008v4ky7q2lx0pi6hzqd4kxgfdwbsr4zylwbrdqvsga";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://stutzbachenterprises.com/blist/";
|
||||
description = "A list-like type with better asymptotic performance and similar performance on small lists";
|
||||
license = licenses.bsd0;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -13,21 +13,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.1.10913";
|
||||
version = "9.1.11508";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-66dc0y4mu5S5PtTx2fRkBdpNlH53ZpTiKyM3s0OUamw=";
|
||||
sha256 = "sha256-xCtITYRiIBtJQ8FIr0NJC30YWoU8iZ4gMGv2blnFNIk=";
|
||||
};
|
||||
|
||||
# Use upstream z3 implementation
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cachetools
|
||||
decorator
|
||||
|
|
@ -41,7 +38,15 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "claripy" ];
|
||||
postPatch = ''
|
||||
# Use upstream z3 implementation
|
||||
substituteInPlace setup.py \
|
||||
--replace "z3-solver>=4.8.5.0" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"claripy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python abstraction layer for constraint solvers";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.1.10913";
|
||||
version = "9.1.11508";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
|
@ -29,13 +29,15 @@ in
|
|||
buildPythonPackage rec {
|
||||
pname = "cle";
|
||||
inherit version;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-z8hBOqeI7T6Rov00OySDBdzUQ6jeBRseE7sz8VfIJmk=";
|
||||
hash = "sha256-/5GKuf+nmt1/M6yAhZy9+itMnIVUGHP7BqEIxjNjep8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cli_helpers";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "733f65d8c921e0cffa8f7ae4c8735bd7ecdffec383c5246f647ddd0fddb33448";
|
||||
sha256 = "sha256-DMwc/Noaxk3H7YPXATBVzxnll50p5Wwh87aS3gFVWq4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "4.3.0";
|
||||
version = "5.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "17l11mhv1qkdbhmwwal3zfgr1a3w1c4bwm9lqi78gadpl5lli4i2";
|
||||
sha256 = "1vygyjmmin34iqmhq2l4qb9x2zgc41y6x50xavqzrkfkdd7vhwg6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "elgato";
|
||||
version = "2.2.0";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-elgato";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xsIglJSnvtd3NKqwoRAonPRN+C9KWyar0mrYcC3hPpw=";
|
||||
sha256 = "sha256-lGHRwDxxgi1QJvK3WrvwghoAZk5J1mdwD4+Is0n7Jgs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glean_parser";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s=";
|
||||
sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-automl";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4c759ae99979d9f94ed0bdfe4937f41c81634f934ec11d25eb089430781eafec";
|
||||
sha256 = "bcd3b2913c2eb83e356a457ad6e89a2a9505b2e9cb7be37055d6ce1f0fef20cf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fdc8cb68a3ee54780f673f06b3cce83a5bb5d600db7ad363c85e38bf45afb59c";
|
||||
sha256 = "6e93c134669bbb7b79be4bd73329842c5e5f071f1fde624fc82233da42677021";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e012d76aa32b918c71392c11e1c727328c1570364f8d8e0676e52bc64c57a7af";
|
||||
sha256 = "c3b60ea9059070e6d0d5c3bd3a705b5c7216a54e6a586149f9caa9158d099c3f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0b249fa87deb57f5c7107a7d5d303673590a6524a7f113fc95f87493f3328606";
|
||||
sha256 = "3a757a3fafab46f28ffd2465ae06c5f87071aee1b41aee13f44255074483d480";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-redis";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c5aaf6dbdf8bb1425bd42ef482a6c0ecc4b4d1718d49267d510799015c6ff1d2";
|
||||
sha256 = "ad81fed19af6af68426e76891e4acc8a021a8bc475e2ce4be51bf28a610a9713";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7321a88191d61ca0cc720b7ad07d9693e07726728492739930562bcd33ec1494";
|
||||
sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-speech";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3a15400d2fab2ec161c9b647730e8ba92feb9cbe6a1c0c7734ec8e8941290dbd";
|
||||
sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pXoVrq0PnfvUOB8b/b6L+JgYpL11urhGyvzvstuEbEc=";
|
||||
sha256 = "0a5e7ab1a38d2c24be8e566e50b8b0daa8af8fd49d4ab312b1fda5c147429893";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,30 +1,36 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "itanium_demangler";
|
||||
pname = "itanium-demangler";
|
||||
version = "1.0"; # pulled from pypi version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whitequark";
|
||||
repo = "python-${pname}";
|
||||
repo = "python-itanium_demangler";
|
||||
rev = "29c77860be48e6dafe3496e4d9d0963ce414e366";
|
||||
sha256 = "0qm95l6542nk63986w9lgzkxg824l31714i584s02rh9xwfg1xfx";
|
||||
hash = "sha256-3fXwHO8JZgE0QSWScMKgRKDX5380cYPSMNMKUgwtqWI=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests/test.py
|
||||
'';
|
||||
pytestFlagsArray = [
|
||||
"tests/test.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
" itanium_demangler "
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pure Python parser for the Itanium C++ ABI symbol mangling language";
|
||||
description = "Python parser for the Itanium C++ ABI symbol mangling language";
|
||||
homepage = "https://github.com/whitequark/python-itanium_demangler";
|
||||
license = licenses.bsd0;
|
||||
maintainers = [ maintainers.pamplemousse ];
|
||||
maintainers = with maintainers; [ pamplemousse ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meross-iot";
|
||||
version = "0.4.4.2";
|
||||
version = "0.4.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "albertogeniola";
|
||||
repo = "MerossIot";
|
||||
rev = version;
|
||||
sha256 = "sha256-/sUY8XU3IYdvlIfxmKIrF9KH/LubR0EZCW7ehrb2YNk=";
|
||||
sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policyuniverse";
|
||||
version = "1.4.0.20210819";
|
||||
version = "1.4.0.20220110";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RBRUR9Rzw3/yd2ZnteEBigDApJPBagpIk5lSGzeGqL4=";
|
||||
sha256 = "sha256-EWuAhVTX6nXvyXtMuQQIVUbbRZNO8xUXXLR1XHpEid4=";
|
||||
};
|
||||
|
||||
# Tests are not shipped and there are no GitHub tags
|
||||
|
|
|
|||
|
|
@ -7,23 +7,21 @@
|
|||
, fetchPypi
|
||||
, future
|
||||
, pycparser
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.1.10913";
|
||||
version = "9.1.11508";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-EUgCyjD5ia5KQMvZWVAsXeKRjmSVE7tRRYH5u/Ozug0=";
|
||||
hash = "sha256-FNCAvag0ErVjzgXqiwDnX80WnjUdnWHtcLYuanlj0ME=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace vex/Makefile-gcc --replace '/usr/bin/ar' 'ar'
|
||||
'';
|
||||
|
||||
setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
archinfo
|
||||
bitstring
|
||||
|
|
@ -32,15 +30,29 @@ buildPythonPackage rec {
|
|||
pycparser
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace vex/Makefile-gcc \
|
||||
--replace '/usr/bin/ar' 'ar'
|
||||
'';
|
||||
|
||||
setupPyBuildFlags = lib.optionals stdenv.isLinux [
|
||||
"--plat-name"
|
||||
"linux"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export CC=${stdenv.cc.targetPrefix}cc
|
||||
substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
|
||||
substituteInPlace pyvex_c/Makefile \
|
||||
--replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
|
||||
'';
|
||||
|
||||
# No tests are available on PyPI, GitHub release has tests
|
||||
# Switch to GitHub release after all angr parts are present
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pyvex" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyvex"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface to libVEX and VEX IR";
|
||||
|
|
|
|||
|
|
@ -10,12 +10,16 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0kxiv0yjbbvp1zx694ir149b26kjzvb6600fh397v32b8jvs8w2w";
|
||||
hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"freezegun-stubs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for freezegun";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pgcli";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PQ7UDfaR1gJUzLTVZUpSwcY3P3fSs89qkK6m7pn+pDk=";
|
||||
sha256 = "sha256-/MyeVcpopK0Ih6z6KZGvs7ivk/PM6a2iSeatiYeZM6E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/packethost/prometheus-packet-sd";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.andir ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
|
|||
'';
|
||||
homepage = "https://github.com/kolloch/crate2nix";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kolloch andir cole-h ];
|
||||
maintainers = with maintainers; [ kolloch cole-h ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -947,8 +947,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "todo-tree";
|
||||
publisher = "Gruntfuggly";
|
||||
version = "0.0.214";
|
||||
sha256 = "0rwxjnrl44rnhx3183037k6435xs4772p58a37azl5cahsyav1hk";
|
||||
version = "0.0.215";
|
||||
sha256 = "sha256-WK9J6TvmMCLoqeKWh5FVp1mNAXPWVmRvi/iFuLWMylM=";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
|
@ -1274,8 +1274,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-docker";
|
||||
publisher = "ms-azuretools";
|
||||
version = "1.18.0";
|
||||
sha256 = "0hhlhx3xy7x31xx2v3srvk67immajs6dm9h0wi49ii1rwx61zxah";
|
||||
version = "1.19.0";
|
||||
sha256 = "sha256-buIAbsyKUvX3blO1AbCq/tJ1KAcqaFpciqQovmOZ5GE=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -1377,8 +1377,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "java";
|
||||
publisher = "redhat";
|
||||
version = "0.76.0";
|
||||
sha256 = "0xb9brki4s00piv4kqgz6idm16nk6x1j6502jljz7y9pif38z32y";
|
||||
version = "1.2.0";
|
||||
sha256 = "sha256-YmR3FWhPZSU2gE6NIVoA1HZBzaYaTNYFXC/uNwbDEdQ=";
|
||||
};
|
||||
buildInputs = [ jdk ];
|
||||
meta = {
|
||||
|
|
@ -1391,8 +1391,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-yaml";
|
||||
publisher = "redhat";
|
||||
version = "1.2.2";
|
||||
sha256 = "06n4fxqr3lqmiyns9jdk3rdnanamcpzhrivllai8z9d997xmwcx6";
|
||||
version = "1.3.0";
|
||||
sha256 = "sha256-Tz6bLcBUATn8cYIzGoLJwgaJZGbBVr1CISmJHz+iM60=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, which, xdg-dbus-proxy, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, libapparmor
|
||||
, which
|
||||
, xdg-dbus-proxy
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "firejail";
|
||||
|
|
@ -11,7 +20,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-oKstTiGt0r4wePaZ9u1o78GZ1XWJ27aS0BdLxmfYk9Q=";
|
||||
};
|
||||
|
||||
buildInputs = [ which ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libapparmor
|
||||
which
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-apparmor"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Adds the /nix directory when using an overlay.
|
||||
|
|
@ -26,11 +46,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
prePatch = ''
|
||||
# Allow whitelisting ~/.nix-profile
|
||||
substituteInPlace etc/firejail.config --replace \
|
||||
'# follow-symlink-as-user yes' \
|
||||
'follow-symlink-as-user no'
|
||||
|
||||
# Fix the path to 'xdg-dbus-proxy' hardcoded in the 'common.h' file
|
||||
substituteInPlace src/include/common.h \
|
||||
--replace '/usr/bin/xdg-dbus-proxy' '${xdg-dbus-proxy}/bin/xdg-dbus-proxy'
|
||||
|
|
@ -62,7 +77,7 @@ stdenv.mkDerivation rec {
|
|||
# See https://github.com/netblue30/firejail/blob/e4cb6b42743ad18bd11d07fd32b51e8576239318/src/firejail/profile.c#L68-L83
|
||||
# for the profile file lookup implementation.
|
||||
postInstall = ''
|
||||
for local in $(grep -Eh '^include.*local$' $out/etc/firejail/*.profile | awk '{print $2}' | sort | uniq)
|
||||
for local in $(grep -Eh '^include.*local$' $out/etc/firejail/*{.inc,.profile} | awk '{print $2}' | sort | uniq)
|
||||
do
|
||||
echo "include /etc/firejail/$local" >$out/etc/firejail/$local
|
||||
done
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Microcode for Intel processors";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -612,6 +612,6 @@ stdenv.mkDerivation {
|
|||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
priority = 10;
|
||||
maintainers = with maintainers; [ andir eelco flokli kloenk ];
|
||||
maintainers = with maintainers; [ eelco flokli kloenk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "t-rex";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3-beta4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t-rex-tileserver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QNowkQzEYLOgJ2h0yq+gShmW5WgqPF3iiSejqwrOrHo=";
|
||||
hash = "sha256-EG/nnHxnBwlxreJ+RWHvKqLpaVtlU95+YTJynEnypOE=";
|
||||
|
||||
};
|
||||
|
||||
cargoHash = "sha256-k10DjLJCJLqjmtEED5pwQDt3mOiey89UYC36lG+3AmM=";
|
||||
cargoHash = "sha256-noDZNFZlfX6lZ4czsSrHXe7xbBLTD0Gz8i5EyfEp8lc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wimlib.net";
|
||||
description = "A library and program to extract, create, and modify WIM files";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = with licenses; [ gpl3 lgpl3 cc0 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
with python3.pkgs; buildPythonPackage rec {
|
||||
pname = "esphome-dashboard";
|
||||
version = "20211211.0";
|
||||
version = "20220116.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xF1/gUJCr4qRO+AnWeFO6b1YnQBOgve/23ZaGmCa910=";
|
||||
sha256 = "sha256-eItt7AP96juIaP57yGzW/Fb8NAGsns/4nGWQIMv7Xn8=";
|
||||
};
|
||||
|
||||
# no tests
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@ let
|
|||
in
|
||||
with python.pkgs; buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2021.12.3";
|
||||
version = "2022.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-uEwpolMbtBPHAOk3fDE6OE3/Sls5NB0p5ibnrbNIbV0=";
|
||||
sha256 = "sha256-cqL+54Hjqql1YpsXEFLTD5UhxoEizFSr//4TZm7QEVU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ];
|
||||
|
||||
# workaround https://github.com/NixOS/nixpkgs/issues/155458
|
||||
preBuild = lib.optionalString stdenv.cc.isClang ''
|
||||
rm version
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data";
|
||||
homepage = "http://www.mavetju.org/unix/general.php";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libreswan";
|
||||
version = "4.5";
|
||||
version = "4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7";
|
||||
sha256 = "1zsnsfx18pf5dy1p4jva2sfl0bdfx5y9ls54f9bp70m64r46yf96";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -70,11 +70,14 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional stdenv.isLinux libselinux;
|
||||
|
||||
prePatch = ''
|
||||
# Correct iproute2 path
|
||||
sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \
|
||||
-e 's|"/sbin/iptables"|"${iptables}/bin/iptables"|' \
|
||||
# Correct iproute2 and iptables path
|
||||
sed -e 's|/sbin/ip|${iproute2}/bin/ip|' \
|
||||
-e 's|/sbin/\(ip6\?tables\)|${iptables}/bin/\1|' \
|
||||
-i initsystems/systemd/ipsec.service.in \
|
||||
programs/barf/barf.in \
|
||||
programs/verify/verify.in
|
||||
sed -e 's|\([[:blank:]]\)\(ip6\?tables\(-save\)\? -\)|\1${iptables}/bin/\2|' \
|
||||
-i programs/verify/verify.in
|
||||
|
||||
# Prevent the makefile from trying to
|
||||
# reload the systemd daemon or create tmpfiles
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.31";
|
||||
version = "3.0.32";
|
||||
pname = "swagger-codegen";
|
||||
|
||||
jarfilename = "${pname}-cli-${version}.jar";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
|
||||
sha256 = "sha256-GZJLS+gy23FcSS2twF4fnRf5QkVEpx23UaN7pdJIudM=";
|
||||
sha256 = "sha256-FPSBnM2MLmYVb0A27UhDp5D3oWJlrjZlMYDEr3qwmDY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||
description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)";
|
||||
homepage = "https://github.com/tcatm/ecdsautils/";
|
||||
license = with licenses; [ mit bsd2 ];
|
||||
maintainers = with maintainers; [ andir ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gau";
|
||||
version = "2.0.6";
|
||||
version = "2.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d9Cfd2KD+ymGnzOjlVQkSm3XBamoJIUKQLnRZzSDBtk=";
|
||||
sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA=";
|
||||
|
|
|
|||
130
pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch
Normal file
130
pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
From 913e74b8682f77da94ed7b7d459482b9b23a5d88 Mon Sep 17 00:00:00 2001
|
||||
From: roblabla <unfiltered@roblab.la>
|
||||
Date: Tue, 28 Dec 2021 14:20:30 +0100
|
||||
Subject: [PATCH] Use protobuf gradle plugin
|
||||
|
||||
---
|
||||
Ghidra/Debug/Debugger-gadp/build.gradle | 76 +++----------------------
|
||||
build.gradle | 6 ++
|
||||
2 files changed, 15 insertions(+), 67 deletions(-)
|
||||
|
||||
diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle
|
||||
index 1b4922f66..3d2ef8856 100644
|
||||
--- a/Ghidra/Debug/Debugger-gadp/build.gradle
|
||||
+++ b/Ghidra/Debug/Debugger-gadp/build.gradle
|
||||
@@ -23,42 +23,19 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle"
|
||||
apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle"
|
||||
|
||||
apply plugin: 'eclipse'
|
||||
-eclipse.project.name = 'Debug Debugger-gadp'
|
||||
+apply plugin: 'com.google.protobuf'
|
||||
|
||||
-configurations {
|
||||
- allProtocArtifacts
|
||||
- protocArtifact
|
||||
-}
|
||||
+eclipse.project.name = 'Debug Debugger-gadp'
|
||||
|
||||
def platform = getCurrentPlatformName()
|
||||
|
||||
-dependencies {
|
||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
|
||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
|
||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
|
||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
|
||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
|
||||
-
|
||||
- if (isCurrentWindows()) {
|
||||
- protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
|
||||
- }
|
||||
- if (isCurrentLinux()) {
|
||||
- if (platform.endsWith("x86_64")) {
|
||||
- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
|
||||
- }
|
||||
- else {
|
||||
- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
|
||||
- }
|
||||
- }
|
||||
- if (isCurrentMac()) {
|
||||
- if (platform.endsWith("x86_64")) {
|
||||
- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
|
||||
- }
|
||||
- else {
|
||||
- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
|
||||
- }
|
||||
- }
|
||||
+buildscript {
|
||||
+ dependencies {
|
||||
+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
|
||||
+ }
|
||||
+}
|
||||
|
||||
+dependencies {
|
||||
api 'com.google.protobuf:protobuf-java:3.17.3'
|
||||
api project(':Framework-AsyncComm')
|
||||
api project(':Framework-Debugging')
|
||||
@@ -68,43 +45,8 @@ dependencies {
|
||||
testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
|
||||
}
|
||||
|
||||
-/*protobuf {
|
||||
+protobuf {
|
||||
protoc {
|
||||
artifact = 'com.google.protobuf:protoc:3.17.3'
|
||||
}
|
||||
-}*/
|
||||
-
|
||||
-task generateProto {
|
||||
- ext.srcdir = file("src/main/proto")
|
||||
- ext.src = fileTree(srcdir) {
|
||||
- include "**/*.proto"
|
||||
- }
|
||||
- ext.outdir = file("build/generated/source/proto/main/java")
|
||||
- outputs.dir(outdir)
|
||||
- inputs.files(src)
|
||||
- dependsOn(configurations.protocArtifact)
|
||||
- doLast {
|
||||
- def exe = configurations.protocArtifact.first()
|
||||
- if (!isCurrentWindows()) {
|
||||
- exe.setExecutable(true)
|
||||
- }
|
||||
- exec {
|
||||
- commandLine exe, "--java_out=$outdir", "-I$srcdir"
|
||||
- args src
|
||||
- }
|
||||
- }
|
||||
}
|
||||
-
|
||||
-tasks.compileJava.dependsOn(tasks.generateProto)
|
||||
-tasks.eclipse.dependsOn(tasks.generateProto)
|
||||
-rootProject.tasks.prepDev.dependsOn(tasks.generateProto)
|
||||
-
|
||||
-sourceSets {
|
||||
- main {
|
||||
- java {
|
||||
- srcDir tasks.generateProto.outdir
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-zipSourceSubproject.dependsOn generateProto
|
||||
-
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index dce3a5149..7a2e637ce 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -76,6 +76,12 @@ if (flatRepo.isDirectory()) {
|
||||
jcenter()
|
||||
flatDir name: "flat", dirs:["$flatRepo"]
|
||||
}
|
||||
+ buildscript {
|
||||
+ repositories {
|
||||
+ mavenLocal()
|
||||
+ mavenCentral()
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
}
|
||||
else {
|
||||
--
|
||||
2.33.1
|
||||
|
||||
177
pkgs/tools/security/ghidra/build.nix
Normal file
177
pkgs/tools/security/ghidra/build.nix
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
{ stdenv
|
||||
, fetchzip
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, gradle
|
||||
, perl
|
||||
, makeWrapper
|
||||
, openjdk11
|
||||
, unzip
|
||||
, makeDesktopItem
|
||||
, autoPatchelfHook
|
||||
, icoutils
|
||||
, xcbuild
|
||||
, protobuf3_17
|
||||
, libredirect
|
||||
}:
|
||||
|
||||
let
|
||||
pkg_path = "$out/lib/ghidra";
|
||||
pname = "ghidra";
|
||||
version = "10.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NationalSecurityAgency";
|
||||
repo = "Ghidra";
|
||||
rev = "Ghidra_${version}_build";
|
||||
sha256 = "sha256-0hj9IVvTxgStCbfnTzqeKD+Q5GnGowDsIkMvk2GqJqY=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "ghidra";
|
||||
exec = "ghidra";
|
||||
icon = "ghidra";
|
||||
desktopName = "Ghidra";
|
||||
genericName = "Ghidra Software Reverse Engineering Suite";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
# postPatch scripts.
|
||||
# Tells ghidra to use our own protoc binary instead of the prebuilt one.
|
||||
fixProtoc = ''
|
||||
cat >>Ghidra/Debug/Debugger-gadp/build.gradle <<HERE
|
||||
protobuf {
|
||||
protoc {
|
||||
path = '${protobuf3_17}/bin/protoc'
|
||||
}
|
||||
}
|
||||
HERE
|
||||
'';
|
||||
|
||||
# Adds a gradle step that downloads all the dependencies to the gradle cache.
|
||||
addResolveStep = ''
|
||||
cat >>build.gradle <<HERE
|
||||
task resolveDependencies {
|
||||
doLast {
|
||||
project.rootProject.allprojects.each { subProject ->
|
||||
subProject.buildscript.configurations.each { configuration ->
|
||||
resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}")
|
||||
}
|
||||
subProject.configurations.each { configuration ->
|
||||
resolveConfiguration(subProject, configuration, "config \''${configuration.name}")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
void resolveConfiguration(subProject, configuration, name) {
|
||||
if (configuration.canBeResolved) {
|
||||
logger.info("Resolving project {} {}", subProject.name, name)
|
||||
configuration.resolve()
|
||||
}
|
||||
}
|
||||
HERE
|
||||
'';
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
# Taken from mindustry derivation.
|
||||
deps = stdenv.mkDerivation {
|
||||
pname = "${pname}-deps";
|
||||
inherit version src;
|
||||
|
||||
patches = [ ./0001-Use-protobuf-gradle-plugin.patch ];
|
||||
postPatch = fixProtoc + addResolveStep;
|
||||
|
||||
nativeBuildInputs = [ gradle perl ] ++ lib.optional stdenv.isDarwin xcbuild;
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
|
||||
# First, fetch the static dependencies.
|
||||
gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk11} -I gradle/support/fetchDependencies.gradle init
|
||||
|
||||
# Then, fetch the maven dependencies.
|
||||
gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk11} resolveDependencies
|
||||
'';
|
||||
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
||||
installPhase = ''
|
||||
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/maven/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
cp -r dependencies $out/dependencies
|
||||
'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-Yxf6g908+fRRUh40PrwNUCTvxzlvSmwzE8R+3ZkRIvs=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle unzip makeWrapper icoutils
|
||||
] ++ lib.optional stdenv.isDarwin xcbuild;
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
patches = [ ./0001-Use-protobuf-gradle-plugin.patch ];
|
||||
postPatch = fixProtoc;
|
||||
|
||||
buildPhase = (lib.optionalString stdenv.isDarwin ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# construct a dummy /etc/passwd file - something attempts to determine
|
||||
# the user's "real" home using this
|
||||
DUMMY_PASSWD=$(realpath ../dummy-passwd)
|
||||
cat > $DUMMY_PASSWD <<EOF
|
||||
$(whoami)::$(id -u):$(id -g)::$HOME:$SHELL
|
||||
EOF
|
||||
|
||||
export NIX_REDIRECTS=/etc/passwd=$DUMMY_PASSWD
|
||||
export DYLD_INSERT_LIBRARIES=${libredirect}/lib/libredirect.dylib
|
||||
'') + ''
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
|
||||
ln -s ${deps}/dependencies dependencies
|
||||
|
||||
sed -i "s#mavenLocal()#mavenLocal(); maven { url '${deps}/maven' }#g" build.gradle
|
||||
|
||||
gradle --offline --no-daemon --info -Dorg.gradle.java.home=${openjdk11} buildGhidra
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "${pkg_path}" "$out/share/applications"
|
||||
|
||||
ZIP=build/dist/$(ls build/dist)
|
||||
echo $ZIP
|
||||
unzip $ZIP -d ${pkg_path}
|
||||
f=("${pkg_path}"/*)
|
||||
mv "${pkg_path}"/*/* "${pkg_path}"
|
||||
rmdir "''${f[@]}"
|
||||
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
||||
|
||||
icotool -x "Ghidra/RuntimeScripts/Windows/support/ghidra.ico"
|
||||
rm ghidra_4_40x40x32.png
|
||||
for f in ghidra_*.png; do
|
||||
res=$(basename "$f" ".png" | cut -d"_" -f3 | cut -d"x" -f1-2)
|
||||
mkdir -pv "$out/share/icons/hicolor/$res/apps"
|
||||
mv "$f" "$out/share/icons/hicolor/$res/apps/ghidra.png"
|
||||
done;
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "${pkg_path}/ghidraRun" "$out/bin/ghidra"
|
||||
wrapProgram "${pkg_path}/support/launch.sh" \
|
||||
--prefix PATH : ${lib.makeBinPath [ openjdk11 ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission";
|
||||
homepage = "https://ghidra-sre.org/";
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -59,7 +59,7 @@ buildGoModule rec {
|
|||
description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go";
|
||||
homepage = "https://www.gopass.pw/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andir rvolosatovs ];
|
||||
maintainers = with maintainers; [ rvolosatovs ];
|
||||
changelog = "https://github.com/gopasspw/gopass/raw/v${version}/CHANGELOG.md";
|
||||
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,12 @@
|
|||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "knockpy";
|
||||
version = "5.2.0";
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guelfoweb";
|
||||
repo = "knock";
|
||||
rev = version;
|
||||
sha256 = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o=";
|
||||
hash = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -27,7 +26,9 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "knockpy" ];
|
||||
pythonImportsCheck = [
|
||||
"knockpy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to scan subdomains";
|
||||
|
|
|
|||
|
|
@ -259,6 +259,7 @@ mapAliases ({
|
|||
euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # added 2022-01-01
|
||||
evolution_data_server = evolution-data-server; # added 2018-02-25
|
||||
etcdctl = etcd; # added 2018-04-25
|
||||
evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # added 2022-01-14
|
||||
exfat-utils = exfat; # 2015-09-11
|
||||
facette = throw "facette has been removed."; # added 2020-01-06
|
||||
fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
|
||||
|
|
@ -506,6 +507,8 @@ mapAliases ({
|
|||
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
|
||||
libwnck3 = libwnck;
|
||||
lilypond-unstable = lilypond; # added 2021-03-11
|
||||
lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14
|
||||
lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14
|
||||
links = links2; # added 2016-01-31
|
||||
linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09
|
||||
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
|
||||
|
|
|
|||
|
|
@ -1085,8 +1085,6 @@ with pkgs;
|
|||
|
||||
eterm = callPackage ../applications/terminal-emulators/eterm { };
|
||||
|
||||
evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {});
|
||||
|
||||
foot = callPackage ../applications/terminal-emulators/foot { };
|
||||
|
||||
germinal = callPackage ../applications/terminal-emulators/germinal { };
|
||||
|
|
@ -1110,16 +1108,6 @@ with pkgs;
|
|||
|
||||
lilo = callPackage ../tools/misc/lilo { };
|
||||
|
||||
lilyterm = callPackage ../applications/terminal-emulators/lilyterm {
|
||||
inherit (gnome2) vte;
|
||||
gtk = gtk2;
|
||||
flavour = "stable";
|
||||
};
|
||||
|
||||
lilyterm-git = lilyterm.override {
|
||||
flavour = "git";
|
||||
};
|
||||
|
||||
logseq = callPackage ../applications/misc/logseq { };
|
||||
|
||||
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
|
||||
|
|
@ -3108,6 +3096,8 @@ with pkgs;
|
|||
|
||||
ghdorker = callPackage ../tools/security/ghdorker { };
|
||||
|
||||
ghidra = callPackage ../tools/security/ghidra/build.nix { };
|
||||
|
||||
ghidra-bin = callPackage ../tools/security/ghidra { };
|
||||
|
||||
gif-for-cli = callPackage ../tools/misc/gif-for-cli { };
|
||||
|
|
@ -15273,7 +15263,6 @@ with pkgs;
|
|||
r10k = callPackage ../tools/system/r10k { };
|
||||
|
||||
radare2 = callPackage ../development/tools/analysis/radare2 ({
|
||||
inherit (gnome2) vte;
|
||||
lua = lua5;
|
||||
} // (config.radare or {}));
|
||||
|
||||
|
|
@ -25509,9 +25498,7 @@ with pkgs;
|
|||
|
||||
grip-search = callPackage ../tools/text/grip-search { };
|
||||
|
||||
grip = callPackage ../applications/misc/grip {
|
||||
inherit (gnome2) libgnome libgnomeui vte;
|
||||
};
|
||||
grip = callPackage ../applications/misc/grip { };
|
||||
|
||||
gsimplecal = callPackage ../applications/misc/gsimplecal { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1240,8 +1240,6 @@ in {
|
|||
|
||||
blis = callPackage ../development/python-modules/blis { };
|
||||
|
||||
blist = callPackage ../development/python-modules/blist { };
|
||||
|
||||
blockchain = callPackage ../development/python-modules/blockchain { };
|
||||
|
||||
blockdiag = callPackage ../development/python-modules/blockdiag { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue