ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 21:57:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-01-03 06:01:09 +00:00 committed by GitHub
commit abccc35038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 94 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/oranda/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "oranda";
version = "0.5.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "axodotdev";
repo = "oranda";
rev = "v${version}";
hash = "sha256-CB3ALd8N+bZ6kD34rKTxdIXrSqZtaQTINmI2yf/m38w=";
hash = "sha256-/tlGpsJ7qqBKC13w0kX2AqYyGR+KLNh+hM/FKjlEIaY=";
};
cargoHash = "sha256-GLnczSTDMDjvLw+8js6LUVtW8QLlS3G12pSabYkYsHI=";
cargoHash = "sha256-cXf94Y9v80ofayJxzVTnrz0EpzWwhIH1CLvQIHDm1sw=";
nativeBuildInputs = [
pkg-config

21
pkgs/applications/networking/irc/tiny/default.nix
View File

@ -12,18 +12,21 @@
rustPlatform.buildRustPackage rec {
pname = "tiny";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "osa1";
repo = pname;
repo = "tiny";
rev = "v${version}";
hash = "sha256-oOaLQh9gJlurHi9awoRh4wQnXwkuOGJLnGQA6di6k1Q=";
hash = "sha256-VlKhOHNggT+FbMvE/N2JQOJf0uB1N69HHdP09u89qSk=";
};
cargoPatches = [ ./Cargo.lock.patch ];
cargoHash = "sha256-AhQCfLCoJU7o8s+XL3hDOPmZi9QjOxXSA9uglA1KSuY=";
cargoHash = "sha256-wUBScLNRNAdDZ+HpQjYiExgPJnE9cxviooHePbJI13Q=";
# Cargo.lock is outdated
preConfigure = ''
cargo metadata --offline
'';
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optionals dbusSupport [ dbus ]
@ -32,16 +35,12 @@ rustPlatform.buildRustPackage rec {
buildFeatures = lib.optional notificationSupport "desktop-notifications";
checkFlags = [
# flaky test
"--skip=tests::config::parsing_tab_configs"
];
meta = with lib; {
description = "A console IRC client";
homepage = "https://github.com/osa1/tiny";
changelog = "https://github.com/osa1/tiny/raw/v${version}/CHANGELOG.md";
changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne vyp ];
mainProgram = "tiny";
};
}

1
pkgs/applications/window-managers/i3/workstyle.nix
View File

@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/pierrechevalier83/workstyle";
license = licenses.mit;
maintainers = with maintainers; [ FlorianFranzen ];
mainProgram = "workstyle";
};
}

6
pkgs/development/compilers/emscripten/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "emscripten";
version = "3.1.50";
version = "3.1.51";
llvmEnv = symlinkJoin {
name = "emscripten-llvm-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
name = "emscripten-node-modules-${version}";
inherit pname version src;
npmDepsHash = "sha256-Qft+//za5ed6Oquxtcdpv7g5oOc2WmWuRJ/CDe+FEiI=";
npmDepsHash = "sha256-N7WbxzKvW6FljY6g3R//9RdNiezhXGEvKPbOSJgdA0g=";
dontBuild = true;
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "emscripten-core";
repo = "emscripten";
hash = "sha256-iFZF+DxGaq279QPPugoLhYmoXmyLPkmn1x4rBCkdW+I=";
hash = "sha256-oXecS6B0u8YLeoybjxLwx5INGj/Kp/8GA6s3A1S0y4k=";
rev = version;
};

