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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-23 06:00:57 +00:00 committed by GitHub
commit f95580a6ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 228 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/examples.nix
View File

@ -206,6 +206,7 @@ rec {
aarch64-embedded = {
config = "aarch64-none-elf";
libc = "newlib";
rustc.config = "aarch64-unknown-none";
};
aarch64be-embedded = {

6
maintainers/maintainer-list.nix
View File

@ -10770,6 +10770,12 @@
githubId = 7878181;
name = "Mateo Diaz";
};
materus = {
email = "materus@podkos.pl";
github = "materusPL";
githubId = 28183516;
name = "Mateusz Słodkowicz";
};
math-42 = {
email = "matheus.4200@gmail.com";
github = "Math-42";

17
nixos/modules/programs/fish.nix
View File

@ -258,16 +258,13 @@ in
preferLocalBuild = true;
allowSubstitutes = false;
};
generateCompletions = package: pkgs.runCommand
"${package.name}_fish-completions"
(
{
inherit package;
preferLocalBuild = true;
allowSubstitutes = false;
}
// optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }
)
generateCompletions = package: pkgs.runCommandLocal
( with lib.strings; let
storeLength = stringLength storeDir + 34; # Nix' StorePath::HashLen + 2 for the separating slash and dash
pathName = substring storeLength (stringLength package - storeLength) package;
in (package.name or pathName) + "_fish-completions")
( { inherit package; } //
optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; })
''
mkdir -p $out
if [ -d $package/share/man ]; then

4
pkgs/applications/audio/yoshimi/default.nix
View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "yoshimi";
version = "2.3.0.2";
version = "2.3.0.3";
src = fetchFromGitHub {
owner = "Yoshimi";
repo = pname;
rev = version;
hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8=";
hash = "sha256-IsmhLUGqoa4Le86LE9SHFiXeiIKgwNfLaPFYXxnC9BM=";
};
sourceRoot = "${src.name}/src";

3
pkgs/applications/editors/gedit/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, meson
, mesonEmulatorHook
, fetchurl
, python3
, pkg-config
@ -58,6 +59,8 @@ stdenv.mkDerivation rec {
gtk-doc
gobject-introspection
docbook-xsl-nons
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
mesonEmulatorHook
];
buildInputs = [

27
pkgs/applications/misc/konsave/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "konsave";
version = "2.2.0";
src = fetchPypi {
inherit version;
pname = "Konsave";
hash = "sha256-tWarqT2jFgCuSsa2NwMHRaR3/wj0khiRHidvRNMwM8M=";
};
nativeBuildInputs = with python3Packages; [ setuptools-scm ];
propagatedBuildInputs = with python3Packages; [ pyyaml setuptools ];
preCheck = ''
export HOME=$(mktemp -d)
'';
meta = with lib; {
description = "Save Linux Customization";
maintainers = with maintainers; [ MoritzBoehme ];
homepage = "https://github.com/Prayag2/konsave";
license = licenses.gpl3;
platforms = platforms.linux;
};
}

4
pkgs/applications/misc/protonup-qt/default.nix
View File

