mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
229cde6757
@ -16288,6 +16288,11 @@
|
||||
githubId = 5104601;
|
||||
name = "schnusch";
|
||||
};
|
||||
Schweber = {
|
||||
github = "Schweber";
|
||||
githubId = 64630479;
|
||||
name = "Schweber";
|
||||
};
|
||||
sciencentistguy = {
|
||||
email = "jamie@quigley.xyz";
|
||||
name = "Jamie Quigley";
|
||||
|
||||
@ -92,11 +92,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.60.125";
|
||||
version = "1.61.101";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-ZctJBLEpaOzRK8BppMK7aT0kx00e7zXO+y8U38CCxKo=";
|
||||
hash = "sha256-s+YjTZs+dT/T/MSzOAvXMHzd3pWMbLa8v9amnd2sqns=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,39 +1,39 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-sRAU9RJANz+Sov6oaoZasMoaqM+mIZSDbag92wXsVCI=";
|
||||
hash_darwin = "sha256-ThsKOOLNcmFTUnLirSHea9wzw+FyC3v7I/5ghbz8GAg=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-U+PBsfpc7PNZYedHIdPnWXA9xKpRnon5vxgKKJr69ow=";
|
||||
hash_linux = "sha256-2o6LAo2pEsCi1exPv1nEMk2Tklhh49UyWaYoyQ7Df/Y=";
|
||||
version = "119.0.6045.105";
|
||||
"sha256-UVBLCo8Lkbnt882PeTMnO8lxam42mIDkEN28Ps8E0a8=";
|
||||
hash_linux = "sha256-X8bia1BaLQm5WKn5vdShpQ4A7sPNZ8lgmeXoYj2earc=";
|
||||
version = "120.0.6099.71";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=";
|
||||
rev = "991530ce394efb58fcd848195469022fa17ae126";
|
||||
hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=";
|
||||
rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-09-12";
|
||||
version = "2023-10-23";
|
||||
};
|
||||
};
|
||||
hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg=";
|
||||
hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU=";
|
||||
version = "119.0.6045.199";
|
||||
hash = "sha256-2IYdIhe299Fn5gtmLKxqIPqTYYEpCJqbXh3Vx8zN9Uo=";
|
||||
hash_deb_amd64 = "sha256-xHwBLIU1QoDM0swG2DzRJ7BY9ESiqOrm4SwvK0mfIZc=";
|
||||
version = "120.0.6099.71";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=";
|
||||
rev = "991530ce394efb58fcd848195469022fa17ae126";
|
||||
hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=";
|
||||
rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-09-12";
|
||||
version = "2023-10-23";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-ZcE5rmreXt4X+PuMalNRE7FakMIMOCyZQfhIhKDSxMg=";
|
||||
rev = "119.0.6045.199-1";
|
||||
hash = "sha256-S0Kt9M21zyjIozJuyy4kBDt07kJxXBR7SoNzdvf0iPI=";
|
||||
rev = "120.0.6099.71-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg=";
|
||||
hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU=";
|
||||
version = "119.0.6045.199";
|
||||
hash = "sha256-2IYdIhe299Fn5gtmLKxqIPqTYYEpCJqbXh3Vx8zN9Uo=";
|
||||
hash_deb_amd64 = "sha256-xHwBLIU1QoDM0swG2DzRJ7BY9ESiqOrm4SwvK0mfIZc=";
|
||||
version = "120.0.6099.71";
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,14 +39,14 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "1.21.1-0";
|
||||
version = "1.21.2-0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "forgejo";
|
||||
repo = "forgejo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e7Y1YBJq3PwYl7hf5KUa/CSI4ihbpN/TjWwltjNwXRM=";
|
||||
hash = "sha256-kH4m958gmIYpIwYmT2kIj9FcfXdyh8no06E0WQII/6E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8=";
|
||||
|
||||
@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
# SparkleShare's default desktop file falls back to flatpak.
|
||||
sed -ie "s_^Exec=.*_Exec=$out/bin/sparkleshare_" SparkleShare/Linux/SparkleShare.Autostart.desktop
|
||||
|
||||
# Nix will manage the icon cache.
|
||||
echo '#!/bin/sh' >scripts/post-install.sh
|
||||
'';
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hypnotix";
|
||||
version = "4.0";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "hypnotix";
|
||||
rev = version;
|
||||
hash = "sha256-0iJzlj5FRDXJdh+vWVvZaBJVNru7CfkvJtZUZYKoqPw=";
|
||||
hash = "sha256-YmVMcNbvbkODAmEgv8Ofgo07Mew/F4xv5cBaWKsH1S4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
52
pkgs/by-name/hd/hdrop/package.nix
Executable file
52
pkgs/by-name/hd/hdrop/package.nix
Executable file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, scdoc
|
||||
, coreutils
|
||||
, util-linux
|
||||
, jq
|
||||
, libnotify
|
||||
, withHyprland ? true
|
||||
, hyprland
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hdrop";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Schweber";
|
||||
repo = "hdrop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VsM1wPl8edAnZUvYw3IeOHw/XQ2pvbLt0v3G0B8+iSA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
scdoc
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/hdrop --prefix PATH ':' \
|
||||
"${lib.makeBinPath ([
|
||||
coreutils
|
||||
util-linux
|
||||
jq
|
||||
libnotify
|
||||
]
|
||||
++ lib.optional withHyprland hyprland)}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Emulate 'tdrop' in Hyprland (run, show and hide specific programs per keybind)";
|
||||
homepage = "https://github.com/Schweber/hdrop";
|
||||
changelog = "https://github.com/Schweber/hdrop/releases/tag/v${version}";
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ Schweber ];
|
||||
mainProgram = "hdrop";
|
||||
};
|
||||
}
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xorriso";
|
||||
version = "1.5.7";
|
||||
version = "1.5.7-unstable-2023-12-06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gnu.org/software/xorriso/xorriso-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-hnV3w4f2tKmjIk60Qd7Y+xY432y8Bg+NGh5dAPMY9QI=";
|
||||
url = "https://web.archive.org/web/20231206123448/https://www.gnu.org/software/xorriso/xorriso-1.5.7.tar.gz";
|
||||
hash = "sha256-B7lV3n3e1aF7yJsLxwi8C8m3sBmUUePpCV9KfWRuTm0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
# rev-version = /* human readable version; i.e. "unstable-2022-26-07" */;
|
||||
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
|
||||
# }
|
||||
, officialRelease ? { version = "17.0.2"; sha256 = "08w6mksm7mkws3hhhsy5gg881b4whr6abrshmh6q4c32qlni94nn"; }
|
||||
, officialRelease ? { version = "17.0.6"; sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; }
|
||||
# i.e.:
|
||||
# {
|
||||
# version = /* i.e. "15.0.0" */;
|
||||
|
||||
@ -117,6 +117,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
preCheck = ''
|
||||
# For test_trash_file
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# Upstream disables a few tests in CI upstream as they are known to
|
||||
# be flaky. Let's disable those downstream as hydra exhibits similar
|
||||
# flakes:
|
||||
# https://github.com/NixOS/nixpkgs/pull/270085#issuecomment-1840053951
|
||||
export TEST_IN_CI=1
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meteofrance-api";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hacf-fr";
|
||||
repo = pname;
|
||||
repo = "meteofrance-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-W26R+L2ZJpycEQ9KwkHqVARKsd/5YkJCxMeciKnKAX8=";
|
||||
hash = "sha256-uSrVK6LwCDyvsjzGl4xQd8585Hl6sp2Ua9ly0wqnC1Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -48,8 +48,9 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_currentphenomenons"
|
||||
"test_dictionary"
|
||||
"test_forecast"
|
||||
"test_full_with_coastal_bulletint"
|
||||
"test_full_with_coastal_bulletin"
|
||||
"test_fulls"
|
||||
"test_no_rain_expected"
|
||||
"test_picture_of_the_day"
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
# Qt
|
||||
, qt5compat
|
||||
, qtbase
|
||||
, qtwayland
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtwebengine
|
||||
@ -61,6 +62,8 @@ let cutter = stdenv.mkDerivation rec {
|
||||
qttools
|
||||
qtwebengine
|
||||
rizin
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
qtwayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "couchdb";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
|
||||
hash = "sha256-PWgj1C0Qzw1PhsnE/lnJkyyJ1oV4/LbEtCeNx2kwjao=";
|
||||
hash = "sha256-eiAHtfZz1L4iolyaER2QZpGdhy3bkTWn3OwBIimb054=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.77.0";
|
||||
version = "2.78.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xU/1Bs3uIFomy6w2Vf50O3VbwoGfJMng88J1NXfg1pQ=";
|
||||
hash = "sha256-5a9mrRd3YqKuz/VG7/CheMWpy99PpnyPaA5/VFEvj3Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@ let
|
||||
python = python3;
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "spotdl";
|
||||
version = "4.2.2";
|
||||
version = "4.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spotDL";
|
||||
repo = "spotify-downloader";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pJr0OGUI3OcFsmvn9eqkvpFeF1EkHDdNoWc91s8h9O8=";
|
||||
hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
@ -79,8 +79,10 @@ in python.pkgs.buildPythonApplication rec {
|
||||
"test_download_ffmpeg"
|
||||
"test_download_song"
|
||||
"test_preload_song"
|
||||
"test_ytm_get_results"
|
||||
"test_yt_get_results"
|
||||
"test_yt_search"
|
||||
"test_ytm_search"
|
||||
"test_ytm_get_results"
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@ -18,13 +18,22 @@ stdenv.mkDerivation rec {
|
||||
--replace '-Wl,-soname,$(SONAME)' ""
|
||||
'';
|
||||
|
||||
# the configure script is not generated by autoconf
|
||||
# and do not recognize --build/--host cross compilation flags
|
||||
configurePlatforms = [ ];
|
||||
|
||||
configureFlags = [
|
||||
(if static then "--static" else "--dynamic")
|
||||
"--install-dir" "$(out)/bin"
|
||||
"--install-lib" "$(out)/lib"
|
||||
];
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
makeFlags = [
|
||||
"CC:=$(CC)"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
preCheck = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -118,7 +118,7 @@ in buildGoModule rec {
|
||||
'';
|
||||
homepage = "https://www.datadoghq.com";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ thoughtpolice domenkozar rvl viraptor ];
|
||||
maintainers = with maintainers; [ thoughtpolice domenkozar viraptor ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@ datadog-agent.overrideAttrs (attrs: {
|
||||
meta = with lib;
|
||||
attrs.meta // {
|
||||
description = "Live process collector for the DataDog Agent v7";
|
||||
maintainers = with maintainers; [ domenkozar rvl ];
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
subPackages = [ "cmd/process-agent" ];
|
||||
postInstall = null;
|
||||
|
||||
@ -31397,10 +31397,10 @@ with pkgs;
|
||||
emacs29-macport
|
||||
;
|
||||
|
||||
emacs-macport = emacs28-macport;
|
||||
emacs = emacs28;
|
||||
emacs-gtk = emacs28-gtk3;
|
||||
emacs-nox = emacs28-nox;
|
||||
emacs-macport = emacs29-macport;
|
||||
emacs = emacs29;
|
||||
emacs-gtk = emacs29-gtk3;
|
||||
emacs-nox = emacs29-nox;
|
||||
|
||||
emacsPackagesFor = emacs: import ./emacs-packages.nix {
|
||||
inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user