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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2020-12-18 12:22:44 +00:00 committed by GitHub
parent 2af34c1479 c23db78bbd
commit a4876421e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 196 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/licenses.nix
View File

@ -623,6 +623,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "Open Software License 3.0";
};
parity70 = spdx {
spdxId = "Parity-7.0.0";
fullName = "Parity Public License 7.0.0";
url = "https://paritylicense.com/versions/7.0.0.html";
};
php301 = spdx {
spdxId = "PHP-3.01";
fullName = "PHP License v3.01";

2
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -650,7 +650,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details.
<listitem>
<para>
<literal>boot.extraTTYs</literal> renamed to
<link linkend="opt-console.extraTTYs">console.extraTTYs</link>
<literal>console.extraTTYs</literal>.
</para>
</listitem>
</itemizedlist>

18
nixos/modules/config/console.nix
View File

@ -90,20 +90,6 @@ in
'';
};
extraTTYs = mkOption {
default = [];
type = types.listOf types.str;
example = ["tty8" "tty9"];
description = ''
TTY (virtual console) devices, in addition to the consoles on
which mingetty and syslogd run, that must be initialised.
Only useful if you have some program that you want to run on
some fixed console. For example, the NixOS installation CD
opens the manual in a web browser on console 7, so it sets
<option>console.extraTTYs</option> to <literal>["tty7"]</literal>.
'';
};
useXkbConfig = mkOption {
type = types.bool;
default = false;
@ -199,5 +185,9 @@ in
(mkRenamedOptionModule [ "i18n" "consoleUseXkbConfig" ] [ "console" "useXkbConfig" ])
(mkRenamedOptionModule [ "boot" "earlyVconsoleSetup" ] [ "console" "earlySetup" ])
(mkRenamedOptionModule [ "boot" "extraTTYs" ] [ "console" "extraTTYs" ])
(mkRemovedOptionModule [ "console" "extraTTYs" ] ''
Since NixOS switched to systemd (circa 2012), TTYs have been spawned on
demand, so there is no need to configure them manually.
'')
];
}

8
nixos/modules/installer/tools/nix-fallback-paths.nix
View File

@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/fwak7l5jjl0py4wldsqjbv7p7rdzql0b-nix-2.3.9";
i686-linux = "/nix/store/jlqrx9zw3vkwcczndaar5ban1j8g519z-nix-2.3.9";
aarch64-linux = "/nix/store/kzvpzlm12185hw27l5znrprgvcja54d0-nix-2.3.9";
x86_64-darwin = "/nix/store/kanh3awpf370pxfnjfvkh2m343wr3hj0-nix-2.3.9";
x86_64-linux = "/nix/store/iwfs2bfcy7lqwhri94p2i6jc87ih55zk-nix-2.3.10";
i686-linux = "/nix/store/a3ccfvy9i5n418d5v0bir330kbcz3vj8-nix-2.3.10";
aarch64-linux = "/nix/store/bh5g6cv7bv35iz853d3xv2sphn51ybmb-nix-2.3.10";
x86_64-darwin = "/nix/store/8c98r6zlwn2d40qm7jnnrr2rdlqviszr-nix-2.3.10";
}

2
nixos/modules/services/networking/wakeonlan.nix
View File

@ -51,6 +51,6 @@ in
###### implementation
config.powerManagement.powerDownCommands = lines;
config.powerManagement.powerUpCommands = lines;
}

10
pkgs/applications/misc/librecad/default.nix
View File

