cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-09-20 00:01:41 +00:00 committed by GitHub
commit 20062d8491
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 1481 additions and 1387 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/blockchains/chia/default.nix
View file

@ -7,14 +7,14 @@
let chia = python3Packages.buildPythonApplication rec {
pname = "chia";
version = "1.2.6";
version = "1.2.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
fetchSubmodules = true;
sha256 = "sha256-Y+cRfx5WE+hb31E975xquuSmNgqr2AvaQnCE70sW91w=";
sha256 = "sha256-yjpBB51EgaJvFdfhC1AG5N7H5u6aJwD1UqJqIv22QpQ=";
};
patches = [

6
pkgs/applications/misc/seatd/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "seatd";
version = "0.5.0";
version = "0.6.2";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
repo = "seatd";
rev = version;
sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0=";
sha256 = "0c07i1nq0k60xmcsnr37ryqs7nzbg4qfq6fzbnzwbh1yhr8kypcm";
};
outputs = [ "bin" "out" "dev" "man" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ systemd ];
mesonFlags = [ "-Dlogind=enabled" "-Dbuiltin=enabled" ];
mesonFlags = [ "-Dlibseat-logind=systemd" "-Dlibseat-builtin=enabled" ];
meta = with lib; {
description = "A universal seat management library";

8
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -85,12 +85,12 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
# https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [
"ffmpeg"
"snappy"
] ++ lib.optionals (!chromiumVersionAtLeast "95") [
gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [
"zlib"
] ++ [
# TODO:
# "ffmpeg"
# "snappy"
"flac"
"libjpeg"
"libpng"

7
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
@ -19,7 +19,7 @@
}:
let
llvmPackages = llvmPackages_12;
llvmPackages = llvmPackages_13;
stdenv = llvmPackages.stdenv;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
@ -54,9 +54,6 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (chromiumVersionAtLeast "93") rec {
llvmPackages = llvmPackages_13;
stdenv = llvmPackages.stdenv;
});
browser = callPackage ./browser.nix {

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -44,19 +44,19 @@
}
},
"ungoogled-chromium": {
"version": "92.0.4515.159",
"sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr",
"sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985",
"version": "93.0.4577.82",
"sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx",
"sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify",
"deps": {
"gn": {
"version": "2021-05-07",
"version": "2021-07-08",
"url": "https://gn.googlesource.com/gn",
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
"rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
"sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
},
"ungoogled-patches": {
"rev": "92.0.4515.159-1",
"sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0"
"rev": "93.0.4577.82-1",
"sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66"
}
}
}

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

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
version = "0.22.8";
version = "0.22.9";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LUx/Ewk7wesHpFbdWZtjEkhYIEkEhJ3XqZ2WywmcqJg=";
sha256 = "sha256-h19Cj4ztgypT/j1gB+PbvgDJ7jlJ3CYPEbK62tJeMss=";
};
vendorSha256 = null;

13
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -28,25 +28,16 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "3.2.1";
version = "3.3";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "sha256-gtFskJoJLw7cqLao46LRUcZobOtzgwUOiKf7I4OiJAQ=";
sha256 = "sha256-GnSi7uMxiyWSQau75q07NlX1ikaBeWOdrzOf9f0jnBM=";
};
patches = [
# weechat 3.2 fails to build on Darwin, but is fixed for the next release:
(fetchpatch {
url = "https://github.com/weechat/weechat/commit/0b7e4977bef763993e361c23db0f52117b799949.patch";
sha256 = "eVdrhr4mrqv+OkqYOv1E7mUkmzd5NC3LmZhbXJnCpFg=";
excludes = [ "ChangeLog.adoc" ];
})
];
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
cmakeFlags = with lib; [

2601
pkgs/development/compilers/elm/packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/development/compilers/idris2/default.nix
View file

@ -13,13 +13,13 @@
# Uses scheme to bootstrap the build of idris2
stdenv.mkDerivation rec {
pname = "idris2";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "idris-lang";
repo = "Idris2";
rev = "v${version}";
sha256 = "105jybjf5s0k6003qzfxchzsfcpsxip180bh3mdmi74d464d0h8g";
sha256 = "sha256-JRI5/dEy9GT8SIj3X+UcJ0SiTQ20pqevWeTNX6e+Nfw=";
};
# We do not add any propagatedNativeBuildInputs because we do not want the

51
pkgs/development/dhall-modules/dhall-packages.nix
View file

@ -1,51 +0,0 @@
{ buildDhallGitHubPackage, dhall-kubernetes, Prelude }:
let
Prelude_12_0_0 = Prelude.overridePackage {
name = "Prelude-12.0.0";
rev = "9f248138f69ee5e22192dc3d0417d5c77b189e04";
sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";
};
kubernetes = {
"6a47bd" = dhall-kubernetes.overridePackage {
name = "dhall-kubernetes-6a47bd";
rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
};
"4ad581" = dhall-kubernetes.overridePackage {
name = "dhall-kubernetes-4ad581";
rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";
sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
};
"fee24c" = dhall-kubernetes.overridePackage {
name = "dhall-kubernetes-fee24c";
rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
};
};
in
buildDhallGitHubPackage {
name = "dhall-packages-0.11.1";
owner = "EarnestResearch";
repo = "dhall-packages";
file = "package.dhall";
rev = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";
sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";
dependencies = [
(kubernetes."6a47bd".overridePackage { file = "1.14/package.dhall"; })
(kubernetes."6a47bd".overridePackage { file = "1.15/package.dhall"; })
(kubernetes."6a47bd".overridePackage { file = "1.16/package.dhall"; })
(kubernetes."4ad581".overridePackage { file = "types.dhall"; })
(kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })
(kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })
Prelude_12_0_0
(Prelude_12_0_0.overridePackage { file = "JSON/package.dhall"; })
(Prelude_12_0_0.overridePackage { file = "JSON/Type"; })
(Prelude_12_0_0.overridePackage { file = "Map/Type"; })
];
}

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
version = "8.1.12";
version = "8.1.13";
src = fetchPypi {
inherit pname version;
sha256 = "84e2db897731461a1d6bccd17923c7e8cd0f2512df018287b62fea55fd61891d";
sha256 = "2833679bccd507e3eac9ec931cfae85c8070a78ad1286159475b7d3b79a40dc2";
};
sourceRoot = ".";