@ -1,10 +1,10 @@
{ appimageTools, fetchurl, lib }:
let
pname = "protonup-qt";
version = "2.8.0";
version = "2.8.2";
src = fetchurl {
url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
hash = "sha256-o3Tsrdrj5qDcTqhdgdf4Lcpp9zfBQY+/l3Ohm1A/pm4=";
hash = "sha256-y7PoYbZBwkohqVEb/vGE0B8TTCtMncZIozABs0KJpL0=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in

6
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -23,7 +23,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.2.3105.45";
version = "6.2.3105.48";
suffix = {
aarch64-linux = "arm64";
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-AumYFbCa5+Ou89e6MDQZFlyCu30IvX8jbz+deRojzOQ=";
x86_64-linux = "sha256-9U7vPvmCbwgkYGIZblKghuqClhOfGSEQqTVkaDgc0Ms=";
aarch64-linux = "sha256-SIuHulBZ7r0gaIdkF3zM3mzLOyiUWCM7YM2teA7T9is=";
x86_64-linux = "sha256-LsyeX+nPlOtMCWv1Zu46OZ7yMm9feqyGR73saAwM1SU=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

6
pkgs/applications/networking/cluster/kubebuilder/default.nix
View File

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "kubebuilder";
version = "3.11.1";
version = "3.12.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "kubebuilder";
rev = "v${version}";
hash = "sha256-VT9S8Ijf684rowfoU1kvgPSTzR8ZGr3GwxWiYHWLANc=";
hash = "sha256-drg7hFUEFoicZxzorO365b3eFN9NRdhWYn9bIk+sSY8=";
};
vendorHash = "sha256-5XUYmAfFH6UlLF09PqcSLUxkgZ5iHZGj0Vurab+Jl1g=";
vendorHash = "sha256-qH7+DDGYRCrXI3B2dN/4pZMBqSXKkZUvIrtVEg0Ep+c=";
subPackages = ["cmd"];

4
pkgs/applications/networking/flexget/default.nix
View File

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.9.9";
version = "3.9.10";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-kZ+RHkqmmRd7Ew5u8/SQADzOUa9YwCsj+nmtthCDlDw=";
hash = "sha256-cUcfXoqNKe5Ok0vDqe0uCpV84XokKe4iXbWeTm1Qv14=";
};
postPatch = ''

10
pkgs/applications/version-management/gql/default.nix
View File

@ -2,29 +2,29 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2_1_6
, libgit2
, zlib
}:
rustPlatform.buildRustPackage rec {
pname = "gql";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
hash = "sha256-eWupAfe2lOcOp8hC4sx8Wl1jaVZT4E99I5V9YsMcDZA=";
hash = "sha256-iM5a0uy+egPBMSDBo6ks8QNfRoKku2GmFpzoanSDm9M=";
};
cargoHash = "sha256-O6Y+JOMpucrjvYAJZe2D97vODFXVysuiitXzMkfcSpI=";
cargoHash = "sha256-bpPrnguDSj1K22vmf/hEimd4tVS6ANmTiVtdsUuN1BM=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libgit2_1_6
libgit2
zlib
];

2
pkgs/applications/video/obs-studio/default.nix
View File

@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
video content, efficiently
'';
homepage = "https://obsproject.com";
maintainers = with maintainers; [ jb55 MP2E V ];
maintainers = with maintainers; [ jb55 MP2E V materus ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
mainProgram = "obs";

15
pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
View File

@ -1,5 +1,18 @@
diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake
index d1e58a083..a03c6b98e 100644
--- a/cmake/Modules/ObsDefaults_Linux.cmake
+++ b/cmake/Modules/ObsDefaults_Linux.cmake
@@ -76,7 +76,7 @@ macro(setup_obs_project)
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
- set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
+ set(OBS_SCRIPT_PLUGIN_PATH "${OBS_SCRIPT_PLUGIN_DESTINATION}")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}")
else()
set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")
diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
index 36aac7097..801cec788 100644
index b006a5598..531655eb3 100644
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
@@ -56,7 +56,7 @@ const char *get_module_extension(void)

4
pkgs/applications/virtualization/driver/win-virtio/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "win-virtio";
version = "0.1.229-1";
version = "0.1.240-1";
src = fetchurl {
url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";
hash = "sha256-yIoN3jRgXq7mz4ifPioMKvPK65G130WhJcpPcBrLu+A=";
hash = "sha256-69SCWGaPf3jgJu0nbCip0Z2D4CD/oICtaZENyGu8vMY=";
};
nativeBuildInputs = [

27
pkgs/by-name/aa/aarch64-esr-decoder/package.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "aarch64-esr-decoder";
version = "0.2.1";
src = fetchFromGitHub {
owner = "google";
repo = "aarch64-esr-decoder";
rev = version;
hash = "sha256-YdB/8EUeELcKBj8UMbeWFzJ8HeMHvDgrP2qlOJp2dXA=";
};
cargoHash = "sha256-P55DiHBUkr6mreGnWET4+TzLkKnVQJ0UwvrGp6BQ304=";
meta = with lib; {
description = "A utility for decoding aarch64 ESR register values";
homepage = "https://github.com/google/aarch64-esr-decoder";
changelog = "https://github.com/google/aarch64-esr-decoder/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ jmbaur ];
mainProgram = "aarch64-esr-decoder";
};
}

15
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
View File

@ -11,15 +11,17 @@ let
# than we do. We don't just use theirs because ours are less ambiguous and
# some builds need that clarity.
#
# FIXME:
# There's some dragons here. Build host and target concepts are being mixed up.
ndkInfoFun = { config, ... }: {
ndkBuildInfoFun = { config, ... }: {
x86_64-apple-darwin = {
double = "darwin-x86_64";
};
x86_64-unknown-linux-gnu = {
double = "linux-x86_64";
};
}.${config} or
(throw "Android NDK doesn't support building on ${config}, as far as we know");
ndkTargetInfoFun = { config, ... }: {
i686-unknown-linux-android = {
triple = "i686-linux-android";
arch = "x86";
@ -37,11 +39,10 @@ let
triple = "aarch64-linux-android";
};
}.${config} or
(throw "Android NDK doesn't support ${config}, as far as we know");
(throw "Android NDK doesn't support targetting ${config}, as far as we know");
buildInfo = ndkInfoFun stdenv.buildPlatform;
hostInfo = ndkInfoFun stdenv.hostPlatform;
targetInfo = ndkInfoFun stdenv.targetPlatform;
buildInfo = ndkBuildInfoFun stdenv.buildPlatform;
targetInfo = ndkTargetInfoFun stdenv.targetPlatform;
inherit (stdenv.targetPlatform) sdkVer;
suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] stdenv.targetPlatform.config;

6
pkgs/development/androidndk-pkgs/default.nix
View File

@ -29,7 +29,7 @@
# these two really are the same.
buildAndroidndk = buildAndroidComposition.ndk-bundle;
androidndk = androidComposition.ndk-bundle;
targetAndroidndkPkgs = targetPackages.androidndkPkgs_21;
targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_21 then targetPackages.androidndkPkgs_21 else throw "androidndkPkgs_21: no targetPackages, use `buildPackages.androidndkPkgs_21";
};
"23b" =
@ -59,7 +59,7 @@
# these two really are the same.
buildAndroidndk = buildAndroidComposition.ndk-bundle;
androidndk = androidComposition.ndk-bundle;
targetAndroidndkPkgs = targetPackages.androidndkPkgs_23b;
targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_23b then targetPackages.androidndkPkgs_23b else throw "androidndkPkgs_23b: no targetPackages, use `buildPackages.androidndkPkgs_23b";
};
"24" =
@ -89,7 +89,7 @@
# these two really are the same.
buildAndroidndk = buildAndroidComposition.ndk-bundle;
androidndk = androidComposition.ndk-bundle;
targetAndroidndkPkgs = targetPackages.androidndkPkgs_24;
targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_24 then targetPackages.androidndkPkgs_24 else throw "androidndkPkgs_24: no targetPackages, use `buildPackages.androidndkPkgs_24";
};
}

25
pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch Normal file
View File

