colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-25 18:28:52 +00:00 committed by GitHub
commit 7659201d58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 108 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -8573,6 +8573,12 @@
githubId = 1040871;
name = "Mathis Antony";
};
svrana = {
email = "shaw@vranix.com";
github = "svrana";
githubId = 850665;
name = "Shaw Vrana";
};
svsdep = {
email = "svsdep@gmail.com";
github = "svsdep";

5
nixos/modules/system/boot/resolved.nix
View File

@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, pkgs, lib, ... }:
with lib;
let
@ -150,6 +150,9 @@ in
wantedBy = [ "multi-user.target" ];
aliases = [ "dbus-org.freedesktop.resolve1.service" ];
restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
# Upstream bug: https://github.com/systemd/systemd/issues/18078
# systemd-resolved without libidn2 is broken
environment.LD_LIBRARY_PATH = "${lib.getLib pkgs.libidn2}/lib";
};
environment.etc = {

7
pkgs/applications/editors/glow/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glow";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "glow";
rev = "v${version}";
sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh";
sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j";
};
vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z";
vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639";
doCheck = false;
@ -20,6 +20,7 @@ buildGoModule rec {
meta = with lib; {
description = "Render markdown on the CLI, with pizzazz!";
homepage = "https://github.com/charmbracelet/glow";
changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne penguwin ];
};

11
pkgs/applications/office/zanshin/default.nix
View File

@ -1,6 +1,7 @@
{ mkDerivation
, lib
, fetchurl
, fetchpatch
, extra-cmake-modules
, qtbase
, boost
@ -24,6 +25,15 @@ mkDerivation rec {
sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";
};
patches = [
# Build with kontactinterface >= 5.14.42.
# Remove after next release.
(fetchpatch {
url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";
sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";
})
];
nativeBuildInputs = [
extra-cmake-modules
];
@ -48,6 +58,5 @@ mkDerivation rec {
maintainers = with maintainers; [ zraexy ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
broken = true;
};
}

8
pkgs/development/interpreters/perl/default.nix
View File

@ -174,11 +174,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
crossVersion = "6c115604fcbf01ceb3c6d7c13206a7590abf6c21"; # Nov 22, 2020
crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
sha256 = "1xb3krm7m3f7lhq774pf48czyfa8378jahg1q0kkcz8alrl270w1";
sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@ -214,7 +214,7 @@ in {
perldevel = common {
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
version = "5.33.4";
sha256 = "02r8d0wrwaj0vgqbbqidhqgck2xp5k9g49aslj9faqcmgpsj5kcz";
version = "5.33.5";
sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr";
};
}

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

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "jupyterlab_git";
version = "0.23.2";
version = "0.23.3";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089";
sha256 = "20a4954d8d1b1eb6f9111cd15d6a598bd7ff72b08797cf5e86c5a55827c85a1d";
};
propagatedBuildInputs = [ notebook nbdime git ];

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

@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "runway-python";
version = "0.6.0";
version = "0.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8";
sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740";
};
propagatedBuildInputs = [

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

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.4.5";
version = "1.4.6";
src = fetchurl {
url =
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U=";
sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ=";
};
patchPhase = ''

26
pkgs/development/tools/go-minimock/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "go-minimock";
version = "3.0.8";
src = fetchFromGitHub {
owner = "gojuno";
repo = "minimock";
rev = "v${version}";
sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h";
};
vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc";
doCheck = true;
subPackages = [ "cmd/minimock" "." ];
meta = with lib; {
homepage = "https://github.com/gojuno/minimock";
description = "A golang mock generator from interfaces";
license = licenses.mit;
maintainers = with maintainers; [ svrana ];
};
}

25
pkgs/tools/misc/code-minimap/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "code-minimap";
version = "0.4.3";
src = fetchFromGitHub {
owner = "wfxr";
repo = pname;
rev = "v${version}";
sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc";
};
cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww";
meta = with stdenv.lib; {
description = "A high performance code minimap render";
homepage = "https://github.com/wfxr/code-minimap";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ bsima ];
};
}

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

@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
pname = "httpstat";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "reorx";
repo = pname;
rev = version;
sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1";
sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM=";
};
doCheck = false; # No tests
buildInputs = [ glibcLocales ];

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

@ -1867,6 +1867,8 @@ in
cpulimit = callPackage ../tools/misc/cpulimit { };
code-minimap = callPackage ../tools/misc/code-minimap { };
codesearch = callPackage ../tools/text/codesearch { };
codec2 = callPackage ../development/libraries/codec2 { };
@ -15769,6 +15771,12 @@ in
suffix = "qt5";
};
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
lcms = lcms2;
qt5Support = true;
suffix = "qt5";
};
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
@ -19018,6 +19026,8 @@ in
go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };
go-minimock = callPackage ../development/tools/go-minimock { };
go-protobuf = callPackage ../development/tools/go-protobuf { };
go-symbols = callPackage ../development/tools/go-symbols { };
@ -20700,13 +20710,10 @@ in
calibre = calibre-py3;
calligra = libsForQt514.callPackage ../applications/office/calligra {
calligra = libsForQt5.callPackage ../applications/office/calligra {
openjpeg = openjpeg_1;
poppler = poppler_0_61.override {
qt5Support = true;
# Must be using the same qt version as calligra itself.
qtbase = qt514.qtbase;
};
# Must use the same Qt version as Calligra itself:
poppler = libsForQt5.poppler_0_61;
};
perkeep = callPackage ../applications/misc/perkeep { };
@ -22383,14 +22390,14 @@ in
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
llvmPackages = llvmPackages_10;
};
kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
python = python3;
};
@ -24555,7 +24562,7 @@ in
tribler = callPackage ../applications/networking/p2p/tribler { };
trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { };
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
tudu = callPackage ../applications/office/tudu { };
@ -25374,7 +25381,7 @@ in
zam-plugins = callPackage ../applications/audio/zam-plugins { };
zanshin = libsForQt514.callPackage ../applications/office/zanshin {
zanshin = libsForQt5.callPackage ../applications/office/zanshin {
boost = boost160;
};
@ -25718,7 +25725,7 @@ in
dhewm3 = callPackage ../games/dhewm3 {};
digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
digikam = libsForQt5.callPackage ../applications/graphics/digikam {};
displaycal = callPackage ../applications/graphics/displaycal {};
@ -26607,10 +26614,9 @@ in
lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit qt5;
inherit libsForQt5;
inherit pkgs;
inherit (lib) makeScope;
inherit qt5 libsForQt5;
});
mate = recurseIntoAttrs (callPackage ../desktops/mate { });