6
pkgs/development/python-modules/emoji/default.nix
View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "emoji";
version = "1.4.2";
version = "1.5.0";
src = fetchFromGitHub {
owner = "carpedm20";
repo = pname;
rev = "v.${version}";
sha256 = "072m0l1wcbz1jiyc2x5dx0b4ks5zri7m5lhjjy9sgq4qwlqsnr5n";
rev = "v${version}";
sha256 = "1b75p1ia4ip6aq1657pdwpspvhyjw6dpsrglj2qlql2gdmcm8sp8";
};
checkInputs = [

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

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "gensim";
version = "4.1.1";
version = "4.1.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "7c762daa4029046dfbe467fdd79f911aa140748bf50dc64dbeddc8eaa07f760b";
sha256 = "1932c257de4eccbb64cc40d46e8577a25f5f47b94b96019a969fb36150f11d15";
};
propagatedBuildInputs = [ smart-open numpy six scipy ];

22
pkgs/development/python-modules/py-air-control-exporter/default.nix
View file

@ -8,23 +8,18 @@
, prometheus-client
, py-air-control
, pytestCheckHook
, setuptools-scm
}:
buildPythonPackage rec {
pname = "py-air-control-exporter";
version = "0.3.0";
version = "0.3.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b";
sha256 = "0cwhcyyjzc6wlj7jp5h7fcj1hl03wzrz1if3sg205kh2hfrzzlqq";
};
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
click
flask
@ -36,19 +31,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
substituteInPlace setup.cfg \
--replace "--cov=py_air_control_exporter" ""
'';
disabledTests = [
# Tests are outdated
"test_help"
"test_unknown_protocol"
];
pythonImportsCheck = [ "py_air_control_exporter" ];
passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; };

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.36.2";
version = "0.36.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "sha256-3QRrGfyMXiSas70IL19/DQAPf7I6vdg/itiZlD4/pvg=";
sha256 = "sha256-HjS8KwbSir8L0irstoMeSRfeHaq8Kvcwib9wvGdyHEo=";
};
propagatedBuildInputs = [

23
pkgs/development/tools/rust/cargo-diet/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cargo-diet";
version = "1.2.2";
src = fetchFromGitHub {
owner = "the-lean-crate";
repo = pname;
rev = "v${version}";
sha256 = "1wxwf3i8qhak8b61iscsbndm4z7r5sg6iiarqlpf0y3lzb0yi5ah";
};
cargoSha256 = "06scamzr1676q5lx75bm05hdr21mdiby84dpm1wf2va5qpq6mjyl";
meta = with lib; {
description = "Help computing optimal include directives for your Cargo.toml manifest";
homepage = "https://github.com/the-lean-crate/cargo-diet";
changelog = "https://github.com/the-lean-crate/cargo-diet/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

22
pkgs/development/tools/rust/cargo-llvm-lines/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-lines";
version = "0.4.11";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "1p1agxsarkhw1mlqxawb2pj0fvsdyvi1rpp11p2k7fm341z1j71p";
};
cargoSha256 = "1b5py9md3lkqjyn9jkl6bdynfri0yvqvrfj2frbps0hqbxiv30jl";
meta = with lib; {
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
homepage = "https://github.com/dtolnay/cargo-llvm-lines";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ figsoda ];
};
}

9
pkgs/tools/filesystems/gocryptfs/default.nix
View file

