Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-09-01 18:01:09 +00:00 committed by GitHub
commit 6db5c6fc7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 252 additions and 92 deletions

View file

@ -23,6 +23,7 @@ let
offloadCfg = pCfg.offload;
primeEnabled = syncCfg.enable || offloadCfg.enable;
nvidiaPersistencedEnabled = cfg.nvidiaPersistenced;
nvidiaSettings = cfg.nvidiaSettings;
in
{

View file

@ -196,6 +196,17 @@
"msbc-alt1"
]
},
{
"sysname": "Linux",
"release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50)($|[^0-9])"
},
{
"sysname": "Linux",
"release": "~^5\\.10\\.",
"no-features": [
"msbc-alt1"
]
},
{
"sysname": "Linux",
"release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])"

View file

@ -37,5 +37,6 @@
}
}
],
"context.exec": [],
"stream.properties": {}
}

View file

@ -1,20 +1,20 @@
{
"stable": {
"version": "92.0.4515.159",
"sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr",
"sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985",
"version": "93.0.4577.63",
"sha256": "0ls8r77la6p7474j84wchvs4rvnxwfv7c8xvbxjm8h7jqak4zwza",
"sha256bin64": "1kv742arnv710mhakm2v59dwfypg7j01k7rd5if8h0s49yzdw3qc",
"deps": {
"gn": {
"version": "2021-05-07",
"version": "2021-07-08",
"url": "https://gn.googlesource.com/gn",
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
"rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
"sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
}
},
"chromedriver": {
"version": "92.0.4515.107",
"sha256_linux": "12yckzjhlhxp14j7aphnvlw4xv713vllj44h5pba181ivxavmky3",
"sha256_darwin": "0gm0zazwy053rip9h0ma2s53rc65b8pzy57x48ch0fpq7rrsbycp"
"version": "93.0.4577.15",
"sha256_linux": "11wcimkcgaiz740k9xibi5hq1kd4zgy1vk6bd6cp31wjw4y21x5f",
"sha256_darwin": "0cxf3cg5pg9rigq7wmbap6wvmgpdr6v44bndisyaqhlw7s2hhndn"
}
},
"beta": {

View file

@ -27,23 +27,27 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
desktop-file-utils
gettext
glib
itstool
libxml2
meson
ninja
pkg-config
vala
gettext
itstool
libxml2
desktop-file-utils
wrapGAppsHook
python3
vala
wrapGAppsHook
# Prevents “error: Package `libhandy-1' not found in specified Vala API
# directories or GObject-Introspection GIR directories” with strictDeps,
# even though it should only be a runtime dependency.
libhandy
];
buildInputs = [
gtk3
libhandy
glib
gnome.adwaita-icon-theme
];
doCheck = true;

View file

@ -17,13 +17,13 @@ in
stdenv.mkDerivation rec {
pname = "fstar";
version = "2021.07.31";
version = "2021.08.27";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "FStar";
rev = "v${version}";
sha256 = "KZTmphpt8nYpOd8EReAZ6iIkS4uY3ZziKQ3A70BL/90=";
sha256 = "1bf5hrv2nv0ljvdf6jhk59lw1ds3j5qkkcylgxwakylw30g8rxqb";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
description = "ML-like functional programming language aimed at program verification";
homepage = "https://www.fstar-lang.org";
license = licenses.asl20;
changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md";
platforms = with platforms; darwin ++ linux;
maintainers = with maintainers; [ gebner ];
};

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.59.0";
version = "1.60.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
sha256 = "1lwck5gb2kys7wxg08q3pnb8cqhzwwqy6nxcf2yc030gmnwm4sya";
sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2";
};
patches = [
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "13zzc8c50cy6fknrxzw5gf6rcclsn5bcb2bi3z9mmzsl29ga32gx";
sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1";
};
nativeBuildInputs = [

View file

@ -27,20 +27,29 @@
, callPackage
, nixosTests
, withMediaSession ? true
, gstreamerSupport ? true, gst_all_1 ? null
, ffmpegSupport ? true, ffmpeg ? null
, bluezSupport ? true, bluez ? null, sbc ? null, libfreeaptx ? null, ldacbt ? null, fdk_aac ? null
, gstreamerSupport ? true
, gst_all_1 ? null
, ffmpegSupport ? true
, ffmpeg ? null
, bluezSupport ? true
, bluez ? null
, sbc ? null
, libfreeaptx ? null
, ldacbt ? null
, fdk_aac ? null
, nativeHspSupport ? true
, nativeHfpSupport ? true
, ofonoSupport ? true
, hsphfpdSupport ? true
, pulseTunnelSupport ? true, libpulseaudio ? null
, zeroconfSupport ? true, avahi ? null
, pulseTunnelSupport ? true
, libpulseaudio ? null
, zeroconfSupport ? true
, avahi ? null
}:
let
fontsConf = makeFontsConf {
fontDirectories = [];
fontDirectories = [ ];
};
mesonEnable = b: if b then "enabled" else "disabled";
@ -48,7 +57,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.33";
version = "0.3.34";
outputs = [
"out"
@ -66,7 +75,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-HP2HcGjrLw0+8pO1upvJQk32v+bifYpi5Rtod0TbBis=";
sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0=";
};
patches = [
@ -213,4 +222,5 @@ let
};
};
in self
in
self

