ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-12 12:01:30 +00:00 committed by GitHub
commit 9eeed94d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 105 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/mopidy/iris.nix
View File

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.60.0";
version = "3.64.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "18w6qqmxzn8psiacybryxailm826f3j1wgiv0c03fbdsy6kr5f7l";
sha256 = "062x73glhn1x4wgc7zmb9y3cq15d5grgqf5drdpbp6p3cgk4s2vc";
};
propagatedBuildInputs = [

9
pkgs/applications/audio/mopidy/ytmusic.nix
View File

@ -2,19 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "mopidy-ytmusic";
version = "0.3.5";
version = "0.3.7";
src = python3Packages.fetchPypi {
inherit version;
pname = "Mopidy-YTMusic";
sha256 = "0pncyxfqxvznb9y4ksndbny1yf5mxh4089ak0yz86dp2qi5j99iv";
sha256 = "0gqjvi3nfzkqvbdhihzai241p1h5p037bj2475cc93xwzyyqxcrq";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'ytmusicapi>=0.20.0,<0.21.0' 'ytmusicapi>=0.20.0'
'';
propagatedBuildInputs = [
mopidy
python3Packages.ytmusicapi

11
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -147,7 +147,7 @@ let
// extraPolicies;
};
mozillaCfg = writeText "mozilla.cfg" ''
mozillaCfg = ''
// First line must be a comment
// Disables addon signature checking
@ -155,7 +155,6 @@ let
// Security is maintained because only user whitelisted addons
// with a checksum can be installed
${ lib.optionalString usesNixExtensions ''lockPref("xpinstall.signatures.required", false)'' };
${extraPrefs}
'';
#############################
@ -345,13 +344,19 @@ let
echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${libName}/defaults/pref/autoconfig.js"
echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${libName}/defaults/pref/autoconfig.js"
cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg}
cat > "$out/lib/${libName}/mozilla.cfg" << EOF
${mozillaCfg}
EOF
extraPrefsFiles=(${builtins.toString extraPrefsFiles})
for extraPrefsFile in "''${extraPrefsFiles[@]}"; do
cat "$extraPrefsFile" >> "$out/lib/${libName}/mozilla.cfg"
done
cat >> "$out/lib/${libName}/mozilla.cfg" << EOF
${extraPrefs}
EOF
mkdir -p $out/lib/${libName}/distribution/extensions
#############################

4
pkgs/applications/networking/instant-messengers/nheko/default.nix
View File

@ -33,13 +33,13 @@
mkDerivation rec {
pname = "nheko";
version = "0.10.0";
version = "0.10.1-1";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "nheko";
rev = "v${version}";
sha256 = "sha256-JNAI1+GmRgee7bqeJi8JadV3W7vXMpEvvKqqinb97Ng=";
sha256 = "sha256-Bpf38BAGfvmVyrAptIsQ9HaRUopqvytko6unlWLooUo=";
};
nativeBuildInputs = [

9
pkgs/development/libraries/libusb-compat/0.1.nix
View File

@ -2,7 +2,6 @@
, lib
, fetchFromGitHub
, autoreconfHook
, patchelf
, pkg-config
, libusb1
}:
@ -14,10 +13,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
outputBin = "dev";
nativeBuildInputs = [ autoreconfHook patchelf pkg-config ];
buildInputs = [ libusb1 ];
src = fetchFromGitHub {
owner = "libusb";
repo = "libusb-compat-0.1";
@ -27,6 +22,10 @@ stdenv.mkDerivation rec {
patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libusb1 ];
# without this, libusb-compat is unable to find libusb1
postFixup = ''
find $out/lib -name \*.so\* -type f -exec \

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "neatvnc";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Y+qFTSvMX/iop+5UOm+4NqMSAZesFIJeTR+CRnlZTYo=";
sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q=";
};
nativeBuildInputs = [ meson pkg-config ninja ];

4
pkgs/development/libraries/ngtcp2/gnutls.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "0.7.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
rev = "v${version}";
sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no=";
sha256 = "sha256-Sn03nY80UmL5oeoK6ScPye1oSUmEKxgoz2VLHcvor3U=";
};
outputs = [ "out" "dev" ];

3
pkgs/development/python-modules/tensorflow-datasets/default.nix
View File

@ -37,6 +37,7 @@
, termcolor
, tifffile
, tqdm
, zarr
}:
buildPythonPackage rec {
@ -99,6 +100,7 @@ buildPythonPackage rec {
scipy
tensorflow
tifffile
zarr
];
disabledTestPaths = [
@ -123,6 +125,7 @@ buildPythonPackage rec {
"tensorflow_datasets/image/lsun_test.py"
# Requires `envlogger` which is not packaged in `nixpkgs`.
"tensorflow_datasets/rlds/locomotion/locomotion_test.py"
"tensorflow_datasets/rlds/robosuite_panda_pick_place_can/robosuite_panda_pick_place_can_test.py"
# Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments`

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

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.14.1";
version = "3.14.2";
disabled = pythonOlder "3.6";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "ietf-tools";
repo = "xml2rfc";
rev = "refs/tags/v${version}";
sha256 = "sha256-v8wvmAV5t2dEWFWtbM68Npe+QzwXksRUl0H+tP0RgFc=";
sha256 = "sha256-7UKav9IOH3u/3ZPDWVTBSf+A1li65qK2qASJpNVezdI=";
};
postPatch = ''

3
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -270,6 +270,9 @@ let
};
video = {
DRM_LEGACY = no;
NOUVEAU_LEGACY_CTX_SUPPORT = whenAtLeast "5.2" no;
# Allow specifying custom EDID on the kernel command line
DRM_LOAD_EDID_FIRMWARE = yes;
VGA_SWITCHEROO = yes; # Hybrid graphics support

26
pkgs/servers/dns/knot-dns/default.nix
View File

@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
, ngtcp2-gnutls
, autoreconfHook, nixosTests, knot-resolver
, fetchpatch
, autoreconfHook
, nixosTests, knot-resolver, knot-dns, runCommandLocal
}:
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.2.0";
version = "3.2.1";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "426d120994daf93af348aa6c48428e583dd286656415de4daf7a59106fd98631";
sha256 = "51efa36f92679b25d43dbf8ba543e9f26138559f0fa1ba5fae172f5400659c8f";
};
outputs = [ "bin" "out" "dev" ];
@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
];
patches = [
(fetchpatch {
name = "test-32bit-xdp.patch";
url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/325dfeefdfd8a3dd318cfe0ab52cd7efbf839ccd.diff";
sha256 = "E5J2Jf4/m5H59Xn6TyATu2gKs3CgShYlMF2Qj1SW1zw=";
})
# Don't try to create directories like /var/lib/knot at build time.
# They are later created from NixOS itself.
./dont-create-run-time-dirs.patch
@ -65,6 +60,19 @@ stdenv.mkDerivation rec {
inherit knot-resolver;
} // lib.optionalAttrs stdenv.isLinux {
inherit (nixosTests) knot;
# Some dependencies are very version-sensitive, so the might get dropped
# or embedded after some update, even if the nixPackagers didn't intend to.
# For non-linux I don't know a good replacement for `ldd`.
deps = runCommandLocal "knot-deps-test"
{ nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; }
''
for libname in libngtcp2 libbpf; do
echo "Checking for $libname:"
ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname"
echo "OK"
done
touch "$out"
'';
};
meta = with lib; {

4
pkgs/servers/http/nginx/modules.nix
View File

@ -566,8 +566,8 @@ in
name = "vts";
owner = "vozlt";
repo = "nginx-module-vts";
rev = "v0.1.18";
sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7";
rev = "v0.2.0";
sha256 = "sha256-uVGHFJt9KNcM4cdCUcSYL5KxbCiZkFf1eTdafCZXRew=";
};
};
}

4
pkgs/servers/nosql/apache-jena/binary.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "apache-jena";
version = "4.6.0";
version = "4.6.1";
src = fetchurl {
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
sha256 = "sha256-1fNl6O9FVLzBx4U+4E72GY60UGMSRFdKNxIrPdcb/aA=";
sha256 = "sha256-XCExqN0S5aIeLUNkAXjBHPW/fvj+MxQP3GEOP9gSdLE=";
};
nativeBuildInputs = [
makeWrapper

4
pkgs/tools/admin/eksctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "eksctl";
version = "0.110.0";
version = "0.111.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-QcSSdMWQNgsxzK9JJxGgIUkx54sLYXaF2HEAJZGWnjI=";
sha256 = "sha256-I/EYq83snTphHlOk6SgZSYpRS3RNpD2JX1fkwqEG9j0=";
};
vendorSha256 = "sha256-Dka0UbTxR2UsMkClq8t0//m+Ky7NEw3g9XP6PtTWOe4=";

