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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-01-28 18:01:43 +00:00 committed by GitHub
commit a8d6b7102d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 145 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkgs/applications/misc/kaufkauflist/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib, buildPackages, buildGoModule, fetchFromGitHub, esbuild, buildNpmPackage, fetchFromGitea }:
let
esbuild' = buildPackages.esbuild.override {
buildGoModule = args: buildPackages.buildGoModule (args // rec {
version = "0.16.15";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
};
in buildNpmPackage rec {
pname = "kaufkauflist";
version = "1.0.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "annaaurora";
repo = "kaufkauflist";
rev = "v${version}";
hash = "sha256-feqk2FUs3lcnIgyPzhsow+xO9u7l9+9eZEk9jxRlpG4=";
};
npmDepsHash = "sha256-lSnGLK7+ac/wEpAxlpkZS/kgr9F+8WK+nRjCzkrPJt0=";
ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}";
installPhase = ''
runHook preInstall
mkdir -p $out/share/kaufkauflist $out/share/pocketbase
cp -vr build/* $out/share/kaufkauflist/
cp -v pb_schema.json $out/share/pocketbase/
runHook postInstall
'';
# Uncomment this when nix-update-script supports Gitea.
#passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://codeberg.org/annaaurora/kaufkauflist";
description = "A to-do list for shopping or other use cases";
license = licenses.mit;
maintainers = with maintainers; [ annaaurora ];
};
}

8
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -45,8 +45,8 @@
}
},
"ungoogled-chromium": {
"version": "109.0.5414.87",
"sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8",
"version": "109.0.5414.120",
"sha256": "1yvfd0a7zfz4x00f83irrs6hy15wn85mrbbm7mk5wy4gjwg5zyrj",
"sha256bin64": null,
"deps": {
"gn": {
@ -56,8 +56,8 @@
"sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b"
},
"ungoogled-patches": {
"rev": "109.0.5414.87-1",
"sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j"
"rev": "109.0.5414.120-1",
"sha256": "0hq48lsjl7da8rdq129mc7cd0z5ykqbaf1sbhhs1d10dzm5zs4p3"
}
}
}

36
pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib , buildNpmPackage , fetchFromGitHub, nodejs }:
buildNpmPackage rec {
pname = "webtorrent-mpv-hook";
version = "1.3.3";
src = fetchFromGitHub {
owner = "mrxdst";
repo = pname;
rev = "v${version}";
hash = "sha256-AFKX31kriacXygZy0Mw+QwO+SwFEu13687mJ/WeAoKY=";
};
postPatch = ''
substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'"
# This executable is just for telling non-Nix users how to install
substituteInPlace package.json --replace '"bin": "build/bin.js",' ""
rm -rf src/bin.ts
'';
npmDepsHash = "sha256-GpNUJ5ZCgMjSYLqsIE/RwkTSFT3uAhxrHPe7XvGDRHE=";
makeCacheWritable = true;
postInstall = ''
mkdir -p $out/share/mpv/scripts/
ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/
'';
passthru.scriptName = "webtorrent.js";
meta = {
description = "Adds a hook that allows mpv to stream torrents";
homepage = "https://github.com/mrxdst/webtorrent-mpv-hook";
maintainers = [ lib.maintainers.chuangzhu ];
license = lib.licenses.isc;
};
}

4
pkgs/development/compilers/crystal/default.nix
View File

@ -269,8 +269,8 @@ rec {
};
crystal_1_7 = generic {
version = "1.7.1";
sha256 = "sha256-PaeqqY+rSxntzz+30mJnjxzj2Xgu/BNkolw3Y30aZgk=";
version = "1.7.2";
sha256 = "sha256-Bwd9Gmtwa/0oLhps3fc8GqBlB4o31LCR1Sf98Pz4i90=";
binary = binaryCrystal_1_2;
};

2
pkgs/development/compilers/dmd/generic.nix
View File

@ -213,7 +213,7 @@ stdenv.mkDerivation rec {
NIX_ENFORCE_PURITY= \
make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD"
runHook postBuild
runHook postCheck
'';
installPhase = ''

6
pkgs/development/interpreters/zuo/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zuo";
version = "unstable-2022-11-15";
version = "unstable-2023-01-02";
src = fetchFromGitHub {
owner = "racket";
repo = "zuo";
rev = "7492a8aa3721bfad7d158497313b913537a8b12d";
hash = "sha256-9tMYaKjBTGm9NjcytpUS9mgBlE9L1U2VECsqfU706u4=";
rev = "464aae9ae90dcb43ab003b922e4ae4d08611c55b";
hash = "sha256-O8p3dEXqAP2UNPNBla9AtkndxgL8UoVp/QygXOmcgWg=";
};
doCheck = true;

4
pkgs/development/python-modules/dinghy/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dinghy";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "nedbat";
repo = pname;
rev = version;
hash = "sha256-hrRs4hBRckUMsDGix+6GMr5VwyhXl/ib3jon7VNca1Y=";
hash = "sha256-3qj3CU0A7oyPcUMEoqe4lUK5Jl1tlnCaqXMtDnn9+bw=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/emcee/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "emcee";
version = "3.1.3";
version = "3.1.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "dfm";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HAuwWFNL63BlvHomQx+hWw4et7kRYd3zhH2FAj632Lg=";
hash = "sha256-K2cPSbR7jnl9Vzf2sEiPZqk2vTwgChNWAf6CAerhZCg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -42,6 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Kick ass affine-invariant ensemble MCMC sampling";
homepage = "https://emcee.readthedocs.io/";
changelog = "https://github.com/dfm/emcee/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
};

14
pkgs/development/python-modules/flask-migrate/default.nix
View File

@ -1,25 +1,25 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pythonOlder
, alembic
, flask
, flask_script
, flask-sqlalchemy
, unittestCheckHook
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "Flask-Migrate";
version = "3.1.0";
version = "4.0.2";
format = "setuptools";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "miguelgrinberg";
repo = pname;
rev = "v${version}";
sha256 = "0zj7qpknvlhrh4fsp5sx4fwyx3sp41ynclka992zympm3xym9zyq";
hash = "sha256-6P5oIH/mVuMy4J71VIRD1p+qbvPUlq3COpytEgKz1qo=";
};
propagatedBuildInputs = [
@ -33,7 +33,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
unittestCheckHook
pytestCheckHook
flask_script
];
@ -41,6 +41,6 @@ buildPythonPackage rec {
description = "SQLAlchemy database migrations for Flask applications using Alembic";
homepage = "https://github.com/miguelgrinberg/Flask-Migrate";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ gador ];
};
}

4
pkgs/development/python-modules/pulumi-aws/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.27.0";
version = "5.28.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-JNiklXAAyHFLdspglGLokmHOiffDS1I5igsmupla1Qo=";
hash = "sha256-7lO3GbVPG70u+PzS/22d6i6xIRXiTMc/iUXrZurD2LU=";
};
sourceRoot = "${src.name}/sdk/python";

4
pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-elasticsearch";
version = "0.1.2";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-elasticsearch";
rev = "refs/tags/v${version}";
hash = "sha256-HzvL6b2zeUrAAJ4mmKPOacZzHVVxfs3gjzP+fZIhApI=";
hash = "sha256-EDs1ZBjwZCNrZMiH0Lcp2NyxQhGHygUMNBEU/5zuUYI=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-opensearch";
version = "0.1.4";
version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-opensearch";
rev = "refs/tags/v${version}";
hash = "sha256-ZcX8LK/qckNEhMWljv73QHtWv4IY7Xtr4ISrlnrUaAY=";
hash = "sha256-j8BiO/7wp1TRSK+C5cPSgF72CuBpb2jLhJXRJLHgh5I=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/schema-salad/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "schema-salad";
version = "8.3.20230109181936";
version = "8.4.20230127112827";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-4PuPvnk92kITPzdGQr6fGvFlG7+zyjfjQdiGbWld5Fo=";
hash = "sha256-nptZTNveutV9bGSkDPWLfiBusZblVqd/5m7DN4HwGJY=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/textual/default.nix
View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "textual";
version = "0.10.0";
version = "0.10.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "Textualize";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-T71Jmgj/hgLOcSHu5QyqdZ7dYpLjhTQqDBdQgiaGXA8=";
sha256 = "sha256-DPE8brf8y6DJDPfDNUBk09ngthSWN59UYw6yPfI4+Qw=";
};
nativeBuildInputs = [

6
pkgs/development/tools/rust/duckscript/default.nix
View File

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "duckscript_cli";
version = "0.8.16";
version = "0.8.17";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-H9lZIIJrE6onqGHw0l8Y58IW9EAcQ7eCHxgqqeSLgGY=";
sha256 = "sha256-fEAm7HhRGYZpGL9I8h3wX8AnPs00pG/ui7Rm+PaXJpA=";
};
nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoSha256 = "sha256-DQw3DDOUo4ogf6PIY7/1U0uiyX8dpXE5D2P8QDdie9M=";
cargoHash = "sha256-kll2q5HhcpizBDbWipj30F8WEQnjG1fndxCHoXBbik8=";
meta = with lib; {
description = "Simple, extendable and embeddable scripting language.";

4
pkgs/servers/dns/bind/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "bind";
version = "9.18.10";
version = "9.18.11";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-9BWpL+tiVotQhUoGPLIx4lc1H4ZyGG0KsDGkmz3iysY=";
sha256 = "sha256-j/M1KBIjDLy9pC34fK2WH5QWPT2kV8XkvvgFf9XfIVg=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

9
pkgs/tools/misc/wimboot/default.nix
View File

@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sourceRoot = "source/src";
# Workaround '-idirafter' ordering bug in staging-next:
# https://github.com/NixOS/nixpkgs/pull/210004
# where libc '-idirafter' gets added after user's idirafter and
# breaks.
# TODO(trofi): remove it in staging once fixed in cc-wrapper.
preConfigure = ''
export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags)
'';
buildInputs = [ libbfd zlib libiberty ];
makeFlags = [ "wimboot.x86_64.efi" ];

4
pkgs/tools/security/gotrue/supabase.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gotrue";
version = "2.41.4";
version = "2.42.0";
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
hash = "sha256-wHsjCf9TdRZ80l4nGEsLlB4J7pXv65fOv4pfFy3Wp/0=";
hash = "sha256-ZLonPW7lXaBE039R21DWjRBa7xxRnH9rTNu4PDNOWoY=";
};
vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU=";

6
pkgs/tools/text/ov/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "ov";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "noborus";
repo = "ov";
rev = "refs/tags/v${version}";
hash = "sha256-8xurv4RldKVeakYSkY4rxx9kCeXxKc7ou7bN1+uoY50=";
hash = "sha256-ow2tIML7+x0X3FSpr4UQ8bzzYhZJZ9pZL8eNReEjitQ=";
};
vendorHash = "sha256-hyvWyUJyDZgxlOJI5NhLNC6kf2e1SvH/msg2WMKTW4Y=";
vendorHash = "sha256-X2/kcXxdGwFvdiTu1MGyv90OngWmR/xR2YtjvmLkiVE=";
ldflags = [
"-X main.Version=v${version}"

4
pkgs/tools/typesetting/sile/default.nix
View File

@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.14.7";
version = "0.14.8";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "01sx4368bws47989zdahhksgy5jgc1qw4hhvpib4qcz3fs6xpx9j";
sha256 = "0r00s7c8ycc9haqf7p141gj5jn3k0kxpjdzb538f1jpwkgi6mjh9";
};
configureFlags = [

5
pkgs/top-level/all-packages.nix
View File

@ -1471,6 +1471,8 @@ with pkgs;
kanata-with-cmd = kanata.override { withCmd = true; };
kaufkauflist = callPackage ../applications/misc/kaufkauflist { };
ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { };
ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
@ -24105,9 +24107,11 @@ with pkgs;
cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
python = python2;
};
cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
python = python2;
};
cassandra_4 = callPackage ../servers/nosql/cassandra/4.nix {
# Effective Cassandra 4.0.2 there is full Java 11 support
@ -31301,6 +31305,7 @@ with pkgs;
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};
thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };
vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix {};
webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { };
youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { };
cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { };
};