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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-24 12:41:15 +00:00 committed by GitHub
commit 98869352a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/rescuetime/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }:
let
version = "2.16.4.2";
version = "2.16.5.1";
src =
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb";
sha256 = "0zyal9n3rfj8i13v1q25inq6qyil7897483cdhqvwpb8wskrij4c";
sha256 = "1xrvyy0higc1fbc8ascpaszvg2bl6x0a35bzmdq6dkay48hnrd8b";
} else fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb";
sha256 = "03bmnkxhip1wilnfqs8akmy1hppahxrmnm8gasnmw5s922vn06cv";
sha256 = "09ng0yal66d533vzfv27k9l2va03rqbqmsni43qi3hgx7w9wx5ii";
};
in mkDerivation rec {
# https://www.rescuetime.com/updates/linux_release_notes.html

8
pkgs/applications/networking/sync/lsyncd/default.nix
View File

@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/rsync" "${rsync}/bin/rsync"
'';
# Special flags needed on Darwin:
# https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51
cmakeFlags = lib.optional stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ];
dontUseCmakeBuildDir = true;
buildInputs = [
@ -36,8 +40,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/axkibe/lsyncd";
description = "A utility that synchronizes local directories with remote targets";
license = licenses.gpl2;
platforms = platforms.linux;
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ bobvanderlinden ];
};
}

3
pkgs/applications/version-management/gitea/default.nix
View File

@ -2,6 +2,7 @@
, git, bash, gzip, openssh, pam
, sqliteSupport ? true
, pamSupport ? true
, nixosTests
}:
with lib;
@ -60,6 +61,8 @@ buildGoPackage rec {
goPackagePath = "code.gitea.io/gitea";
passthru.tests.gitea = nixosTests.gitea;
meta = {
description = "Git with a cup of tea";
homepage = "https://gitea.io";

2
pkgs/development/interpreters/lua-5/interpreter.nix
View File

@ -83,7 +83,9 @@ self = stdenv.mkDerivation rec {
Libs: -L$out/lib -llua -lm
Cflags: -I$out/include
EOF
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc"
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc"
'';
passthru = rec {

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

@ -1,14 +1,14 @@
{lib, stdenv, fetchurl, mpfr}:
stdenv.mkDerivation rec {
pname = "mpfi";
version = "1.5.3";
version = "1.5.4";
file_nr = "37331";
src = fetchurl {
# NOTE: the file_nr is whats important here. The actual package name (including the version)
# is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/
# and click on Download in the section "Latest File Releases".
url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2";
sha256 = "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3";
sha256 = "sha256-I4PUV7IIxs088uZracTOR0d7Kg2zH77AzUseuqJHGS8=";
};
buildInputs = [mpfr];
meta = {

2
pkgs/development/python-modules/glances-api/default.nix
View File

@ -26,7 +26,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "glances_api" ];
meta = with lib; {
description = "Python Wrapper for interacting with the Volkszahler API";
description = "Python API for interacting with Glances";
homepage = "https://github.com/home-assistant-ecosystem/python-glances-api";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];

9
pkgs/development/tools/build-managers/cmake/application-services.patch
View File

@ -14,15 +14,16 @@ diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.c
index a5ce5d18f4..3d6838ce82 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -43,11 +43,6 @@
@@ -43,11 +43,10 @@
struct cmLinkImplementation;
-#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
-# define HAVE_APPLICATION_SERVICES
-# include <ApplicationServices/ApplicationServices.h>
-#endif
-
+# include <CoreFoundation/CoreFoundation.h>
#endif
#if !defined(CMAKE_BOOTSTRAP)
# include "cmXMLParser.h"

6
pkgs/servers/x11/xorg/default.nix
View File

@ -2029,11 +2029,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
name = "xf86-video-nouveau-1.0.16";
name = "xf86-video-nouveau-1.0.17";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2";
sha256 = "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h";
url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2";
sha256 = "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];

2
pkgs/servers/x11/xorg/tarballs.list
View File

@ -105,7 +105,7 @@ mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2
mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2
mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2

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

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "findutils";
version = "4.8.0";
version = "4.7.0";
src = fetchurl {
url = "mirror://gnu/findutils/${pname}-${version}.tar.xz";
sha256 = "0r3i72hnw0a30khlczi9k2c51aamaj6kfmp5mk3844nrjxz7n4jp";
sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5";
};
postPatch = ''

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.01.16";
version = "2021.01.24.1";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1q8pvw5j45k8nvr3d9rvnhi6xaj1mdqlkrg7q7qq6zciq5r54fhi";
sha256 = "001hs73fpm4nxcgn60n9wlsdmiv40f4b1k6hkl4g4wyywv9ic9fy";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];