View file

@ -0,0 +1,27 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, httpx }:
buildPythonPackage rec {
pname = "youtube-search-python";
version = "1.4.7";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "7f93d9ecfd9b965dc93782d8174b1c1888f8900e2a303254037ba34e1d0ebed4";
};
propagatedBuildInputs = [ httpx ];
pythonImportsCheck = [ "youtubesearchpython" ];
# project has no tests
doCheck = false;
meta = with lib; {
description = "Search for YouTube videos, channels & playlists & get video information using link WITHOUT YouTube Data API v3";
homepage = "https://github.com/alexmercerind/youtube-search-python";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

View file

@ -20,13 +20,13 @@
buildPythonApplication rec {
pname = "pgcli";
version = "3.1.0";
version = "3.2.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b";
sha256 = "6cde97e71996bf910a40b579e5285483c10ea04962a08def01c12433d5f7c6b7";
};
propagatedBuildInputs = [
@ -55,7 +55,7 @@ buildPythonApplication rec {
syntax highlighting.
'';
homepage = "https://pgcli.com";
changelog = "https://github.com/dbcli/pgcli/blob/v${version}/changelog.rst";
changelog = "https://github.com/dbcli/pgcli/raw/v${version}/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ dywedir ];
};

View file

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.15";
version = "6.16";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-Yf1lo2WDKmK656eEKScMB2+yop8cf0YlldHzVDZRd5s=";
sha256 = "sha256-aVCSBQ2YoSnE1/MVPLDkkjJIuuXz2SBjn6SrGnP4+ug=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
@ -65,7 +65,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-zT77xmc2gD8xNSk19OPYVJB6nZmh+g6TYRhVW674RFI=";
sha256 = "sha256-TvTx3vSOyudyC7aravQGcj5KGqI8uHkgHroIJww5buQ=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

View file

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, jdk, jre, makeWrapper }:
{ lib, stdenv, fetchurl, jdk, jre, makeWrapper, runCommand, python3Packages, writeText }:
stdenv.mkDerivation rec {
let
elasticmq-server = stdenv.mkDerivation rec {
pname = "elasticmq-server";
version = "0.14.6";
version = "1.2.0";
src = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar";
sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz";
sha256 = "06bn5ixz0pvvhfvavr6njv8c2i9pgd6gj32wnp2f0fn0z1kypn1f";
};
# don't do anything?
@ -31,4 +32,9 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ peterromfeldhk ];
};
}
};
in elasticmq-server.overrideAttrs (_: {
passthru.tests.elasticmqTest = import ./elasticmq-test.nix {
inherit elasticmq-server runCommand python3Packages writeText;
};
})

View file

@ -0,0 +1,47 @@
{ elasticmq-server, python3Packages, runCommand, writeText}:
runCommand "${elasticmq-server.name}-tests" (let
commonPy = ''
import boto3
client = boto3.resource(
"sqs",
endpoint_url="http://localhost:9324",
region_name="elasticmq",
aws_secret_access_key="x",
aws_access_key_id="x",
use_ssl=False,
)
queue = client.get_queue_by_name(QueueName="foobar")
'';
in {
buildInputs = with python3Packages; [ python boto3 ];
emqConfig = writeText "emq-test.conf" ''
generate-node-address = true
queues {
foobar {}
}
'';
putMessagePy = writeText "put_message.py" ''
${commonPy}
queue.send_message(MessageBody="bazqux")
'';
checkMessagePy = writeText "check_message.py" ''
${commonPy}
messages = queue.receive_messages()
print(f"Received {messages!r}")
assert len(messages) == 1
assert messages[0].body == "bazqux"
'';
}) ''
JAVA_TOOL_OPTIONS="-Dconfig.file=$emqConfig" ${elasticmq-server}/bin/elasticmq-server &
SERVER_PID=$!
sleep 10
python $putMessagePy
python $checkMessagePy
touch $out
# needed on darwin
kill $SERVER_PID
''

