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

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-08-05 00:03:12 +00:00 committed by GitHub
parent 7601759c8c 40b757ff44
commit 851f4c9d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 146 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/misc/documentation.nix
View File

@ -258,8 +258,7 @@ in
environment.systemPackages = []
++ optional cfg.man.enable manual.manpages
++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ]
++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]);
++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ];
services.getty.helpLine = mkIf cfg.doc.enable (
"\nRun 'nixos-help' for the NixOS manual."

1
nixos/modules/services/x11/xserver.nix
View File

@ -651,6 +651,7 @@ in
pkgs.xterm
pkgs.xdg-utils
xorg.xf86inputevdev.out # get evdev.4 man page
pkgs.nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more
]
++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;

4
pkgs/applications/graphics/glimpse/default.nix
View File

@ -51,6 +51,7 @@
, makeWrapper
, autoreconfHook
, gtk-doc
, graphviz
}:
let
python = python2.withPackages (pp: [ pp.pygtk ]);
@ -154,7 +155,8 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix PATH ":" ${ lib.makeBinPath [ graphviz ] }
'';
passthru = rec {

6
pkgs/applications/misc/gollum/Gemfile
View File

@ -1,2 +1,8 @@
source 'https://rubygems.org'
gem 'gollum'
gem 'asciidoctor'
gem 'creole'
gem 'wikicloth'
gem 'org-ruby'
gem 'RedCloth'

22
pkgs/applications/misc/gollum/Gemfile.lock
View File

@ -1,9 +1,14 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
asciidoctor (2.0.15)
builder (3.2.4)
concurrent-ruby (1.1.8)
crass (1.0.6)
creole (0.5.0)
execjs (2.7.0)
expression_parser (0.9.0)
ffi (1.14.2)
gemojione (4.3.3)
json
@ -36,6 +41,7 @@ GEM
gollum-rugged_adapter (1.0)
mime-types (>= 1.15)
rugged (~> 0.99)
htmlentities (4.3.4)
json (2.5.1)
kramdown (2.3.0)
rexml
@ -59,6 +65,8 @@ GEM
racc (~> 1.4)
octicons (12.1.0)
nokogiri (>= 1.6.3.1)
org-ruby (0.9.12)
rubypants (~> 0.2)
racc (1.5.2)
rack (2.2.3)
rack-protection (2.1.0)
@ -71,6 +79,7 @@ GEM
rss (0.2.9)
rexml
ruby2_keywords (0.0.4)
rubypants (0.7.1)
rugged (0.99.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
@ -105,12 +114,23 @@ GEM
unf_ext
unf_ext (0.0.7.7)
useragent (0.16.10)
wikicloth (0.8.3)
builder
expression_parser
htmlentities
nokogiri
twitter-text
PLATFORMS
ruby
DEPENDENCIES
RedCloth
asciidoctor
creole
gollum
org-ruby
wikicloth
BUNDLED WITH
2.1.4
2.2.20

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

@ -1,5 +1,5 @@
{ lib, stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript
, git }:
, git, docutils, perl }:
stdenv.mkDerivation rec {
pname = "gollum";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
in ''
mkdir -p $out/bin
makeWrapper ${env}/bin/gollum $out/bin/gollum \
--prefix PATH ":" ${lib.makeBinPath [ git ]}
--prefix PATH ":" ${lib.makeBinPath [ git docutils perl]}
makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \
--prefix PATH ":" ${lib.makeBinPath [ git ]}
'';

92
pkgs/applications/misc/gollum/gemset.nix
View File

@ -1,4 +1,24 @@
{
asciidoctor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4";
type = "gem";
};
version = "2.0.15";
};
builder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
type = "gem";
};
version = "3.2.4";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
@ -19,6 +39,16 @@
};
version = "1.0.6";
};
creole = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
type = "gem";
};
version = "0.5.0";
};
execjs = {
groups = ["default"];
platforms = [];
@ -29,6 +59,16 @@
};
version = "2.7.0";
};
expression_parser = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
type = "gem";
};
version = "0.9.0";
};
ffi = {
groups = ["default"];
platforms = [];
@ -93,6 +133,16 @@
};
version = "1.0";
};
htmlentities = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
type = "gem";
};
version = "4.3.4";
};
json = {
groups = ["default"];
platforms = [];
@ -231,6 +281,17 @@
};
version = "12.1.0";
};
org-ruby = {
dependencies = ["rubypants"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
type = "gem";
};
version = "0.9.12";
};
racc = {
groups = ["default"];
platforms = [];
@ -283,6 +344,16 @@
};
version = "0.10.1";
};
RedCloth = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
type = "gem";
};
version = "4.3.2";
};
rexml = {
groups = ["default"];
platforms = [];
@ -324,6 +395,16 @@
};
version = "0.0.4";
};
rubypants = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kv2way45d2dz3h5b7wxyw36clvlwrz7ydf6699d0za5vm56gsrh";
type = "gem";
};
version = "0.7.1";
};
rugged = {
groups = ["default"];
platforms = [];
@ -484,4 +565,15 @@
};
version = "0.16.10";
};
wikicloth = {
dependencies = ["builder" "expression_parser" "htmlentities" "nokogiri" "twitter-text"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c78r1rg93mb5rcrfxl01b162ma9sh46dhjksc4c9dngg62nhbjh";
type = "gem";
};
version = "0.8.3";
};
}

