Merge staging into staging

This commit is contained in:
Frederik Rietdijk 2020-05-01 09:29:45 +02:00
commit d02e4774fd
32 changed files with 183 additions and 103 deletions

View File

@ -1,12 +1,12 @@
{ mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: { mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }:
mkDerivation rec { mkDerivation rec {
version = "0.6.1"; version = "0.6.2";
pname = "qmidinet"; pname = "qmidinet";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
sha256 = "1nvbvx3wg2s6s7r4x6m2pm9nx7pdz00ghw9h10wfqi2s474mwip0"; sha256 = "0siqzyhwg3l9av7jbca3bqdww7xspjlpi9ya4mkj211xc3a3a1d6";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View File

@ -19,7 +19,7 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vertcoin"; pname = "vertcoin";
version = "0.14.0"; version = "0.15.0.1";
name = pname + toString (optional (!withGui) "d") + "-" + version; name = pname + toString (optional (!withGui) "d") + "-" + version;
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = pname + "-project"; owner = pname + "-project";
repo = pname + "-core"; repo = pname + "-core";
rev = version; rev = version;
sha256 = "00vnmrhn5mad58dyiz8rxgsrn0663ii6fdbcqm20mv1l313k4882"; sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,12 +1,14 @@
{ mkDerivation { mkDerivation
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, pkgconfig , pkgconfig
, exiv2 , exiv2
, mpv , mpv
, opencv4
, qtbase , qtbase
, qtimageformats , qtimageformats
, qtsvg , qtsvg
@ -14,15 +16,25 @@
mkDerivation rec { mkDerivation rec {
pname = "qimgv"; pname = "qimgv";
version = "0.8.9"; version = "0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "easymodo"; owner = "easymodo";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl";
}; };
patches = [
# QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only
# has Qt 5.12. This appears to be the only instance of Qt 5.12
# incompatibility, and will be fixed in the next release.
(fetchpatch {
url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch";
sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
@ -31,6 +43,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
exiv2 exiv2
mpv mpv
opencv4
qtbase qtbase
qtimageformats qtimageformats
qtsvg qtsvg

View File

@ -0,0 +1,13 @@
diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
index 96ec9d3..6d95d08 100644
--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
+++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) {
void LinuxWorker::run() {
emit started();
- isRunning.storeRelaxed(true);
+ isRunning.store(true);
if (fd == -1) {
qDebug() << TAG << "File descriptor isn't set! Stopping";

View File

@ -4,23 +4,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clipit"; pname = "clipit";
version = "1.4.4"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shantzu"; owner = "CristianHenzel";
repo = "ClipIt"; repo = "ClipIt";
rev = "v${version}"; rev = "45e2ea386d04dbfc411ea370299502450d589d0c";
sha256 = "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"; sha256 = "0byqz9hanwmdc7i55xszdby2iqrk93lws7hmjda2kv17g34apwl7";
}; };
patches = [
# gtk3 support, can be removed in the next release
(fetchpatch {
url = "https://github.com/CristianHenzel/ClipIt/commit/22e012c7d406436e1785b6dd3c4c138b25f68431.patch";
sha256 = "0la4gc324dzxpx6nk2lqg5fmjgjpm2pyvzwddmfz1il8hqvrqg3j";
})
];
preConfigure = '' preConfigure = ''
intltoolize --copy --force --automake intltoolize --copy --force --automake
''; '';
@ -38,5 +30,6 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage; inherit (src.meta) homepage;
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ kamilchm ];
}; };
} }

View File

@ -3,13 +3,13 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "tuir"; pname = "tuir";
version = "1.28.3"; version = "1.29.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ajak"; owner = "ajak";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0nhpbb0vdngwb0fhlimjgm3wq2s67m4rb3vv920zyllnmfplk0lk"; sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib";
}; };
# Tests try to access network # Tests try to access network

View File

@ -24,8 +24,13 @@
, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone , libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone
# package customization # package customization
, useVaapi ? false
, useOzone ? false , useOzone ? false
, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper
# VA-API TODOs:
# - Ozone: M81 fails to build due to "ozone_platform_gbm = false"
# - Possible solutions: Write a patch to fix the build (wrong gn dependencies)
# or build with minigbm
# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879)
, gnomeSupport ? false, gnome ? null , gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null
, proprietaryCodecs ? true , proprietaryCodecs ? true
@ -134,10 +139,10 @@ let
libXScrnSaver libXcursor libXtst libGLU libGL libXScrnSaver libXcursor libXtst libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core pciutils protobuf speechd libXdamage at-spi2-core
jre jre
] ++ optional gnomeKeyringSupport libgnome-keyring3 ] ++ optional useVaapi libva
++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ] ++ optionals cupsSupport [ libgcrypt cups ]
++ optional useVaapi libva
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
@ -156,9 +161,9 @@ let
# #
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) ([ ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build:
# source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
./patches/vaapi-fix.patch ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
] ++ optionals (versionRange "81" "82") [ ] ++ optionals (versionRange "81" "82") [
(githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902")
(githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064")

View File

@ -6,14 +6,16 @@
, lib , lib
# package customization # package customization
# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
, channel ? "stable" , channel ? "stable"
, gnomeSupport ? false, gnome ? null , gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false , gnomeKeyringSupport ? false
, proprietaryCodecs ? true , proprietaryCodecs ? true
, enablePepperFlash ? false , enablePepperFlash ? false
, enableWideVine ? false , enableWideVine ? false
, useVaapi ? false # Deprecated, use enableVaapi instead!
, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon
, ungoogled ? true , ungoogled ? true
, useVaapi ? false # test video on radeon, before enabling this
, useOzone ? false , useOzone ? false
, cupsSupport ? true , cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux , pulseSupport ? config.pulseaudio or stdenv.isLinux
@ -21,7 +23,7 @@
}: }:
let let
llvmPackages = if channel == "dev" llvmPackages = if channel != "stable"
then llvmPackages_10 then llvmPackages_10
else llvmPackages_9; else llvmPackages_9;
stdenv = llvmPackages.stdenv; stdenv = llvmPackages.stdenv;
@ -34,9 +36,10 @@ let
upstream-info = (callPackage ./update.nix {}).getChannel channel; upstream-info = (callPackage ./update.nix {}).getChannel channel;
mkChromiumDerivation = callPackage ./common.nix ({ mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone ungoogled; inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
inherit ungoogled;
gnChromium = gn; gnChromium = gn;
} // lib.optionalAttrs (channel == "dev") { } // lib.optionalAttrs (channel != "stable") {
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes): # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
gnChromium = gn.overrideAttrs (oldAttrs: { gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-03-23"; version = "2020-03-23";
@ -130,6 +133,14 @@ let
cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/
'' ''
else browser; else browser;
optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09:
then throw ''
Chromium's useVaapi was replaced by enableVaapi and you don't need to pass
"--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).
'' else lib.optionalString
(!enableVaapi)
"--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "chromium${suffix}-${version}"; name = "chromium${suffix}-${version}";
inherit version; inherit version;
@ -149,15 +160,14 @@ in stdenv.mkDerivation {
buildCommand = let buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium"; browserBinary = "${chromiumWV}/libexec/chromium/chromium";
getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
libPath = stdenv.lib.makeLibraryPath ([] libPath = stdenv.lib.makeLibraryPath [ libva ];
++ stdenv.lib.optional useVaapi libva
);
in with stdenv.lib; '' in with stdenv.lib; ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
--add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
${optionalVaapiFlags} \
${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
ed -v -s "$out/bin/chromium" << EOF ed -v -s "$out/bin/chromium" << EOF

View File

@ -0,0 +1,48 @@
From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 14 Apr 2020 14:16:10 +0200
Subject: [PATCH] Enable accelerated video decode on Linux
This will enable accelerated video decode on Linux by default (i.e.
without "--ignore-gpu-blacklist"), but on NixOS we'll provide
"--disable-accelerated-video-decode" and
"--disable-accelerated-video-encode" by default to avoid regressions
(e.g. VA-API doesn't work properly for some radeon drivers).
Video acceleration can then be enabled via:
chromium.override { enableVaapi = true; }
without rebuilding Chromium.
---
gpu/config/software_rendering_list.json | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
index 22712bdbf38f..a06dd19a50e4 100644
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
@@ -336,22 +336,6 @@
]
},
{
- "id": 48,
- "description": "Accelerated video decode is unavailable on Linux",
- "cr_bugs": [137247, 1032907],
- "os": {
- "type": "linux"
- },
- "exceptions": [
- {
- "machine_model_name": ["Chromecast"]
- }
- ],
- "features": [
- "accelerated_video_decode"
- ]
- },
- {
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
--
2.11.0

View File

@ -45,11 +45,11 @@ let
flash = stdenv.mkDerivation rec { flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi"; pname = "flashplayer-ppapi";
version = "32.0.0.344"; version = "32.0.0.363";
src = fetchzip { src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460";
stripRoot = false; stripRoot = false;
}; };

View File

@ -1,6 +1,6 @@
{ {
"81.0.4044.92" = { "81.0.4044.122" = {
rev = "81.0.4044.92-2"; rev = "81.0.4044.122-2";
sha256 = "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"; sha256 = "0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q";
}; };
} }

View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf";
sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax";
version = "81.0.4044.92"; version = "83.0.4103.14";
}; };
dev = { dev = {
sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny";
sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf";
version = "83.0.4100.3"; version = "84.0.4115.5";
}; };
stable = { stable = {
sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg";
sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w";
version = "81.0.4044.92"; version = "81.0.4044.122";
}; };
} }

View File

@ -13,11 +13,11 @@ let
in in
mkDerivation rec { mkDerivation rec {
pname = "eagle"; pname = "eagle";
version = "9.6.0"; version = "9.6.1";
src = fetchurl { src = fetchurl {
url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8"; sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {

View File

@ -8,11 +8,11 @@ let
in python3Packages.buildPythonApplication rec { in python3Packages.buildPythonApplication rec {
pname = "mercurial"; pname = "mercurial";
version = "5.3"; version = "5.3.1";
src = fetchurl { src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5"; sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp";
}; };
format = "other"; format = "other";

View File

@ -2,23 +2,17 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "metamath"; pname = "metamath";
version = "0.181"; version = "0.182";
buildInputs = [ autoreconfHook ]; buildInputs = [ autoreconfHook ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "metamath"; owner = "metamath";
repo = "metamath-exe"; repo = "metamath-exe";
rev = "67cbfa8468deb6f8ad5bedafc6399bee59064764"; rev = "5df616efe4119ff88daf77e7041d45b6fa39c578";
sha256 = "1mk3g41qz26j38j68i9qmnl8khkd8jwrzj4vxkb855h4b819s000"; sha256 = "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp";
}; };
# the files necessary to build the DATA target are not in this distribution
# luckily, they're not really needed so we don't build it.
makeFlags = [ "DATA=" ];
installTargets = [ "install-exec" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Interpreter for the metamath proof language"; description = "Interpreter for the metamath proof language";
longDescription = '' longDescription = ''

View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="libmwaw"; baseName="libmwaw";
version="0.3.15"; version="0.3.16";
name="${baseName}-${version}"; name="${baseName}-${version}";
hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc";
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"; url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz";
sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "suitesparse-graphblas"; pname = "suitesparse-graphblas";
version = "3.2.1"; version = "3.2.2";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "DrTimothyAldenDavis"; owner = "DrTimothyAldenDavis";
repo = "GraphBLAS"; repo = "GraphBLAS";
rev = "v${version}"; rev = "v${version}";
sha256 = "AAwwzrpKFHy40Ldm6hTO6L0FWPYwi3kJj3zrshFwYas="; sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sentencepiece"; pname = "sentencepiece";
version = "0.1.85"; version = "0.1.86";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; sha256 = "0r4z5n3dx0bg1pm2kgfllyj65s7ljn2ny7i7c5bz618r7h8bax9p";
}; };
nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools;

View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, autoreconfHook, libkrb5 }: { fetchurl, stdenv, autoreconfHook, libkrb5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libtirpc-1.2.5"; name = "libtirpc-1.2.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
sha256 = "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk"; sha256 = "1k6i6wma3xs7gmp54z587nd4yi5wrvg2ycl5g36zjnhx32jyjy22";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pep8-naming"; pname = "pep8-naming";
version = "0.9.1"; version = "0.10.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf"; sha256 = "0fmzccbmr0jn9ynamdb9ly2ai8qs5qfk8alfgnzr3fbjvpwsbd7k";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sqlalchemy-utils"; pname = "sqlalchemy-utils";
version = "0.36.0"; version = "0.36.3";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "SQLAlchemy-Utils"; pname = "SQLAlchemy-Utils";
sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv"; sha256 = "0fj9qiz5hq8gf9pnir077sl58chry7jz63fnj1vgx5rmq1dsys7j";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -4,16 +4,21 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
pname = "kubie"; pname = "kubie";
version = "0.7.3"; version = "0.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "sbstp"; owner = "sbstp";
repo = "kubie"; repo = "kubie";
sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp"; sha256 = "1f82xlhhxbjadjw609kr1kdm4n69c9mqjia4b3k505wjh7cc55n0";
}; };
cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98"; cargoSha256 = "0mish7wqwq5ynl98n6swdn5i6mg62aih5rfykbl3wx39b468n481";
installPhase = ''
mkdir -p $out/share/bash-completion/completions
cp -v ${src}/completion/kubie.bash $out/share/bash-completion/completions/kubie
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = description =

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rtl8812au-${kernel.version}-${version}"; name = "rtl8812au-${kernel.version}-${version}";
version = "5.2.20.2_28373.20190903"; version = "5.6.4.2_35491.20200318";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zebulon2"; owner = "gordboy";
repo = "rtl8812au-driver-5.2.20"; repo = "rtl8812au-5.6.4.2";
rev = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2"; rev = "49e98ff9bfdbe2ddce843808713de383132002e0";
sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; sha256 = "0f4isqasm9rli5v6a7xpphyh509wdxs1zcfvgdsnyhnv8amhqxgs";
}; };
nativeBuildInputs = [ bc nukeReferences ]; nativeBuildInputs = [ bc nukeReferences ];

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apache-felix"; pname = "apache-felix";
version = "5.6.1"; version = "6.0.3";
src = fetchurl { src = fetchurl {
url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz";
sha256 = "0kis26iajzdid162j4i7g558q09x4hn9z7pqqys6ipb0fj84hz1x"; sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0";
}; };
buildCommand = buildCommand =
'' ''

View File

@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "EventStore"; pname = "EventStore";
version = "5.0.7"; version = "5.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EventStore"; owner = "EventStore";
repo = "EventStore"; repo = "EventStore";
rev = "oss-v${version}"; rev = "oss-v${version}";
sha256 = "0yvprql73g4lc88b6kp1kk8h64az2hn4am5hc4gyiaxfavaww3ci"; sha256 = "021m610gzmrp2drywl1q3y6xxpy4qayn580d855ag952z9s6w9nj";
}; };
buildInputs = [ buildInputs = [

View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nushell"; pname = "nushell";
version = "0.12.0"; version = "0.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0cy3rm0yr4ay4hcgw202w5k1sqw09kd75a0yyk0s0v0cxpmssf5n"; sha256 = "1n92wcd3f6p38iwp9sc4bfhmaxb61ff6vvn0zvy3h4q8wmvxpiky";
}; };
cargoSha256 = "0q89841jwbsvl4c90sl8wgnjjl8q0bb3kw7sl7k9dpnfmj5j144x"; cargoSha256 = "0dyszvy0nmbjill3wfyqprqkh911r070rvkxc1ls9s3yhxhwlhzq";
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

