MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-03-15 12:25:41 +00:00 committed by GitHub
commit dec95bae4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 97 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/photoflare/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "photoflare";
version = "1.6.6";
version = "1.6.7";
src = fetchFromGitHub {
owner = "PhotoFlare";
repo = "photoflare";
rev = "v${version}";
sha256 = "07lrlxagv1bljj607s8m0zsbzx9jrvi18bnxahnm7r4i5car5x2d";
sha256 = "sha256-Gx3YP29NrNHp0p05a1O4Xb9kqkA6pQLTJZ3/wOx+BWY=";
};
nativeBuildInputs = [ qmake qttools ];

4
pkgs/applications/misc/calibre/default.nix
View file

@ -26,11 +26,11 @@
mkDerivation rec {
pname = "calibre";
version = "5.12.0";
version = "5.13.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-N3/y1kSWyM36LpwbimftJ67h4zfk2j9hcvUi/pQL3YU=";
sha256 = "sha256-GDFAZxZmkio7e7kVjhYqhNdhXIlUPJF0iMWVl0uWVCM=";
};
patches = [

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

@ -13,7 +13,6 @@
, gnomeKeyringSupport ? false
, proprietaryCodecs ? true
, enableWideVine ? false
, enableVaapi ? false # Disabled by default due to unofficial support
, ungoogled ? false # Whether to build chromium or ungoogled-chromium
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
@ -167,8 +166,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
--add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"}
--add-flags ${escapeShellArg (escapeShellArg commandLineArgs)}
ed -v -s "$out/bin/chromium" << EOF
2i

4
pkgs/applications/version-management/git-and-tools/ghorg/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ghorg";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "gabrie30";
repo = "ghorg";
rev = version;
sha256 = "sha256-OoNHKDxYKTmfm1rrQxG7PnH7DINa2M/NKc/5iKaUybg=";
sha256 = "sha256-HkOMG7VG8jyvr1W1T/62murtNYE8wyT/p3lDtuxfm5M=";
};
doCheck = false;

38
pkgs/development/coq-modules/mathcomp/default.nix
View file

