mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
82ecb2df7f
105 changed files with 966 additions and 372 deletions
|
|
@ -9044,6 +9044,12 @@
|
|||
githubId = 116740;
|
||||
name = "Paweł Pacana";
|
||||
};
|
||||
pb- = {
|
||||
email = "pbaecher@gmail.com";
|
||||
github = "pb-";
|
||||
githubId = 84886;
|
||||
name = "Paul Baecher";
|
||||
};
|
||||
pbogdan = {
|
||||
email = "ppbogdan@gmail.com";
|
||||
github = "pbogdan";
|
||||
|
|
@ -12828,6 +12834,12 @@
|
|||
githubId = 11229748;
|
||||
name = "Lin Yinfeng";
|
||||
};
|
||||
ylecornec = {
|
||||
email = "yves.stan.lecornec@tweag.io";
|
||||
github = "ylecornec";
|
||||
githubId = 5978566;
|
||||
name = "Yves-Stan Le Cornec";
|
||||
};
|
||||
ylwghst = {
|
||||
email = "ylwghst@onionmail.info";
|
||||
github = "ylwghst";
|
||||
|
|
|
|||
|
|
@ -83,11 +83,22 @@
|
|||
release based on GTK+3 and Python 3.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>writers.writePython2</literal> and corresponding
|
||||
<literal>writers.writePython2Bin</literal> convenience
|
||||
functions to create executable Python 2 scripts in the store
|
||||
were removed in preparation of removal of the Python 2
|
||||
interpreter. Scripts have to be converted to Python 3 for use
|
||||
with <literal>writers.writePython3</literal> or
|
||||
<literal>writers.writePyPy2</literal> needs to be used.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
<title>Other Notable Changes</title>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
The option
|
||||
|
|
@ -113,6 +124,16 @@
|
|||
socket <literal>/run/redis-${serverName}/redis.sock</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The
|
||||
<literal>writers.writePyPy2</literal>/<literal>writers.writePyPy3</literal>
|
||||
and corresponding
|
||||
<literal>writers.writePyPy2Bin</literal>/<literal>writers.writePyPy3Bin</literal>
|
||||
convenience functions to create executable Python 2/3 scripts
|
||||
using the PyPy interpreter were added.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.
|
||||
Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3.
|
||||
|
||||
- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
|
||||
Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
||||
- The option [services.redis.servers](#opt-services.redis.servers) was added
|
||||
|
|
@ -51,3 +54,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
are only accessible by default
|
||||
to the members of the Unix group `redis-${serverName}`
|
||||
through the Unix socket `/run/redis-${serverName}/redis.sock`.
|
||||
|
||||
- The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ in
|
|||
Type = "simple";
|
||||
User = "youtrack";
|
||||
Group = "youtrack";
|
||||
Restart = "on-failure";
|
||||
ExecStart = ''${cfg.package}/bin/youtrack --J-Xmx${cfg.maxMemory} --J-XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${cfg.address}:${toString cfg.port}'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fZ0yQGLGnEFxt+OiG9J+niYzvttybudfciu5xo104Qo=";
|
||||
sha256 = "sha256-k4EGyQjjJCvUhp56OjYl63n+giI05GiIS2++I1SVhCg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-i3/96rVfP8TbIz3pNArTp8w27rfp1aPhohfFMMHgubo=";
|
||||
cargoSha256 = "sha256-YsjInqmkPnAwqgRBDiwcLH0DDqCF0NElrn+WO2v+ATM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, pkg-config, cmake
|
||||
, libpulseaudio, ncurses }:
|
||||
|
||||
|
|
@ -13,6 +13,20 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# ncurses-6.3 support, included in next release
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3-p1.patch";
|
||||
url = "https://github.com/patroclos/PAmix/commit/3400b9c048706c572373e4617b4d5fcdb8dd2505.patch";
|
||||
sha256 = "0rw56a844pz876ad9p8hfvn2fkd5rh29gpp47h55g08spf0vwb2z";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3-p2.patch";
|
||||
url = "https://github.com/patroclos/PAmix/commit/5ef67fc5ef6fc0dc0b48ff07ba48093881561d9c.patch";
|
||||
sha256 = "0f8shpdv2swxdz04bkqgmkvl6c17r5mn4slzr7xd6pvw8hh51p4h";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPackages.rustPlatform.buildRustPackage rec {
|
||||
pname = "spotifyd";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Spotifyd";
|
||||
repo = "spotifyd";
|
||||
rev = "v${version}";
|
||||
sha256 = "1a578h13iv8gqmskzlncfr42jlg5gp0zfcizv4wbd48y9hl8fh2l";
|
||||
sha256 = "1liql2wp7cx0x4ha1578wx3m4byd295m4ph268s05yw2wrnr3v6c";
|
||||
};
|
||||
|
||||
cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z";
|
||||
cargoSha256 = "1plvqd55d1gj0ydimv3154pwgj2sh1fqx2182nw8akzdfmzg1150";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +1,57 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, copper
|
||||
, ruby
|
||||
, python3
|
||||
, qtbase
|
||||
, gtk3
|
||||
, pkg-config
|
||||
, withQt ? false
|
||||
, withGtk ? false, wrapQtAppsHook ? null
|
||||
, withQt ? false, qtbase ? null, wrapQtAppsHook ? null
|
||||
, withGtk2 ? false, gtk2
|
||||
, withGtk3 ? false, gtk3
|
||||
, mkDerivation ? stdenv.mkDerivation
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
let onlyOneEnabled = xs: 1 == builtins.length (builtins.filter lib.id xs);
|
||||
in assert onlyOneEnabled [ withQt withGtk2 withGtk3 ];
|
||||
mkDerivation rec {
|
||||
pname = "code-browser";
|
||||
version = "7.1.20";
|
||||
version = "8.0";
|
||||
src = fetchurl {
|
||||
url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz";
|
||||
sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz";
|
||||
sha256 = "sha256-beCp4lx4MI1+hVgWp2h3piE/zu51zfwQdB5g7ImgmwY=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L."
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
|
||||
patchShebangs .
|
||||
'';
|
||||
''
|
||||
+ lib.optionalString withQt ''
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: qt"
|
||||
''
|
||||
+ lib.optionalString withGtk2 ''
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk2"
|
||||
''
|
||||
+ lib.optionalString withGtk3 ''
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk"
|
||||
''
|
||||
;
|
||||
nativeBuildInputs = [ copper
|
||||
python3
|
||||
ruby
|
||||
qtbase
|
||||
gtk3
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals withQt [ wrapQtAppsHook ];
|
||||
++ lib.optionals withGtk2 [ gtk2 ]
|
||||
++ lib.optionals withGtk3 [ gtk3 ]
|
||||
++ lib.optionals withQt [ qtbase wrapQtAppsHook ];
|
||||
buildInputs = lib.optionals withQt [ qtbase ]
|
||||
++ lib.optionals withGtk [ gtk3 ];
|
||||
++ lib.optionals withGtk2 [ gtk2 ]
|
||||
++ lib.optionals withGtk3 [ gtk3 ];
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"COPPER=${copper}/bin/copper-elf64"
|
||||
"with-local-libs"
|
||||
"QINC=${qtbase.dev}/include"
|
||||
]
|
||||
++ lib.optionals withQt [ "UI=qt" ]
|
||||
++ lib.optionals withGtk [ "UI=gtk" ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
++ lib.optionals withQt [ "QINC=${qtbase.dev}/include"
|
||||
"UI=qt"
|
||||
]
|
||||
++ lib.optionals withGtk2 [ "UI=gtk2" ]
|
||||
++ lib.optionals withGtk3 [ "UI=gtk" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code";
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1w28rmb9fi45s85rrlzzh6r826dnyisd6lh3j8ir4hx6d34cawsf";
|
||||
x86_64-darwin = "1fyg3ygqk0z3jcj5bskgprlq8k9j134y75xq06z4xbv1dhgwhswj";
|
||||
aarch64-linux = "0hha9ksbj51zmq0p3d1fwni4jd0yp0wab0w19carmbhnydhrgh22";
|
||||
aarch64-darwin = "1cmrh621z7ddl4qh95hm0nwzazshl71a43c6113jf4w6b1kvy5m5";
|
||||
armv7l-linux = "1kipvqc5hrpgsfw7x2ab5jydf7zksdd3q8qr2mg20kjsdi4skwy4";
|
||||
x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9";
|
||||
x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig";
|
||||
aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3";
|
||||
aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz";
|
||||
armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.63.0";
|
||||
version = "1.63.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "17kck7pkklhifm6hpsd93wmnyk06vi9sa55gp62m3diymp1b129z";
|
||||
x86_64-darwin = "1japc6yyvw07rll53pf2jfg89m2g9jqj5daghg10v1gqk98j7r3x";
|
||||
aarch64-linux = "0zg05q0hyldnw5g8b9zdf0ls4s07fixib7v830wa5dyi2sjcv149";
|
||||
armv7l-linux = "0mky66cyxhx3cfm35sa4vlwh8m1878rc80jml9mqxdhlrpnxgdiy";
|
||||
x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq";
|
||||
x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk";
|
||||
aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5";
|
||||
armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
|
@ -31,7 +31,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.63.0";
|
||||
version = "1.63.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grip";
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/grip/grip-${version}.tar.gz";
|
||||
sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE=";
|
||||
sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config libtool ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "masterpdfeditor";
|
||||
version = "5.7.90";
|
||||
version = "5.8.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
|
||||
sha256 = "sha256-wUHLesJ/YV3QyTJfGUr1lFD55JBnfSmjO2VvriaqlII=";
|
||||
sha256 = "sha256-2YfjTRTC/ZvgnV4tEY4wwoqUeUG8+0SCYuRPBzQ8ba4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -93,11 +93,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.32.115";
|
||||
version = "1.33.106";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "6DY3gLyaMSkjZEPR9o1hiuFFsL22bTeq2SN9Nt3DCSc=";
|
||||
sha256 = "XSqlQyc6gJthchfmq29d5+OVVSaxYG7zpVZNFZpl67s=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "96.0.4664.93",
|
||||
"sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw",
|
||||
"sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb",
|
||||
"version": "96.0.4664.110",
|
||||
"sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n",
|
||||
"sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-09-24",
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
"sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "96.0.4664.93-1",
|
||||
"sha256": "0r8cwriaxbmzy9sxa6mx71h8n1a0x7pdx3kmqc1sg97b2qwmg15r"
|
||||
"rev": "96.0.4664.110-1",
|
||||
"sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, glib
|
||||
, gnome2
|
||||
, gtk3
|
||||
, gtk4
|
||||
, lib
|
||||
, libX11
|
||||
, libxcb
|
||||
|
|
@ -50,11 +51,11 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "opera";
|
||||
version = "76.0.4017.94";
|
||||
version = "82.0.4227.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
sha256 = "sha256-vjSfzkl1jIQ9P1ARDa0eOuD8CmKHIEZ+IwMB2wIVjE8=";
|
||||
sha256 = "sha256-jA8fglRLH0aqhjsD65bsieplCLCJXgdBViPGrAu9sSQ=";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
|
@ -111,12 +112,16 @@ in stdenv.mkDerivation rec {
|
|||
# brings up the crash report, which also crashes. `strace -f` hints at a
|
||||
# missing libudev.so.0.
|
||||
(lib.getLib systemd)
|
||||
|
||||
# Error at startup:
|
||||
# "Illegal instruction (core dumped)"
|
||||
gtk3
|
||||
gtk4
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r . $out/
|
||||
mv $out/lib/*/opera/*.so $out/lib/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -44,12 +44,12 @@ assert with lib.strings; (
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.4.2.1";
|
||||
version = "29.4.3";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
|
||||
sha256 = "sha256-iTn1jbbsw7u+rVe/1J9yJbS0wi5Rlkcy4rO8nWcXu2I=";
|
||||
sha256 = "sha256-9Qut7zgzDrU6T/sWbSF2Me7E02VJVL/B2bzJw14KWFs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.24.0";
|
||||
sha256 = "025dynxkfqrnpqrvdq39394biky2ra1mfjirrigamngchifav3b3";
|
||||
manifestsSha256 = "0sbbvv40c66qdrhlvas42qcdmpgg1mb8zzcdrfr5yrkqwxnzis7x";
|
||||
version = "0.24.1";
|
||||
sha256 = "18jzf5kd06c10f45y4crvaqa5r10dhq2ashlhppzrmhigiyavxac";
|
||||
manifestsSha256 = "0qbdik65irnwgw7klj5w0z00jxflm855gikpnqb9gsxd7rbw8ysk";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
|
|
@ -23,7 +23,7 @@ in buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "0w1qzsri3dkyzwfh6s13np52j3xzxxhk02pqgfh7297djwbppnbs";
|
||||
vendorSha256 = "sha256-HoAVdY+kZLpUEl3mE7obbTzAJUyt5MBPjGhs6ZDSnzU=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.25.8";
|
||||
version = "0.25.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZHIFMNY6eW3t604Kd6Cb9Ex9DbsG31ShD4ITKnDAUbs=";
|
||||
sha256 = "sha256-S+roKkAtiGJmp/MHFeB+8mLQDL9okzLuJW6DMz3dQDk=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rancher-cli";
|
||||
version = "2.4.13";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tkAnbQP35P+ZEE/WTpjgjdmvt0eJ0esKJ+I21cWraEI=";
|
||||
sha256 = "sha256-RfhcTo10nkHmKGwmS8WdjBioZhDIGSQ9vPPOv3Wg0Y4=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -19,7 +19,7 @@ buildGoModule rec {
|
|||
"-static"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-agXztvvrMEoa6bo/bQr3qhinOSj7bFnZ4kzTx4F0VxQ=";
|
||||
vendorSha256 = "sha256-Nay4YkUNXuH7vTK3ergILF0efCF1XyJZd2wBiT6fims=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/rancher
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.25.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.26.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1b634sy2bac5i548g1z1fd5qqy8jr6abl5kbhq50d1kmwnqy1a5l";
|
||||
sha256 = "1l61m976x2pha3bvlcjppkgwn6b8ws1nqfa9zk7xwq4c5qz9mpj2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.77.0.97";
|
||||
version = "8.79.0.92";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
|
|
@ -69,7 +69,7 @@ let
|
|||
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
];
|
||||
sha256 = "sha256-0u1fpKJrsEgbvTwdkqJZ/SwCRDmJwEi9IXHbMmY8MJI=";
|
||||
sha256 = "sha256-wGt0zNBmJf5NJGGOopWNUoBoy8sr4jWp8UKLd8AudnM=";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport);
|
|||
|
||||
gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.14.6";
|
||||
version = "2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "csete";
|
||||
owner = "gqrx-sdr";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DMmQXcGPudAVOwuc+LVrcIzfwMMQVBZPbM6Bt1w56D8=";
|
||||
sha256 = "sha256-m3YV5Hbu5+3eS+LOy+x6HjpdiJo1iObbeEKuQXXmAak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
40
pkgs/applications/science/biology/subread/default.nix
Normal file
40
pkgs/applications/science/biology/subread/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "subread";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz";
|
||||
sha256 = "sha256-Vs7zovkU1DJxMGnVwoL0iDHDoezIlDKtVYDKoyKl9Ws=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
cd src
|
||||
cp Makefile.${if stdenv.isLinux then "Linux" else "MacOS"} Makefile
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC_EXEC=cc" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r ../bin $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance read alignment, quantification and mutation discovery";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ jbedo ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" ];
|
||||
homepage = "http://subread.sourceforge.net/";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cloud-hypervisor";
|
||||
version = "20.0";
|
||||
version = "20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-hypervisor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1j2p2phv1fxsa2mdr66gyswqgij33m3sdaa460xrf98dm581bqw2";
|
||||
sha256 = "1r55ykxwa0xr1f9sp7mnv8nqf0dr7vw62b1w8r7mmyrndwnq6z5b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
|
||||
|
||||
cargoSha256 = "12fmpq1y29mawa3xdwbwa3fw2hnhy5rqhlx54qp0s3x9g2jd7gsa";
|
||||
cargoSha256 = "07wpfhlp82hp3hr8vc52vhkrxd8xpyvdvfqh1dn1fnhxk3b1z7lz";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "docker-slim";
|
||||
version = "1.37.2";
|
||||
version = "1.37.3";
|
||||
|
||||
goPackagePath = "github.com/docker-slim/docker-slim";
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ buildGoPackage rec {
|
|||
owner = "docker-slim";
|
||||
repo = "docker-slim";
|
||||
rev = version;
|
||||
sha256 = "1svhi9xf71zrk843bnwkpmq4iaaln07dpfrdvq0vdqhj5xvbx47g";
|
||||
sha256 = "sha256-jzwQ3nrhLDiQXcVkPiXrRAmpLQOD8ILBnoCEUiEbxzw=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
|
||||
|
|
|
|||
35
pkgs/build-support/writers/aliases.nix
Normal file
35
pkgs/build-support/writers/aliases.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
lib: prev:
|
||||
|
||||
let
|
||||
# Removing recurseForDerivation prevents derivations of aliased attribute
|
||||
# set to appear while listing all the packages available.
|
||||
removeRecurseForDerivations = alias: with lib;
|
||||
if alias.recurseForDerivations or false then
|
||||
removeAttrs alias ["recurseForDerivations"]
|
||||
else alias;
|
||||
|
||||
# Disabling distribution prevents top-level aliases for non-recursed package
|
||||
# sets from building on Hydra.
|
||||
removeDistribute = alias: with lib;
|
||||
if isDerivation alias then
|
||||
dontDistribute alias
|
||||
else alias;
|
||||
|
||||
# Make sure that we are not shadowing something from
|
||||
# writers.
|
||||
checkInPkgs = n: alias: if builtins.hasAttr n prev
|
||||
then throw "Alias ${n} is still in writers"
|
||||
else alias;
|
||||
|
||||
mapAliases = aliases:
|
||||
lib.mapAttrs (n: alias: removeDistribute
|
||||
(removeRecurseForDerivations
|
||||
(checkInPkgs n alias)))
|
||||
aliases;
|
||||
|
||||
in
|
||||
mapAliases ({
|
||||
/* Cleanup before 22.05, Added 2021-12-11 */
|
||||
writePython2 = "Python 2 is EOL and the use of writers.writePython2 is deprecated.";
|
||||
writePython2Bin = "Python 2 is EOL and the use of writers.writePython2Bin is deprecated.";
|
||||
})
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
{ pkgs, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }:
|
||||
{ pkgs, config, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }:
|
||||
|
||||
with lib;
|
||||
rec {
|
||||
let
|
||||
aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else prev: {};
|
||||
|
||||
writers = with lib; rec {
|
||||
# Base implementation for non-compiled executables.
|
||||
# Takes an interpreter, for example `${pkgs.bash}/bin/bash`
|
||||
#
|
||||
|
|
@ -245,11 +247,11 @@ rec {
|
|||
'');
|
||||
} name;
|
||||
|
||||
# writePython2 takes a name an attributeset with libraries and some python2 sourcecode and
|
||||
# writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and
|
||||
# returns an executable
|
||||
#
|
||||
# Example:
|
||||
# writePython2 "test_python2" { libraries = [ pkgs.python2Packages.enum ]; } ''
|
||||
# writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } ''
|
||||
# from enum import Enum
|
||||
#
|
||||
# class Test(Enum):
|
||||
|
|
@ -257,11 +259,11 @@ rec {
|
|||
#
|
||||
# print Test.a
|
||||
# ''
|
||||
writePython2 = makePythonWriter pkgs.python2 pkgs.python2Packages;
|
||||
writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages;
|
||||
|
||||
# writePython2Bin takes the same arguments as writePython2 but outputs a directory (like writeScriptBin)
|
||||
writePython2Bin = name:
|
||||
writePython2 "/bin/${name}";
|
||||
# writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin)
|
||||
writePyPy2Bin = name:
|
||||
writePyPy2 "/bin/${name}";
|
||||
|
||||
# writePython3 takes a name an attributeset with libraries and some python3 sourcecode and
|
||||
# returns an executable
|
||||
|
|
@ -280,4 +282,25 @@ rec {
|
|||
# writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin)
|
||||
writePython3Bin = name:
|
||||
writePython3 "/bin/${name}";
|
||||
}
|
||||
|
||||
# writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and
|
||||
# returns an executable
|
||||
#
|
||||
# Example:
|
||||
# writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } ''
|
||||
# import yaml
|
||||
#
|
||||
# y = yaml.load("""
|
||||
# - test: success
|
||||
# """)
|
||||
# print(y[0]['test'])
|
||||
# ''
|
||||
writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages;
|
||||
|
||||
# writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin)
|
||||
writePyPy3Bin = name:
|
||||
writePyPy3 "/bin/${name}";
|
||||
|
||||
};
|
||||
in
|
||||
writers // (aliases writers)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
, lib
|
||||
, nodePackages
|
||||
, perlPackages
|
||||
, python2Packages
|
||||
, pypy2Packages
|
||||
, python3Packages
|
||||
, pypy3Packages
|
||||
, runCommand
|
||||
, writers
|
||||
, writeText
|
||||
|
|
@ -54,7 +55,7 @@ let
|
|||
print "success\n" if true;
|
||||
'';
|
||||
|
||||
python2 = writePython2Bin "test-writers-python2-bin" { libraries = [ python2Packages.enum ]; } ''
|
||||
pypy2 = writePyPy2Bin "test-writers-pypy2-bin" { libraries = [ pypy2Packages.enum ]; } ''
|
||||
from enum import Enum
|
||||
|
||||
|
||||
|
|
@ -73,6 +74,15 @@ let
|
|||
""")
|
||||
print(y[0]['test'])
|
||||
'';
|
||||
|
||||
pypy3 = writePyPy3Bin "test-writers-pypy3-bin" { libraries = [ pypy3Packages.pyyaml ]; } ''
|
||||
import yaml
|
||||
|
||||
y = yaml.load("""
|
||||
- test: success
|
||||
""")
|
||||
print(y[0]['test'])
|
||||
'';
|
||||
};
|
||||
|
||||
simple = {
|
||||
|
|
@ -111,7 +121,7 @@ let
|
|||
print "success\n" if true;
|
||||
'';
|
||||
|
||||
python2 = writePython2 "test-writers-python2" { libraries = [ python2Packages.enum ]; } ''
|
||||
pypy2 = writePyPy2 "test-writers-pypy2" { libraries = [ pypy2Packages.enum ]; } ''
|
||||
from enum import Enum
|
||||
|
||||
|
||||
|
|
@ -131,13 +141,26 @@ let
|
|||
print(y[0]['test'])
|
||||
'';
|
||||
|
||||
python2NoLibs = writePython2 "test-writers-python2-no-libs" {} ''
|
||||
pypy3 = writePyPy3 "test-writers-pypy3" { libraries = [ pypy3Packages.pyyaml ]; } ''
|
||||
import yaml
|
||||
|
||||
y = yaml.load("""
|
||||
- test: success
|
||||
""")
|
||||
print(y[0]['test'])
|
||||
'';
|
||||
|
||||
pypy2NoLibs = writePyPy2 "test-writers-pypy2-no-libs" {} ''
|
||||
print("success")
|
||||
'';
|
||||
|
||||
python3NoLibs = writePython3 "test-writers-python3-no-libs" {} ''
|
||||
print("success")
|
||||
'';
|
||||
|
||||
pypy3NoLibs = writePyPy3 "test-writers-pypy3-no-libs" {} ''
|
||||
print("success")
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,17 +28,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-dock";
|
||||
version = "unstable-2021-11-08";
|
||||
version = "unstable-2021-12-08";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
repoName = "dock";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = "51e8d3ddfbed0dfce3158d80f997ab183e92567b";
|
||||
sha256 = "sha256-w6HGxEAXNod/uMEEfSz9nRNTRrCbcEqJCP9EFkVbX1U=";
|
||||
repo = "dock";
|
||||
rev = "5e4b5ba2eec3b522e107ad834a59c0f1271d4699";
|
||||
sha256 = "sha256-/Ul21t9VFxhmlQbfx4eY86UKU33hiRfXF9OPHBzPe5o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
|
||||
pkg = self: stdenv.mkDerivation rec {
|
||||
pname = "hex";
|
||||
version = "0.21.2";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hexpm";
|
||||
repo = "hex";
|
||||
rev = "v${version}";
|
||||
sha256 = "18vwrc5b7pyi3nifmx5hd5wbz8fy3h6sfvkmskjg5acmz66fys0g";
|
||||
sha256 = "sha256-5g2MDbStlUrAPQCv1xWp+oPyRIOqARmlsKo/ONLTLnY=";
|
||||
};
|
||||
|
||||
setupHook = writeText "setupHook.sh" ''
|
||||
|
|
|
|||
|
|
@ -4,16 +4,15 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "copper";
|
||||
version = "4.4";
|
||||
version = "4.6";
|
||||
src = fetchurl {
|
||||
url = "https://tibleiz.net/download/copper-${version}-src.tar.gz";
|
||||
sha256 = "1nf0bw143rjhd019yms3k6k531rahl8anidwh6bif0gm7cngfwfw";
|
||||
sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg=";
|
||||
};
|
||||
buildInputs = [
|
||||
libffi
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "-s scripts/" "scripts/"
|
||||
patchShebangs .
|
||||
'';
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
|
|||
, libuuid
|
||||
, zlib
|
||||
, curl
|
||||
, lttng-ust_2_12
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -40,14 +41,17 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
||||
# Some of these dependencies are `dlopen()`ed.
|
||||
rpath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
lttng-ust_2_12
|
||||
zlib
|
||||
|
||||
curl
|
||||
icu
|
||||
libunwind
|
||||
libuuid
|
||||
openssl
|
||||
stdenv.cc.cc
|
||||
zlib
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -73,7 +77,7 @@ in stdenv.mkDerivation rec {
|
|||
patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet
|
||||
patchelf --set-rpath "${rpath}" $out/dotnet
|
||||
find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
|
||||
find $out -type f -name "apphost" -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \;
|
||||
find $out -type f \( -name "apphost" -or -name "createdump" \) -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \;
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -132,6 +132,6 @@ stdenv.mkDerivation rec {
|
|||
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
|
||||
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
|
||||
maintainers = with maintainers; [ ThomasMader lionello ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -502,12 +502,15 @@ self: super: builtins.intersectAttrs super {
|
|||
postPatch = ''
|
||||
sed -i -e 's|"abc"|"${pkgs.abc-verifier}/bin/abc"|' Data/SBV/Provers/ABC.hs
|
||||
sed -i -e 's|"boolector"|"${pkgs.boolector}/bin/boolector"|' Data/SBV/Provers/Boolector.hs
|
||||
sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs
|
||||
sed -i -e 's|"yices-smt2"|"${pkgs.yices}/bin/yices-smt2"|' Data/SBV/Provers/Yices.hs
|
||||
sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs
|
||||
|
||||
'' + (if pkgs.stdenv.isAarch64 then ''
|
||||
sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs
|
||||
''
|
||||
else ''
|
||||
sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs
|
||||
sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, cvc4, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs
|
||||
'';
|
||||
'');
|
||||
}) super.sbv;
|
||||
|
||||
# The test-suite requires a running PostgreSQL server.
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@ let
|
|||
;
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
SKIP_PERF_SENSITIVE = 1;
|
||||
|
||||
configureFlags =
|
||||
# Disable all extensions
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libff";
|
||||
version = "1.0.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipr-lab";
|
||||
|
|
@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DWITH_PROCPS=Off" ];
|
||||
cmakeFlags = [ "-DWITH_PROCPS=Off" ]
|
||||
++ lib.optional stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ];
|
||||
|
||||
# CMake is hardcoded to always build static library which causes linker
|
||||
# failure for Haskell applications depending on haskellPackages.hevm on macOS.
|
||||
|
|
|
|||
|
|
@ -207,8 +207,8 @@ in {
|
|||
};
|
||||
|
||||
openssl_3_0 = common {
|
||||
version = "3.0.0";
|
||||
sha256 = "sha256-We7fy0bCUhTJvTftYHgpe03wHQEiZ/6enu4x9hvHBTY=";
|
||||
version = "3.0.1";
|
||||
sha256 = "sha256-wxGthTNTvOeW7a0BqGLFCopYf2Ln4hAO9GWrU+ybBtE=";
|
||||
patches = [
|
||||
./3.0/nix-ssl-cert-file.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -36,84 +36,84 @@ in
|
|||
{
|
||||
name = "G4NDL";
|
||||
version = "4.6";
|
||||
sha256 = "022l2jjhi57frfdv9nk6s6q23gmr9zkix06fmni8gf0gmvr7qa4x";
|
||||
sha256 = "sha256-nSh88q4PuIeirc6AHudPub4hsNFm2rSby+6UCKUUVAg=";
|
||||
envvar = "NEUTRONHP";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4EMLOW";
|
||||
version = "7.13";
|
||||
sha256 = "0scczd4ismvd4g3vfshbvwv92bzkdjz0ma7y21n6qxxy96v9cj1p";
|
||||
version = "8.0";
|
||||
sha256 = "sha256-2Rmo5YOGiCV7kkimE5EOsqdjMFngMMi1DAosKtn9Kzs=";
|
||||
envvar = "LE";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4PhotonEvaporation";
|
||||
version = "5.7";
|
||||
sha256 = "1rg7fygfxx06h98ywlci6b0b9ih74q8diygr76c3vppxdzjl47kn";
|
||||
sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U=";
|
||||
envvar = "LEVELGAMMA";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4RadioactiveDecay";
|
||||
version = "5.6";
|
||||
sha256 = "1w8d9zzc4ss7sh1f8cxv5pmrx2b74p1y26377rw9hnlfkiy0g1iq";
|
||||
sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE=";
|
||||
envvar = "RADIOACTIVE";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4SAIDDATA";
|
||||
version = "2.0";
|
||||
sha256 = "149fqy801n1pj2g6lcai2ziyvdz8cxdgbfarax6y8wdakgksh9hx";
|
||||
sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE=";
|
||||
envvar = "SAIDXS";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4PARTICLEXS";
|
||||
version = "3.1.1";
|
||||
sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6";
|
||||
version = "4.0";
|
||||
sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU=";
|
||||
envvar = "PARTICLEXS";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4ABLA";
|
||||
version = "3.1";
|
||||
sha256 = "1v97q28g1xqwnav0lwzwk7hc3b87yrmbvkgadf4bkwcbnm9b163n";
|
||||
sha256 = "sha256-dpiwUrWL8bmIa+rNvWr2B63B4Jn8cwq2shz38JDAJ+0=";
|
||||
envvar = "ABLA";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4INCL";
|
||||
version = "1.0";
|
||||
sha256 = "0z9nqk125vvf4f19lhgb37jy60jf9zrjqg5zbxbd1wz93a162qbi";
|
||||
sha256 = "sha256-cWFhghrp89BWX788LPNPTgLj5RnrQZqCI27vIsLENn0=";
|
||||
envvar = "INCL";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4PII";
|
||||
version = "1.3";
|
||||
sha256 = "09p92rk1sj837m6n6yd9k9a8gkh6bby2bfn6k0f3ix3m4s8as9b2";
|
||||
sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY=";
|
||||
envvar = "PII";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4ENSDFSTATE";
|
||||
version = "2.3";
|
||||
sha256 = "00wjir59rrrlk0a12vi8rsnhyya71rdi1kmark9sp487hbhcai4l";
|
||||
sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM=";
|
||||
envvar = "ENSDFSTATE";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4RealSurface";
|
||||
version = "2.2";
|
||||
sha256 = "08382y1258ifs7nap6zaaazvabg72blr0dkqgwk32lrg07hdwm4r";
|
||||
sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA=";
|
||||
envvar = "REALSURFACE";
|
||||
}
|
||||
|
||||
{
|
||||
name = "G4TENDL";
|
||||
version = "1.3.2";
|
||||
sha256 = "0jdqmz3rz5a7yrq1mli6dj3bnmn73igf4fdxwfbl3rxywg38fa9v";
|
||||
version = "1.4";
|
||||
sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA=";
|
||||
envvar = "PARTICLEHP";
|
||||
}
|
||||
])
|
||||
|
|
|
|||
|
|
@ -49,24 +49,14 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.7.1";
|
||||
version = "11.0.0";
|
||||
pname = "geant4";
|
||||
|
||||
src = fetchurl{
|
||||
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz";
|
||||
sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj";
|
||||
url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz";
|
||||
sha256 = "sha256-PMin350/8ceiGmLS6zoQvhX2uxWNOTI78yEzScnvdbk=";
|
||||
};
|
||||
|
||||
boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
|
||||
postPatch = ''
|
||||
# Fix for boost 1.67+
|
||||
substituteInPlace environments/g4py/CMakeLists.txt \
|
||||
--replace "REQUIRED python" \
|
||||
"REQUIRED COMPONENTS $boost_python_lib"
|
||||
substituteInPlace environments/g4py/G4PythonHelpers.cmake \
|
||||
--replace "Boost::python" "Boost::$boost_python_lib"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGEANT4_INSTALL_DATA=OFF"
|
||||
"-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
|
||||
|
|
@ -137,7 +127,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "http://www.geant4.org";
|
||||
license = licenses.g4sl;
|
||||
maintainers = with maintainers; [ tmplt omnipotententity ];
|
||||
maintainers = with maintainers; [ omnipotententity ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spglib";
|
||||
version = "1.16.2";
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atztogo";
|
||||
repo = "spglib";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sbrk26xyvlhqxxv9cq2ycxwbiafgmh7lf221377zpqq8q3iavd7";
|
||||
sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "mdx";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
|
||||
sha256 = "1hk8ffh3d9hiibrj6691khnbmjnfs9psmiawnrbgi0577bw030wx";
|
||||
sha256 = "sha256:1q6169gmynnbrvlnzlmx7lpd6hwv6vwxg5j8ibc88wgs5s0r0fb0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-runtime";
|
||||
version = "3.10.4";
|
||||
version = "3.10.7";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ buildDunePackage rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
|
||||
sha256 = "c2ea22b6faf16bed783cac0e0bafd87f321756a91798f56c9a930f0edb5d9116";
|
||||
sha256 = "fec4492239c6d1fdd73db4da0782e33e66202e19595bf1d52aa98972296cc72d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "sha";
|
||||
version = "1.14";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "114vydrfdp7fayigvgk3ckiby0kh4n49c1j53v8k40gk6nzm3l19";
|
||||
sha256 = "sha256-cRtjydvwgXgimi6F3C48j7LrWgfMO6m9UJKjKlxvp0Q=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "wayland";
|
||||
version = "0.2";
|
||||
version = "1.0";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-v${version}.tbz";
|
||||
sha256 = "4eb323e42a8c64e9e49b15a588342bfcc1e99640305cb261d128c75612d9458c";
|
||||
url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz";
|
||||
sha256 = "bf8fd0057242d11f1c265c11cfa5de3c517ec0ad5994eae45e1efe3aac034510";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchurl, buildDunePackage
|
||||
{ lib, fetchurl, buildDunePackage, ocaml
|
||||
, dune-configurator
|
||||
, bos, ctypes, fmt, logs, rresult
|
||||
, mdx, alcotest, crowbar, junit_alcotest, ezjsonm
|
||||
|
|
@ -17,7 +17,9 @@ buildDunePackage rec {
|
|||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ bos ctypes rresult ];
|
||||
checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ];
|
||||
# crowbar is not available for OCaml < 4.08
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ];
|
||||
|
||||
meta = {
|
||||
description = "Parse and generate YAML 1.1 files";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.17.2";
|
||||
version = "3.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-IA846zNFmBqSUc0oXJ0eA5wj6PzQ28jxO22z5WNOT24=";
|
||||
sha256 = "593f3719580b31b3dffab0817414a3aa548ed609659ad216ceb8cf31cc51ec9b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiostream";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vxgmichel";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13";
|
||||
sha256 = "07if27z1h0mg236sj9lc8nl0bqy9sdrj83ls73mrc69h76bzg5xi";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "v${version}";
|
||||
sha256 = "05jg8qm0ix02qvcjqcfalp15j22hzlf9wfdnhrll57bnwgk4kkf8";
|
||||
sha256 = "1majsbpldsch3wgg7pdm87vk9dhqll9nk2pjjvqp8rvg93x2kkww";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
40
pkgs/development/python-modules/fastcore/default.nix
Normal file
40
pkgs/development/python-modules/fastcore/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.3.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ogCNDh18FHP9KY0q0BIbsjPH5vGGioGh4FFUUb3c3Jc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fastcore"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for Fast AI";
|
||||
homepage = "https://github.com/fastai/fastcore";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-appbuilder";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-AppBuilder";
|
||||
inherit version;
|
||||
sha256 = "a5dfb559a0e96dd06bf5ff023f72bb3cc855e6db68e573e70f30caa31840f50f";
|
||||
sha256 = "c0830935077c4d06d57237ca4791fcabfc682fe3e315c1c9444a2bd6f94e7514";
|
||||
};
|
||||
|
||||
# See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch
|
||||
|
|
|
|||
42
pkgs/development/python-modules/ghapi/default.nix
Normal file
42
pkgs/development/python-modules/ghapi/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, fastcore
|
||||
, packaging
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ghapi";
|
||||
version = "0.1.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastai";
|
||||
repo = "ghapi";
|
||||
rev = version;
|
||||
sha256 = "sha256-UV2cfotRad9jg/X3pOysKJyMi4/XKt24kf6F4aw4vcI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fastcore
|
||||
packaging
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ghapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface to GitHub's API";
|
||||
homepage = "https://github.com/fastai/ghapi";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "manimpango";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManimCommunity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "ldZfvv5kloQ0uj0agxOP8cRh+Ix8f9Z0PT+pnhWYjiQ=";
|
||||
sha256 = "1qffb04bz4s2anb6a7nm6dpqwdlvq6626z1whqwrwsvn8z9sry76";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "open-meteo";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "frenck";
|
||||
repo = "python-open-meteo";
|
||||
rev = "v${version}";
|
||||
sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs=";
|
||||
sha256 = "0i8jmhd29vvkpfxs9l5wy8525ngs79mnc7si2j9b1nc41xrv91f6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, packaging
|
||||
# Check Inputs
|
||||
, pytestCheckHook
|
||||
, pytest-subtests
|
||||
, numpy
|
||||
, matplotlib
|
||||
, uncertainties
|
||||
|
|
@ -14,12 +15,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pint";
|
||||
version = "0.14";
|
||||
version = "0.18";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Pint";
|
||||
sha256 = "0wkzb7g20wzpqr3xaqpq96dlfv6irw202icsz81ys8npp7mm194s";
|
||||
sha256 = "sha256-jEvOiEwmkFH+t6vGnb/RhAPAx2SryD2hMuinIi+LqAE=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -32,6 +33,7 @@ buildPythonPackage rec {
|
|||
# Test suite explicitly requires pytest
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-subtests
|
||||
numpy
|
||||
matplotlib
|
||||
uncertainties
|
||||
|
|
@ -42,7 +44,7 @@ buildPythonPackage rec {
|
|||
description = "Physical quantities module";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://github.com/hgrecco/pint/";
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc doronbehar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pychromecast";
|
||||
version = "10.1.1";
|
||||
version = "10.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyChromecast";
|
||||
inherit version;
|
||||
sha256 = "sha256-M6R9VRrotvkxKVZIKOcuf03LJsn4gSMohwzzAO5FQ48=";
|
||||
sha256 = "1b5f0ce62374d01f7eef027adcc87f87e7c519b1ef2f7168e28be9c2adff5153";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "SoMaJo";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsproisl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "17v1vmbjwpxwql25vlbm7xsair7945ljmyaricxx8fd6fxvgn9rr";
|
||||
sha256 = "1q88x05729qdnl1gbahisjk3s97wha0b5dj3n63kq2qyvyy0929s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ regex ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tailscale";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "frenck";
|
||||
repo = "python-tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xRVkmofD2pOco0kJfVcmUaPow2ZZNEZrhvNmldUjQuw=";
|
||||
sha256 = "1a33xibkbavl442sc7phvj6d6w17x91zh64f59w0xrsccabn25b1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vehicle";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "frenck";
|
||||
repo = "python-vehicle";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo=";
|
||||
sha256 = "0blpyh246l16bn6jy8ifym2br13k8qxagggbwpzwrwfxkb3kdz5x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.659";
|
||||
version = "2.0.660";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-oxR4hji7BWnbAihZXLdOlCZlzpvZcs6RNoyGwQe+PlQ=";
|
||||
sha256 = "sha256-ebVOEtJTlYaj9sYJsJ8BBxx+2PSyzbwivQIph3slaho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "include-what-you-use";
|
||||
# Also bump llvmPackages in all-packages.nix to the supported version!
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "sha256-jW/JslU0O8Hl7EWeOVEt8dUcYOA1YpheAHYDYRn/Whw=";
|
||||
sha256 = "sha256-7KfAT4tBa2OF7QDjNmmn+kaTzSbLcrUizeVYgo6wxmU=";
|
||||
url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.33.2";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CjpeBB1krbRJxwfvBbhhHUf5IDOZFWRds/t9h22iLE0=";
|
||||
sha256 = "sha256-MdA1bS8ZPsfwnmnmIKBissuvwWY9HHxoLJEfGcJQ3j0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y+bPFCjgTu+C5Cx85lYRjUbLd6c5PcckXRpg102d1zk=";
|
||||
|
|
|
|||
|
|
@ -89,9 +89,9 @@ rec {
|
|||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_7 = gen {
|
||||
version = "7.3.1";
|
||||
version = "7.3.2";
|
||||
nativeVersion = "0.22-milestone-21";
|
||||
sha256 = "0rkb9pdmvq0zidv8lv4im2j7gs949lg35r79l1hwf4pwi2k3ryws";
|
||||
sha256 = "14jk1mhk59flzml55alwi9r5picmf8657q1nhd5mygrnmj79zf13";
|
||||
defaultJava = jdk17;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt";
|
||||
version = "1.5.6";
|
||||
version = "1.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "sha256-PC0ndJkv4nNIdZMCtZhi3XRp/dRlXXx1yHvK8bAwIGg=";
|
||||
sha256 = "sha256-6dnG02A0azpycsfdQOyh9GLewvezZl3s8esmIqWJfBk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gojsontoyaml";
|
||||
version = "unstable-2020-12-16";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brancz";
|
||||
repo = "gojsontoyaml";
|
||||
rev = "202f76bf8c1f8fb74941a845b349941064603185";
|
||||
sha256 = "sha256-N49iHQh28nAZBGJnLKG/aZPdn5fwPKQpdrXXtX28yss=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
4
pkgs/development/tools/misc/lttng-ust/2.12.nix
Normal file
4
pkgs/development/tools/misc/lttng-ust/2.12.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
import ./generic.nix {
|
||||
version = "2.12.2";
|
||||
sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c=";
|
||||
}
|
||||
|
|
@ -1,42 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }:
|
||||
|
||||
# NOTE:
|
||||
# ./configure ...
|
||||
# [...]
|
||||
# LTTng-UST will be built with the following options:
|
||||
#
|
||||
# Java support (JNI): Disabled
|
||||
# sdt.h integration: Disabled
|
||||
# [...]
|
||||
#
|
||||
# Debian builds with std.h (systemtap).
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-ust";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ numactl python3 ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ liburcu ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "LTTng Userspace Tracer libraries";
|
||||
homepage = "https://lttng.org/";
|
||||
license = with licenses; [ lgpl21Only gpl2Only mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
|
||||
import ./generic.nix {
|
||||
version = "2.13.1";
|
||||
sha256 = "sha256-Vme/Amnh5i4tnLl0xFb/huBAG9eqO/yNX9uXIzJJ7dw=";
|
||||
}
|
||||
|
|
|
|||
44
pkgs/development/tools/misc/lttng-ust/generic.nix
Normal file
44
pkgs/development/tools/misc/lttng-ust/generic.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ version, sha256 }:
|
||||
|
||||
{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }:
|
||||
|
||||
# NOTE:
|
||||
# ./configure ...
|
||||
# [...]
|
||||
# LTTng-UST will be built with the following options:
|
||||
#
|
||||
# Java support (JNI): Disabled
|
||||
# sdt.h integration: Disabled
|
||||
# [...]
|
||||
#
|
||||
# Debian builds with std.h (systemtap).
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-ust";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ numactl python3 ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ liburcu ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "LTTng Userspace Tracer libraries";
|
||||
homepage = "https://lttng.org/";
|
||||
license = with licenses; [ lgpl21Only gpl2Only mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,16 +1,26 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tcptrack";
|
||||
version = "1.4.3";
|
||||
version = "unstable-2017-04-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bchretien";
|
||||
repo = "tcptrack";
|
||||
rev = "d05fe08154ff1e46578e92be49e4cfa2c6543283";
|
||||
sha256 = "08lh3l67wn4kq9q0nfspc7rj0jvp9dzwjgxpvqliwcif8cy5mi45";
|
||||
rev = "2b096ac103af2884bbd7648cff8adcbadbda9394";
|
||||
sha256 = "0084g9s0ynv1az67j08q9nz4p07bqqz9k6w5lprzj3ljlh0x10gj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion for ncurses-6.3 support:
|
||||
# https://github.com/bchretien/tcptrack/pull/10
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/bchretien/tcptrack/commit/409007afbce8ec5a81312a2a4123dd83b62b4494.patch";
|
||||
sha256 = "00641jyr52ksww5bbzvxlprmbb36jnvzg2w1aj1jgnm75jiajcfc";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses libpcap ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
|
||||
"rev": "69921685a7688361626600543a2beaf82b67a64d",
|
||||
"date": "2021-11-03T12:36:17+00:00",
|
||||
"path": "/nix/store/f4rd6avwf2flqr9yv0dvy9288qrgn2bs-tree-sitter-c-sharp",
|
||||
"sha256": "18yzr0yvkbp5wf2slcfn04fc23jn0ray72ica0jyv92jkp5pxc03",
|
||||
"rev": "3104df21065af0f3d51e05a96cd0e2ff16a6f982",
|
||||
"date": "2021-12-09T21:13:54+00:00",
|
||||
"path": "/nix/store/1xgrz7rm6mc6j2svaidj4x0zyda0ahz4-tree-sitter-c-sharp",
|
||||
"sha256": "14g8x5q4xc87s2wpycws6r6ci083j7pk1jdw6sr8qp96zyzs17pp",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-go",
|
||||
"rev": "7f6bfd0161b2fe97f03564edad3287ebea0494a3",
|
||||
"date": "2021-10-04T13:10:27-04:00",
|
||||
"path": "/nix/store/64xzxzc8z4fmwhfb7wbdkcxlk7r3bia2-tree-sitter-go",
|
||||
"sha256": "12naks95vzb0sf219i39myvfpkycr2dh3lv7i7i6kwddmlhqsjnl",
|
||||
"rev": "1203c11e422c73350e672445c5c32b8c0f79266d",
|
||||
"date": "2021-12-03T14:22:11-08:00",
|
||||
"path": "/nix/store/5h584m7qgvlh0s5k10503zj3idggandz-tree-sitter-go",
|
||||
"sha256": "03i63mh5g21y424pf9whl42p7shqp9xlrx90xpyrd12dlc9zhh2j",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/cstrahan/tree-sitter-nix",
|
||||
"rev": "83ee5993560bf15854c69b77d92e34456f8fb655",
|
||||
"date": "2021-07-21T20:36:40-05:00",
|
||||
"path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix",
|
||||
"sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr",
|
||||
"rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
|
||||
"date": "2021-11-29T00:27:21-06:00",
|
||||
"path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
|
||||
"sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/nvim-neorg/tree-sitter-norg",
|
||||
"rev": "995d7e0be4dc2a9655d2285405c0ef3fededf63c",
|
||||
"date": "2021-11-05T21:28:42+01:00",
|
||||
"path": "/nix/store/1l5dq21x6sln1gvixf20gx3pkadjad4d-tree-sitter-norg",
|
||||
"sha256": "181y8p91hl5j7mrff0pmnx91d9vr24nvklgx12qvc0297vdp8c5v",
|
||||
"rev": "665736e400cfd52ae92ead244ca9f5d44db98151",
|
||||
"date": "2021-12-14T15:04:57+01:00",
|
||||
"path": "/nix/store/crbl24rj54f8c9pjq8igadz3wqcw6qrw-tree-sitter-norg",
|
||||
"sha256": "0hxar07a7n3ghqagr0qjxbz4sgzcpyxwgd4dbj1vvy4xnk07i0br",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-php",
|
||||
"rev": "435fa00006c0d1515c37fbb4dd6a9de284af75ab",
|
||||
"date": "2021-10-17T09:05:36+02:00",
|
||||
"path": "/nix/store/0vgi25jrbc6fks97sxkya80dvwa0gzbk-tree-sitter-php",
|
||||
"sha256": "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad",
|
||||
"rev": "57f855461aeeca73bd4218754fb26b5ac143f98f",
|
||||
"date": "2021-11-19T17:22:11+01:00",
|
||||
"path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php",
|
||||
"sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
|
||||
"rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
|
||||
"date": "2021-03-03T16:54:30-08:00",
|
||||
"path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
|
||||
"sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
|
||||
"rev": "888e2e563ed3b43c417f17e57f7e29c39ce9aeea",
|
||||
"date": "2021-12-03T16:33:06+01:00",
|
||||
"path": "/nix/store/6g101r5pwy6iqicch9srlhwfz9xdrvzd-tree-sitter-ruby",
|
||||
"sha256": "0xfcqafslxlpkw7agw4a179w3c6k6ivi3fzlf32pqfd5bjrlx9d7",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-rust",
|
||||
"rev": "cc7bdd3e6d14677e8aa77da64f6a3f57b6f8b00a",
|
||||
"date": "2021-08-17T11:21:11-07:00",
|
||||
"path": "/nix/store/aw8bi91hz7a26swc5qrfqwn2lrdmiymr-tree-sitter-rust",
|
||||
"sha256": "15qz4rwz1fkpcy78g0aspfgk9pgykvzv5sxmhgm37nfpgyi7vlg1",
|
||||
"rev": "d045b04b66d51c0ba8671e7ce1ee23a9f286b7d7",
|
||||
"date": "2021-12-12T10:08:54-08:00",
|
||||
"path": "/nix/store/2h6vkl05jxqgp4738a0dxccmg40yhqvj-tree-sitter-rust",
|
||||
"sha256": "0ckyaw1ll3yazyg18wd40kc09h6f0zmwqmahsm07bwgfyc2nvf3h",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/maxxnino/tree-sitter-zig",
|
||||
"rev": "63e8a11f1858c7351a299223b231c8134ed61612",
|
||||
"date": "2021-10-13T22:25:30+09:00",
|
||||
"path": "/nix/store/2dy3wrmjss5mnmdv6xf50cjj3k9bfpp0-tree-sitter-zig",
|
||||
"sha256": "1izvw3dv5ydklqlh8n4fslyzqdal9n8kark0g4xslcrnji3q71wg",
|
||||
"rev": "cf93353d5682c3e9d8112d448ff24d4de7b2304e",
|
||||
"date": "2021-11-25T20:46:40+09:00",
|
||||
"path": "/nix/store/jwrs3fdgdqymjkrni6mlz1j0f0ai6h9y-tree-sitter-zig",
|
||||
"sha256": "04ja9w28zprw575s4734d02ibi498whh3z7cxm3m1fdydhjsdlrj",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ buildGoModule rec {
|
|||
'';
|
||||
homepage = "https://github.com/pb-/gotypist";
|
||||
license = licenses.mit;
|
||||
maintainers = [ "Paul Baecher" ];
|
||||
maintainers = with maintainers; [ pb- ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "starsector";
|
||||
version = "0.95a-RC15";
|
||||
version = "0.95.1a-RC5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip";
|
||||
sha256 = "sha256-/5ij/079aOad7otXSFFcmVmiYQnMX/0RXGOr1j0rkGY=";
|
||||
sha256 = "sha256-V8/WQPvPIrF3Tg7JVO+GfeYqWhkWWrnHSVcFXGQqDAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -362,14 +362,16 @@ if [ "$action" = edit ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
ORIGIN_PWD="$PWD"
|
||||
tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
|
||||
SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
|
||||
cd "$tmpDir"
|
||||
|
||||
cleanup() {
|
||||
for ctrl in "$tmpDir"/ssh-*; do
|
||||
ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
|
||||
done
|
||||
cd "$ORIGIN_PWD"
|
||||
rm -rf "$tmpDir"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jdk11, gawk }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jdk17, gawk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "youtrack";
|
||||
version = "2021.1.13597";
|
||||
version = "2021.4.35970";
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar";
|
||||
sha256 = "0lc0ra95ix5bs1spfjnx5akh8jm754v8lc3yja8dc438zi221qhh";
|
||||
sha256 = "sha256-HB515TS0XXEAiT463nVHP/naeoF7nmeB+6EK0NJ+5c0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/youtrack \
|
||||
makeWrapper ${jdk17}/bin/java $out/bin/youtrack \
|
||||
--add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \
|
||||
--prefix PATH : "${lib.makeBinPath [ gawk ]}" \
|
||||
--set JRE_HOME ${jdk11}
|
||||
--set JRE_HOME ${jdk17}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,25 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, rustPlatform, python3, fetchFromGitHub, pkg-config, openssl }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-synapse-compress-state";
|
||||
version = "0.1.0";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "15jvkpbq6pgdc91wnni8fj435yqlwqgx3bb0vqjgsdyxs5lzalfh";
|
||||
sha256 = "sha256-uL7uoJPvZoTbrmEFY7jiBphvjWSRpH9pyk3x7s3Yvrs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "173nylp9xj88cm42yggj41iqvgb25s3awhf1dqssy8f1zyw2cf3d";
|
||||
cargoSha256 = "sha256-3w5RyVrpCnetXnxnzgVl94kUZa+1i9bU2O8vp7sb3lY=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--all"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to compress some state in a Synapse instance's database";
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.25.1.5286-34f965be8";
|
||||
version = "1.25.2.5319-c43dc0277";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "0w707j0mn13xdqyffbyl51nvliiaqwnpyjqh52n40s81iid2jlg5";
|
||||
sha256 = "09kkkyli5fygyvlzqd46jzi0y4jp0a24d92ayvfm95gm3fcxl73x";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "05bcpwkpim2clv55k7g0610pp1bpd4wn56azbvhqv52vyd7q3q9j";
|
||||
sha256 = "17whd724sjblqxz6d79jb6hrqvkgg5mbh3bh1lr9b8sswa3pxb07";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "soft-serve";
|
||||
version = "0.1.0";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "soft-serve";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z88699q34a9cbhcz12y2qs2qrspfd8yx4ay0r8jzvkgax9ylrlk";
|
||||
sha256 = "sha256-sRlEF1ee+oBnYOGSN6rDOvNr3OnfAqV+1Wx5XOyIylw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1g2iznfh08l23i81x7g2bhc7l8cppshzlyynxik4jshswlpv80sr";
|
||||
vendorSha256 = "sha256-FukkmuBTPPhY0UTe3r1iU3nbGoMsPTcRKTLBd+VMGUk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ in rec {
|
|||
};
|
||||
|
||||
unifi6 = generic {
|
||||
version = "6.5.54";
|
||||
sha256 = "sha256-M2gYqKZi0czFgfWx0tTW43b+aUVqS6Mg+misRB9/Fes=";
|
||||
version = "6.5.55";
|
||||
sha256 = "sha256-NUGRO+f6JzWvYPwiitZsgp+LQwnGSncnost03mgNVxA=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
version = "2021-12-13";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "9a3d853481645ae0f961e9cc8421fc5d84e2c3c3";
|
||||
rev = "5403db85998ff0c087bc97d972e1e76551127b7e";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "TFktV7xBm3KaRfW+cUGdwIZZD7TfU0gaq4J8cKBjtMM=";
|
||||
sha256 = "xv/qruRy96omAaboedcG6+KTkR3CkaFDgw/agihTCNs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,18 +1,35 @@
|
|||
{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, flac
|
||||
, fuse
|
||||
, lame
|
||||
, libid3tag
|
||||
, libvorbis
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mp3fs";
|
||||
version = "0.91";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "khenriks";
|
||||
repo = "mp3fs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-statfs-operation.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace src/mp3fs.cc \
|
||||
--replace "#include <fuse_darwin.h>" "" \
|
||||
--replace "osxfuse_version()" "fuse_version()"
|
||||
'';
|
||||
|
||||
buildInputs = [ flac fuse lame libid3tag ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ flac fuse lame libid3tag libvorbis ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config pandoc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -20,13 +37,14 @@ stdenv.mkDerivation rec {
|
|||
description = "FUSE file system that transparently transcodes to MP3";
|
||||
longDescription = ''
|
||||
A read-only FUSE filesystem which transcodes between audio formats
|
||||
(currently only FLAC to MP3) on the fly when files are opened and read.
|
||||
It can let you use a FLAC collection with software and/or hardware
|
||||
which only understands the MP3 format, or transcode files through
|
||||
simple drag-and-drop in a file browser.
|
||||
(currently FLAC and Ogg Vorbis to MP3) on the fly when opened and read.
|
||||
This can let you use a FLAC or Ogg Vorbis collection with software
|
||||
and/or hardware which only understands the MP3 format, or transcode
|
||||
files through simple drag-and-drop in a file browser.
|
||||
'';
|
||||
homepage = "https://khenriks.github.io/mp3fs/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
From fea072084ff9d7c4d2c688059a2462bb0e59a2ec Mon Sep 17 00:00:00 2001
|
||||
From: K Henriksson <kthenriksson@gmail.com>
|
||||
Date: Wed, 27 Aug 2014 21:55:18 -0700
|
||||
Subject: [PATCH] Fix statfs operation
|
||||
|
||||
The statfs implementation does not properly translate names back to the
|
||||
original, since the major encoding rewrite. This corrects that, and
|
||||
should fix issue #27.
|
||||
---
|
||||
src/fuseops.c | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/fuseops.c b/src/fuseops.c
|
||||
index e7b4e7e..c333cbd 100644
|
||||
--- a/src/fuseops.c
|
||||
+++ b/src/fuseops.c
|
||||
@@ -337,9 +337,20 @@ static int mp3fs_statfs(const char *path, struct statvfs *stbuf) {
|
||||
if (!origpath) {
|
||||
goto translate_fail;
|
||||
}
|
||||
-
|
||||
+
|
||||
+ /* pass-through for regular files */
|
||||
+ if (statvfs(origpath, stbuf) == 0) {
|
||||
+ goto passthrough;
|
||||
+ } else {
|
||||
+ /* Not really an error. */
|
||||
+ errno = 0;
|
||||
+ }
|
||||
+
|
||||
+ find_original(origpath);
|
||||
+
|
||||
statvfs(origpath, stbuf);
|
||||
-
|
||||
+
|
||||
+passthrough:
|
||||
free(origpath);
|
||||
translate_fail:
|
||||
return -errno;
|
||||
23
pkgs/tools/misc/fbmark/default.nix
Normal file
23
pkgs/tools/misc/fbmark/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fbmark";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caramelli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0n2czl2sy1k6r5ri0hp7jgq84xcwrx4x43bqvw1b4na99mqhyahn";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux Framebuffer Benchmark";
|
||||
homepage = "https://github.com/caramelli/fbmark";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ davidak ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fortune-mod";
|
||||
version = "3.6.1";
|
||||
version = "3.8.0";
|
||||
|
||||
# We use fetchurl instead of fetchFromGitHub because the release pack has some
|
||||
# special files.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1cw7xf9xhh6d73y4h4q57g6akjhc1gq6xv37k57sx0wx77wjxqdp";
|
||||
sha256 = "sha256-HXQYYWZhfYIT7wEr9FAymaQWEfg0DcaWT0z7yvcZ+BI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rudde";
|
||||
owner = "pobrn";
|
||||
repo = "mktorrent";
|
||||
rev = "v${version}";
|
||||
sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr";
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ openssl ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://mktorrent.sourceforge.net/";
|
||||
homepage = "https://github.com/pobrn/mktorrent/wiki";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
description = "Command line utility to create BitTorrent metainfo files";
|
||||
maintainers = with lib.maintainers; [Profpatsch];
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bia1q2IPrlVeSLsD/HGkWwAUW8THAuzXQR2Iw0v8TKM=";
|
||||
sha256 = "sha256-BOUZ26XeBwWZezSS38Dek1Zgu7TyTqMkCb7UHLZBkrI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ptM0QrrWFy9rb/CpLYuzRE48Wr429lcE9xnV8uA8mGs=";
|
||||
cargoSha256 = "sha256-oDFq6+RZ6ubBAnEq2l21EhJlUiKAQtaoO6U1UjY4RPY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httplz";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "https";
|
||||
sha256 = "sha256-vMhQHWzsZlqMVkEQHCZTB8T4ETTaf8iAS9QhgYdfcx0=";
|
||||
sha256 = "sha256-FhxNYss6n0AJEszpJ7+6CAJE2sdsflWQkvSLakTnFdY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9gnKVZ3HQs3kNj4i1cgC+Jl3dhjx7QRaHSih1HOB3nI=";
|
||||
cargoSha256 = "sha256-wyksA3RYpGkD6nhllNv8WkUwEdml4TiPM2a4GzfBD1o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwarden";
|
||||
version = "1.29.1";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb";
|
||||
sha256 = "0rxy19bazi7a6m2bpx6wadg5d9p0k324h369vgr5ppmxb69d6zp8";
|
||||
sha256 = "sha256-x0i7MUVr0nhPy8M/dTVtRjaLfJQlzqhzLQ/JHLRmL6E=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
35
pkgs/tools/security/ghdorker/default.nix
Normal file
35
pkgs/tools/security/ghdorker/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ghdorker";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ghapi
|
||||
glom
|
||||
python-dotenv
|
||||
pyyaml
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"GHDorker"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extensible GitHub dorking tool";
|
||||
homepage = "https://github.com/dtaivpp/ghdorker";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
29
pkgs/tools/security/gomapenum/default.nix
Normal file
29
pkgs/tools/security/gomapenum/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomapenum";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodauf";
|
||||
repo = "GoMapEnum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6WZTmRse3mj1bimHE81JdSc4VKpMFbcJN3U4zgHMzJc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Z/uLZIPKd75P9nI7kTFOwzWFkRTVwUojYEQms4OJ6Bk=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/src $out/bin/$pname
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for user enumeration and password bruteforce";
|
||||
homepage = "https://github.com/nodauf/GoMapEnum";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
25
pkgs/tools/security/lmp/default.nix
Normal file
25
pkgs/tools/security/lmp/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lmp";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xInfection";
|
||||
repo = "LogMePwn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EDhNnNmIVBtBj+zHjLzW60sdI0dH8cLvXDQBmVgM4hM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-X7Djcp4reOXL6SX4jiSLicolENu7Uo5webSePYrPKug=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scanning and validation toolkit for the Log4J vulnerability";
|
||||
homepage = "https://github.com/0xInfection/LogMePwn";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
38
pkgs/tools/security/log4j-detect/default.nix
Normal file
38
pkgs/tools/security/log4j-detect/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "log4j-detect";
|
||||
version = "unstable-2021-12-14";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "takito1812";
|
||||
repo = pname;
|
||||
rev = "2f5b7a598a6d0b4aee8111bb574ea72c6a1c76d6";
|
||||
sha256 = "sha256-fFKW7uPBfrnze0UoPL3Mfwd4sFOuHYuDP7kv6VtdM3o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
requests
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "1 i #!/usr/bin/python" ${pname}.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -vD ${pname}.py $out/bin/${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to detect the log4j vulnerability";
|
||||
homepage = "https://github.com/takito1812/log4j-detect";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
30
pkgs/tools/security/log4j-vuln-scanner/default.nix
Normal file
30
pkgs/tools/security/log4j-vuln-scanner/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "log4j-vuln-scanner";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hillu";
|
||||
repo = "local-log4j-vuln-scanner";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YEXYZtjcZTl+9IgRuSRK/pvnISuW6Jbwuv+dqr4pork=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/scanner $out/bin/$pname
|
||||
mv $out/bin/patcher $out/bin/log4j-vuln-patcher
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Local log4j vulnerability scanner";
|
||||
homepage = "https://github.com/hillu/local-log4j-vuln-scanner";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
34
pkgs/tools/security/log4jcheck/default.nix
Normal file
34
pkgs/tools/security/log4jcheck/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "log4jcheck";
|
||||
version = "unstable-2021-12-14";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NorthwaveSecurity";
|
||||
repo = pname;
|
||||
rev = "736f1f4044e8a9b7bf5db515e2d1b819253f0f6d";
|
||||
sha256 = "sha256-1al7EMYbE/hFXKV4mYZlkEWTUIKYxgXYU3qBLlczYvs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
requests
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -vD nw_log4jcheck.py $out/bin/${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to check for vulnerable Log4j (CVE-2021-44228) systems";
|
||||
homepage = "https://github.com/NorthwaveSecurity/log4jcheck";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
35
pkgs/tools/security/log4shell-detector/default.nix
Normal file
35
pkgs/tools/security/log4shell-detector/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "log4shell-detector";
|
||||
version = "unstable-2021-12-15";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Neo23x0";
|
||||
repo = pname;
|
||||
rev = "66d974af40049c0cab7b0d7f988e5d705031f3af";
|
||||
sha256 = "sha256-wKNJWbnDPY3+k7RwEjJws1h4nIqL22Dr2m88CbJZ/rg=";
|
||||
};
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -vD ${pname}.py $out/bin/${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Detector for Log4Shell exploitation attempts";
|
||||
homepage = "https://github.com/Neo23x0/log4shell-detector";
|
||||
# https://github.com/Neo23x0/log4shell-detector/issues/24
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue