ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-17 00:02:15 +00:00 committed by GitHub
commit 2ad7b248e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 404 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/python.section.md
View File

@ -1513,7 +1513,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
python = super.python.override {
packageOverrides = python-self: python-super: {
twisted = python-super.twisted.overrideAttrs (oldAttrs: {
src = super.fetchPipy {
src = super.fetchPypi {
pname = "twisted";
version = "19.10.0";
sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";

6
maintainers/maintainer-list.nix
View File

@ -4287,6 +4287,12 @@
githubId = 731722;
name = "Ryan Scheel";
};
hawkw = {
email = "eliza@elizas.website";
github = "hawkw";
githubId = 2796466;
name = "Eliza Weisman";
};
hax404 = {
email = "hax404foogit@hax404.de";
github = "hax404";

105
nixos/lib/testing-python.nix
View File

@ -257,105 +257,18 @@ rec {
inherit test driver driverInteractive nodes;
};
runInMachine =
{ drv
, machine
, preBuild ? ""
, postBuild ? ""
, qemu_pkg ? pkgs.qemu_test
, ... # ???
}:
let
build-vms = import ./build-vms.nix {
inherit system pkgs minimal specialArgs extraConfigurations;
};
vm = build-vms.buildVM { }
[
machine
{
key = "run-in-machine";
networking.hostName = "client";
nix.readOnlyStore = false;
virtualisation.writableStore = false;
}
];
abortForFunction = functionName: abort ''The ${functionName} function was
removed because it is not an essential part of the NixOS testing
infrastructure. It had no usage in NixOS or Nixpkgs and it had no designated
maintainer. You are free to reintroduce it by documenting it in the manual
and adding yourself as maintainer. It was removed in
https://github.com/NixOS/nixpkgs/pull/137013
'';
buildrunner = writeText "vm-build" ''
source $1
${coreutils}/bin/mkdir -p $TMPDIR
cd $TMPDIR
exec $origBuilder $origArgs
'';
testScript = ''
start_all()
client.wait_for_unit("multi-user.target")
${preBuild}
client.succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2")
${postBuild}
client.succeed("sync") # flush all data before pulling the plug
'';
testDriver = pythonTestDriver { inherit qemu_pkg; };
vmRunCommand = writeText "vm-run" ''
xchg=vm-state-client/xchg
${coreutils}/bin/mkdir $out
${coreutils}/bin/mkdir -p $xchg
for i in $passAsFile; do
i2=''${i}Path
_basename=$(${coreutils}/bin/basename ''${!i2})
${coreutils}/bin/cp ''${!i2} $xchg/$_basename
eval $i2=/tmp/xchg/$_basename
${coreutils}/bin/ls -la $xchg
done
unset i i2 _basename
export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env
unset xchg
export tests='${testScript}'
${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm
''; # */
in
lib.overrideDerivation drv (attrs: {
requiredSystemFeatures = [ "kvm" ];
builder = "${bash}/bin/sh";
args = [ "-e" vmRunCommand ];
origArgs = attrs.args;
origBuilder = attrs.builder;
});
runInMachineWithX = { require ? [ ], ... } @ args:
let
client =
{ ... }:
{
inherit require;
imports = [
../tests/common/auto.nix
];
virtualisation.memorySize = 1024;
services.xserver.enable = true;
test-support.displayManager.auto.enable = true;
services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true;
};
in
runInMachine ({
machine = client;
preBuild =
''
client.wait_for_x()
'';
} // args);
runInMachine = abortForFunction "runInMachine";
runInMachineWithX = abortForFunction "runInMachineWithX";
simpleTest = as: (makeTest as).test;

2
nixos/modules/misc/ids.nix
View File

@ -201,7 +201,7 @@ in
peerflix = 163;
#chronos = 164; # removed 2020-08-15
gitlab = 165;
tox-bootstrapd = 166;
# tox-bootstrapd = 166; removed 2021-09-15
cadvisor = 167;
nylon = 168;
#apache-kafka = 169;# dynamically allocated as of 2021-09-03

12
nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
View File

@ -51,6 +51,18 @@
{
"name": "JBL LIVE650BTNC"
},
{
"name": "Motorola DC800",
"no-features": [
"sbc-xq"
]
},
{
"name": "Motorola S305",
"no-features": [
"sbc-xq"
]
},
{
"name": "Soundcore Life P2-L",
"no-features": [

21
nixos/modules/services/networking/tox-bootstrapd.nix
View File

@ -3,15 +3,15 @@
with lib;
let
home = "/var/lib/tox-bootstrapd";
PIDFile = "${home}/pid";
WorkingDirectory = "/var/lib/tox-bootstrapd";
PIDFile = "${WorkingDirectory}/pid";
pkg = pkgs.libtoxcore;
cfg = config.services.toxBootstrapd;
cfgFile = builtins.toFile "tox-bootstrapd.conf"
''
port = ${toString cfg.port}
keys_file_path = "${home}/keys"
keys_file_path = "${WorkingDirectory}/keys"
pid_file_path = "${PIDFile}"
${cfg.extraConfig}
'';
@ -36,7 +36,7 @@ in
keysFile = mkOption {
type = types.str;
default = "${home}/keys";
default = "${WorkingDirectory}/keys";
description = "Node key file.";
};
@ -56,13 +56,6 @@ in
config = mkIf config.services.toxBootstrapd.enable {
users.users.tox-bootstrapd =
{ uid = config.ids.uids.tox-bootstrapd;
description = "Tox bootstrap daemon user";
inherit home;
createHome = true;
};
systemd.services.tox-bootstrapd = {
description = "Tox DHT bootstrap daemon";
after = [ "network.target" ];
@ -70,8 +63,10 @@ in
serviceConfig =
{ ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}";
Type = "forking";
inherit PIDFile;
User = "tox-bootstrapd";
inherit PIDFile WorkingDirectory;
AmbientCapabilities = ["CAP_NET_BIND_SERVICE"];
DynamicUser = true;
StateDirectory = "tox-bootstrapd";
};
};

1
nixos/tests/all-tests.nix
View File

@ -386,7 +386,6 @@ in
rspamd = handleTest ./rspamd.nix {};
rss2email = handleTest ./rss2email.nix {};
rsyslogd = handleTest ./rsyslogd.nix {};
runInMachine = handleTest ./run-in-machine.nix {};
rxe = handleTest ./rxe.nix {};
samba = handleTest ./samba.nix {};
samba-wsdd = handleTest ./samba-wsdd.nix {};

23
nixos/tests/run-in-machine.nix
View File

@ -1,23 +0,0 @@
{ system ? builtins.currentSystem,
config ? {},
pkgs ? import ../.. { inherit system config; }
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
let
output = runInMachine {
drv = pkgs.hello;
machine = { ... }: { /* services.sshd.enable = true; */ };
};
test = pkgs.runCommand "verify-output" { inherit output; } ''
if [ ! -e "$output/bin/hello" ]; then
echo "Derivation built using runInMachine produced incorrect output:" >&2
ls -laR "$output" >&2
exit 1
fi
"$output/bin/hello" > "$out"
'';
in test // { inherit test; } # To emulate behaviour of makeTest

4
pkgs/applications/audio/qmidinet/default.nix
View File

@ -1,12 +1,12 @@
{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsa-lib, libjack2 }:
mkDerivation rec {
version = "0.9.1";
version = "0.9.4";
pname = "qmidinet";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
sha256 = "sha256-cDgF5hbjy5DzGn4Rlmb76XzRa2wURVwPu2rQRKENxQU=";
sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0=";
};
hardeningDisable = [ "format" ];

6
pkgs/applications/audio/spotify/default.nix
View File

@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
version = "1.1.67.586.gbb5ef64e";
version = "1.1.68.628.geb44bd66";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
rev = "50";
rev = "52";
deps = [
alsa-lib
@ -80,7 +80,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
sha512 = "f29aa4a3f3d6a72f108f350905789f12ab3ae50cf4f4828f021d3be7759b192506c9a397e45309a5ee659578b6e85de80d7d78f994af9ab631c9fb2dc527c242";
sha512 = "be6f1cb650924eb9e244497374d1dfe6136d28056dbecc7000a03341a4bb4c6ab2c83ec6c707bd6f57afde95262230eafbde08e9c7a7dfcacdf660eb10499f3a";
};
nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];

2
pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix
View File

@ -1,6 +1,6 @@
{ trivialBuild
, haskellPackages
}
}:
trivialBuild {
pname = "agda-input";

4
pkgs/applications/editors/sigil/default.nix
View File

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "sigil";
version = "1.5.1";
version = "1.7.0";
src = fetchFromGitHub {
repo = "Sigil";
owner = "Sigil-Ebook";
rev = version;
sha256 = "sha256-BqNaIsUJE0KmFcmTjJERbclzaRe1dMjareWxUye2se0=";
sha256 = "sha256-a1gstR7qHbzQ3GZ0g/lxUxcHeZ5QgJIvhCV37tqlVfA=";
};
pythonPath = with python3Packages; [ lxml ];

2
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -13,7 +13,7 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1lzw3svnaf11g8g50w3plymy16rbb71lcag46y1q3xdh62jbq8nc";
x86_64-linux = "03z6wpzbvf046sl1mjvvcshy5czvr4bq2f3ajlr8bj39y9df93h9";
x86_64-darwin = "0cs5ikf5dxkg9qkyaq75h0rypil80sk6zmbb0s63191gj6l569yl";
aarch64-linux = "05ivgn72v05yy3a9qly4qx0qpyjd2r3ygdw978zc8z09694g5x3i";
armv7l-linux = "044izh9ap5s50k796zjcfk0p997b7sfryshp4gaxh3yf5qs0w7l9";

4
pkgs/applications/misc/anytype/default.nix
View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.18.68";
version = "0.19.0";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-VZYFMUgflc3LEk/nN7eoQbinGQS1AnPHmb8WgKzhGRM=";
sha256 = "sha256-sqCq9/QFygFcOUNCCBReD+eEk/8gvhMsuVD3g/ZPAFg=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

4
pkgs/applications/misc/qdirstat/default.nix
View File

@ -4,13 +4,13 @@
let
pname = "qdirstat";
version = "1.7.1";
version = "1.8";
src = fetchFromGitHub {
owner = "shundhammer";
repo = pname;
rev = version;
sha256 = "sha256-i1xHMwSnBULJbOA/ykQK9WBd+6TBNBRI9hnU1FDGQlY=";
sha256 = "sha256-R/eUqv5AxO5TcLkqOvlAXEkjAzeKGihf8YIQIIevOR0=";
};
in

4
pkgs/applications/misc/ticker/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ticker";
version = "4.2.1";
version = "4.3.0";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-T9pApuzATohiOUmWa+GBlLrlTNgKNMwtW6fSPO/NS6Y=";
sha256 = "sha256-DdUXT8xrKd114U+CSwIgl7XczxQZGWVZA3tMU7461xY=";
};
vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg=";

6
pkgs/applications/networking/cluster/fluxctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
version = "1.24.0";
version = "1.24.1";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
sha256 = "sha256-YjZ73Qc1lXosHopW+ZsrIyv16YupgB6ZpdcSGaZuafQ=";
sha256 = "sha256-lgcEkOu4iaLg+tP826Qpgmn0ogOpr62o1iWlv1yLbBQ=";
};
vendorSha256 = "sha256-OlM0HXFLTLYOZuVCud3k8K5X89zdZVlNkhXZzh0eKXc=";
vendorSha256 = "sha256-NQonBTHToGPo7QsChvuVM/jbV5FK71HMJfe5fe1gZYw=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/cluster/helmsman/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmsman";
version = "3.7.2";
version = "3.7.3";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
sha256 = "sha256-wzmn06nUycNaQ4tUEBd4q17M1CVC0+5X13rqF7zaHqU=";
sha256 = "sha256-7WN4YjhPbsFZfoFuZzsN85a+kdEVlEzQ9CfWh4nxxTs=";
};
vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg=";

4
pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "whatsapp-for-linux";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "eneshecan";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dB+NsoUEYM3cT0cg5ZOkBGW7ozRGFWSsYQMja3CjaHM=";
sha256 = "sha256-dEJRufOqlY+DnJdUaG5WP9hR1qO7KxR6MjKWq1SJB8A=";
};
nativeBuildInputs = [

27
pkgs/applications/science/chemistry/quantum-espresso/default.nix
View File

@ -1,5 +1,10 @@
{ lib, stdenv, fetchurl
, gfortran, fftw, blas, lapack
{ lib
, stdenv
, fetchFromGitLab
, gfortran
, fftw
, blas
, lapack
, useMpi ? false
, mpi
}:
@ -8,9 +13,11 @@ stdenv.mkDerivation rec {
version = "6.6";
pname = "quantum-espresso";
src = fetchurl {
url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj";
src = fetchFromGitLab {
owner = "QEF";
repo = "q-e";
rev = "qe-${version}";
sha256 = "1mkfmw0fq1dabplzdn6v1abhw0ds55gzlvbx3a9brv493whk21yp";
};
passthru = {
@ -33,11 +40,11 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Electronic-structure calculations and materials modeling at the nanoscale";
longDescription = ''
Quantum ESPRESSO is an integrated suite of Open-Source computer codes for
electronic-structure calculations and materials modeling at the
nanoscale. It is based on density-functional theory, plane waves, and
pseudopotentials.
'';
Quantum ESPRESSO is an integrated suite of Open-Source computer codes for
electronic-structure calculations and materials modeling at the
nanoscale. It is based on density-functional theory, plane waves, and
pseudopotentials.
'';
homepage = "https://www.quantum-espresso.org/";
license = licenses.gpl2;
platforms = [ "x86_64-linux" "x86_64-darwin" ];

24
pkgs/development/interpreters/lunatic/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ cmake, fetchFromGitHub, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "lunatic";
version = "0.6.2";
src = fetchFromGitHub {
owner = "lunatic-solutions";
repo = pname;
rev = "v${version}";
sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r";
};
cargoSha256 = "1rkxl27l6ydmcq3flc6qbnd7zmpkfmyc86b8q4pi7dwhqnd5g70g";
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "An Erlang inspired runtime for WebAssembly";
homepage = "https://lunatic.solutions";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ figsoda ];
};
}

12
pkgs/development/libraries/apr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook }:
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "apr";
@ -9,7 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
};
patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
patches = [
(fetchpatch {
name = "CVE-2021-35940.patch";
url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch";
sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs";
# convince fetchpatch to restore missing `a/`, `b/` to paths
extraPrefix = "";
})
] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
# This test needs the net
postPatch = ''

41
pkgs/development/libraries/bash/bash-preexec/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenvNoCC, lib, fetchFromGitHub, bats }:
let version = "0.4.1";
in stdenvNoCC.mkDerivation {
pname = "bash-preexec";
inherit version;
src = fetchFromGitHub {
owner = "rcaloras";
repo = "bash-preexec";
rev = version;
sha256 = "062iigps285628p710i7vh7kmgra5gahq9qiwj7rxir167lg0ggw";
};
checkInputs = [ bats ];
dontConfigure = true;
doCheck = true;
dontBuild = true;
patchPhase = ''
# Needed since the tests expect that HISTCONTROL is set.
sed -i '/setup()/a HISTCONTROL=""' test/bash-preexec.bats
'';
checkPhase = ''
bats test
'';
installPhase = ''
install -Dm755 $src/bash-preexec.sh $out/share/bash/bash-preexec.sh
'';
meta = with lib; {
description = "preexec and precmd functions for Bash just like Zsh";
license = licenses.mit;
homepage = "https://github.com/rcaloras/bash-preexec";
maintainers = [ maintainers.hawkw maintainers.rycee ];
platforms = platforms.unix;
};
}

13
pkgs/development/libraries/opencv/3.x.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv
, fetchFromGitHub, fetchpatch
, fetchFromGitHub
, cmake, pkg-config, unzip, zlib, pcre, hdf5
, glog, boost, gflags, protobuf
, config
@ -39,20 +39,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas";
assert enablePython -> pythonPackages != null;
let
version = "3.4.8";
version = "3.4.15";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "1dnz3gfj70lm1gbrk8pz28apinlqi2x6nvd6xcy5hs08505nqnjp";
hash = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc=";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
sha256 = "0psaa1yx36n34l09zd1y8jxgf8q4jzxd3vn06fqmzwzy85hcqn8i";
hash = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg=";
};
# Contrib must be built in order to enable Tesseract support:
@ -151,6 +151,11 @@ stdenv.mkDerivation {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
'';
# Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
patches = [
./cmake-don-t-use-OpenCVFindOpenEXR.patch
];
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with

6
pkgs/development/libraries/opencv/4.x.nix
View File

@ -214,11 +214,13 @@ stdenv.mkDerivation {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
'';
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
patches = [
./cmake-don-t-use-OpenCVFindOpenEXR.patch
] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
postPatch = ''
sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
'';

4
pkgs/development/libraries/pipewire/default.nix
View File

@ -58,7 +58,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.35";
version = "0.3.36";
outputs = [
"out"
@ -77,7 +77,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-cGH0Hd4c4KLyynMb3LIwElwHD99apNiI40SwZC3KG/s=";
sha256 = "sha256-kwoffB0Hi84T4Q0NaxLxsCyPV4R0LayX9kHmXU/vRPA=";
};
patches = [

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.9792";
version = "9.0.9947";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-c+E3ypmN69IyE0HagefrYN8bdCY7amRxa/PGoIX4/cQ=";
sha256 = "sha256-4QwpIZbS+ZPjKp2oKSOzpjCK3Bi5AdntKTO8Ujx2TPE=";
};
propagatedBuildInputs = [ pyvex ];

4
pkgs/development/python-modules/angr/default.nix
View File

@ -43,14 +43,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.9792";
version = "9.0.9947";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-zDy3dwhCNBtCAwflF/grdNsRllNUHJHMx1PQThHjcnw=";
sha256 = "sha256-qE2LIfcKwMAbmEXycPYo4T1WU9A6tr6mDYcxDs21ySI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/angrop/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.9792";
version = "9.0.9947";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rXhXzqjefsKvfsFky4XJd+RaF5z/TRWDg6+IYFIfP2w=";
sha256 = "sha256-f9T2M2ilT8v6G87sbJ1r192zEpBeuWUpgQP9sYsUoeU=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.9792";
version = "9.0.9947";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-st4h/ck7hxIx2cZ241C4hEFJvFsTqHmawAB4zsfQ/oU=";
sha256 = "sha256-DffiOMJUxreoWyPxelEL7mzaekwInYLquTS7HBIUJiM=";
};
checkInputs = [

4
pkgs/development/python-modules/censys/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "censys";
version = "2.0.6";
version = "2.0.7";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk=";
sha256 = "0s9y9956awl26rnrp5l78rbrjcwliqdijnmm7k6xm4hh7iak4q6z";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.9792";
version = "9.0.9947";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9jwD75leV02N5B7RaLF2DbC6GjhoDQMmkfFIO9MJ4Es=";
sha256 = "sha256-3nG173x0N4enGTN52wd0HbHbJJrAI7IKSp7FHQ/v/5U=";
};
# Use upstream z3 implementation

4
pkgs/development/python-modules/cle/default.nix
View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.9792";
version = "9.0.9947";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lCRZj0/L/XNcnJNiLxPY2mCFZowV6hLEpHOEiCsyQ/0=";
sha256 = "sha256-xlzc5Bde/OFlGJe9e4qb7QSszWyINJkQfEzY0wTaKD0=";
};
propagatedBuildInputs = [

1
pkgs/development/python-modules/mat2/default.nix
View File

@ -3,7 +3,6 @@
, python
, pythonOlder
, fetchFromGitLab
, fetchpatch
, substituteAll
, bubblewrap
, exiftool

227
pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
View File

@ -1,100 +1,127 @@
diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py
--- PySDL2-0.9.7-old/sdl2/dll.py 2020-02-15 09:36:29.000000000 +0100
+++ PySDL2-0.9.7/sdl2/dll.py 2020-09-23 20:24:09.365497270 +0200
@@ -94,15 +94,16 @@
"""Function wrapper around the different DLL functions. Do not use or
instantiate this one directly from your user code.
"""
- def __init__(self, libinfo, libnames, path=None):
+ def __init__(self, libinfo, libfile):
self._dll = None
self._libname = libinfo
self._version = None
- foundlibs = _findlib(libnames, path)
- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
- if len(foundlibs) == 0:
- raise RuntimeError("could not find any library for %s (%s)" %
- (libinfo, dllmsg))
+ #foundlibs = _findlib(libnames, path)
+ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
+ #if len(foundlibs) == 0:
+ # raise RuntimeError("could not find any library for %s (%s)" %
+ # (libinfo, dllmsg))
+ foundlibs = [ libfile ]
for libfile in foundlibs:
try:
self._dll = CDLL(libfile)
@@ -117,9 +118,9 @@
if self._dll is None:
raise RuntimeError("found %s, but it's not usable for the library %s" %
(foundlibs, libinfo))
- if path is not None and sys.platform in ("win32",) and \
- path in self._libfile:
- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
+ #if path is not None and sys.platform in ("win32",) and \
+ # path in self._libfile:
+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
def bind_function(self, funcname, args=None, returns=None, added=None):
"""Binds the passed argument and return value types to the specified
@@ -220,7 +221,7 @@
return
try:
- dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2", "@sdl2@")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py
--- PySDL2-0.9.7-old/sdl2/sdlgfx.py 2020-02-02 11:07:00.000000000 +0100
+++ PySDL2-0.9.7/sdl2/sdlgfx.py 2020-09-23 20:23:56.997419129 +0200
@@ -39,8 +39,7 @@
]
try:
- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_gfx", "@sdl2_gfx@")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py
--- PySDL2-0.9.7-old/sdl2/sdlimage.py 2020-02-02 11:07:00.000000000 +0100
+++ PySDL2-0.9.7/sdl2/sdlimage.py 2020-09-23 20:23:50.085375658 +0200
@@ -27,8 +27,7 @@
]
try:
- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_image", "@sdl2_image@")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py
--- PySDL2-0.9.7-old/sdl2/sdlmixer.py 2020-02-02 11:07:00.000000000 +0100
+++ PySDL2-0.9.7/sdl2/sdlmixer.py 2020-09-23 20:23:46.117350771 +0200
@@ -53,8 +53,7 @@
]
try:
- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_mixer", "@sdl2_mixer@")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py
--- PySDL2-0.9.7-old/sdl2/sdlttf.py 2020-02-02 11:07:00.000000000 +0100
+++ PySDL2-0.9.7/sdl2/sdlttf.py 2020-09-23 20:23:40.069312931 +0200
@@ -39,8 +39,7 @@
]
try:
- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_ttf", "@sdl2_ttf@")
except RuntimeError as exc:
raise ImportError(exc)
diff --git a/sdl2/dll.py b/sdl2/dll.py
index 6e30259..12e1f7d 100644
--- a/sdl2/dll.py
+++ b/sdl2/dll.py
@@ -145,7 +145,7 @@ class DLL(object):
"""Function wrapper around the different DLL functions. Do not use or
instantiate this one directly from your user code.
"""
- def __init__(self, libinfo, libnames, path=None):
+ def __init__(self, libinfo, libfile):
self._dll = None
self._deps = None
self._libname = libinfo
@@ -157,11 +157,12 @@ class DLL(object):
"SDL2_image": 2001,
"SDL2_gfx": 1003
}
- foundlibs = _findlib(libnames, path)
- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
- if len(foundlibs) == 0:
- raise RuntimeError("could not find any library for %s (%s)" %
- (libinfo, dllmsg))
+ #foundlibs = _findlib(libnames, path)
+ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
+ #if len(foundlibs) == 0:
+ # raise RuntimeError("could not find any library for %s (%s)" %
+ # (libinfo, dllmsg))
+ foundlibs = [ libfile ]
for libfile in foundlibs:
try:
self._dll = CDLL(libfile)
@@ -185,19 +186,19 @@ class DLL(object):
(foundlibs, libinfo))
if _using_ms_store_python():
self._deps = _preload_deps(libinfo, self._libfile)
- if path is not None and sys.platform in ("win32",) and \
- path in self._libfile:
- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
+ #if path is not None and sys.platform in ("win32",) and \
+ # path in self._libfile:
+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
def bind_function(self, funcname, args=None, returns=None, added=None):
"""Binds the passed argument and return value types to the specified
function. If the version of the loaded library is older than the
version where the function was added, an informative exception will
be raised if the bound function is called.
Args:
funcname (str): The name of the function to bind.
args (List or None, optional): The data types of the C function's
arguments. Should be 'None' if function takes no arguments.
returns (optional): The return type of the bound C function. Should
be 'None' if function returns 'void'.
@@ -288,7 +289,7 @@ def nullfunc(*args):
return
try:
- dll = DLL("SDL2", ["SDL2", "SDL2-2.0", "SDL2-2.0.0"], os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2", "@sdl2@")
except RuntimeError as exc:
raise ImportError(exc)
diff --git a/sdl2/sdlgfx.py b/sdl2/sdlgfx.py
index 090752e..a8a7488 100644
--- a/sdl2/sdlgfx.py
+++ b/sdl2/sdlgfx.py
@@ -50,8 +50,7 @@ __all__ = [
try:
- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_gfx", "@sdl2_gfx@")
except RuntimeError as exc:
raise ImportError(exc)
diff --git a/sdl2/sdlimage.py b/sdl2/sdlimage.py
index a6884e8..95d96df 100644
--- a/sdl2/sdlimage.py
+++ b/sdl2/sdlimage.py
@@ -32,15 +32,14 @@ __all__ = [
"IMG_LoadXCF_RW", "IMG_LoadWEBP_RW", "IMG_LoadXPM_RW",
"IMG_LoadXV_RW", "IMG_ReadXPMFromArray",
"IMG_GetError", "IMG_SetError", "IMG_SaveJPG", "IMG_SaveJPG_RW",
-
+
# Python Functions
"get_dll_file"
]
try:
- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_image", "@sdl2_image@")
except RuntimeError as exc:
raise ImportError(exc)
diff --git a/sdl2/sdlmixer.py b/sdl2/sdlmixer.py
index 9ad9b85..1c36289 100644
--- a/sdl2/sdlmixer.py
+++ b/sdl2/sdlmixer.py
@@ -76,8 +76,7 @@ __all__ = [
]
try:
- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_mixer", "@sdl2_mixer@")
except RuntimeError as exc:
raise ImportError(exc)
diff --git a/sdl2/sdlttf.py b/sdl2/sdlttf.py
index 9c2d951..bd5a16a 100644
--- a/sdl2/sdlttf.py
+++ b/sdl2/sdlttf.py
@@ -54,8 +54,7 @@ __all__ = [
try:
- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_ttf", "@sdl2_ttf@")
except RuntimeError as exc:
raise ImportError(exc)

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.9792";
version = "9.0.9947";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8AF7dCvQvBDjITRwi40KqMXcgiJpmKcK16ys1ybFIyk=";
sha256 = "sha256-52yI8V2rQTDbo/giHqhTKJ5Pz0PAMEz6ErZuo7RlbbM=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/python-modules/userpath/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "userpath";
version = "1.6.0";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256="1xpgdmdvhmmmdlivsqlzx1xvyj0gcnfp0j2ba5izmv3q2k5abfdj";
sha256="sha256-3NZsX6mxo8EjYvMJu7W8eZK6yK+G0XtOaxpLFmoRxD8=";
};
propagatedBuildInputs = [ click ];

8
pkgs/development/tools/build-managers/bloop/default.nix
View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "bloop";
version = "1.4.8";
version = "1.4.9";
bloop-coursier-channel = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
sha256 = "1hfd5gc98bp4p4m85jva2mlkh10q10n9s5136z8620mmjq93rx70";
sha256 = "0yh9k98c0cq9ksi3g6rb1q1qblnhcznrc5z1y9ps8cvwv2lx8ly4";
};
bloop-bash = fetchurl {
@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1cs3ng6bj9s7xf6c4xaiqgg5qr34abnipfgc44sy2ljklr7x0jwa"
else if stdenv.isDarwin && stdenv.isx86_64 then "0l9vqvzcmxya1s04cps96skw4dslh3i3ks73dl53ing50zb0ga9r"
outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hxyzf430g95l6qz1qlq8wvizvy6j3a7a9crb3lcxd67cpbg3x7i"
else if stdenv.isDarwin && stdenv.isx86_64 then "0x5yqf3i8y6s5h27yr0jkpvj6ch25ckx2802dmaxlgq6gz0fx6w2"
else throw "unsupported platform";
};

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "d77c348e3f2fdfbd90b51ce0e5894405bb08687c";
version = "2021-08-04";
rev = "bd4c3e80a0a07c78407422de13039ce5889fb4b0";
version = "2021-09-15";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "u0stt4w0iK4h+5PMkqjp9m8kqvrKvM3m7lBcV2yXPKU=";
sha256 = "NBERpDSY1FoGzD0AXJx1yTG37fjzw+VsTAgkIBfJdhs=";
};
dontBuild = true;

4
pkgs/development/tools/oq/default.nix
View File

@ -8,13 +8,13 @@
crystal.buildCrystalPackage rec {
pname = "oq";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "Blacksmoke16";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RJVAEbNLlYNnOL/RDG0R9f8fHhNWtR+IMnnjtLK4e34=";
sha256 = "sha256-oLy8Ts+wnI0LxtAH6vVqhS7nqNkaLs0/vK9GxfG4vU8=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/tools/pipenv/default.nix
View File

@ -18,11 +18,11 @@ let
in buildPythonApplication rec {
pname = "pipenv";
version = "2020.11.15";
version = "2021.5.29";
src = fetchPypi {
inherit pname version;
sha256 = "8253fe6f9cfb3791a54da8a0571f73c918cb3457dd908684c1800a13a06ec4c1";
sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e";
};
LC_ALL = "en_US.UTF-8";

4
pkgs/development/tools/symfony-cli/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "symfony-cli";
version = "4.26.0";
version = "4.26.3";
src = fetchurl {
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz";
sha256 = "sha256-fQZKRDLc6T+YEX443k6DnarSNV3Rbc2Y34ingJik+sc=";
sha256 = "sha256-les12GheTKr4XvZpE4YIyNMaXWizeB0COhDiMcYYC7o=";
};
dontBuild = true;

6
pkgs/development/tools/taplo-lsp/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "taplo-lsp";
version = "0.2.4";
version = "0.2.5";
src = fetchCrate {
inherit pname version;
sha256 = "1a5v0x60iicv9snsr0a3lqbziyh38iqhiw11s2lqnr6l1hmp69jy";
sha256 = "0a8y2fdkflc7lq0q40j7dr80hbj56bbsc585isbd7lk6xavg7cvi";
};
cargoSha256 = "0ak70cwxcviv86b4zrcgqaxhdm6fxsji03mnacvp4pwlwv84ikkc";
cargoSha256 = "133p5kmcfq5ksrri2f8jvnc1ljmsczq49gh3k0gmgby45yvy6xa1";
# excludes test_tcp since it fails
cargoTestFlags = [ "test_stdio" ];

17
pkgs/misc/vscode-extensions/default.nix
View File

@ -564,6 +564,23 @@ let
};
};
faustinoaq.lex-flex-yacc-bison = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "lex-flex-yacc-bison";
publisher = "faustinoaq";
version = "0.0.3";
sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog";
description = "Language support for Lex, Flex, Yacc and Bison.";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison";
homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison";
license = licenses.mit;
maintainers = with maintainers; [ angustrau ];
};
};
file-icons.file-icons = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";

4
pkgs/os-specific/linux/kernel/linux-zen.nix
View File

@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
modDirVersion = "5.14.1-zen1";
modDirVersion = "5.14.3-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@ -19,7 +19,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${modDirVersion}";
sha256 = "sha256-InfDIs+eELLJE5aw7mD8Jo7SlrpeI/ZuD3z4TyFf7/k=";
sha256 = "sha256-ByewBT+1z83jCuEMmNvtmhHaEk4qjHa2Kgue8wVfPIY=";
};
structuredExtraConfig = with lib.kernel; {

14
pkgs/os-specific/linux/zfs/default.nix
View File

@ -207,23 +207,23 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14";
latestCompatibleLinuxPackages = linuxPackages_5_13;
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_14;
# this package should point to the latest release.
version = "2.1.0";
version = "2.1.1";
sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o=";
sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";
};
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_13;
latestCompatibleLinuxPackages = linuxPackages_5_14;
# this package should point to a version / git revision compatible with the latest kernel release
version = "unstable-2021-08-30";
rev = "3b89d9518df2c7fd747e349873a3d4d498beb20e";
version = "2.1.1";
# rev = "0000000000000000000000000000000000000000";
sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg=";

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -17,12 +17,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
version = "2.4.48";
version = "2.4.49";
pname = "apache-httpd";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v";
sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5";
};
# FIXME: -dev depends on -doc

8
pkgs/servers/http/tomcat/default.nix
View File

@ -32,13 +32,13 @@ let
in {
tomcat9 = common {
versionMajor = "9";
versionMinor = "0.46";
sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h";
versionMinor = "0.53";
sha256 = "1zdnbb0bfbi7762lz69li0wf48jbfz1mv637jzcl42vbsxp4agkv";
};
tomcat10 = common {
versionMajor = "10";
versionMinor = "0.6";
sha256 = "1bpcxpsfws3b8ykq53vrcx3f04mvs5if80p329jm3x2dvdvj3d9n";
versionMinor = "0.11";
sha256 = "1hjvsxxxavni7bis1hm56281ffmf4x0zdh65zqkrnhqa1rbs0lg2";
};
}

4
pkgs/servers/http/tomcat/tomcat-native.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tomcat-native";
version = "1.2.30";
version = "1.2.31";
src = fetchurl {
url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";
sha512 = "51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953";
sha512 = "2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49";
};
sourceRoot = "${pname}-${version}-src/native";

6
pkgs/servers/libreddit/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "libreddit";
version = "0.14.14";
version = "0.15.1";
src = fetchFromGitHub {
owner = "spikecodes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-duirX+X8moByV1urdgXjzTQ2zOfCfz7etzjDxkSKvhk=";
sha256 = "sha256-Df2WedLOz4wpot0Isy3JCF5p1sV9Hx3bkTNp1KkSfHQ=";
};
cargoSha256 = "sha256-pFCERBnN386rW8ajpLWUHteCTWRmEiR19Sp5d8HXc5Y=";
cargoSha256 = "sha256-eR/0gpuEBQ7gHrSmJqGaM4vqKwg9WZdVVnBU4DgJcVQ=";
buildInputs = lib.optional stdenv.isDarwin Security;

6
pkgs/servers/livepeer/default.nix
View File

@ -4,16 +4,16 @@
buildGoModule rec {
pname = "livepeer";
version = "0.5.15";
version = "0.5.20";
runVend = true;
vendorSha256 = "sha256-PhkdbixJDA9Ym4cK5ALIYJgDQnO5GTbZ0XGsVHcvYYQ=";
vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw=";
src = fetchFromGitHub {
owner = "livepeer";
repo = "go-livepeer";
rev = "v${version}";
sha256 = "sha256-ZB80QssqN9SBpmYk/QgPRVF88qedmNeUG+EkjxWz4rQ=";
sha256 = "sha256-cOxIL093Mi+g9Al/SQJ6vdaeBAXUN6ZGsSaVvEIiJpU=";
};
# livepeer_cli has a vendoring problem

6
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "8.1.3";
version = "8.1.4";
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-gJO21qTTiP6/8Oln0w89UYEYWb6pIlXvKfiALAUAjnM=";
sha256 = "sha256-fBeiJL40TXY5UHdNUYQhy4wzuaoCidHAidN7aWJ2GnQ=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-1ZZMZEErt/OD55mEu/mF2XrsZcDVk700jRkTcYK14rE=";
sha256 = "sha256-a1fY4W8ZfA9wSb1DiNixTnwKhfoJ+salaRXcy1Y2t9Y=";
};
vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I=";

2
pkgs/servers/monitoring/zabbix/agent2.nix
View File

@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }:
modRoot = "src/go";
vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd";
vendorSha256 = "1iyi7lnknr42gbv25illqnnjc7mshv73ih9anc6rxbf87n9s46ac";
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libiconv openssl pcre zlib ];