6
pkgs/development/compilers/erg/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "erg";
version = "0.6.25";
version = "0.6.28";
src = fetchFromGitHub {
owner = "erg-lang";
repo = "erg";
rev = "v${version}";
hash = "sha256-z3481/vWmR5QlULfJZtLdGhwsJKBbLcvyC87SCngMVg=";
hash = "sha256-TK7Ak6ZKjEBcwimV0W/CgD3yd9q1aSgSkp9MuGE3d8k=";
};
cargoHash = "sha256-+jN+6At8tLHA/ilSBxugHIS79Cw8bGhE0RUNU4sSGeM=";
cargoHash = "sha256-DD6RXGdkQHMKZCJhHRTbTrRQ15MdOZHbREJ31LePHUY=";
nativeBuildInputs = [
makeWrapper

1
pkgs/development/libraries/dconf/default.nix
View File

@ -76,5 +76,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = teams.gnome.members;
mainProgram = "dconf";
};
}

4
pkgs/development/libraries/libbpkg/default.nix
View File

@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "libbpkg";
version = "0.15.0";
version = "0.16.0";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz";
sha256 = "sha256-KfvkG6bHSU8wTZDKGeEfI1AV9T8uSYZHePMlmjpBXHc=";
hash = "sha256-h3Stt1n1057ASf3n16plr5cNGIKOjHiiuOfqrcCJ5tA=";
};
nativeBuildInputs = [

13
pkgs/development/libraries/libbutl/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv
, build2
, DarwinTools
, fetchurl
, libuuid
, enableShared ? !stdenv.hostPlatform.isStatic
@ -8,17 +9,25 @@
stdenv.mkDerivation rec {
pname = "libbutl";
version = "0.15.0";
version = "0.16.0";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
sha256 = "sha256-yzs6DFt6peJPPaMQ3rtx+kiYu7H+bUuShcdnEN90WWI=";
hash = "sha256-MGL6P/lG2sJdJXZiTcDvdy4jmU+2jYHsvaX4eEO9J2g=";
};
nativeBuildInputs = [
build2
] ++ lib.optionals stdenv.isDarwin [
DarwinTools
];
patches = [
# Install missing .h files needed by dependers
# https://github.com/build2/libbutl/issues/5
./install-h-files.patch
];
strictDeps = true;

22
pkgs/development/libraries/libbutl/install-h-files.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/libbutl/buildfile b/libbutl/buildfile
index ba4ad96..f5356a1 100644
--- a/libbutl/buildfile
+++ b/libbutl/buildfile
@@ -1,7 +1,7 @@
# file : libbutl/buildfile
# license : MIT; see accompanying LICENSE file
-lib{butl}: {hxx ixx txx cxx}{** -uuid-* +uuid-io \
+lib{butl}: {h hxx ixx txx cxx}{** -uuid-* +uuid-io \
-win32-utility \
-mingw-* \
-version \
@@ -154,7 +154,7 @@ else
# Install into the libbutl/ subdirectory of, say, /usr/include/
# recreating subdirectories.
#
-{hxx ixx txx}{*}:
+{h hxx ixx txx}{*}:
{
install = include/libbutl/
install.subdirs = true

4
pkgs/development/libraries/libodb-sqlite/default.nix
View File

@ -8,13 +8,13 @@
}:
stdenv.mkDerivation rec {
pname = "libodb-sqlite";
version = "2.5.0-b.23";
version = "2.5.0-b.25";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
sha256 = "sha256-HjEFfNDXduHOexNm82S+vqKRQM3SwgEYiDBZcPXsr/w=";
hash = "sha256-Ko40WZErbL77B4eoJ5FFko/gTFYhADGlBzxPLuy8Wqc=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libodb/default.nix
View File

@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "libodb";
version = "2.5.0-b.23";
version = "2.5.0-b.25";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
sha256 = "sha256-j+lW9WFdjwIlP24/GUZsezyMf7/31XTfkuY2WGLdaeA=";
hash = "sha256-G634kVRbgwfBmIh8QqUclr/xvY3o0ouVmp/jxJrHzcs=";
};
nativeBuildInputs = [ build2 ];

1
pkgs/development/python-modules/ocrmypdf/default.nix
View File

@ -104,5 +104,6 @@ buildPythonPackage rec {
license = with licenses; [ mpl20 mit ];
maintainers = with maintainers; [ kiwi dotlambda ];
changelog = "https://github.com/ocrmypdf/OCRmyPDF/blob/${src.rev}/docs/release_notes.rst";
mainProgram = "ocrmypdf";
};
}

4
pkgs/development/tools/build-managers/build2/bdep.nix
View File

@ -11,12 +11,12 @@
stdenv.mkDerivation rec {
pname = "bdep";
version = "0.15.0";
version = "0.16.0";
outputs = [ "out" "doc" "man" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz";
sha256 = "sha256-dZldNVeQJWim3INBtOaPYP8yQMH3sjBzCLEHemvdxnU=";
hash = "sha256-5w8Ng8TS8g+Nkbixn5txg4FGi57TSfc6ii+2wh8apCo=";
};
strictDeps = true;

4
pkgs/development/tools/build-managers/build2/bootstrap.nix
View File

@ -6,10 +6,10 @@
}:
stdenv.mkDerivation rec {
pname = "build2-bootstrap";
version = "0.15.0";
version = "0.16.0";
src = fetchurl {
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
sha256 = "1i1p52fr5sjs5yz6hqhljwhc148mvs4fyq0cf7wjg5pbv9wzclji";
hash = "sha256-I3k/aCoXsdlcgLvYSSRHNe1Zo+JzYVKapIZdJ3b/itw=";
};
patches = [
# Pick up sysdirs from NIX_LDFLAGS

14
pkgs/development/tools/build-managers/build2/bpkg.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, build2
, fetchpatch
, fetchurl
, git
, libbpkg
@ -14,24 +13,15 @@
stdenv.mkDerivation rec {
pname = "bpkg";
version = "0.15.0";
version = "0.16.0";
outputs = [ "out" "doc" "man" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz";
sha256 = "sha256-3F4Pv8YX++cNa6aKhPM67mrt/5oE1IeoZUSmljHqBfI=";
hash = "sha256-sxzVidVL8dpoH82IevcwjcIWj4LQzliGv9zasTYqeok=";
};
patches = [
# Patch git tests for git v2.38+
# Remove when bumping to v0.16.0 or greater
(fetchpatch {
url = "https://github.com/build2/bpkg/commit/a97b12a027546b37f66d3e08064f92f5539cf79.patch";
sha256 = "sha256-x5iJQXt84XyjZYdAmYO4FymSV2vi7nfIoeMOxFm/2eQ=";
})
];
strictDeps = true;
nativeBuildInputs = [
build2

6
pkgs/development/tools/build-managers/build2/default.nix
View File

@ -17,7 +17,7 @@ let
in
stdenv.mkDerivation rec {
pname = "build2";
version = "0.15.0";
version = "0.16.0";
outputs = [ "out" "dev" "doc" "man" ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
sha256 = "07369gw6zlad6nk29564kj17yp145l3dzbgrx04pyiyl1s84aa1r";
hash = "sha256-ZK4+UACsAs51bC1dE0sIxmCiHlH3pYGPWJNsl61oSOY=";
};
patches = [
@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
./remove-config-store-paths.patch
# Pick up sysdirs from NIX_LDFLAGS
./nix-ldflags-sysdirs.patch
./remove-const-void-param.patch
];
strictDeps = true;

24
pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch
View File

@ -1,16 +1,14 @@
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -83,9 +83,13 @@ config/cxx{host-config}: config/in{host-config}
# want it).
#
build2_config = $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
[null], \
+ return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
+ [null], \
return_lines)
@@ -86,8 +86,11 @@ build2_config_lines = [strings]
host_config_lines = [strings]
# Also preserve config.version.
for l: $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
+ [null], return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
[null])
{
build2_config_lines += $l

11
pkgs/development/tools/build-managers/build2/remove-const-void-param.patch
View File

@ -1,11 +0,0 @@
--- a/libbuild2/cc/pkgconfig-libpkgconf.cxx
+++ b/libbuild2/cc/pkgconfig-libpkgconf.cxx
@@ -84,7 +84,7 @@ namespace build2
static bool
pkgconf_error_handler (const char* msg,
const pkgconf_client_t*,
- const void*)
+ void*)
{
error << runtime_error (msg); // Sanitize the message (trailing dot).
return true;

1
pkgs/development/tools/language-servers/rnix-lsp/default.nix
View File

@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec {
description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
license = licenses.mit;
maintainers = with maintainers; [ ];
mainProgram = "rnix-lsp";
};
}

1
pkgs/development/tools/marksman/default.nix
View File

@ -54,5 +54,6 @@ buildDotnetModule rec {
license = licenses.mit;
maintainers = with maintainers; [ stasjok plusgut ];
platforms = dotnet-sdk.meta.platforms;
mainProgram = "marksman";
};
}

1
pkgs/os-specific/linux/macchanger/default.nix
View File

@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = "https://github.com/alobbs/macchanger";
platforms = platforms.linux;
mainProgram = "macchanger";
};
}

4
pkgs/os-specific/linux/prl-tools/default.nix
View File

@ -36,13 +36,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools";
version = "19.2.0-54827";
version = "19.2.1-54832";
# We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
hash = "sha256-iVrI7ZM/tY5ZumTnQHhGizmdNDJ9I8sP/EOVFcpCQ48=";
hash = "sha256-PmQSGoJbB0+Q7t56FOFxOVQ86CJLqAa6PTnWLx5CzpA=";
};
hardeningDisable = [ "pic" "format" ];

6
pkgs/servers/misc/starcharts/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "starcharts";
version = "1.8.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "caarlos0";
repo = "starcharts";
rev = "v${version}";
hash = "sha256-B5w6S3qNLdUayYpF03cnxpLzyRBaC9jhaYnNqDZ2AsU=";
hash = "sha256-RLGKf5+HqJlZUhA5C3cwDumIhlbXcOr5iitI+7GZPBc=";
};
vendorHash = "sha256-sZS3OA1dTLLrL5csXV6nWbY/TLiqJUH1UQnJUEva7Jk=";
vendorHash = "sha256-BlVjGG6dhh7VO9driT0rnpbW6lORojiV+YhrV1Zlj4M=";
ldflags = [
"-s"

6
pkgs/tools/misc/star-history/default.nix
View File

@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "star-history";
version = "1.0.16";
version = "1.0.17";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-ChUZf8aohDOmNKPgn9+i0NNZ4rKJsXQPK6IMqWf0NQc=";
sha256 = "sha256-r1mDMpnu0/xWLtfM7WsVdO8nbkqNBXvYn31hB9qzgVY=";
};
cargoHash = "sha256-RsBWmEe4D+m3hxE1ryQ5aZb2uDax519qjQoIK7xStPw=";
cargoHash = "sha256-e65WlmHfo6zIXkQ/7RqqX4wYjbATfC1ke9Zwcm+EQ7M=";
nativeBuildInputs = [ pkg-config ];

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

@ -18730,6 +18730,7 @@ with pkgs;
# Dependency of build2, must also break cycle for this
libbutl = callPackage ../development/libraries/libbutl {
build2 = build2.bootstrap;
inherit (darwin) DarwinTools;
};
libbpkg = callPackage ../development/libraries/libbpkg { };

4
pkgs/top-level/perl-packages.nix
View File

@ -10380,10 +10380,10 @@ with self; {
FinanceQuote = buildPerlPackage rec {
pname = "Finance-Quote";
version = "1.58";
version = "1.59";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
hash = "sha256-jN3qDTgJo2aVzuaaKGK+qs1hU1f+uv23JkGnerRna4A=";
hash = "sha256-mukoeazGgv9AFuHsqSScjko4y38wHnKio21fIVfxKSg=";
};
buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ];
propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ];