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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-08-12 06:01:03 +00:00 committed by GitHub
commit d3f3bec267
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 125 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -201,7 +201,16 @@ let
};
};
meta = (builtins.removeAttrs neovim-unwrapped.meta ["position" "outputsToInstall"]) // {
meta = {
inherit (neovim-unwrapped.meta)
description
longDescription
homepage
mainProgram
license
maintainers
platforms;
# To prevent builds on hydra
hydraPlatforms = [];
# prefer wrapper over the package

4
pkgs/by-name/pa/pack/package.nix
View File

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "pack";
version = "0.35.0";
version = "0.35.1";
src = fetchFromGitHub {
owner = "buildpacks";
repo = "pack";
rev = "v${version}";
hash = "sha256-Y6weRD3MrWEL/KYBMb/bJd6NKfcRELG+RQAhmh/gsuo=";
hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA=";
};
vendorHash = "sha256-gp6Hd0MZxtUX0yYshFIGwrm6yY2pdSOtUs6xmzXBqc4=";

4
pkgs/by-name/pr/pragtical/package.nix
View File

@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pragtical";
version = "3.4.1";
version = "3.4.2";
pluginManagerVersion = "1.2.9";
src = fetchFromGitHub {
@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
find subprojects -type d -name .git -prune -execdir rm -r {} +
'';
hash = "sha256-JlVNcNPsn4trO0w5NDtWvZhxgY2jXqVzFaXfjxGg6+s=";
hash = "sha256-mYLYRyyKfjTCD8mi1KrQNLqwd8QX1wgpJtpWASQCLQU=";
};
nativeBuildInputs = [

6
pkgs/by-name/pr/protoc-gen-es/package.nix
View File

@ -7,20 +7,20 @@
buildNpmPackage rec {
pname = "protoc-gen-es";
version = "1.10.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "protobuf-es";
rev = "refs/tags/v${version}";
hash = "sha256-bHl8gqNrTm1+Cnj43RWmrLDUz+G11C4gprEiNOpyOdQ=";
hash = "sha256-foPt++AZjBfqKepzi2mKXB7zbpCqjmPftN9wyk5Yk8g=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-ozkkakfSBycu83gTs8Orhm5Tg8kRSrF/vMJxVnPjhIw=";
npmDepsHash = "sha256-4m3xeiid+Ag9l1qNoBH08hu3wawWfNw1aqeniFK0Byc=";
npmWorkspace = "packages/protoc-gen-es";

6
pkgs/by-name/pr/protonmail-desktop/package.nix
View File

@ -13,15 +13,15 @@ let
srcHashes = {
# Upstream info: It's intended to stay like this in further releases
# https://github.com/NixOS/nixpkgs/pull/326152#discussion_r1679558135
universal-darwin = "sha256-JfZwHFp0aZtHcbP7tyG7uqFs2w+LWKfnfyuxxpxDJZ8=";
x86_64-linux = "sha256-En5vkTHYtwN6GMgbtyhzsPqknOPRO9KlTqZfbBFaIFQ=";
universal-darwin = "sha256-6b+CNCvrkIA1CvSohSJZq/veZZNsA3lyhVv5SsBlJlw=";
x86_64-linux = "sha256-v8ufnQQEqTT5cr7fq8Fozje/NDlBzaCeKIzE6yU/biE=";
};
in
stdenv.mkDerivation rec {
pname = "protonmail-desktop";
# Upstream info: "v"-prefix got dropped
version = "1.0.5";
version = "1.0.6";
src = fetchurl {
url =

11
pkgs/by-name/su/sunpaper/package.nix
View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sunpaper";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "hexive";
repo = "sunpaper";
rev = "v${finalAttrs.version}";
hash = "sha256-8s7SS79wCS0nRR7IpkshP5QWJqqKEeBu6EtFPDM+2cM=";
hash = "sha256-koCK0ntzRf8OXoUj5DJdPWsFDD8EAMjnGdM1B5oeBBc=";
};
buildInputs = [
@ -23,9 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace sunpaper.sh \
--replace "sunwait" "${lib.getExe sunwait}" \
--replace "setwallpaper" "${lib.getExe' wallutils "setwallpaper"}" \
--replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/"
--replace-fail "sunwait" "${lib.getExe sunwait}" \
--replace-fail "setwallpaper" "${lib.getExe' wallutils "setwallpaper"}" \
--replace-fail '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" \
--replace-fail '/usr/share' '/etc'
'';
installPhase = ''

20
pkgs/development/libraries/openmpi/default.nix
View File

@ -40,11 +40,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openmpi";
version = "5.0.3";
version = "5.0.5";
src = fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
sha256 = "sha256-mQWC8gazqzLpOKoxu/B8Y5No5EBdyhlvq+fw927tqQs=";
sha256 = "sha256-ZYjVfApL0pmiQQP04ZYFGynotV+9pJ4R1bPTIDCjJ3Y=";
};
postPatch = ''
@ -116,8 +116,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.enableFeature cudaSupport "mca-dso")
(lib.enableFeature fortranSupport "mpi-fortran")
(lib.withFeatureAs stdenv.isLinux "libnl" (lib.getDev libnl))
"--with-pmix=${if stdenv.isLinux then (lib.getDev pmix) else "internal"}"
(lib.withFeatureAs stdenv.isLinux "pmix-libdir" "${lib.getLib pmix}/lib")
"--with-pmix=${lib.getDev pmix}"
"--with-pmix-libdir=${lib.getLib pmix}/lib"
# Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables
(lib.withFeatureAs stdenv.isLinux "prrte" (lib.getBin prrte))
(lib.withFeature enableSGE "sge")
@ -212,7 +212,12 @@ stdenv.mkDerivation (finalAttrs: {
${lib.pipe wrapperDataFileNames [
(lib.mapCartesianProduct (
{ part1, part2 }:
''
# From some reason the Darwin build doesn't include some of these
# wrapperDataSubstitutions strings and even some of the files. Hence
# we currently don't perform these substitutions on other platforms,
# until a Darwin user will care enough about this cross platform
# related substitution.
lib.optionalString stdenv.isLinux ''
substituteInPlace "''${!outputDev}/share/openmpi/${part1}${part2}-wrapper-data.txt" \
--replace-fail \
compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 0} \
@ -263,7 +268,10 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://www.open-mpi.org/";
description = "Open source MPI-3 implementation";
longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
maintainers = with lib.maintainers; [ markuskowa ];
maintainers = with lib.maintainers; [
markuskowa
doronbehar
];
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
};

97
pkgs/development/libraries/pmix/default.nix
View File

@ -1,22 +1,37 @@
{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake
, removeReferencesTo, libtool, python3, flex, libevent
, targetPackages, makeWrapper
, hwloc, munge, zlib, pandoc, gitMinimal
} :
{
lib,
stdenv,
fetchFromGitHub,
perl,
autoconf,
automake,
removeReferencesTo,
libtool,
python3,
flex,
libevent,
targetPackages,
makeWrapper,
hwloc,
munge,
zlib,
pandoc,
gitMinimal,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pmix";
version = "5.0.3";
src = fetchFromGitHub {
repo = "openpmix";
owner = "openpmix";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-5qBZj4L0Qu/RvNj8meL0OlLCdfGvBP0D916Mr+0XOCQ=";
fetchSubmodules = true;
};
outputs = [ "out" "dev" ];
outputs = [ "out" ] ++ lib.optionals stdenv.isLinux [ "dev" ];
postPatch = ''
patchShebangs ./autogen.pl
@ -36,7 +51,12 @@ stdenv.mkDerivation rec {
makeWrapper
];
buildInputs = [ libevent hwloc munge zlib ];
buildInputs = [
libevent
hwloc
munge
zlib
];
configureFlags = [
"--with-libevent=${lib.getDev libevent}"
@ -50,40 +70,47 @@ stdenv.mkDerivation rec {
./autogen.pl
'';
postInstall = ''
find $out/lib/ -name "*.la" -exec rm -f \{} \;
postInstall =
''
find $out/lib/ -name "*.la" -exec rm -f \{} \;
moveToOutput "bin/pmix_info" "''${!outputDev}"
moveToOutput "bin/pmixcc" "''${!outputDev}"
moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
moveToOutput "bin/pmix_info" "''${!outputDev}"
moveToOutput "bin/pmixcc" "''${!outputDev}"
moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
''
# From some reason the Darwin build doesn't include this file, so we
# currently disable this substitution for any non-Linux platform, until a
# Darwin user will care enough about this cross platform fix.
+ lib.optionalString stdenv.isLinux ''
# Pin the compiler to the current version in a cross compiler friendly way.
# Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
--replace-fail compiler=gcc \
compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
'';
postFixup = lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
# The build info (parameters to ./configure) are hardcoded
# into the library. This clears all references to $dev/include.
remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so)
# The path to the pmixcc-wrapper-data.txt is hard coded and
# points to $out instead of dev. Use wrapper to fix paths.
wrapProgram $dev/bin/pmixcc \
--set PMIX_INCLUDEDIR $dev/include \
--set PMIX_PKGDATADIR $dev/share/pmix
'';
postFixup = ''
# The build info (parameters to ./configure) are hardcoded
# into the library. This clears all references to $dev/include.
remove-references-to -t $dev $(readlink -f $out/lib/libpmix.so)
# Pin the compiler to the current version in a cross compiler friendly way.
# Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
substituteInPlace $dev/share/pmix/pmixcc-wrapper-data.txt \
--replace-fail compiler=gcc \
compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
wrapProgram "''${!outputDev}"/bin/pmixcc \
--set PMIX_INCLUDEDIR "''${!outputDev}"/include \
--set PMIX_PKGDATADIR "''${!outputDev}"/share/pmix
'';
enableParallelBuilding = true;
meta = with lib; {
meta = {
description = "Process Management Interface for HPC environments";
homepage = "https://openpmix.github.io/";
license = licenses.bsd3;
maintainers = [ maintainers.markuskowa ];
platforms = platforms.linux;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
markuskowa
doronbehar
];
};
}
})

22
pkgs/development/php-packages/castor/default.nix
View File

@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
fetchpatch,
installShellFiles,
php,
nix-update-script,
@ -10,34 +9,25 @@
php.buildComposerProject (finalAttrs: {
pname = "castor";
version = "0.14.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "jolicode";
repo = "castor";
rev = "v${finalAttrs.version}";
hash = "sha256-sSIkXNW6RR1mx15dKouQLMaHBr5FEkTTc/0QIkWV8sg=";
hash = "sha256-ng32vuGlGffpkzf3hXu0sNbj0PCDu4DpZnMnbDV9pZk=";
};
patches = [
# Upstream lock is invalid. https://github.com/jolicode/castor/issues/319
(fetchpatch {
name = "fix-invalid-lock.patch";
url = "https://github.com/jolicode/castor/commit/5ff0c3ecbdddad20146adbc2f055b83f5aadba0f.patch";
hash = "sha256-1a3Dpk/UXp92Ugw9zSoLPsbWOJEuP2FBWc/pQ/EKwaM=";
})
];
vendorHash = "sha256-HfEjwlkozeuT4LDnYwiCu7T0spcf4GLhkd7Kc1VRnro=";
vendorHash = "sha256-E2NMWuUQXQ96NbKrcFnFGlxWR0tkd56MXk1bCL0N/sE=";
nativeBuildInputs = [ installShellFiles ];
# install shell completions
postInstall = ''
installShellCompletion --cmd castor \
--bash <($out/bin/castor completion bash) \
--fish <($out/bin/castor completion fish) \
--zsh <($out/bin/castor completion zsh)
--bash <(php $out/bin/castor completion bash) \
--fish <(php $out/bin/castor completion fish) \
--zsh <(php $out/bin/castor completion zsh)
'';
passthru = {

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

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "glean-parser";
version = "14.5.0";
version = "14.5.1";
pyproject = true;
src = fetchPypi {
pname = "glean_parser";
inherit version;
hash = "sha256-/j96nM3vW1HpfaxFMyumIj1IccjUcK6lySuTiKf5kLA=";
hash = "sha256-G01gBwBN3oQ5yvobaLiJYrhjjLfninVjSYuXLsJg1DU=";
};
postPatch = ''

6
pkgs/development/tools/extism-cli/default.nix
View File

@ -27,9 +27,9 @@ buildGoModule rec {
postInstall = ''
local INSTALL="$out/bin/extism"
installShellCompletion --cmd extism \
--bash <($out/bin/containerlab completion bash) \
--fish <($out/bin/containerlab completion fish) \
--zsh <($out/bin/containerlab completion zsh)
--bash <($out/bin/extism completion bash) \
--fish <($out/bin/extism completion fish) \
--zsh <($out/bin/extism completion zsh)
'';
meta = with lib; {

4
pkgs/development/tools/language-servers/nixd/default.nix
View File

@ -21,13 +21,13 @@
let
common = rec {
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixd";
rev = version;
hash = "sha256-iB6Hc3kgtsZ360JlAhPqCRWFTf3tawHEKYAeYt7DM4E=";
hash = "sha256-JmDMcxIQ0220O/vWw/9SyB1dH7MSJaPK/CKY44ViVjM=";
};
nativeBuildInputs = [

4
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@ -181,10 +181,6 @@ while [ "$#" -gt 0 ]; do
esac
done
if [[ -n "$SUDO_USER" ]]; then
useSudo=1
fi
# log the given argument to stderr if verbose mode is on
logVerbose() {
if [ -n "$verboseScript" ]; then

4
pkgs/servers/tautulli/default.nix
View File

@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "Tautulli";
version = "2.14.3";
version = "2.14.4";
format = "other";
pythonPath = [ setuptools ];
@ -12,7 +12,7 @@ buildPythonApplication rec {
owner = "Tautulli";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-9/KtlthI71qrf1QlJ0/WI+H401U+6bnrO1qfQO5TTUU=";
sha256 = "sha256-IV5ZyVuZvr09wQ8SgcHiTBp916B2ZPQvrg9+O8H3xsk=";
};
installPhase = ''

2
pkgs/tools/networking/ivpn/default.nix
View File

@ -69,7 +69,7 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
substituteInPlace daemon/service/platform/platform_linux_release.go \
--replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
--replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
'obfsproxyStartScript = "${obfs4}/bin/obfs4proxy"' \
'obfsproxyStartScript = "${lib.getExe obfs4}"' \
--replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \
--replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \

4
pkgs/tools/text/asciigraph/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "asciigraph";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "guptarohit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pCfjk8ViMY2iAus2/hibSZXgKY9YBFRH3vsD19MTJ+8=";
sha256 = "sha256-Y+RRFFCeuDjzTznpfC7Wn3j96ZCFSOzvb8ND/ATW+JI=";
};
vendorHash = null;

8
pkgs/tools/text/percollate/default.nix
View File

@ -2,21 +2,21 @@
buildNpmPackage rec {
pname = "percollate";
version = "4.2.2";
version = "4.2.3";
src = fetchFromGitHub {
owner = "danburzo";
repo = pname;
rev = "v${version}";
hash = "sha256-zvvgK0LJ8EK6ANqRmJI96RgMkRAlSD7yIAoe0kxG5gU=";
hash = "sha256-JpdSEockALXtuuMMi5mgD5AXcayojyK0qMMWF+XFfZE=";
};
npmDepsHash = "sha256-xvck+IEWaPOuXU4k8keCPHiWfylAffe1eDgN/GpxW7g=";
npmDepsHash = "sha256-qWu1YYi4ddpAUtbDxF4YA8OO6BLZ6gfeb4pw0n9BaZw=";
dontNpmBuild = true;
# Dev dependencies include an unnecessary Java dependency (epubchecker)
# https://github.com/danburzo/percollate/blob/v4.2.2/package.json#L40
# https://github.com/danburzo/percollate/blob/v4.2.3/package.json#L40
npmInstallFlags = [ "--omit=dev" ];
nativeBuildInputs = [ makeWrapper ];

1
pkgs/tools/video/recyclarr/default.nix
View File

@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
updateScript = ./update.sh;
tests.version = testers.testVersion {
package = recyclarr;
version = "v${version}";
};
};