@ -2,6 +2,8 @@
, stdenv
, buildGoModule
, fetchFromGitHub
, fuse
, makeWrapper
, openssl
, pandoc
, pkg-config
@ -22,6 +24,7 @@ buildGoModule rec {
vendorSha256 = "sha256-Q/oBT5xdLpgQCIk7KES6c8+BaCQVUIwCwVufl4oTFRs=";
nativeBuildInputs = [
makeWrapper
pkg-config
pandoc
];
@ -48,6 +51,12 @@ buildGoModule rec {
popd
'';
postInstall = ''
wrapProgram $out/bin/gocryptfs \
--prefix PATH : ${lib.makeBinPath [ fuse ]}
ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs
'';
meta = with lib; {
description = "Encrypted overlay filesystem written in Go";
license = licenses.mit;

4
pkgs/tools/misc/github-backup/default.nix
View file

@ -6,11 +6,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "github-backup";
version = "0.39.0";
version = "0.40.0";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47";
sha256 = "sha256-HgNOTi4z1wbRdeVFjGVbpuxd9/o9aWWYd8/ykiVF8Ks=";
};
makeWrapperArgs = [

22
pkgs/tools/misc/ristate/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitLab }:
rustPlatform.buildRustPackage rec {
pname = "ristate";
version = "unstable-2021-09-10";
src = fetchFromGitLab {
owner = "snakedye";
repo = pname;
rev = "34dfd0a0bab5b36df118d8da3956fd938c625b15";
sha256 = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY=";
};
cargoSha256 = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw=";
meta = with lib; {
description = "A river-status client written in Rust";
homepage = "https://gitlab.com/snakedye/ristate";
license = licenses.mit;
maintainers = with maintainers; [ kranzes ];
};
}

3
pkgs/tools/misc/toybox/default.nix
View file

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
};
depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross
buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ];
buildInputs = lib.optionals (enableStatic && stdenv.cc.libc ? static)
[ stdenv.cc.libc stdenv.cc.libc.static ];
postPatch = "patchShebangs .";

4
pkgs/tools/networking/haproxy/default.nix
View file

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "2.3.13";
version = "2.3.14";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "0mz2vga8wwhqa8n4psphbqfd5q33n4m8ar7ac9chhn0i397s8lf6";
sha256 = "0ah6xsxlk1a7jsxdg0pbdhzhssz9ysrfxd3bs5hm1shql1jmqzh4";
};
buildInputs = [ openssl zlib ]

4
pkgs/tools/networking/i2pd/default.nix
View file

@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
stdenv.mkDerivation rec {
pname = "i2pd";
version = "2.38.0";
version = "2.39.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "sha256-8wy6Zdnw0JgnHFLa1U3qlzjpDIqi2gykbkkV7lh+Zag=";
sha256 = "sha256-j8kHuX5Ca90ODjmF94HpGvjSpocDSuSxfVmvbIYRAKo=";
};
buildInputs = with lib; [ boost zlib openssl ]

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-09-17";
version = "2021-09-18";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-vpRthxgvDK2J9OnhF1AQR3yKxvrETLDM1APas8ZM8W8=";
sha256 = "sha256-Rgm76Za2z2g4FpyyoX//UmcW4vGAjK51GWpJYOF4uV4=";
};
installPhase = ''

12
pkgs/tools/text/hck/default.nix
View file

@ -1,7 +1,7 @@
{ cmake
, fetchFromGitHub
, lib
{ lib
, rustPlatform
, fetchFromGitHub
, cmake
, stdenv
, libiconv
, CoreFoundation
@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "hck";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "sstadick";
repo = pname;
rev = "v${version}";
sha256 = "02yvpgvzdprysg0spa0abn7d3vjj5spzc3528rwbpl4cw2yx8j6w";
sha256 = "sha256-nEWU4L1704g+0QNCOHEWDrw5U587RLv+WG6v9/5E650=";
};
cargoSha256 = "0n6wywb1xyaxkbr0fs39992dfv55wzvp05i1vk9mxgnsim9s7aw8";
cargoSha256 = "sha256-JSnikt00yOcIB6CuLUgphRS9JTMWo3MtAOya4M9E6kI=";
nativeBuildInputs = [ cmake ];

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

@ -12369,6 +12369,7 @@ with pkgs;
cargo-kcov = callPackage ../tools/package-management/cargo-kcov { };
cargo-graph = callPackage ../tools/package-management/cargo-graph { };
cargo-license = callPackage ../tools/package-management/cargo-license { };
cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { };
cargo-outdated = callPackage ../tools/package-management/cargo-outdated {};
cargo-release = callPackage ../tools/package-management/cargo-release {
inherit (darwin.apple_sdk.frameworks) Security;
@ -12396,6 +12397,7 @@ with pkgs;
cargo-deny = callPackage ../development/tools/rust/cargo-deny {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-diet = callPackage ../development/tools/rust/cargo-diet { };
cargo-embed = callPackage ../development/tools/rust/cargo-embed {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
@ -21823,6 +21825,8 @@ with pkgs;
riscv-pk = callPackage ../misc/riscv-pk { };
ristate = callPackage ../tools/misc/ristate { };
roccat-tools = callPackage ../os-specific/linux/roccat-tools { };
rtsp-simple-server = callPackage ../servers/rtsp-simple-server { };

3
pkgs/top-level/dhall-packages.nix
View file

@ -30,9 +30,6 @@ let
dhall-kubernetes =
callPackage ../development/dhall-modules/dhall-kubernetes.nix { };
dhall-packages =
callPackage ../development/dhall-modules/dhall-packages.nix { };
Prelude =
callPackage ../development/dhall-modules/Prelude.nix { };
};