@ -10,7 +10,7 @@
# See the documentation at doc/languages-frameworks/coq.section.md. #
############################################################################
{ lib, ncurses, which, graphviz, lua,
{ lib, ncurses, which, graphviz, lua, fetchzip,
mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false,
coqPackages, coq, ocamlPackages, version ? null }@args:
with builtins // lib;
@ -55,27 +55,51 @@ let
derivation = mkCoqDerivation ({
inherit version pname defaultVersion release releaseRev repo owner;
nativeBuildInputs = optional withDoc graphviz;
nativeBuildInputs = optionals withDoc [ graphviz lua ];
mlPlugin = versions.isLe "8.6" coq.coq-version;
extraBuildInputs = [ ncurses which ] ++ optional withDoc lua;
extraBuildInputs = [ ncurses which ];
propagatedBuildInputs = mathcomp-deps;
buildFlags = optional withDoc "doc";
preBuild = ''
patchShebangs etc/utils/ssrcoqdep || true
if [[ -f etc/utils/ssrcoqdep ]]
then patchShebangs etc/utils/ssrcoqdep
fi
if [[ -f etc/buildlibgraph ]]
then patchShebangs etc/buildlibgraph
fi
'' + ''
cd ${pkgpath}
'' + optionalString (package == "all") pkgallMake;
installTargets = "install" + optionalString withDoc " doc";
meta = {
homepage = "https://math-comp.github.io/";
license = licenses.cecill-b;
maintainers = with maintainers; [ vbgl jwiegley cohencyril ];
};
} // optionalAttrs (package != "single") { passthru = genAttrs packages mathcomp_; });
} // optionalAttrs (package != "single")
{ passthru = genAttrs packages mathcomp_; }
// optionalAttrs withDoc {
htmldoc_template =
fetchzip {
url = "https://github.com/math-comp/math-comp.github.io/archive/doc-1.12.0.zip";
sha256 = "0y1352ha2yy6k2dl375sb1r68r1qi9dyyy7dyzj5lp9hxhhq69x8";
};
postBuild = ''
cp -rf _build_doc/* .
rm -r _build_doc
'';
postInstall =
let tgt = "$out/share/coq/${coq.coq-version}/"; in
optionalString withDoc ''
mkdir -p ${tgt}
cp -r htmldoc ${tgt}
cp -r $htmldoc_template/htmldoc_template/* ${tgt}/htmldoc/
'';
buildTargets = "doc";
extraInstallFlags = [ "-f Makefile.coq" ];
});
patched-derivation1 = derivation.overrideAttrs (o:
optionalAttrs (o.pname != null && o.pname == "mathcomp-all" &&
o.version != null && o.version != "dev" && versions.isLt "1.7" o.version)

4
pkgs/development/libraries/amdvlk/default.nix
View file

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2021.Q1.4";
version = "2021.Q1.5";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "mA7YalgcfjfYdmKPk8L4mfDJWn0rimPDoDB9/S3pyNM=";
sha256 = "OSX4alrR49jqIu2QZcTieurUnyWQJ0wheDwFiNd9QcY=";
};
buildInputs = [

7
pkgs/development/libraries/gdal/default.nix
View file

@ -7,14 +7,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "gdal";
# broken with poppler 20.08, however, can't fetch patches cleanly
version = "3.1.2.post2020-08-26";
version = "3.2.2";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9";
sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9";
rev = "a33784291d19015217ea2604988e53d448e14a07";
sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ=";
};
sourceRoot = "source/gdal";

4
pkgs/development/libraries/libfilezilla/default.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libfilezilla";
version = "0.26.0";
version = "0.27.0";
src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0=";
sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/tools/X11/alttab/default.nix
View file

@ -2,7 +2,7 @@
, xorg }:
stdenv.mkDerivation rec {
version = "1.5.0";
version = "1.6.0";
pname = "alttab";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "sagb";
repo = pname;
rev = "v${version}";
sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6";
sha256 = "sha256-G4tu008IC3RCeCRZVKFPY2+ioLuUa9hDDKUx1q5C5FQ=";
};
nativeBuildInputs = [

6
pkgs/tools/backup/monolith/default.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "monolith";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "Y2Z";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kCyfVeGTXBzdwmTTDJM1eaR6ANoIXAydj1ePmrZehqE=";
sha256 = "sha256-n89rfZwR8B6SKeLtzmbeHRyw2G9NIQ1BY6JvJuZmC/w=";
};
cargoSha256 = "sha256-juxaL/zjfqzFMqZe9tpevdjjVU7fPK8zalksAARWHC8=";
cargoSha256 = "sha256-RqtJLfBF9hfPh049uyc9K+uNBh+P3VMznuA2UtOwK3M=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]

6
pkgs/tools/misc/dijo/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }:
let version = "0.2.6"; in
let version = "0.2.7"; in
rustPlatform.buildRustPackage {
pname = "dijo";
inherit version;
@ -8,9 +8,9 @@ rustPlatform.buildRustPackage {
owner = "NerdyPepper";
repo = "dijo";
rev = "v${version}";
sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ=";
sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
};
cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs=";
cargoSha256 = "sha256-3V94bOixYMznkCQu90+E/68Sfl9GvHp9LNxwWwk4xZQ=";
meta = with lib; {
description = "Scriptable, curses-based, digital habit tracker";

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yad";
version = "7.3";
version = "8.0";
src = fetchFromGitHub {
owner = "v1cont";
repo = "yad";
rev = "v${version}";
sha256 = "sha256-3y3QLqUWBSJ9BLI8gd0LQ9SxNhcj5dXpz8Y2Hi2iCwU=";
sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA=";
};
configureFlags = [

15
pkgs/tools/misc/ytfzf/default.nix
View file

@ -2,25 +2,34 @@
, stdenv
, fetchFromGitHub
, makeWrapper
, coreutils
, curl
, dmenu
, fzf
, gnused
, jq
, mpv
, ncurses
, ueberzug
, youtube-dl
}:
stdenv.mkDerivation rec {
pname = "ytfzf";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv";
sha256 = "sha256-ATQRXYaIp1MKCO/EAPsopzFEZeNJzdk73/OcgjsMdkg=";
};
patches = [
# Updates have to be installed through Nix.
./no-update.patch
];
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "PREFIX=${placeholder "out"}/bin" ];
@ -29,7 +38,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
curl dmenu fzf jq mpv youtube-dl
coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl
]}
'';

30
pkgs/tools/misc/ytfzf/no-update.patch Normal file
View file

@ -0,0 +1,30 @@
diff --git a/ytfzf b/ytfzf
index 5238682..c5c3a1a 100755
--- a/ytfzf
+++ b/ytfzf
@@ -757,23 +757,8 @@ clear_history () {
}
update_ytfzf () {
- branch="$1"
- updatefile="/tmp/ytfzf-update"
- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile"
-
- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then
- chmod 755 "$updatefile"
- if [ "$(uname)" = "Darwin" ]; then
- sudo cp "$updatefile" "/usr/local/bin/ytfzf"
- else
- sudo cp "$updatefile" "/usr/bin/ytfzf"
- fi
- else
- printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset"
- fi
-
- rm "$updatefile"
- exit
+ printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset"
+ exit 1
}