@ -1,5 +1,6 @@
{ boost
, fetchFromGitHub
, fetchpatch
, installShellFiles
, mkDerivationWith
, muparser
@ -16,7 +17,7 @@ let
stdenv = gcc8Stdenv;
in
# Doesn't build with gcc9
# Doesn't build with gcc9
mkDerivationWith stdenv.mkDerivation rec {
pname = "librecad";
version = "2.2.0-rc1";
@ -30,6 +31,13 @@ mkDerivationWith stdenv.mkDerivation rec {
patches = [
./fix_qt_5_11_build.patch
(
fetchpatch {
# Fix missing app name and icon on Wayland.
url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch";
sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5";
}
)
];
postPatch = ''

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -31,9 +31,9 @@
}
},
"dev": {
"version": "89.0.4350.4",
"sha256": "1jh3r227j70imjzj0gm7cf1mv25zcdd2waa9qvim0p3g6wbdacmq",
"sha256bin64": "06963r7a1xc9vjlwgn0wgzqfj6mavfks20lzf49axw6izrxf8sbr",
"version": "89.0.4356.6",
"sha256": "1jq0wbaaz07kz2190rq3vl2b5spx3qfda4al9ygkm8man817d2nr",
"sha256bin64": "0dgvp2my328s4ah0hmp1hg1c3x21gkrz9mjvbfs54r2pjb7y5sbl",
"deps": {
"gn": {
"version": "2020-11-05",

88
pkgs/applications/networking/feedreaders/feeds/default.nix Normal file
View File

@ -0,0 +1,88 @@
{ lib
, callPackage
, stdenv
, fetchFromGitLab
, appstream
, gobject-introspection
, meson
, ninja
, pkg-config
, wrapGAppsHook
, glib
, gtk3
, libhandy
, listparser ? callPackage ./listparser.nix { }
, webkitgtk
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "feeds";
version = "0.16.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gfeeds";
rev = version;
sha256 = "10hq06nx7lcm3dqq34qkxc6k6383mvjs7pxii9y9995d9kk5a49k";
};
format = "other";
nativeBuildInputs = [
appstream
glib # for glib-compile-schemas
gobject-introspection
meson
ninja
pkg-config
wrapGAppsHook
];
buildInputs = [
glib
gtk3
libhandy
webkitgtk
];
propagatedBuildInputs = with python3.pkgs; [
beautifulsoup4
dateutil
feedparser
html5lib
listparser
lxml
pillow
pygments
pygobject3
pyreadability
pytz
requests
];
# https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru = {
inherit listparser;
};
meta = with lib; {
description = "An RSS/Atom feed reader for GNOME";
homepage = "https://gitlab.gnome.org/World/gfeeds";
license = licenses.gpl3Plus;
maintainers = [
maintainers.pbogdan
];
platforms = platforms.linux;
};
}

31
pkgs/applications/networking/feedreaders/feeds/listparser.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, python3
}:
python3.pkgs.buildPythonPackage rec {
pname = "listparser";
version = "0.18";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b";
};
propagatedBuildInputs = with python3.pkgs; [
requests
six
];
checkPhase = ''
${python3.interpreter} lptest.py
'';
meta = with lib; {
description = "A parser for subscription lists";
homepage = "https://github.com/kurtmckee/listparser";
license = licenses.lgpl3Plus;
maintainers = [
maintainers.pbogdan
];
platforms = platforms.linux;
};
}

6
pkgs/applications/science/logic/cryptoverif/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cryptoverif";
version = "2.03pl1";
version = "2.04";
src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz";
sha256 = "0q7qa1qm7mbky3m36445gdmgmkb9mrhrdsk7mmwn8fzw0rfc6z00";
sha256 = "1mzk6n0g2vdsv38y493zg85lxrpz72b92cmsray3g970xzanqd6s";
};
buildInputs = [ ocaml ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
** from under $out/libexec. By default, it expects to find the files
** in $CWD which doesn't work. */
patchPhase = ''
substituteInPlace ./src/settings.ml \
substituteInPlace ./src/syntax.ml \
--replace \"default\" \"$out/libexec/default\"
'';

2
pkgs/applications/window-managers/i3/gaps.nix
View File

@ -20,7 +20,7 @@ i3.overrideAttrs (oldAttrs : rec {
homepage = "https://github.com/Airblader/i3";
maintainers = with maintainers; [ fmthoma ];
license = licenses.bsd3;
platforms = platforms.all;
platforms = platforms.linux ++ platforms.netbsd ++ platforms.openbsd;
longDescription = ''
Fork of i3wm, a tiling window manager primarily targeted at advanced users

4
pkgs/development/libraries/ceres-solver/default.nix
View File

@ -12,11 +12,11 @@ assert runTests -> gflags != null;
stdenv.mkDerivation rec {
pname = "ceres-solver";
version = "1.14.0";
version = "2.0.0";
src = fetchurl {
url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz";
sha256 = "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27";
sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/libva/utils.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libva-utils";
version = "2.9.1";
version = "2.10.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libva-utils";
rev = version;
sha256 = "1viqxq9r424hvbfgjlw4zb1idsq24fqr5cz6rk47j37rcnqclj2k";
sha256 = "14v4mw0asjgg4l0683hn87d8jai8lrmcpbfcm9z93p4mpn2sp7aw";
};
nativeBuildInputs = [ meson ninja pkg-config ];

27
pkgs/development/libraries/libzra/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "libzra";
version = "unstable-2020-08-10";
src = fetchFromGitHub {
owner = "zraorg";
repo = "zra";
rev = "e678980ae7e79efd716b4a6610fe9f148425fd6b";
sha256 = "132xyzhadahm01nas8gycjza5hs839fnpsh73im2a7wwfdw76z4h";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://github.com/zraorg/ZRA";
description = "Library for ZStandard random access";
platforms = platforms.all;
maintainers = [ maintainers.ivar ];
license = licenses.bsd3;
};
}

4
pkgs/os-specific/linux/eventstat/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "eventstat";
version = "0.04.10";
version = "0.04.11";
src = fetchzip {
url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
sha256 = "0rmg49m56qxji7gwci03pkk4f4hnaq1n2x1348dqkaf5zs5nhi6b";
sha256 = "0hsi5w8dmqwwdahnqvs83bam3j1cagw1ggm06d35dfwy5xknc5i4";
};
buildInputs = [ ncurses ];
installFlags = [ "DESTDIR=$(out)" ];

4
pkgs/tools/bluetooth/blueberry/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "blueberry";
version = "1.3.9";
version = "1.4.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0llvz1h2dmvhvwkkvl0q4ggi1nmdbllw34ppnravs5lybqkicyw9";
sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6";
};
nativeBuildInputs = [

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yad";
version = "6.0";
version = "7.2";
src = fetchFromGitHub {
owner = "v1cont";
repo = "yad";
rev = "v${version}";
sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7";
sha256 = "0ih97hrcra2bg8q19b8819hip1p424z1vj61cl1ym5p477rp37yx";
};
configureFlags = [

4
pkgs/tools/package-management/nix/default.nix
View File

@ -188,10 +188,10 @@ in rec {
nix = nixStable;
nixStable = callPackage common (rec {
name = "nix-2.3.9";
name = "nix-2.3.10";
src = fetchurl {
url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa";
sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab";
};
inherit storeDir stateDir confDir boehmgc;

4
pkgs/tools/system/inxi/default.nix
View File

@ -22,13 +22,13 @@ let
++ recommendedDisplayInformationPrograms;
in stdenv.mkDerivation rec {
pname = "inxi";
version = "3.2.00-1";
version = "3.2.01-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
sha256 = "0hfhjfd8rzaabs0wbj390ybmig3gxymfi4gs4xbjvvwvg8fzdc0y";
sha256 = "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65";
};
buildInputs = [ perl makeWrapper ];

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

@ -3885,6 +3885,8 @@ in
feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
feeds = callPackage ../applications/networking/feedreaders/feeds {};
fend = callPackage ../tools/misc/fend { };
ferm = callPackage ../tools/networking/ferm { };
@ -16623,6 +16625,8 @@ in
zmqpp = callPackage ../development/libraries/zmqpp { };
libzra = callPackage ../development/libraries/libzra { };
zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_10;
};