8
pkgs/servers/monitoring/zabbix/versions.nix
View File

@ -1,11 +1,11 @@
generic: {
v50 = generic {
version = "5.0.12";
sha256 = "1gxlsmvz3m3dm4qqgx5qg5zjs680salah17mdzm3m27w8srg13i5";
version = "5.0.15";
sha256 = "1q9xwixzdj3w9qmarpp8xbkjphsz4m185br8g6i9f96676hrw5ww";
};
v40 = generic {
version = "4.0.31";
sha256 = "1jfawwwqzd9bsywsn4qc7d1j2a4i8d92xg16k0f3y34pbmfm4603";
version = "4.0.33";
sha256 = "05pdqiql6xv1l7cn2piydsfjiaw6np0rbl1n5wg7bc7r4ikiyp4v";
};
}

11
pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, postgresql }:
{ lib, stdenv, fetchFromGitLab, postgresql }:
stdenv.mkDerivation rec {
pname = "pg_ed25519";
version = "0.2";
src = fetchurl {
url = "https://gitlab.com/dwagin/${pname}/-/archive/${version}/${pname}-${version}.tar.bz2";
sha256 = "0q46pvk1vq5w3al6i3inzlw6w7za3n7p1gd4wfbbxzvzh7qnynda";
src = fetchFromGitLab {
owner = "dwagin";
repo = "pg_ed25519";
rev = version;
sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0";
};
buildInputs = [ postgresql ];

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2021-09-10";
version = "2021-09-15";
pname = "oh-my-zsh";
rev = "735808f48d54aabce540f6c90294e21118104cf4";
rev = "93b557e291ba60286bcd49f5d3e4ac61730b3f7c";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "fd/Y6kBqO/RO+LMUdCgGGHdHXWghj1YU+Pch5RLNAP0=";
sha256 = "71vJHlr+g8a+mTGBn4Bupog1lsmukJhl+qT8aVnd8pk=";
};
installPhase = ''

4
pkgs/tools/misc/profetch/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "profetch";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "RustemB";
repo = pname;
rev = "v${version}";
sha256 = "1clh3l50wz6mlrw9kx0wh2bbhnz6bsksyh4ngz7givv4y3g9m702";
sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo=";
};
nativeBuildInputs = [ gprolog ];