4
pkgs/applications/networking/irc/convos/default.nix
View File

@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
version = "6.24";
version = "6.26";
src = fetchFromGitHub {
owner = "convos-chat";
repo = pname;
rev = "v${version}";
sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx";
sha256 = "1wh3ryhd4b7nanh0yp2nycmhky5afw8lpfx34858p6wfimsv9794";
};
nativeBuildInputs = [ makeWrapper ]

4
pkgs/applications/networking/remote/putty/default.nix
View File

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
version = "0.75";
version = "0.76";
pname = "putty";
src = fetchurl {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
];
sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk";
sha256 = "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l";
};
# glib-2.62 deprecations

5
pkgs/development/python-modules/gym/default.nix
View File

@ -29,6 +29,11 @@ buildPythonPackage rec {
scipy
];
postPatch = ''
substituteInPlace setup.py \
--replace "Pillow<=8.2.0" "Pillow"
'';
# The test needs MuJoCo that is not free library.
doCheck = false;

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

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.4.276";
version = "4.4.277";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1hf9h5kr1ws2lvinzq6cv7aps8af1kx4q8j4bsk2vv4i2zvmfr7y";
sha256 = "1m5zkssh523f15fvy80rcvfwqzdkldz3jhny6vbaj8q0zvk3w5r5";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

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

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.276";
version = "4.9.277";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "16jp05jhmqcp8lawqga69gxn1acdkxsskn3a6wf0635863fky3hv";
sha256 = "1pkjcz9llc7hkmzfyjcx20b5njnqbkwlzyy1ncc8na71nn6rvsg6";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.13.6";
version = "5.13.7";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56";
sha256 = "0fg41dv62vsnv2hywym15zz0n08rhdzwqvcarspm9r5gac85c7pr";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];

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

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18191";
sha256 = "0ggaccg7z540kh5if48v6sjy39xllzvznqx5srvrlycrs2r89iyr";
rev = "18210";
sha256 = "1vp3d44ha68hhhk13g86j9lk0isfwqfkk1rbm0gihzjjzvpkxbab";
}
, ...
}:

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

@ -11412,10 +11412,10 @@ let
LinkEmbedder = buildPerlPackage {
pname = "LinkEmbedder";
version = "1.18";
version = "1.20";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.18.tar.gz";
sha256 = "17gnixbawzr0r1k37dry7axb7ry6sj2xiahki28m8qbk1l69dfjz";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.20.tar.gz";
sha256 = "19fwr3y8dd1bya2z86x3904s4dxfx15h7b777529j8n74m78ppmi";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ Mojolicious ];