Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5efb7d8d19
@ -133,7 +133,6 @@ with lib.maintainers; {
|
||||
|
||||
jitsi = {
|
||||
members = [
|
||||
mmilata
|
||||
petabyteboy
|
||||
ryantm
|
||||
yuka
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.133.5";
|
||||
version = "1.137.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-0QWYitlOS3x7BQpFTYDAjIgkw83IkRFfA/slyEvQUnw=";
|
||||
sha256 = "sha256-OiLYXx1sBkEJpMPTa/45QPHLtmeI6ZLles7GfjEBGtQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,33 +6,33 @@
|
||||
},
|
||||
"ATBinHex-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.02.13",
|
||||
"sha256": "1p2r2q1al6rcsdbbg8ilm4xn6w48bj348khxdmpak7vfwx9741h8"
|
||||
"rev": "2021.07.02",
|
||||
"sha256": "sha256-XSt2XfHMiF/ZIf07M65u+k5FjacyToL0rWbpcflKcuY="
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.05.16",
|
||||
"sha256": "sha256-oQW0M8Sx1bC+keOWivXwlD5SDKJuO5Sk/3HiO9HvJtY="
|
||||
"rev": "2021.07.09",
|
||||
"sha256": "sha256-hVoHH29JLPy3qq73e5EV4bxERcizocO4RBgvqD+VhWo="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.05.31",
|
||||
"sha256": "sha256-4B6/I0CH9gfslwUbCTTI4kycgTHUjLGtVrCctfO6gRo="
|
||||
"rev": "0cf6e09f673beb3a25d6957c97eeeee37024617b",
|
||||
"sha256": "sha256-oqxzORNva7tZXNlI/mSe722p6Tbkf7Ie6GPL3TxjV98="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.05.03",
|
||||
"sha256": "sha256-zns83XA2SslHRGqa3iro0phIBlz5/neJ34TTYAKhX5Q="
|
||||
"rev": "2021.07.09",
|
||||
"sha256": "sha256-w5f1s8yjkYfDqAcKISRgJd3fe+f2NyO3ZtFLLfiBm2Q="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.05.27",
|
||||
"sha256": "sha256-D0UBK69V28Izs9FgevtvX6vyDU7KpfIGJqcqpWaxU9E="
|
||||
"rev": "2021.07.02",
|
||||
"sha256": "sha256-PndvBiqdqw681AC6q33UWdzUvcYHxj1WuYsVFi2HK7c="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.05.27",
|
||||
"sha256": "sha256-1zhSB6bgeW5G6RAZvhznNTpRk0uEDZnLXsk+cgElKLw="
|
||||
"rev": "2021.07.09",
|
||||
"sha256": "sha256-QCG9i26m3v9J4uO1I1BiDwBerH4iX1rAJuNqx+gHLnA="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-qt";
|
||||
version = "3.1.1";
|
||||
version = "3.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1bz4wjl8zydw46bh2mdbrsx8prh2fw0cmzqliy912fdz5aal2b74";
|
||||
sha256 = "1sg8svb6xvkczp9slqnlm0b6k0z3bzdi4zzvwzzy21kpj6im9002";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "urlscan";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecat53";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16g7dzvjcfhaz52wbmcapamy55l7vfhgizqy3m8dv9gkmy8vap89";
|
||||
sha256 = "D+WJ1HG1gXIFtIpaqazFqC9Y4GBCUsz88U8q8W9tHFA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.urwid ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, fetchurl
|
||||
@ -49,16 +49,16 @@ let
|
||||
meta = with lib; {
|
||||
description = "Web Debugging Proxy";
|
||||
homepage = "https://www.charlesproxy.com/";
|
||||
maintainers = [ maintainers.kalbasit ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
|
||||
in {
|
||||
charles4 = (generic {
|
||||
version = "4.6.1";
|
||||
sha256 = "1kl83jjj5wjhdpj34gcj04vf1asxlqlfx9zi91ln4v90swlaaclv";
|
||||
version = "4.6.2";
|
||||
sha256 = "0r5rann7cq665ih0pa66k52081gylk85ashrwq1khbv2jf80yy52";
|
||||
platform = "_amd64";
|
||||
jdk = jdk11;
|
||||
});
|
||||
@ -68,4 +68,3 @@ in {
|
||||
jdk = jdk8.jre;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
@ -19,10 +19,10 @@ buildGoModule rec {
|
||||
owner = "fluxcd";
|
||||
repo = "flux2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r9Tg6aU8aIA87Mw+HFMdPe9uC+3bfGOnuAIrmB1nlRs=";
|
||||
sha256 = "sha256-OjbyDg+3dSJco162NubK12pbmwib6uGlJQxVaJOzSig=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zaOOwgljqhmIXZPZSMgMsVi02bBqQOag+6uVhxKsu9U=";
|
||||
vendorSha256 = "sha256-GPbuHv/Xi9sWWZ6SIlW8cm5bY1gTO41vygx2C8dEt0k=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -12,11 +12,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "termius";
|
||||
version = "7.1.0";
|
||||
version = "7.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb";
|
||||
sha256 = "801579b931ca0ad5340085df8863042336e2b609dd1cd6771260c873f3d2bb73";
|
||||
# Termius switched to using non-versioned downloads https://s3.amazonaws.com/termius.desktop.autoupdate/linux/Termius.deb
|
||||
url = "https://web.archive.org/web/20210710174019/https://s3.amazonaws.com/termius.desktop.autoupdate/linux/Termius.deb";
|
||||
sha256 = "16zc7ywz3hl1awkc4wk0rd94nsy55l98j2yzfdxcjiixky4gk8wn";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
@ -41,6 +42,8 @@ stdenv.mkDerivation rec {
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
cp -R "opt" "$out"
|
||||
cp -R "usr/share" "$out/share"
|
||||
@ -48,6 +51,8 @@ stdenv.mkDerivation rec {
|
||||
# Desktop file
|
||||
mkdir -p "$out/share/applications"
|
||||
cp "${desktopItem}/share/applications/"* "$out/share/applications"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
runtimeDependencies = [ (lib.getLib udev) ];
|
||||
@ -58,7 +63,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = true;
|
||||
description = "A cross-platform SSH client with cloud data sync and more";
|
||||
homepage = "https://termius.com/";
|
||||
downloadPage = "https://termius.com/linux/";
|
||||
|
||||
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
better management of, and seamless user interactions with, guests.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ joamaki ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,30 +1,74 @@
|
||||
{ stdenv, lib, buildPythonApplication
|
||||
, ajsonrpc
|
||||
, bottle
|
||||
, click
|
||||
, click-completion
|
||||
, colorama
|
||||
{ stdenv, lib, python3
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, jsondiff
|
||||
, lockfile
|
||||
, marshmallow
|
||||
, pyelftools
|
||||
, pyserial
|
||||
, pytest
|
||||
, requests
|
||||
, semantic-version
|
||||
, spdx-license-list-data
|
||||
, starlette
|
||||
, tabulate
|
||||
, tox
|
||||
, uvicorn
|
||||
, wsproto
|
||||
, zeroconf
|
||||
, version, src
|
||||
}:
|
||||
|
||||
let
|
||||
args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.6.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092";
|
||||
};
|
||||
});
|
||||
|
||||
click = super.click.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "7.1.2";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj";
|
||||
};
|
||||
});
|
||||
|
||||
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.13.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = "uvicorn";
|
||||
rev = version;
|
||||
sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
with python.pkgs; buildPythonApplication rec {
|
||||
pname = "platformio";
|
||||
inherit version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ajsonrpc
|
||||
bottle
|
||||
click
|
||||
click-completion
|
||||
colorama
|
||||
git
|
||||
lockfile
|
||||
marshmallow
|
||||
pyelftools
|
||||
pyserial
|
||||
requests
|
||||
semantic-version
|
||||
starlette
|
||||
tabulate
|
||||
uvicorn
|
||||
wsproto
|
||||
zeroconf
|
||||
];
|
||||
|
||||
HOME = "/tmp";
|
||||
|
||||
checkInputs = [
|
||||
jsondiff
|
||||
pytestCheckHook
|
||||
tox
|
||||
];
|
||||
|
||||
pytestFlagsArray = (map (e: "--deselect tests/${e}") [
|
||||
"commands/test_ci.py::test_ci_boards"
|
||||
"commands/test_ci.py::test_ci_build_dir"
|
||||
"commands/test_ci.py::test_ci_keep_build_dir"
|
||||
@ -88,44 +132,10 @@ let
|
||||
"commands/test_update.py"
|
||||
"test_maintenance.py"
|
||||
"test_ino2cpp.py"
|
||||
]));
|
||||
|
||||
in buildPythonApplication rec {
|
||||
pname = "platformio";
|
||||
inherit version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ajsonrpc
|
||||
bottle
|
||||
click
|
||||
click-completion
|
||||
colorama
|
||||
git
|
||||
lockfile
|
||||
marshmallow
|
||||
pyelftools
|
||||
pyserial
|
||||
requests
|
||||
semantic-version
|
||||
starlette
|
||||
tabulate
|
||||
uvicorn
|
||||
wsproto
|
||||
zeroconf
|
||||
]) ++ [
|
||||
"tests"
|
||||
];
|
||||
|
||||
HOME = "/tmp";
|
||||
|
||||
checkInputs = [ pytest tox jsondiff ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
py.test -v tests ${args}
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./fix-searchpath.patch
|
||||
./use-local-spdx-license-list.patch
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, unzip, jre }:
|
||||
{ lib, stdenv, fetchurl, unzip, jre, jre8 }:
|
||||
|
||||
let
|
||||
common = { pname, version, src, description
|
||||
common = { pname, version, src, description, java ? jre
|
||||
, prog ? null, jar ? null, license ? lib.licenses.mpl20 }:
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
@ -45,6 +45,7 @@ in {
|
||||
description = "XSLT 1.0 processor";
|
||||
# http://saxon.sourceforge.net/saxon6.5.3/conditions.html
|
||||
license = lib.licenses.mpl10;
|
||||
java = jre8;
|
||||
};
|
||||
|
||||
saxonb_8_8 = common {
|
||||
@ -56,6 +57,7 @@ in {
|
||||
sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8";
|
||||
};
|
||||
description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0";
|
||||
java = jre8;
|
||||
};
|
||||
|
||||
saxonb_9_1 = common {
|
||||
|
||||
@ -31,12 +31,12 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frama-c";
|
||||
version = "23.0-rc1";
|
||||
version = "23.0";
|
||||
slang = "Vanadium";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
|
||||
sha256 = "1z9f9a217bav3vfc99kq57d5rza6j7hr91ndviwkgcaib6wc5hcv";
|
||||
url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
|
||||
sha256 = "0pdm3y2nfyjhpnicv1pg9j48llq86dmb591d2imnafp4xfqani0s";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stylua";
|
||||
version = "0.9.3";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnnymorganz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1xpl3nxiln6hxxjd9nx99h4qijjym3afxm5nalw40p152h8zgig4";
|
||||
sha256 = "03w976fghqs2kswab5bridpr2p6hgldjyfd3l4kz0p5h98f3wzvf";
|
||||
};
|
||||
|
||||
cargoSha256 = "012zv1myackwk0x73l6ri7zzrzwdkd970hh4p30b590bmsam6sb9";
|
||||
cargoSha256 = "1311ly02r6c2rqx0ssd6hpbw3sp0ffrf37bzdm66chxnh8cr83sj";
|
||||
|
||||
cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]
|
||||
++ lib.optionals luauSupport [ "--features" "luau" ];
|
||||
|
||||
@ -40,7 +40,7 @@ let
|
||||
# The latest Dwarf Fortress version. Maintainers: when a new version comes
|
||||
# out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
|
||||
# this.
|
||||
latestVersion = "0.47.04";
|
||||
latestVersion = "0.47.05";
|
||||
|
||||
# Converts a version to a package name.
|
||||
versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
|
||||
|
||||
@ -71,6 +71,13 @@ let
|
||||
xmlRev = "036b662a1bbc96b4911f3cbe74dfa1243b6459bc";
|
||||
prerelease = false;
|
||||
};
|
||||
"0.47.05" = {
|
||||
dfHackRelease = "0.47.05-r1";
|
||||
sha256 = "sha256-B0iv7fpIcnaO8sx9wPqI7/WuyLK15p8UYlYIcF5F5bw=";
|
||||
xmlRev = "11c379ffd31255f2a1415d98106114a46245e1c3";
|
||||
prerelease = false;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
release =
|
||||
|
||||
@ -121,5 +121,19 @@
|
||||
"legacy_s": "19ai7lvxx0y3iha9qrbl5krric547rzs6vm4ibk8x61vv97jrbd8",
|
||||
"legacy32": "0lli6s1g7yj3p3h26ajgq3h619n88qn6s7amyz6z8w7hyzfi7wij",
|
||||
"legacy32_s": "1wzxbzgln9pmsk2nchrl94d2yd09xdgynmjl4qwcaqzkrnf3sfqc"
|
||||
},
|
||||
"0.47.05": {
|
||||
"linux": "18zwmz2nsgwjxbr2yd9jcrgw6l5b481hh1848cgn5nfpnzdscx5c",
|
||||
"linux32": "1jbav7ghsjsxd6cdp6f2x5qn83zc8707dqan5sp73fp6mbj2jasl",
|
||||
"osx": "092z1vhc5sbdc5irggdz5ai7rxifmg4yhy33aicpsjcnvcmajydw",
|
||||
"osx32": "0lpbwfiagp0zp280aw3fmj8938w5fc5r9gibzk2h86jy63ps29ww",
|
||||
"win": "0bbk7j3d4h2wn9hmbsbbbbr0ajf3ddlprxfaajfbnbiyv72cpn9s",
|
||||
"win_s": "0nl7c9dpfx7jjpy7y52z8h3kiy4cpax1m58apbcfyy95an4jz8s4",
|
||||
"win32": "08ka1lklly82h4mr770y9p0a21x9dx6jqvjgxdsxj5979f26il1v",
|
||||
"win32_s": "06w844zxzx3lfykibgkk4gbg4xymnqraj1ikv4mzlv31l727a1x4",
|
||||
"legacy": "042a0gbad3cp5dwhnrzg3vr9w48b8ybqgxgw5i9rk4c1i0gjjpw2",
|
||||
"legacy_s": "1rb7h8lzlsjs08rvhhl3nwbrpj54zijijp4y0qdp4vyzsig6nisk",
|
||||
"legacy32": "0ayw09x9smihh8qp5pdvr6vvhwkvcqz36h3lh4g1b5kzxj7g9cyf",
|
||||
"legacy32_s": "10gfxlysfs9gyi1mv52idp5xk45g9h517g2jq4a8cqp2j7594v9c"
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,7 +52,8 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dwarf-fortress-${dfVersion}";
|
||||
pname = "dwarf-fortress";
|
||||
version = dfVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${homepage}df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"name": "afro-graphics",
|
||||
"version": "47.04",
|
||||
"sha256": "1x1ir0qi3g8wgzwm1pnrkrqb6lhnjq87vs30l8kva6y5wr4sz7q0"
|
||||
"version": "47.05",
|
||||
"sha256": "0gqrxb4bbx1h93xjz4ygd7yp8g5barj2zc6y7xvr94ww8b9a2r28"
|
||||
},
|
||||
{
|
||||
"name": "autoreiv",
|
||||
@ -21,13 +21,13 @@
|
||||
},
|
||||
{
|
||||
"name": "gemset",
|
||||
"version": "47.04",
|
||||
"sha256": "015nkkdnpykhz6a1n8qi3wgap19a4wavz4n2xbvfa4g770lcjd92"
|
||||
"version": "47.05",
|
||||
"sha256": "1ivsbj71w3zwxnaz0405xhqhn4yzdfziijc0s0vmbmcphhhqnjaj"
|
||||
},
|
||||
{
|
||||
"name": "ironhand",
|
||||
"version": "47.04",
|
||||
"sha256": "0x3hi1isgc2cv7c3qz87rm7ik0kbd748djpnghvjdqpj3a0n1ih2"
|
||||
"version": "47.05",
|
||||
"sha256": "003yrwishkzf6nvr6xlldbnd3x7rf5ds7l91mc0npdq1lcl0br9w"
|
||||
},
|
||||
{
|
||||
"name": "jolly-bastion",
|
||||
@ -36,33 +36,33 @@
|
||||
},
|
||||
{
|
||||
"name": "mayday",
|
||||
"version": "47.04a",
|
||||
"sha256": "1hpj40762n81grsddg3nc5jxc0bqmy2xamxvsgxzb2bx0b7akz0w"
|
||||
"version": "47.05",
|
||||
"sha256": "17sdvr9a98xx5r2nrr3m4jlddvlb4h6qlch8r23g9g4mj0hsifnj"
|
||||
},
|
||||
{
|
||||
"name": "meph",
|
||||
"version": "47.04_v5.5.0_V1.1.2",
|
||||
"sha256": "0q8hfm66rag61qd2hab7lsr4nyg52bn1hvy6bl7z6kv4yj5cra50"
|
||||
"version": "47.05_v5.5.1-V",
|
||||
"sha256": "1kiqxiqw686dii5x7zav2nsw15csg0grv4h8hrb764rl4fw6x9nl"
|
||||
},
|
||||
{
|
||||
"name": "obsidian",
|
||||
"version": "47.04a",
|
||||
"sha256": "0y5kmj362i9y8w1n5d1nx80yq88c0xqps9i02gvnls6r421a4nms"
|
||||
"version": "47.05",
|
||||
"sha256": "1dkwdwm52fsj4gqqqr5vppbsk8a4kd3i7d3qawawgl0qn6q139xs"
|
||||
},
|
||||
{
|
||||
"name": "phoebus",
|
||||
"version": "47.04a",
|
||||
"sha256": "1ihbqs5a3b8pydbcynblvgw2bxkgr9hhpmgjlji7a7zvz8m6h6pw"
|
||||
"version": "47.05",
|
||||
"sha256": "18pn3dqyk9hp82gva92c6y3vk52s366rrx74rdnvahswdr5dmq4d"
|
||||
},
|
||||
{
|
||||
"name": "rally-ho",
|
||||
"version": "47.04",
|
||||
"sha256": "0pmvpfbj07ll674lw7mjgkb4kgjk4mxr82fjq4ppvwrnzx6vi2g0"
|
||||
"version": "47.05",
|
||||
"sha256": "1h3jqq0yq2rbzbl70sq85lgdpwswczpay16kqfwq1n8zdisl4gqn"
|
||||
},
|
||||
{
|
||||
"name": "spacefox",
|
||||
"version": "47.04",
|
||||
"sha256": "0sk3k5bcpfl2xind4vfrgzbcqqbw0mg47pm3d3h44vi6hl3bdaqj"
|
||||
"version": "47.05a",
|
||||
"sha256": "1y1rbsxr1m0mb2k02q6gh24c4nyqc9lw98dvfckp2bzc5f9cx3ks"
|
||||
},
|
||||
{
|
||||
"name": "taffer",
|
||||
@ -76,8 +76,8 @@
|
||||
},
|
||||
{
|
||||
"name": "vettlingr",
|
||||
"version": "1.4a",
|
||||
"sha256": "1p4y0dm52rb49dnmcnivddlsd94m4gr1pxn04fpjbrvck22klgpj"
|
||||
"version": "47.05",
|
||||
"sha256": "0s1vy3ssp1hk8f6wlkz09xy5v747dpbsgw5vi6i1mq3lnlcy68vq"
|
||||
},
|
||||
{
|
||||
"name": "wanderlust",
|
||||
|
||||
@ -50,6 +50,12 @@ let
|
||||
sha256 = "092dgp8fh1j4nqr9wbzn89ib1nhscclr8m91lfxsvg0mgn7j8xlv";
|
||||
prerelease = true;
|
||||
};
|
||||
"0.47.05" = {
|
||||
twbtRelease = "6.xx";
|
||||
dfhackRelease = "0.47.05-beta1";
|
||||
sha256 = "sha256-Y6G0qBMHvotp/oyiqANlzXZVklL270dhskd135PnE9Q=";
|
||||
prerelease = true;
|
||||
};
|
||||
};
|
||||
|
||||
release =
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, ncurses
|
||||
, glib
|
||||
, gtk2
|
||||
, gtk3
|
||||
, libsndfile
|
||||
, zlib
|
||||
, dfVersion
|
||||
@ -58,6 +59,10 @@ let
|
||||
unfuckRelease = "0.47.04";
|
||||
sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9";
|
||||
};
|
||||
"0.47.05" = {
|
||||
unfuckRelease = "0.47.04";
|
||||
sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9";
|
||||
};
|
||||
};
|
||||
|
||||
release =
|
||||
@ -90,11 +95,16 @@ stdenv.mkDerivation {
|
||||
glew
|
||||
openalSoft
|
||||
ncurses
|
||||
gtk2
|
||||
libsndfile
|
||||
zlib
|
||||
libGL
|
||||
];
|
||||
]
|
||||
# switched to gtk3 in 0.47.05
|
||||
++ (if lib.versionOlder release.unfuckRelease "0.47.05" then [
|
||||
gtk2
|
||||
] else [
|
||||
gtk3
|
||||
]);
|
||||
|
||||
# Don't strip unused symbols; dfhack hooks into some of them.
|
||||
dontStrip = true;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, bash, jre }:
|
||||
let
|
||||
mcVersion = "1.16.5";
|
||||
buildNum = "771";
|
||||
mcVersion = "1.17.1";
|
||||
buildNum = "97";
|
||||
jar = fetchurl {
|
||||
url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
|
||||
sha256 = "1lmlfhigbzbkgzfq6knglka0ccf4i32ch25gkny0c5fllmsnm08l";
|
||||
sha256 = "sha256:0d7q6v5w872phcgkha7j5sxniqq9wqbh1jxdvyvy6d2jl74g1gzw";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "papermc";
|
||||
|
||||
@ -1508,6 +1508,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/konfekt/fastfold/";
|
||||
};
|
||||
|
||||
feline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "feline-nvim";
|
||||
version = "2021-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "famiu";
|
||||
repo = "feline.nvim";
|
||||
rev = "4c04c967691d028b4056f726735db329039cdff2";
|
||||
sha256 = "18z9dl58mfmffysr8g5drd6iy79fwn463lagp629cdghrjxcq65c";
|
||||
};
|
||||
meta.homepage = "https://github.com/famiu/feline.nvim/";
|
||||
};
|
||||
|
||||
fennel-vim = buildVimPluginFrom2Nix {
|
||||
pname = "fennel-vim";
|
||||
version = "2020-11-15";
|
||||
|
||||
@ -137,6 +137,7 @@ esneider/YUNOcommit.vim
|
||||
euclidianAce/BetterLua.vim
|
||||
euclio/vim-markdown-composer
|
||||
f-person/git-blame.nvim
|
||||
famiu/feline.nvim
|
||||
farmergreg/vim-lastplace
|
||||
fatih/vim-go
|
||||
fcpg/vim-osc52
|
||||
|
||||
@ -119,7 +119,7 @@ let
|
||||
# This way kernels can be bit-by-bit reproducible depending on settings
|
||||
# (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled).
|
||||
# See also https://kernelnewbies.org/BuildId
|
||||
sed -i Makefile -e 's|--build-id|--build-id=none|'
|
||||
sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|'
|
||||
|
||||
patchShebangs scripts/ld-version.sh
|
||||
'';
|
||||
|
||||
@ -13,13 +13,13 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "0ann1fbh8rqys3rwbz5h9mfnvkpqiw5rgkd4c30y99706h2dzv4i";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ];
|
||||
ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output";
|
||||
homepage = src.meta.homepage;
|
||||
homepage = "https://github.com/dim-an/cod/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
|
||||
@ -8,9 +8,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
|
||||
};
|
||||
};
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
with python.pkgs; buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "1.19.4";
|
||||
|
||||
@ -49,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# They have validation functions like:
|
||||
# - validate_cryptography_installed
|
||||
# - validate_pillow_installed
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
colorama
|
||||
cryptography
|
||||
@ -73,7 +77,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"--set ESPHOME_USE_SUBPROCESS ''"
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
mock
|
||||
pytest-asyncio
|
||||
@ -82,6 +86,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires hypothesis 5.49, we have 6.x
|
||||
# ImportError: cannot import name 'ip_addresses' from 'hypothesis.provisional'
|
||||
"tests/unit_tests/test_core.py"
|
||||
"tests/unit_tests/test_helpers.py"
|
||||
];
|
||||
|
||||
postCheck = ''
|
||||
$out/bin/esphome --help > /dev/null
|
||||
'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, terraform }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, terraform }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "infracost";
|
||||
@ -10,16 +10,57 @@ buildGoModule rec {
|
||||
repo = "infracost";
|
||||
sha256 = "sha256-3AH/VUKIno/jObep5GNfIpyOW5TcfZ5UZyornJWTGOw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
|
||||
|
||||
# Install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkInputs = [ terraform ];
|
||||
checkPhase = "make test";
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# panic if .config directory can't be accessed
|
||||
# https://github.com/infracost/infracost/pull/862
|
||||
export HOME="$TMPDIR"
|
||||
mkdir -p "$HOME/.config/infracost"
|
||||
export INFRACOST_SKIP_UPDATE_CHECK=true
|
||||
|
||||
installShellCompletion --cmd infracost \
|
||||
--bash <($out/bin/infracost completion --shell bash) \
|
||||
--fish <($out/bin/infracost completion --shell fish) \
|
||||
--zsh <($out/bin/infracost completion --shell zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
export HOME="$TMPDIR"
|
||||
mkdir -p "$HOME/.config/infracost"
|
||||
export INFRACOST_SKIP_UPDATE_CHECK=true
|
||||
|
||||
$out/bin/infracost --help
|
||||
$out/bin/infracost --version | grep "v${version}"
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://infracost.io";
|
||||
changelog = "https://github.com/infracost/infracost/releases/tag/v${version}";
|
||||
description = "Cloud cost estimates for Terraform in your CLI and pull requests";
|
||||
homepage = "https://github.com/infracost/infracost";
|
||||
longDescription = ''
|
||||
Infracost shows hourly and monthly cost estimates for a Terraform project.
|
||||
This helps developers, DevOps et al. quickly see the cost breakdown and
|
||||
compare different deployment options upfront.
|
||||
'';
|
||||
license = [ licenses.asl20 ];
|
||||
maintainers = [ maintainers.davegallant ];
|
||||
maintainers = with maintainers; [ davegallant jk ];
|
||||
};
|
||||
}
|
||||
|
||||
20
pkgs/tools/misc/lilo/default.nix
Normal file
20
pkgs/tools/misc/lilo/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, lib, fetchurl, dev86, sharutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lilo";
|
||||
version = "24.2";
|
||||
src = fetchurl {
|
||||
url = "https://www.joonet.de/lilo/ftp/sources/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE=";
|
||||
};
|
||||
nativeBuildInputs = [ dev86 sharutils ];
|
||||
DESTDIR = placeholder "out";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.joonet.de/lilo/";
|
||||
description = "Linux bootloader";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (6.1.3.2)
|
||||
activesupport (6.1.4)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
@ -9,10 +9,10 @@ GEM
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
cms_scanner (0.13.4)
|
||||
cms_scanner (0.13.5)
|
||||
ethon (~> 0.14.0)
|
||||
get_process_mem (~> 0.2.5)
|
||||
nokogiri (~> 1.11.0)
|
||||
nokogiri (~> 1.11.4)
|
||||
opt_parse_validator (~> 1.9.4)
|
||||
public_suffix (~> 4.0.3)
|
||||
ruby-progressbar (>= 1.10, < 1.12)
|
||||
@ -20,17 +20,17 @@ GEM
|
||||
typhoeus (>= 1.3, < 1.5)
|
||||
xmlrpc (~> 0.3)
|
||||
yajl-ruby (~> 1.4.1)
|
||||
concurrent-ruby (1.1.8)
|
||||
concurrent-ruby (1.1.9)
|
||||
ethon (0.14.0)
|
||||
ffi (>= 1.15.0)
|
||||
ffi (1.15.1)
|
||||
ffi (1.15.3)
|
||||
get_process_mem (0.2.7)
|
||||
ffi (~> 1.0)
|
||||
i18n (1.8.10)
|
||||
concurrent-ruby (~> 1.0)
|
||||
mini_portile2 (2.5.3)
|
||||
minitest (5.14.4)
|
||||
nokogiri (1.11.6)
|
||||
nokogiri (1.11.7)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
opt_parse_validator (1.9.4)
|
||||
@ -46,8 +46,8 @@ GEM
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
webrick (1.7.0)
|
||||
wpscan (3.8.17)
|
||||
cms_scanner (~> 0.13.3)
|
||||
wpscan (3.8.18)
|
||||
cms_scanner (~> 0.13.5)
|
||||
xmlrpc (0.3.2)
|
||||
webrick
|
||||
yajl-ruby (1.4.1)
|
||||
|
||||
@ -11,11 +11,13 @@ bundlerApp {
|
||||
--prefix PATH : ${lib.makeBinPath [ curl ]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Black box WordPress vulnerability scanner";
|
||||
homepage = "https://wpscan.org/";
|
||||
license = licenses.unfreeRedistributable;
|
||||
homepage = "https://wpscan.org/";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ nyanloutre manveru ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr";
|
||||
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.3.2";
|
||||
version = "6.1.4";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -27,20 +27,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xzkbk6a93sdhshzlkx1dcpln3fcw2apccb7g6jha0g1im7yhgcj";
|
||||
sha256 = "15qh28drxkyv294l1qcpsghfa875p71q0vkmmv5l6fbmpapmllrk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.13.4";
|
||||
version = "0.13.5";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
};
|
||||
ethon = {
|
||||
dependencies = ["ffi"];
|
||||
@ -58,10 +58,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi";
|
||||
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.1";
|
||||
version = "1.15.3";
|
||||
};
|
||||
get_process_mem = {
|
||||
dependencies = ["ffi"];
|
||||
@ -111,10 +111,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";
|
||||
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.6";
|
||||
version = "1.11.7";
|
||||
};
|
||||
opt_parse_validator = {
|
||||
dependencies = ["activesupport" "addressable"];
|
||||
@ -206,10 +206,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jdn2v5cmxlzq9nkzh5lqnqr0mbiyn87g6bfc0074m19m38g19r9";
|
||||
sha256 = "01ig3fbxxm0gnvqkzmsc4zcipijprrw5xs84rnwp50w0crww842c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.8.17";
|
||||
version = "3.8.18";
|
||||
};
|
||||
xmlrpc = {
|
||||
dependencies = ["webrick"];
|
||||
|
||||
11
pkgs/tools/security/wpscan/update.sh
Executable file
11
pkgs/tools/security/wpscan/update.sh
Executable file
@ -0,0 +1,11 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash bundix bundler
|
||||
|
||||
set -e
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
rm -f Gemfile.lock Gemfile.lock
|
||||
bundler lock
|
||||
BUNDLE_GEMFILE=Gemfile bundler lock --lockfile=Gemfile.lock
|
||||
bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix
|
||||
@ -952,6 +952,8 @@ in
|
||||
|
||||
lifecycled = callPackage ../tools/misc/lifecycled { };
|
||||
|
||||
lilo = callPackage ../tools/misc/lilo { };
|
||||
|
||||
lilyterm = callPackage ../applications/terminal-emulators/lilyterm {
|
||||
inherit (gnome2) vte;
|
||||
gtk = gtk2;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user