6
pkgs/tools/security/grype/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "grype";
version = "0.17.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE=";
sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM=";
};
vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ=";
vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg=";
propagatedBuildInputs = [ docker ];

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

@ -7051,6 +7051,8 @@ with pkgs;
ltris = callPackage ../games/ltris { };
lunatic = callPackage ../development/interpreters/lunatic { };
lv = callPackage ../tools/text/lv { };
lxc = callPackage ../os-specific/linux/lxc {
@ -19578,6 +19580,10 @@ with pkgs;
};
agda = agdaPackages.agda;
### DEVELOPMENT / LIBRARIES / BASH
bash-preexec = callPackage ../development/libraries/bash/bash-preexec { };
### DEVELOPMENT / LIBRARIES / JAVA
commonsBcel = callPackage ../development/libraries/java/commons/bcel { };

18
pkgs/top-level/python-packages.nix
View File

@ -56,7 +56,7 @@ let
# See build-setupcfg/default.nix for documentation.
buildSetupcfg = import ../build-support/build-setupcfg self;
fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix {};
fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix { };
# Check whether a derivation provides a Python module.
hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;
@ -1479,7 +1479,7 @@ in {
class-registry = callPackage ../development/python-modules/class-registry { };
claripy = callPackage ../development/python-modules/claripy { };
claripy = callPackage ../development/python-modules/claripy { };
cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };
@ -1521,11 +1521,11 @@ in {
click-threading = callPackage ../development/python-modules/click-threading { };
clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {};
clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { };
clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { };
clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {};
clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver { };
cliff = callPackage ../development/python-modules/cliff { };
@ -2372,7 +2372,7 @@ in {
env-canada = callPackage ../development/python-modules/env-canada { };
environmental-override = callPackage ../development/python-modules/environmental-override {};
environmental-override = callPackage ../development/python-modules/environmental-override { };
envisage = callPackage ../development/python-modules/envisage { };
@ -3266,9 +3266,9 @@ in {
guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { };
gvm-tools = callPackage ../development/python-modules/gvm-tools {};
gvm-tools = callPackage ../development/python-modules/gvm-tools { };
gviz-api = callPackage ../development/python-modules/gviz-api {};
gviz-api = callPackage ../development/python-modules/gviz-api { };
gym = callPackage ../development/python-modules/gym { };
@ -7652,7 +7652,7 @@ in {
queuelib = callPackage ../development/python-modules/queuelib { };
qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {};
qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { };
r2pipe = callPackage ../development/python-modules/r2pipe { };
@ -8766,7 +8766,7 @@ in {
tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { };
tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {};
tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { };
tensorboardx = callPackage ../development/python-modules/tensorboardx { };