View file

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tea";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitea {
domain = "gitea.com";
owner = "gitea";
repo = "tea";
rev = "v${version}";
sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY=";
sha256 = "sha256-Y/Znj8vVjVt+rs+n8JRQsptq5u17G2D7r98PDxPLyd4=";
};
vendorSha256 = null;

View file

@ -1,44 +1,32 @@
{ lib
, fetchFromGitHub
, python3
, fetchpatch
, python3Packages
, ffmpeg
}:
python3.pkgs.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "ytmdl";
version = "2021.06.26";
version = "2021.08.01";
src = fetchFromGitHub {
owner = "deepjyoti30";
repo = pname;
rev = version;
sha256 = "1jpd5zhqg2m9vjjjw4mgzb594q1v1pq1yl65py6kw42bq9w5yl5p";
src = python3Packages.fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "f5ef23dcba89aaf2307baf4ffc2326dc5c02324f646e5e5748219ed328202af4";
};
patches = [
# Fixes https://github.com/deepjyoti30/ytmdl/issues/188
# Only needed until the next major release after 2021.06.26
(fetchpatch {
url = "https://github.com/deepjyoti30/ytmdl/commit/37ba821d9692249c1fa563505cf60bd11b8e209e.patch";
includes = [ "bin/ytmdl" ];
sha256 = "sha256-VqtthpUL0Oub3DK7tSvAnemOzPPTcLvXXeebZIGOgdc=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "bs4" "beautifulsoup4"
--replace "bs4" "beautifulsoup4" \
--replace "/etc/bash_completion.d" "share/bash-completion/completions" \
--replace "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions"
'';
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with python3Packages; [
ffmpeg-python
musicbrainzngs
rich
simber
pydes
youtube-search
youtube-search-python
unidecode
pyxdg
downloader-cli
@ -48,6 +36,7 @@ python3.pkgs.buildPythonApplication rec {
pysocks
youtube-dl
ytmusicapi
spotipy
];
makeWrapperArgs = [

View file

@ -0,0 +1,41 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }:
stdenv.mkDerivation rec {
pname = "akku";
version = "1.1.0";
src = fetchFromGitLab {
owner = "akkuscm";
repo = "akku";
rev = "v${version}";
sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5";
};
patches = [
# substitute libcurl path
(substituteAll {
src = ./hardcode-libcurl.patch;
libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ guile ];
# Use a dummy package index to boostrap Akku
preBuild = ''
touch bootstrap.db
'';
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
meta = with lib; {
homepage = "https://akkuscm.org/";
description = "Language package manager for Scheme";
changelog = "https://gitlab.com/akkuscm/akku/-/raw/v${version}/NEWS.md";
platforms = platforms.all;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ marsam ];
};
}

View file

@ -0,0 +1,18 @@
--- old/private/http.scm
+++ new/private/http.scm
@@ -101,14 +101,7 @@
;; shouldn't, but it's an old issue.
(log/error "Could not load libcurl. Please install the curl development(!) package.")
(exit 1)))
- (case (os-name)
- ((darwin) (set! libcurl (open-shared-object "libcurl.dylib")))
- ((msys) (set! libcurl (open-shared-object "msys-curl-4")))
- (else
- (guard (exn
- (else
- (set! libcurl (open-shared-object "libcurl.so.3"))))
- (set! libcurl (open-shared-object "libcurl.so.4"))))))
+ (set! libcurl (open-shared-object "@libcurl@")))
(letrec ()
(define %curl_global_init (foreign-procedure libcurl int curl_global_init (long)))
(call %curl_global_init #b11)))

View file

@ -867,6 +867,8 @@ with pkgs;
inherit (plasma5Packages) kdialog;
};
akku = callPackage ../tools/package-management/akku { };
albert = libsForQt5.callPackage ../applications/misc/albert {};
arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {};

View file

@ -9608,6 +9608,8 @@ in {
youtube-search = callPackage ../development/python-modules/youtube-search { };
youtube-search-python = callPackage ../development/python-modules/youtube-search-python { };
youtube-transcript-api = callPackage ../development/python-modules/youtube-transcript-api { };
yowsup = callPackage ../development/python-modules/yowsup { };