summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/systems/inspect.nix2
-rw-r--r--nixos/modules/programs/neovim.nix2
-rw-r--r--pkgs/applications/graphics/darktable/default.nix6
-rw-r--r--pkgs/data/misc/v2ray-geoip/default.nix6
-rw-r--r--pkgs/development/libraries/lensfun/default.nix26
-rw-r--r--pkgs/development/libraries/zimg/default.nix2
-rw-r--r--pkgs/development/python-modules/google-cloud-texttospeech/default.nix4
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/default.nix14
-rw-r--r--pkgs/servers/plex/raw.nix6
-rw-r--r--pkgs/tools/misc/grub/2.0x.nix4
-rw-r--r--pkgs/tools/networking/xl2tpd/default.nix2
-rw-r--r--pkgs/tools/security/yubikey-agent/default.nix8
12 files changed, 49 insertions, 33 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 53d84118bd30..270be3a43cd3 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -78,7 +78,7 @@ rec {
isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
isEfi = map (family: { cpu.family = family; })
- [ "x86" "arm" "aarch64" ];
+ [ "x86" "arm" "aarch64" "riscv" ];
};
matchAnyAttrs = patterns:
diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix
index 8de527fceb26..4562e5a2c29b 100644
--- a/nixos/modules/programs/neovim.nix
+++ b/nixos/modules/programs/neovim.nix
@@ -7,7 +7,7 @@ let
runtime' = filter (f: f.enable) (attrValues cfg.runtime);
- runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime');
+ runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime');
in {
options.programs.neovim = {
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index c9d5afce614c..cc727a9a8509 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -27,6 +27,7 @@
, libpng
, librsvg
, libtiff
+, libjxl
, openexr_3
, osm-gps-map
, pkg-config
@@ -57,12 +58,12 @@
}:
stdenv.mkDerivation rec {
- version = "4.0.0";
+ version = "4.2.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl";
+ sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9";
};
nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
@@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
libpng
librsvg
libtiff
+ libjxl
openexr_3
sqlite
libxslt
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index f00e67dfdcab..7ce9973c3b72 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
- version = "202301050046";
+ version = "202301120046";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "6bb07558ac223b3decdff985d5737f4384b34238";
- sha256 = "sha256-KXLIIs1W+8TC2GtW3m/YA5WQ13Pq5kxC5Zc9jDzW/tU=";
+ rev = "c308361f47373772d1a3b9d486cd7dded7165d8e";
+ sha256 = "sha256-GhCEsMDeMapWpJckMWS+3azuNjMdiN4cjDyq8aSJINA=";
};
installPhase = ''
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index a889e5358a50..2f0e2148dfeb 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }:
let
- version = "0.3.95";
+ version = "0.3.3";
pname = "lensfun";
# Fetch a more recent version of the repo containing a more recent lens
@@ -9,8 +9,8 @@ let
lensfunDatabase = fetchFromGitHub {
owner = "lensfun";
repo = "lensfun";
- rev = "4672d765a17bfef7bc994ca7008cb717c61045d5";
- sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41";
+ rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d";
+ sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic=";
};
in
@@ -21,16 +21,26 @@ stdenv.mkDerivation {
owner = "lensfun";
repo = "lensfun";
rev = "v${version}";
- sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r";
+ sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz";
};
# replace database with a more recent snapshot
+ # the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
+ # so we run the conversion tool the project provides,
+ # then untar the verson 1 profiles into the source dir before we build
prePatch = ''
- rm -R ./data/db
- cp -R ${lensfunDatabase}/data/db ./data
+ rm -R data/db
+ python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db
+ mkdir -p data/db
+ tar xvf $TMPDIR/db/version_1.tar -C data/db
+ date +%s > data/db/timestamp.txt
'';
- nativeBuildInputs = [ cmake pkg-config ];
+ nativeBuildInputs = [
+ cmake pkg-config
+ python3 python3.pkgs.lxml # For the db converison
+ ];
+
buildInputs = [ glib zlib libpng ];
cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 475ebc7517e5..f7b0ab31d83c 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
description = "Scaling, colorspace conversion and dithering library";
homepage = "https://github.com/sekrit-twc/zimg";
license = licenses.wtfpl;
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = with platforms; unix ++ windows;
maintainers = with maintainers; [ rnhmjoj ];
};
}
diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index dc808df9df7f..6d674aeee846 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
- version = "2.13.0";
+ version = "2.14.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-jpDwERTLRmS1mO2O2OboZa6AAUh3k/Dyg77TCVTqLok=";
+ hash = "sha256-q4OD37ryZqg40L89BNZdLCNeC1QPwVhUaT4S5tO88Jk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 5f238e7e14d7..f1f15c6eecca 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -51,13 +51,13 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
- version = "515.49.25";
- persistencedVersion = "515.48.07";
- settingsVersion = "515.48.07";
- sha256_64bit = "sha256-5j+YtKaPhDxd9bcPX10ViugLMCTXEYJfod+ecn3SHWc=";
- openSha256 = "sha256-EnZXEvic9GdcNbcvpmbDkq6YPYqypBKyEXxFJJJJpKk=";
- settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
- persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
+ version = "525.47.04";
+ persistencedVersion = "525.78.01";
+ settingsVersion = "525.78.01";
+ sha256_64bit = "sha256-PcDRM39s4vh5++4TocIJKI3wsxWxJdy3p3KAenpdIc0=";
+ openSha256 = "sha256-jH7mwSpasOdWMvN1xuPkO33g0XJjObzA45aqHwKoD4w=";
+ settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw=";
+ persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA=";
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
};
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 1bb3b0d0103d..c7d1ec7f36e2 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.30.0.6486-629d58034";
+ version = "1.30.1.6562-915986d62";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
- sha256 = "sha256-7blNvNx18sazfff6yIlRXp9vKWiRVISccx/8wjxWz34=";
+ sha256 = "sha256-fUt8fh4jeZiUbDoc8ivuSpx0Hf4ShYYcfJUJjU+GCxQ=";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
- sha256 = "sha256-ol0WSYwk0Cmz6xJYe3mqaPDjgi4VPiH+vHnP0BIwVBU=";
+ sha256 = "sha256-ho/r/ouaFsdCH0xcFuy4TWamu0c/ZBZDJO6cYQK/pW0=";
};
outputs = [ "out" "basedb" ];
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 58ed620ffd08..15c9652d6a29 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -25,6 +25,8 @@ let
x86_64-linux.target = "x86_64";
armv7l-linux.target = "arm";
aarch64-linux.target = "aarch64";
+ riscv32-linux.target = "riscv32";
+ riscv64-linux.target = "riscv64";
};
# For aarch64, we need to use '--target=aarch64-efi' when building,
@@ -34,6 +36,8 @@ let
x86_64-linux.target = "x86_64";
armv7l-linux.target = "arm";
aarch64-linux.target = "arm64";
+ riscv32-linux.target = "riscv32";
+ riscv64-linux.target = "riscv64";
};
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix
index 2f270f8161fa..9f9463ce5958 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/pkgs/tools/networking/xl2tpd/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
- homepage = "http://www.xelerance.com/software/xl2tpd/";
+ homepage = src.meta.homepage;
description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)";
platforms = platforms.linux;
license = licenses.gpl2;
diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix
index c4a9dfd5b0fd..76f63e58222b 100644
--- a/pkgs/tools/security/yubikey-agent/default.nix
+++ b/pkgs/tools/security/yubikey-agent/default.nix
@@ -3,12 +3,12 @@
buildGoModule rec {
pname = "yubikey-agent";
- version = "unstable-2022-03-17";
+ version = "0.1.6";
src = fetchFromGitHub {
owner = "FiloSottile";
repo = "yubikey-agent";
- rev = "205a7ef2554625c7494038600d963123d6311873";
- sha256 = "sha256-wJpN63KY5scmez6yYFsIr3JLEUB+YSl/XvoatIIeRI0=";
+ rev = "v${version}";
+ sha256 = "sha256-Knk1ipBOzjmjrS2OFUMuxi1TkyDcSYlVKezDWT//ERY=";
};
buildInputs =
@@ -21,7 +21,7 @@ buildGoModule rec {
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
'';
- vendorSha256 = "sha256-SnjbkDPVjAnCbM2nLqBsuaPZwOmvDTKiUbi/93BlWVQ=";
+ vendorSha256 = "sha256-+IRPs3wm3EvIgfQRpzcVpo2JBaFQlyY/RI1G7XfVS84=";
doCheck = false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 05:13:01 +0000