colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-04-08 06:01:14 +00:00 committed by GitHub
parent 70261795c8 1d6f060cd5
commit 75bd2f210c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 122 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/modules/services/misc/ollama.nix
View File

@ -15,6 +15,22 @@ in
services.ollama = {
enable = lib.mkEnableOption "ollama server for local large language models";
package = lib.mkPackageOption pkgs "ollama" { };
home = lib.mkOption {
type = types.str;
default = "%S/ollama";
example = "/home/foo";
description = ''
The home directory that the ollama service is started in.
'';
};
models = lib.mkOption {
type = types.str;
default = "%S/ollama/models";
example = "/path/to/ollama/models";
description = ''
The directory that the ollama service will read models from and download new models to.
'';
};
listenAddress = lib.mkOption {
type = types.str;
default = "127.0.0.1:11434";
@ -58,8 +74,8 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment = cfg.environmentVariables // {
HOME = "%S/ollama";
OLLAMA_MODELS = "%S/ollama/models";
HOME = cfg.home;
OLLAMA_MODELS = cfg.models;
OLLAMA_HOST = cfg.listenAddress;
};
serviceConfig = {

8
pkgs/applications/audio/reaper/default.nix
View File

@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.11";
version = "7.13";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = if stdenv.isDarwin then "sha256-8GWfrr+kKF3Ei6Fed9Oei461veRXXbTICvyNJNLBbYM=" else {
x86_64-linux = "sha256-lpgGXHWWhhs1jLllq5C3UhOLgLyMTE6qWFiGkBcuWlo=";
aarch64-linux = "sha256-0iTdrZYjKzPyNLMIM4othtAMox/65HBEy1VickOZFnA=";
hash = if stdenv.isDarwin then "sha256-g9t1vCPKTw68w6/b401OAdMNth4UlT9Obht6oPArqKY=" else {
x86_64-linux = "sha256-Zj+3LXNoHD6+v0dDn8mKqN14Y9Tk2+fZ4W343VjZoLw=";
aarch64-linux = "sha256-kbonwYlEd13AIzy1DNbsFwy+rRrQpOTrup3NZpJOmUA=";
}.${stdenv.hostPlatform.system};
};

8
pkgs/applications/audio/touchosc/default.nix
View File

@ -45,7 +45,7 @@ in
stdenv.mkDerivation rec {
pname = "touchosc";
version = "1.2.9.200";
version = "1.3.0.202";
suffix = {
aarch64-linux = "linux-arm64";
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
hash = {
aarch64-linux = "sha256-JrpwD4xD4t9e3qmBCl6hfHv/InnRBRsYIsNNrxwQojo=";
armv7l-linux = "sha256-8e50jznyHUJt9aL5K/emp0T8VSLdXMuBl6KCMot8kIY=";
x86_64-linux = "sha256-lQi1HFW53LdS6Q86s0exp0WmTMTz4g48yZC73DaM2lo=";
aarch64-linux = "sha256-qsjZ/oo2V6mknrMktuTP188hp57oiPxO/iwp3G57JXU=";
armv7l-linux = "sha256-33SnAYumfnZlxKms3fANt9wRJghaQHUstZbKqTxBF3Q=";
x86_64-linux = "sha256-4SE2iw45sLyapYLCd31xT/aZMTmetsjmgfWFf0FrluI=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

6
pkgs/applications/editors/wily/default.nix
View File

@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 libXt ];
configureFlags = [ "--prefix=$(out)" ];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
"-Wno-error=implicit-int"
"-Wno-error=implicit-function-declaration"
"-Wno-error=incompatible-function-pointer-types"
]);
preInstall = ''
mkdir -p $out/bin

15
pkgs/applications/misc/megasync/default.nix
View File

@ -8,7 +8,6 @@
, doxygen
, fetchFromGitHub
, ffmpeg
, freeimage
, libmediainfo
, libraw
, libsodium
@ -28,13 +27,13 @@
}:
mkDerivation rec {
pname = "megasync";
version = "4.9.0.0";
version = "4.9.1.0";
src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAsync";
rev = "v${version}_Linux";
sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM=";
sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY=";
fetchSubmodules = true;
};
@ -54,7 +53,6 @@ mkDerivation rec {
cryptopp
curl
ffmpeg
freeimage
libmediainfo
libraw
libsodium
@ -72,7 +70,6 @@ mkDerivation rec {
./noinstall-distro-version.patch
# megasync target is not part of the install rule thanks to a commented block
./install-megasync.patch
./ffmpeg_44.patch
];
postPatch = ''
@ -98,7 +95,7 @@ mkDerivation rec {
"--with-cryptopp"
"--with-curl"
"--with-ffmpeg"
"--with-freeimage"
"--without-freeimage"
"--without-readline"
"--without-termcap"
"--with-sodium"
@ -111,10 +108,10 @@ mkDerivation rec {
'';
preBuild = ''
qmake CONFIG+="release" MEGA.pro
qmake CONFIG+="nofreeimage release" MEGA.pro
pushd MEGASync
lrelease MEGASync.pro
DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release
DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+="nofreeimage release"
popd
'';
@ -124,6 +121,6 @@ mkDerivation rec {
homepage = "https://mega.nz/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.michojel ];
maintainers = [ ];
};
}

14
pkgs/applications/misc/megasync/ffmpeg_44.patch
View File

@ -1,14 +0,0 @@
Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
===================================================================
--- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp
+++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg(
// Force seeking to key frames
formatContext->seek2any = false;
- videoStream->skip_to_keyframe = true;
+ // no longer exposed in ffmpeg 4.4; the line above should be sufficient
+ //videoStream->skip_to_keyframe = true;
if (decoder->capabilities & CAP_TRUNCATED)
{
codecContext->flags |= CAP_TRUNCATED;

4
pkgs/applications/misc/passky-desktop/default.nix
View File

@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation rec {
pname = "passky-desktop";
version = "8.1.1";
version = "8.1.2";
src = fetchFromGitHub {
owner = "Rabbit-Company";
repo = "Passky-Desktop";
rev = "refs/tags/v${version}";
sha256 = "1ma8s1bngjdzclcc4m5pcmavk38sidaskmz7dgfnv84y35si18dr";
sha256 = "sha256-QQ0+qIkDPNCHeWmcF6FkbDrrt/r3fIkNi0dv6XlV1rc=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/xmrig/default.nix
View File

@ -15,13 +15,13 @@ let
in
stdenv.mkDerivation rec {
pname = "xmrig";
version = "6.21.1";
version = "6.21.2";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
hash = "sha256-xMfNWqr43Gxu+ET8oP9l97+tBsL/b6DNuFU4j9wy0UA=";
hash = "sha256-0ej2+g+B9K50JIs0wi1SfLBsaYTsk+0/cImLLZLNtmc=";
};
patches = [

4
pkgs/applications/science/biology/seqkit/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "seqkit";
version = "2.8.0";
version = "2.8.1";
src = fetchFromGitHub {
owner = "shenwei356";
repo = "seqkit";
rev = "v${version}";
sha256 = "sha256-JsrmRUbSNCFJ58tIblKq+VRXCD1mBeCAcosDGiVb5Gs=";
sha256 = "sha256-LtPf99spy2ByTnSMJ5k1mWkh+Nct3Fg4Y9mXARxuXlA=";
};
vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0=";

4
pkgs/by-name/si/simdutf/package.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "simdutf";
version = "5.2.0";
version = "5.2.3";
src = fetchFromGitHub {
owner = "simdutf";
repo = "simdutf";
rev = "v${finalAttrs.version}";
hash = "sha256-4yo962iiwSPW1JeQq5mLse5DJUub7AWqMDA+AdpsRBo=";
hash = "sha256-aGuztJLHfC/GZuvZSieWOOYN5VyvxYCZKGX1nQQDvxo=";
};
# Fix build on darwin

40
pkgs/by-name/ta/tangerine/package.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, ncurses
, SDL2
}:
stdenv.mkDerivation {
pname = "tangerine";
version = "unstable-2024-04-05";
src = fetchFromGitHub {
owner = "Aeva";
repo = "tangerine";
rev = "a628e95d181d396246214df5194ac6b18698d811";
hash = "sha256-vn4/eH5o0UhTNfN2UB4r0eKNn90PbH3UPfarHsnQPIk=";
};
patches = [
(fetchpatch {
name = "no-install-during-build.patch";
url = "https://github.com/Aeva/tangerine/pull/12/commits/2d7d1ae1e21e8fe52df2c4a33e947b2ff6b07812.patch";
hash = "sha256-zLAx5FOvtUsUZM/nUCFW8Z1Xe3+oV95Nv1s3GaNcV/c=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ ncurses SDL2 ];
meta = with lib; {
description = "A system for creating 3D models procedurally from a set of Signed Distance Function (SDF) primitive shapes and combining operators";
homepage = "https://github.com/Aeva/tangerine";
license = licenses.asl20;
maintainers = [ maintainers.viraptor ];
broken = stdenv.isDarwin; # third_party/naive-surface-nets doesn't find std::execution
};
}

4
pkgs/data/icons/whitesur-icon-theme/default.nix
View File

@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2023-07-03";
version = "2024.04.08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-lq6d3BForrvzEJYeEMQZplvn/p6dPjggTToAU9UcPoM=";
hash = "sha256-Baf0BowyR4P7MDx+LmH6MHlANl+9lXlCaQispN4/i9o=";
};
nativeBuildInputs = [ gtk3 jdupes ];

4
pkgs/development/libraries/c-blosc/2.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "c-blosc2";
version = "2.13.2";
version = "2.14.3";
src = fetchFromGitHub {
owner = "Blosc";
repo = "c-blosc2";
rev = "v${finalAttrs.version}";
sha256 = "sha256-RNIvg6p/+brW7oboTDH0bbRfIQDaZwtZbbWFbftfWTk=";
sha256 = "sha256-0rizBygyNW9Sr7qnQZoN/Wv2ZIAYuJTQ5tkW6iwIw7Y=";
};
# https://github.com/NixOS/nixpkgs/issues/144170

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "linien-common";
version = "1.0.1";
version = "1.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "linien-org";
repo = "linien";
rev = "refs/tags/v${version}";
hash = "sha256-ZgAp1SEiHijyjK74VZyRLYY3Hzfc3BQ6cnoO3hZzvbE=";
hash = "sha256-V6oo0a4cNlvn4pIwzchvCTOu7qtUGS+Pc0qpbEsvGZo=";
};
sourceRoot = "${src.name}/linien-common";

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "xmlschema";
version = "3.0.2";
version = "3.2.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "xmlschema";
rev = "refs/tags/v${version}";
hash = "sha256-jYFhoNx4Oxm7c0LsSQ0xw9fY/yxfQU5JoP5RteHzeYM=";
hash = "sha256-jhof4C/jbMcvBRTLFdeFq2+ZucoDhbdcLE9IWvgzN0Y=";
};
nativeBuildInputs = [

4
pkgs/development/tools/altair-graphql-client/default.nix
View File

@ -2,11 +2,11 @@
let
pname = "altair";
version = "6.3.1";
version = "6.4.0";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-ebRwdivDxjcM3dD+RLW09otT/wovz1JjgXai2TsuSOE=";
sha256 = "sha256-eUUPfMwCMrMHk2RcLfpI8VuolgI/7geY6/6QrWjkIXg=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

4
pkgs/development/tools/parsing/re-flex/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "re-flex";
version = "4.1.2";
version = "4.2.0";
src = fetchFromGitHub {
owner = "Genivia";
repo = "RE-flex";
rev = "v${version}";
hash = "sha256-w1aH04VGe9nPvwGdbTEsAcIPb7oC739LZjTI/1Ck7bU=";
hash = "sha256-+/Q3lcdV4tEArYmuQN5iL6r5TS0J/zoLQ85bNazpSf8=";
};
outputs = [ "out" "bin" "dev" ];

6
pkgs/development/tools/rust/cargo-show-asm/default.nix
View File

@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-show-asm";
version = "0.2.30";
version = "0.2.31";
src = fetchCrate {
inherit pname version;
hash = "sha256-Xb7+3HSAa8mSNHufcVwshdS9XuofvFnAgaSvT6ZFj0I=";
hash = "sha256-TjkEzqGFqhVKMmZEcwAoDnHOZWi7+wha228loJjLxgQ=";
};
cargoHash = "sha256-SUL5SPpnx6TqoyEguEdCvkNizbZbFjcacn+xe4P1rFk=";
cargoHash = "sha256-oUfBpx/hElXMw58Dj09JeG2FKy+biFt+4pb4pYNidxc=";
nativeBuildInputs = [
installShellFiles

4
pkgs/games/chiaki4deck/default.nix
View File

@ -33,13 +33,13 @@
stdenv.mkDerivation rec {
pname = "chiaki4deck";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "streetpea";
repo = pname;
rev = "v${version}";
hash = "sha256-ogNfls7RPvzIVat0zlBlCWHWt22YfzGawjfgu5y9Gyk=";
hash = "sha256-hai7fIyeNcAURfeQtAIqOLb9j8erPNoy3zHK4rgLjc0=";
fetchSubmodules = true;
};

4
pkgs/games/heroic/default.nix
View File

@ -17,13 +17,13 @@
let appName = "heroic";
in stdenv.mkDerivation rec {
pname = "heroic-unwrapped";
version = "2.14.0";
version = "2.14.1";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "HeroicGamesLauncher";
rev = "v${version}";
hash = "sha256-EARNmvzOOE/AAQKqiXZhhCf2A/j9Cn2BRV9Yc0ezKfE=";
hash = "sha256-AnyltqNP+XyVzgCobM3g6DIXntD3spKecYtCRx+8oic=";
};
offlineCache = fetchYarnDeps {

8
pkgs/games/openjk/default.nix
View File

@ -31,14 +31,14 @@ let
categories = [ "Game" ];
};
in stdenv.mkDerivation {
pname = "OpenJK";
version = "0-unstable-2024-03-05";
pname = "openjk";
version = "0-unstable-2024-03-25";
src = fetchFromGitHub {
owner = "JACoders";
repo = "OpenJK";
rev = "62124e18ef09b293ea66a1f673b827d83e073928";
sha256 = "sha256-2LgxRWoAfxNE6YDyrpNmDH9APhi2XH4ufNCNMd91llU=";
rev = "d2afcfefb5eb07d6f3787b48b947482160f27a1d";
hash = "sha256-dUXrFlzeLfah0xMXKeXHCXnmeTjRAy0/+aDCtPNw8a8=";
};
dontAddPrefix = true;

6
pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grafana-dash-n-grab";
version = "0.5.2";
version = "0.6.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "esnet";
repo = "gdg";
sha256 = "sha256-EG1hLyoy75nvA1ZmSHSPVEzMwhq6d0PxmVUpQysjsRg=";
sha256 = "sha256-47zKZnq7ADIAti4fjGj6ctoM5Qo6UzAX1aLf87TknkQ=";
};
vendorHash = "sha256-w0w6ac8sNxsVBEYps6ZhM7F4PFcIWKah0cnk/NBtA8M=";
vendorHash = "sha256-XJSi+p++1QFfGk57trfIgyv0nWUm38H0n/qbJgV8lEM=";
ldflags = [
"-s"

4
pkgs/servers/sickbeard/sickgear.nix
View File

@ -4,13 +4,13 @@ let
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
version = "3.30.16";
version = "3.30.17";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
hash = "sha256-9DeHA7wBHz4gjqtRF3uaHKG9EEnjQmmEPvpqKaffJyg=";
hash = "sha256-ITEKF/YPoozAaCH/8s7Jwlj2YUc+CLqIjtpDZ3b2J5w=";
};
patches = [

4
pkgs/shells/oksh/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "oksh";
version = "7.4";
version = "7.5";
src = fetchFromGitHub {
owner = "ibara";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-QkWUTqFoEA+XZv0EAHnDtkm9xI+NlQcNqicCvCtXJYc=";
sha256 = "sha256-r75jjH1E7/36b0ebjsZK7rAuOHEyaIta5Bi8nB4zVjo=";
};
strictDeps = true;

6
pkgs/tools/graphics/netpbm/default.nix
View File

@ -20,14 +20,14 @@ stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
pname = "netpbm";
version = "11.5.3";
version = "11.6.0";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "4867";
sha256 = "JCJW6BBdxoYWMpZoJp6ovHNqyuU4a1FIvjLB2poDGGM=";
rev = "4897";
sha256 = "2aTDM0aVfav2mnOLXj0HuTdbsY7EUH8ieBrXgaFU7FU=";
};
nativeBuildInputs = [

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "moar";
version = "1.23.9";
version = "1.23.10";
src = fetchFromGitHub {
owner = "walles";
repo = pname;
rev = "v${version}";
hash = "sha256-qpbsNHIWiYTa5kt0GTybnWiSnUdPYIeFYsWXinYjtQA=";
hash = "sha256-ue/ZcIIJJAxUMhsEA3FtrkE5mgtiY626b+GmX62Q8dM=";
};
vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE=";

4
pkgs/tools/security/spire/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "spire";
version = "1.9.2";
version = "1.9.3";
outputs = [ "out" "agent" "server" ];
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "spiffe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Gbi6nM9tjH/bYOFwpBrjH/rFEtSs9ihxM3jDAt+5HTU=";
sha256 = "sha256-5Wisxo5RvDMmTgwPprpqVOPVTETCuUGWKuTu035swoY=";
};
vendorHash = "sha256-XYM6r/+31apm9Ygq3eMX5DRf8p7/jwkBNaE2OvooRwM=";