alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-12-15 18:01:15 +00:00 committed by GitHub
parent 5f5bc79a1b 66246ca356
commit 1e85228aa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 313 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -12834,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";

1
nixos/modules/services/web-apps/youtrack.nix
View file

@ -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}'';
};
};

11
pkgs/applications/networking/browsers/opera/default.nix
View file

@ -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; {

4
pkgs/applications/networking/browsers/palemoon/default.nix
View file

@ -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 = [

8
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -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

4
pkgs/applications/networking/cluster/k9s/default.nix
View file

@ -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 = [

6
pkgs/applications/networking/cluster/rancher/default.nix
View file

@ -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

4
pkgs/development/beam-modules/hex/default.nix
View file

@ -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" ''

10
pkgs/development/compilers/dotnet/build-dotnet.nix
View file

@ -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;

9
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -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.

5
pkgs/development/libraries/libff/default.nix
View file

@ -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.

30
pkgs/development/libraries/physics/geant4/datasets.nix
View file

@ -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";
}
])

18
pkgs/development/libraries/physics/geant4/default.nix
View file

@ -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;
};
}

4
pkgs/development/ocaml-modules/mirage/runtime.nix
View file

@ -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 ];

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/aiostream/default.nix
View file

@ -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 ];

40
pkgs/development/python-modules/fastcore/default.nix Normal file
View 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 ];
};
}

42
pkgs/development/python-modules/ghapi/default.nix Normal file
View 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 ];
};
}

4
pkgs/development/python-modules/pychromecast/default.nix
View file

@ -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 = [

4
pkgs/development/tools/analysis/checkov/default.nix
View file

@ -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; [

4
pkgs/development/tools/analysis/include-what-you-use/default.nix
View file

@ -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";
};

4
pkgs/development/tools/build-managers/sbt/default.nix
View file

@ -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 = ''

6
pkgs/development/tools/gojsontoyaml/default.nix
View file

@ -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
View file

@ -0,0 +1,4 @@
import ./generic.nix {
version = "2.12.2";
sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c=";
}

44
pkgs/development/tools/misc/lttng-ust/default.nix
View file

@ -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
View 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 ];
};
}

4
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View file

@ -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

10
pkgs/servers/jetbrains/youtrack.nix
View file

@ -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
'';

6
pkgs/servers/plex/raw.nix
View file

@ -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" ];

6
pkgs/servers/soft-serve/default.nix
View file

@ -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;

35
pkgs/tools/security/ghdorker/default.nix Normal file
View 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 ];
};
}

6
pkgs/tools/security/log4shell-detector/default.nix
View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "log4shell-detector";
version = "unstable-2021-12-14";
version = "unstable-2021-12-15";
format = "other";
src = fetchFromGitHub {
owner = "Neo23x0";
repo = pname;
rev = "7bc368f376b8d95282193eac6ea3970c363577d5";
sha256 = "sha256-MLKd2moMLwAZXqZ5I/pIYzV0PqVwSpze3gNM0IioI1E=";
rev = "66d974af40049c0cab7b0d7f988e5d705031f3af";
sha256 = "sha256-wKNJWbnDPY3+k7RwEjJws1h4nIqL22Dr2m88CbJZ/rg=";
};
checkInputs = with python3.pkgs; [

6
pkgs/top-level/all-packages.nix
View file

@ -3080,6 +3080,8 @@ with pkgs;
gh-ost = callPackage ../tools/misc/gh-ost { };
ghdorker = callPackage ../tools/security/ghdorker { };
ghidra-bin = callPackage ../tools/security/ghidra { };
gif-for-cli = callPackage ../tools/misc/gif-for-cli { };
@ -14811,7 +14813,7 @@ with pkgs;
img = callPackage ../development/tools/img { };
include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
llvmPackages = llvmPackages_12;
llvmPackages = llvmPackages_13;
};
indent = callPackage ../development/tools/misc/indent { };
@ -14958,6 +14960,8 @@ with pkgs;
lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { };
lttv = callPackage ../development/tools/misc/lttv { };
luaformatter = callPackage ../development/tools/luaformatter

48
pkgs/top-level/perl-packages.nix
View file

@ -9050,10 +9050,10 @@ let
Future = buildPerlModule {
pname = "Future";
version = "0.46";
version = "0.47";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.46.tar.gz";
sha256 = "0zx4cabzz5zyzvyvc7mvl0cc7zkslp0jnxsv41yii76dal8blcbq";
url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.47.tar.gz";
sha256 = "1pmhkhrmvaf8c3jbrfqqhmxjrzcsxdn2q7apj033gwxggland88h";
};
buildInputs = [ TestFatal TestIdentity TestRefcount ];
meta = {
@ -17642,10 +17642,10 @@ let
PerlCritic = buildPerlModule {
pname = "Perl-Critic";
version = "1.138";
version = "1.140";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.138.tar.gz";
sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82";
url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.140.tar.gz";
sha256 = "1nzxpn71mrpp85yxrxlraj52q2skvf9ja887ls11d57h6smg1vmz";
};
buildInputs = [ TestDeep ];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
@ -17856,10 +17856,10 @@ let
PerlTidy = buildPerlPackage rec {
pname = "Perl-Tidy";
version = "20201207";
version = "20211029";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20201207.tar.gz";
sha256 = "049x02awvpfr7m8dai04ya61jzs6cl45qplxzx7nf8x6jgj08i9f";
url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20211029.tar.gz";
sha256 = "1nhfi3gb8gif9p34m4ycqw0k8992yy42c21hk9b99l2pdbiv20zc";
};
meta = {
description = "Indent and reformat perl scripts";
@ -18097,6 +18097,22 @@ let
};
};
PLS = buildPerlPackage {
pname = "PLS";
version = "0.897";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MR/MREISNER/PLS-0.897.tar.gz";
sha256 = "0278anidj7bgassj32g20cbki2kkqakkr3axyq4k90nj4snw7p6x";
};
propagatedBuildInputs = [ Future IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ];
meta = {
homepage = "https://github.com/FractalBoy/perl-language-server";
description = "Perl Language Server";
license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.artturin ];
};
};
Po4a = callPackage ../development/perl-modules/Po4a { };
PodMinimumVersion = buildPerlPackage {
@ -18226,6 +18242,20 @@ let
};
};
PPR = buildPerlPackage {
pname = "PPR";
version = "0.000028";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCONWAY/PPR-0.000028.tar.gz";
sha256 = "1adrd189rnfl1fgv14inchvrgjqjbpnviisqsz3y8ds3gisafzfk";
};
meta = {
description = "Pattern-based Perl Recognizer";
license = lib.licenses.artistic2;
maintainers = [ maintainers.artturin ];
};
};
ProcBackground = buildPerlPackage {
pname = "Proc-Background";
version = "1.21";

4
pkgs/top-level/python-packages.nix
View file

@ -2685,6 +2685,8 @@ in {
fastcache = callPackage ../development/python-modules/fastcache { };
fastcore = callPackage ../development/python-modules/fastcore { };
fastdiff = callPackage ../development/python-modules/fastdiff { };
fastdtw = callPackage ../development/python-modules/fastdtw { };
@ -3149,6 +3151,8 @@ in {
gflags = callPackage ../development/python-modules/gflags { };
ghapi = callPackage ../development/python-modules/ghapi { };
ghdiff = callPackage ../development/python-modules/ghdiff { };
ghp-import = callPackage ../development/python-modules/ghp-import { };