View File

@ -2,23 +2,22 @@
buildGoModule rec { buildGoModule rec {
pname = "eksctl"; pname = "eksctl";
version = "0.17.0"; version = "0.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0ck096qfj4wp166bymvync8qyb0q2az86hckjk3hrzqdj8vwhrza"; sha256 = "15dzivnndzsiw7g6qzccpk1hqb5amfn0zba1rzkvcslhl1y9gsfi";
}; };
modSha256 = "024fqknv6f1zzcpxfl3c12d7ya7ynsyy7hf7zsnmpsnrksvbkfvc"; modSha256 = "13gqvr1y1b2yi2iar0p8y9hpajgy5w9xp4az5n6b5xhzcbn19f2k";
subPackages = [ "cmd/eksctl" ]; subPackages = [ "cmd/eksctl" ];
buildFlags = [ "-tags netgo" "-tags release" ]; buildFlags = [ "-tags netgo" "-tags release" ];
postInstall = postInstall = ''
''
mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions}
$out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl"

View File

@ -19,11 +19,11 @@ let
in in
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "duplicity"; pname = "duplicity";
version = "0.8.11.1596"; version = "0.8.12.1612";
src = fetchurl { src = fetchurl {
url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz";
sha256 = "1qdaaybwdc13nfwnwrqij4lc23iwy73lyqn5lb4iznq6axp6m0h9"; sha256 = "06n58pwqg6kfigckjlslz2kx1lsykz1kn9a0r1cl8r3kn93zhk07";
}; };
patches = [ patches = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fselect"; pname = "fselect";
version = "0.6.9"; version = "0.6.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jhspetersson"; owner = "jhspetersson";
repo = "fselect"; repo = "fselect";
rev = version; rev = version;
sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0"; sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra";
}; };
cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb"; cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -8,12 +8,12 @@ let
plugins = callPackage ./plugins.nix args; plugins = callPackage ./plugins.nix args;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.10.0"; version = "5.11.0";
pname = "collectd"; pname = "collectd";
src = fetchurl { src = fetchurl {
url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; url = "https://collectd.org/files/${pname}-${version}.tar.bz2";
sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0"; sha256 = "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gjo"; pname = "gjo";
version = "1.0.2"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "skanehira"; owner = "skanehira";
repo = "gjo"; repo = "gjo";
rev = version; rev = version;
sha256 = "1m5nkv42ri150fgj590nrl24wp90p7ygg9xdh9zblibmnqrvbz4z"; sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw";
}; };
doCheck = true; doCheck = true;