@ -0,0 +1,25 @@
From 5d2377ad5e99742662e056bb782d5c21afb01dfb Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloom@riseup.net>
Date: Tue, 19 Sep 2023 13:27:39 +0300
Subject: [PATCH] Use the module mode to search for the `LibXml2` package.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03490335..fb69e8fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,7 @@ find_package(Expat)
# CMake ships with a `FindLibXml2.cmake` module which does not configure needed libxml2 dependencies.
# Thus, use the `libxml2-config.cmake` config file shipped with libxml which configures dependencies correctly by
# skipping module search mode.
-find_package(LibXml2 NO_MODULE)
+find_package(LibXml2 MODULE)
if(${CMAKE_VERSION} VERSION_GREATER "3.16.0")
find_package(
Qt6
--
2.42.0

19
pkgs/development/libraries/gr-framework/default.nix
View File

@ -1,17 +1,18 @@
{ cairo
, cmake
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, cairo
, cmake
, ffmpeg
, freetype
, ghostscript
, glfw
, lib
, libjpeg
, libtiff
, nix-update-script
, qhull
, qtbase
, stdenv
, wrapQtAppsHook
, xorg
, zeromq
@ -19,15 +20,19 @@
stdenv.mkDerivation rec {
pname = "gr-framework";
version = "0.72.9";
version = "0.72.10";
src = fetchFromGitHub {
owner = "sciapp";
repo = "gr";
rev = "v${version}";
hash = "sha256-4rOcrMn0sxTeRQqiQMAWULzUV39i6J96Mb096Lyblns=";
hash = "sha256-ZFaun8PBtPTmhZ0+OHzUu27NvcJGxsImh+c7ZvCTNa0=";
};
patches = [
./Use-the-module-mode-to-search-for-the-LibXml2-package.patch
];
nativeBuildInputs = [
cmake
wrapQtAppsHook

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

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "sundials";
version = "6.6.1";
version = "6.6.0";
outputs = [ "out" "examples" ];
src = fetchurl {
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
hash = "sha256-UWKw5tGdexQHiiFEHgeVzzjR2IOXO+NZAeAY+bswxUM=";
hash = "sha256-+QApuNqEbI+v9VMP0fpIRweRiNBAVU9VwdXR4EdD0p0=";
};
nativeBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "boost-histogram";
version = "1.3.2";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boost_histogram";
inherit version;
hash = "sha256-4XXvvBBUonvFP7vpVHLKyeqTmZyR0GEYQNd2uZWI1Ro=";
hash = "sha256-z5gmz8/hAzUJa1emH2xlafZfAVklnusiUcW/MdhZ11M=";
};
nativeBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "patiencediff";
version = "0.2.13";
version = "0.2.14";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "breezy-team";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Hst/2hRqH8AIKD2EXtJo8m3diOxPBWAmNhtS3TUYT3I=";
hash = "sha256-KTOESjaj8fMxJZ7URqg6UMpiQppqZAlk4IPWEw4/Nvw=";
};
nativeBuildInputs = [

9
pkgs/development/python-modules/xdg-base-dirs/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "xdg-base-dirs";
version = "6.0.0";
version = "6.0.1";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "srstevenson";
repo = "xdg-base-dirs";
rev = version;
hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI=";
hash = "sha256-nbdF1tjVqlxwiGW0pySS6HyJbmNuQ7mVdQYfhofO4Dk=";
};
nativeBuildInputs = [
@ -28,6 +28,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "xdg_base_dirs" ];
# remove coverage flags from pytest config
postPatch = ''
sed -i /addopts/d pyproject.toml
'';
meta = with lib; {
description = "An implementation of the XDG Base Directory Specification in Python";
homepage = "https://github.com/srstevenson/xdg-base-dirs";

17
pkgs/development/tools/continuous-integration/dagger/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, testers, dagger }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, testers, dagger }:
buildGoModule rec {
pname = "dagger";
version = "0.8.4";
version = "0.8.7";
src = fetchFromGitHub {
owner = "dagger";
repo = "dagger";
rev = "v${version}";
hash = "sha256-iFuPbSat555QHPqqP6j/6uTid19x1+OtRHADmGxTYzs=";
hash = "sha256-vlHLqqUMZAuBgI5D1L2g6u3PDZsUp5oUez4x9ydOUtM=";
};
vendorHash = "sha256-DWmHq8BIR00QTh3ZcbEgTtbHwTmsMFAhV7kQVRSKNdQ=";
vendorHash = "sha256-B8Qvyvh9MRGFDBvc/Hu+IitBBdHvEU3QjLJuIy1S04A=";
proxyVendor = true;
subPackages = [
@ -20,6 +20,15 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/engine.Version=${version}" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd dagger \
--bash <($out/bin/dagger completion bash) \
--fish <($out/bin/dagger completion fish) \
--zsh <($out/bin/dagger completion zsh)
'';
passthru.tests.version = testers.testVersion {
package = dagger;
command = "dagger version";

10
pkgs/development/tools/dtools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dtools";
version = "2.103.1";
version = "2.105.2";
src = fetchFromGitHub {
owner = "dlang";
repo = "tools";
rev = "v${version}";
sha256 = "sha256-XM4gUxcarQCOBR8W/o0iWAI54PyLDkH6CsDce22Cnu4=";
sha256 = "sha256-Y8jSwd6tldCnq3yEuO/xUYrSV+lp7tBPMiheMA06f0M=";
name = "dtools";
};
@ -34,18 +34,18 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = ''
$makeCmd test_rdmd
$makeCmd test_rdmd
'';
installPhase = ''
$makeCmd INSTALL_DIR=$out install
$makeCmd INSTALL_DIR=$out install
'';
meta = with lib; {
description = "Ancillary tools for the D programming language compiler";
homepage = "https://github.com/dlang/tools";
license = lib.licenses.boost;
maintainers = with maintainers; [ ThomasMader ];
maintainers = with maintainers; [ ThomasMader jtbx ];
platforms = lib.platforms.unix;
};
}

6
pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
View File

@ -31,7 +31,7 @@
, gdk-pixbuf
}:
let
version = "0.21.1";
version = "0.22.1";
pname = "space-station-14-launcher";
in
buildDotnetModule rec {
@ -44,7 +44,7 @@ buildDotnetModule rec {
owner = "space-wizards";
repo = "SS14.Launcher";
rev = "v${version}";
hash = "sha256-uJ/47cQZsGgrExemWCWeSM/U6eW2HoKWHCsVE2KypVQ=";
hash = "sha256-I+Kj8amgFxT6yEXI5s1y0n1rgfzIrLtMOkYjguu6wpo=";
fetchSubmodules = true;
};
@ -121,7 +121,7 @@ buildDotnetModule rec {
postInstall = ''
mkdir -p $out/lib/space-station-14-launcher/loader
cp -r SS14.Loader/bin/${buildType}/*/* $out/lib/space-station-14-launcher/loader/
cp -r SS14.Loader/bin/${buildType}/*/*/* $out/lib/space-station-14-launcher/loader/
icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out
'';

5
pkgs/os-specific/linux/intel-compute-runtime/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, patchelf
, cmake
, pkg-config
, intel-gmmlib
@ -12,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
version = "23.22.26516.18";
version = "23.26.26690.22";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
sha256 = "sha256-SeNmCXqoUqTo1F3ia+4fAMHWJgdEz/PsNFEkrqM+0k4=";
hash = "sha256-2ZFDnVfLYKNZbgFARYMWqLDjgH8aZY5SA3ZwQ85nPYo=";
};
nativeBuildInputs = [ cmake pkg-config ];

12
pkgs/servers/home-automation/evcc/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, buildGoModule
, buildGo121Module
, fetchFromGitHub
, fetchNpmDeps
, cacert
@ -14,22 +14,22 @@
, stdenv
}:
buildGoModule rec {
buildGo121Module rec {
pname = "evcc";
version = "0.118.11";
version = "0.120.1";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-gwFArZJX3DBUNaSpWD5n76VImWeDImR8b1s2czBrBaA=";
hash = "sha256-mifpswB8hA7Ke2r2afYRlGDdhbz7AYxMZBNaRQvUodQ=";
};
vendorHash = "sha256-0NTOit1nhX/zxQjHwU7ZOY1GsoIu959/KICCEWyfIQ4=";
vendorHash = "sha256-LNMNqlb/aj+ZHuwMvtK//oWyi34mm47ShAAD427szS4=";
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-/zpyU7x3cdmKrS7YiMe2BVJm0AC0P+yspiG9C3dMVAk=";
hash = "sha256-quznAvgAFJJnKabsFZxAu7yDkAuvujg6of6En8JaFs4=";
};
nativeBuildInputs = [

4
pkgs/tools/llm/open-interpreter/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub
}:
let
version = "0.1.3";
version = "0.1.4";
in
python3.pkgs.buildPythonApplication {
pname = "open-interpreter";
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication {
owner = "KillianLucas";
repo = "open-interpreter";
rev = "v${version}";
hash = "sha256-xmmyDIshEYql41k/7gF+ay7s3mI+iGCjr5gDfLkqLU0=";
hash = "sha256-3a4pRV8o+NBZGgOuXng97KjRVU8xVqBp+B9sXsCqHtk=";
};
nativeBuildInputs = [

16
pkgs/tools/misc/perccli/default.nix
View File

@ -6,16 +6,18 @@
stdenvNoCC.mkDerivation rec {
pname = "perccli";
version = "7.2110.00";
# On a new release, update version, URL, hash, and meta.homepage
version = "7.2313.00";
src = fetchzip {
# On pkg update: manually adjust the version in the URL because of the different format.
url = "https://dl.dell.com/FOLDER09074160M/1/PERCCLI_7.211.0_Linux.tar.gz";
sha256 = "sha256-8gk+0CrgeisfN2hNpaO1oFey57y7KuNy2i6PWTikDls=";
url = "https://dl.dell.com/FOLDER09770976M/1/PERCCLI_7.2313.0_A14_Linux.tar.gz";
hash = "sha256-IhclHVkdihRx5CzyO2dlOEhCon+0/HB3Fkue7MWsWnw=";
# Dell seems to block "uncommon" user-agents, such as Nixpkgs's custom one.
# Sending no user-agent at all seems to be fine though.
curlOptsList = [ "--user-agent" "" ];
# 403 otherwise
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
};
nativeBuildInputs = [ rpmextract ];
@ -43,6 +45,10 @@ stdenvNoCC.mkDerivation rec {
meta = with lib; {
description = "Perccli Support for PERC RAID controllers";
# Must be updated with every release
homepage = "https://www.dell.com/support/home/en-us/drivers/driversdetails?driverid=tdghn";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ panicgh ];

4
pkgs/tools/misc/starship/default.nix
View File

@ -33,6 +33,10 @@ rustPlatform.buildRustPackage rec {
--bash <($out/bin/starship completions bash) \
--fish <($out/bin/starship completions fish) \
--zsh <($out/bin/starship completions zsh)
presetdir=$out/share/starship/presets/
mkdir -p $presetdir
cp docs/.vuepress/public/presets/toml/*.toml $presetdir
'';
cargoHash = "sha256-ZHHrpepKZnSGufyEAjNDozaIKAt2GFRt+hU2ej7LceA=";

4
pkgs/tools/system/openipmi/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "OpenIPMI";
version = "2.0.33";
version = "2.0.34";
src = fetchurl {
url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz";
sha256 = "sha256-+1Pp6l4mgc+K982gJLGgBExnX4QRbKJ66WFsi3rZW0k=";
sha256 = "sha256-kyJ+Q8crXDvVlJMj4GaapVJ9GpcUc6OjZa8D+4KEqV8=";
};
buildInputs = [ ncurses popt python3 readline ];

14
pkgs/tools/wayland/wl-screenrec/default.nix
View File

@ -2,22 +2,23 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, wayland
, libdrm
, ffmpeg
, wayland
}:
rustPlatform.buildRustPackage rec {
pname = "wl-screenrec";
version = "unstable-2023-05-31";
version = "unstable-2023-09-17";
src = fetchFromGitHub {
owner = "russelltg";
repo = pname;
rev = "fc918f7898900c1882c6f64c96ed2de8cb9a6300";
hash = "sha256-P/JELiw0qGcwLFgNPccN/uetNy8CNCJdlCLhgq0h4sc=";
rev = "a36c5923009b44f2131196d8a3a234948f8e0102";
hash = "sha256-V29eB9vozVKIBq8dO7zgA4nirsh1eDBjJN+rwVkeDLE=";
};
cargoHash = "sha256-r9zmAiLiAntHcb5W/WKmKbVP9c9+15ElIWtHkks0wig=";
cargoHash = "sha256-uUfEweLWn/NdqgY8O7Ld+YnGPKQV1tpJi/Gd4MZB4xI=";
nativeBuildInputs = [
pkg-config
@ -26,9 +27,12 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
wayland
libdrm
ffmpeg
];
doCheck = false; # tests use host compositor, etc
meta = with lib; {
description = "High performance wlroots screen recording, featuring hardware encoding";
homepage = "https://github.com/russelltg/wl-screenrec";

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

@ -5810,6 +5810,8 @@ with pkgs;
komorebi = callPackage ../applications/graphics/komorebi { };
konsave = callPackage ../applications/misc/konsave { };
krapslog = callPackage ../tools/misc/krapslog { };
krelay = callPackage ../applications/networking/cluster/krelay { };
@ -7985,7 +7987,9 @@ with pkgs;
ettercap = callPackage ../applications/networking/sniffers/ettercap { };
evcc = callPackage ../servers/home-automation/evcc { };
evcc = callPackage ../servers/home-automation/evcc {
go = go_1_21;
};
eventstat = callPackage ../os-specific/linux/eventstat { };