6
pkgs/tools/misc/fclones/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "fclones";
version = "0.27.2";
version = "0.27.3";
src = fetchFromGitHub {
owner = "pkolaczk";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cP17WnQsP2S78O9MfmpivibvN1vYMeSNBSrrOENHUiE=";
sha256 = "sha256-IAo7FKHh4oRPEmToEJca6b6E+TZvTeICPRYxol6Ppwo=";
};
cargoSha256 = "sha256-P1T9AAeEmCOiM74RPE/3Lz/XGAj150xTF3egjDv+zvc=";
cargoSha256 = "sha256-S4F/2kf9jbOA3o3kj5Ouo3QvCULbVILh3QbBLXUeOzc=";
buildInputs = lib.optionals stdenv.isDarwin [
AppKit

6
pkgs/tools/misc/gh-dash/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gh-dash";
version = "3.2.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${version}";
sha256 = "sha256-y7PJ8BDTiip6cjKQ3CVIcf3LwlGsEj3DHn3EOtCGa4A=";
sha256 = "sha256-fgafubFMYkWEqYVC9aHhheJQO8DnHB9onS1NJ63g74Y=";
};
vendorSha256 = "sha256-Hk/sBUI2XYB+ZHfuGUR3muEzUtVsGR28EkRD1jKg0Ss=";
vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8=";
ldflags = [ "-s" "-w" ];

34
pkgs/tools/misc/hex/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
, testers
, hex
}:
rustPlatform.buildRustPackage rec {
pname = "hex";
version = "0.4.2";
src = fetchFromGitHub {
owner = "sitkevij";
repo = "hex";
rev = "v${version}";
hash = "sha256-mxKjiciejnOTbSkCzOWdAtysRAnEv4JgntPS1qM9og8=";
};
cargoHash = "sha256-kGe6XN03V+ILnlAcT0E8BvrYMa7ub05STFsFY6X5Gkk=";
passthru.tests.version = testers.testVersion {
package = hex;
version = "hx ${version}";
};
meta = with lib; {
description = "Futuristic take on hexdump, made in Rust";
homepage = "https://github.com/sitkevij/hex";
changelog = "https://github.com/sitkevij/hex/releases/tag/v${version}";
mainProgram = "hx";
license = licenses.mit;
maintainers = with maintainers; [ ivar ];
};
}

4
pkgs/tools/networking/ipinfo/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ipinfo";
version = "2.8.1";
version = "2.9.0";
src = fetchFromGitHub {
owner = pname;
repo = "cli";
rev = "${pname}-${version}";
hash = "sha256-j+ASyNWfYh4/u7OX3iZx8DZZg1XAwuy6fpC9TJKI+18=";
hash = "sha256-kv8krhmqwE4IfEYPpN+cRAnku/Vm0ctQskCiYAb5YQ0=";
};
vendorSha256 = null;

6
pkgs/tools/networking/sish/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "sish";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "antoniomika";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Gk6hUv6SKZ71iJdeh9fvA45Oj3J1TjPWpvKQT5qj8NU=";
sha256 = "sha256-TiS28bqwcTbKKAj1trTOEs2a4FGADrkutIU3DkaTcjE=";
};
vendorSha256 = "sha256-FCLhAJxEPskigvlzvm5A+hVQOSWqqZnAxCPe7cawryA=";
vendorSha256 = "sha256-Cky4ggZoNbIZK7w4tL00XqqyDDe0fmYk/+xZvtG/Nmg=";
meta = with lib; {
description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";

6
pkgs/tools/security/gopass/jsonapi.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gopass-jsonapi";
version = "1.14.5";
version = "1.14.6";
src = fetchFromGitHub {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zEyzoIl5LiVbNSRebbcE70HxhOGYaZvArdHQqgvi1ns=";
sha256 = "sha256-4jpW1XGT3LWucrDYsz30fKTO7v7AxDKhjx4UYE7NnMQ=";
};
vendorSha256 = "sha256-mcI8ys+Vs46BEaETzsf0f1f2CgjEIV4iwSF4FWgNjUY=";
vendorSha256 = "sha256-bTZ7fjRCKvp7AJcuNDHnsgB8hQUURPBCISgWtBAO1fI=";
subPackages = [ "." ];

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

@ -1428,7 +1428,7 @@ with pkgs;
breitbandmessung = callPackage ../applications/networking/breitbandmessung { };
zq = callPackage ../development/tools/zq { buildGoModule = buildGo118Module; };
zq = callPackage ../development/tools/zq { };
### APPLICATIONS/EMULATORS
@ -7476,6 +7476,8 @@ with pkgs;
hevea = callPackage ../tools/typesetting/hevea { };
hex = callPackage ../tools/misc/hex { };
hexd = callPackage ../tools/misc/hexd { };
pixd = callPackage ../tools/misc/pixd { };
@ -15035,7 +15037,7 @@ with pkgs;
clojure = callPackage ../development/interpreters/clojure {
# set this to an LTS version of java
jdk = jdk11;
jdk = jdk17;
};
clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { };