ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 12:39:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-03-07 06:00:56 +00:00 committed by GitHub
commit 1314597ec7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/spotify-player/default.nix
View File

@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
version = "0.16.3";
version = "0.17.0";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-8naLLHAVGB8ow88XjU3BpnNzY3SFC2F5uYin67hMc0E=";
hash = "sha256-fGDIlkTaRg+J6YcP9iBcJFuYm9F0UOA+v/26hhdg9/o=";
};
cargoHash = "sha256-NcNEZoERGOcMedLGJE7q9V9plx/7JSnbguZPFD1f4Qg=";
cargoHash = "sha256-oZNydOnD2+6gLAsT3YTSlWSQ06EftS7Tl/AvlTbL84U=";
nativeBuildInputs = [
pkg-config

6
pkgs/applications/version-management/forgejo/default.nix
View File

@ -39,17 +39,17 @@ let
in
buildGoModule rec {
pname = "forgejo";
version = "1.21.6-0";
version = "1.21.7-0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "forgejo";
repo = "forgejo";
rev = "v${version}";
hash = "sha256-YvLdqNo/zGutPnRVkcxCTcX7Xua0FXUs3veQ2NBgaAA=";
hash = "sha256-wYwQnZRIJSbwI+kOPedxnIdfhQ/wWxXpOpdfcFono6k=";
};
vendorHash = "sha256-5BznZiPZCwFEl74JVf7ujFtzsTyG6AcKvQG0LdaMKe4=";
vendorHash = "sha256-Mptfd1WoUXNQkw7sa/GxIO7s5V5/9VmVBtvPCjMsa/4=";
subPackages = [ "." ];

39
pkgs/by-name/de/decent-sampler/package.nix
View File

@ -1,6 +1,9 @@
{ lib
, stdenv
, fetchzip
, fetchurl
, makeDesktopItem
, copyDesktopItems
, buildFHSEnv
, alsa-lib
, freetype
@ -10,22 +13,43 @@
let
pname = "decent-sampler";
version = "1.9.4";
version = "1.10.0";
icon = fetchurl {
url = "https://archive.org/download/ds-256/DS256.png";
hash = "sha256-SV8zY5QJ6uRSrLuGTmT1zwGoIIXCV9GD2ZNiqK+i1Bc=";
};
decent-sampler = stdenv.mkDerivation {
inherit pname version;
src = fetchzip {
# dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\
# dropbox links: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\
url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz";
hash = "sha256-lTp/mukCwLNyeTcBT68eqa7aD0o11Bylbd93A5VCILU=";
hash = "sha256-KYCf/F2/ziuXDHim4FPZQBARiSywvQDJBzKbHua+3SM=";
};
nativeBuildInputs = [ copyDesktopItems ];
desktopItems = [
(makeDesktopItem {
type = "Application";
name = "decent-sampler";
desktopName = "Decent Sampler";
comment = "DecentSampler player";
icon = "decent-sampler";
exec = "decent-sampler";
categories = [ "Audio" "AudioVideo" ];
})
];
installPhase = ''
runHook preInstall
install -Dm755 DecentSampler $out/bin/decent-sampler
install -Dm755 DecentSampler.so -t $out/lib/vst
install -d "$out/lib/vst3" && cp -r "DecentSampler.vst3" $out/lib/vst3
install -Dm444 ${icon} $out/share/pixmaps/decent-sampler.png
runHook postInstall
'';
@ -34,7 +58,7 @@ let
in
buildFHSEnv {
inherit pname version;
inherit (decent-sampler) pname version;
targetPkgs = pkgs: [
alsa-lib
@ -46,6 +70,11 @@ buildFHSEnv {
runScript = "decent-sampler";
extraInstallCommands = ''
cp -r ${decent-sampler}/lib $out/lib
cp -r ${decent-sampler}/share $out/share
'';
meta = with lib; {
description = "An audio sample player";
longDescription = ''

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "immutabledict";
version = "4.1.0";
version = "4.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "corenting";
repo = "immutabledict";
rev = "refs/tags/v${version}";
hash = "sha256-c76apNW6nlxL9paevqKpPw5RpDLMpYnbVabCCIrW3pw=";
hash = "sha256-NpNS8HAacgXm3rFtyd5uFgSURNbDf+YVS1aFx51kwEA=";
};
nativeBuildInputs = [

4
pkgs/development/tools/ctlptl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ctlptl";
version = "0.8.27";
version = "0.8.28";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-4g5QfeAtPEUW7vwOwkJd8W3V6z1DxAmZngbrroCFr5M=";
hash = "sha256-GFCyFJrhl6VEnIuZNpIIYgdTHYxeBmaukpJ72xspwFM=";
};
vendorHash = "sha256-DEUZbqHHYfjD5jGT5nn3UbWT1aODRsLailSorI/W6w4=";

4
pkgs/servers/http/unit/default.nix
View File

@ -28,14 +28,14 @@ let
php82-unit = php82.override phpConfig;
in stdenv.mkDerivation rec {
version = "1.31.1";
version = "1.32.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = pname;
rev = version;
sha256 = "sha256-6hecOCEC2MeJJieOOamEf8ytpEVAGs5mB0H16lJDciU=";
sha256 = "sha256-u693Q6Gp8lFm3DX1q5i6W021bxD962NGBGDRxUtvGrk=";
};
nativeBuildInputs = [ which ];

10
pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
View File

@ -188,7 +188,6 @@ let
passthru = lib.optionalAttrs (! __combine) (splitOutputs // {
all = builtins.attrValues splitOutputs;
outputs = [ "out" ] ++ pkgList.nonEnvOutputs;
}) // {
# This is set primarily to help find-tarballs.nix to do its job
requiredTeXPackages = builtins.filter lib.isDerivation (pkgList.bin ++ pkgList.nonbin
@ -440,14 +439,11 @@ let
;
}).overrideAttrs (prev:
{ allowSubstitutes = true; }
# the outputsToInstall must be built by the main derivation for nix-profile-install to work
// lib.optionalAttrs (! __combine) ({
outputs = pkgList.outputsToInstall;
outputs = [ "out" ] ++ pkgList.nonEnvOutputs;
meta = prev.meta // { inherit (pkgList) outputsToInstall; };
} // (lib.mapAttrs'
(out: drv: { name = "otherOutput_" + out; value = drv; })
(lib.getAttrs (builtins.tail pkgList.outputsToInstall) splitOutputs)
)
} // builtins.listToAttrs
(map (out: { name = "otherOutput_" + out; value = splitOutputs.${out}; }) pkgList.nonEnvOutputs)
)
);
in out)