b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-09-02 00:02:02 +00:00 committed by GitHub
parent dbe312bfdb f0daeb19cb
commit 761072ccdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 231 additions and 672 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/gitlab.nix
View file

@ -168,7 +168,7 @@ let
port = cfg.registry.externalPort;
key = cfg.registry.keyFile;
api_url = "http://${config.services.dockerRegistry.listenAddress}:${toString config.services.dockerRegistry.port}/";
issuer = "gitlab-issuer";
issuer = cfg.registry.issuer;
};
extra = {};
uploads.storage_path = cfg.statePath;

6
pkgs/applications/blockchains/trezor-suite/default.nix
View file

@ -8,7 +8,7 @@
let
pname = "trezor-suite";
version = "22.3.2";
version = "22.8.2";
name = "${pname}-${version}";
suffix = {
@ -19,8 +19,8 @@ let
src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-GW8wmfTjuWrXijyPKeDJgF+mas1pfEMgAASmlvCURfFwg+oSL0B/0Z2qm5QRXIHmyd7eg/Zd8nEZL7Fg2Lb9ww==";
x86_64-linux = "sha512-/XQ/sI0TP++3KHlkBXLHe/SVGKcmyjT7vPkV0NCK4rlL70VE+wKLKQK6XKp4V81B5w2+3a/uPOWtmcVr5iVkSA==";
aarch64-linux = "sha512-tzGkEDVXOJaTfRPO4UUfDpqaddjeJvVHpf81A9hhpUTRIgbAO4fcOrTgJcgWCBotDo8nHCWjw+n5BG5PEfQ19Q==";
x86_64-linux = "sha512-qUM3HGYXbVbLRYXetLGbShPU5ochuptCUNn0G5RD3tQeipVZsgRkQCSfZ1Zb3HgoPUOna3u8Mp7Ipu1n8xi3vg==";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

6
pkgs/applications/editors/helix/default.nix
View file

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "helix";
version = "22.08";
version = "22.08.1";
# This release tarball includes source code for the tree-sitter grammars,
# which is not ordinarily part of the repository.
src = fetchzip {
url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
sha256 = "sha256-PSTsPt+OQhYQ/m/hm5PgHWrQXtbooT+tG0767KyiJJw=";
sha256 = "sha256-pqAhUxKeFN7eebVdNN3Ge38sA30SUSu4Xn4HDZAjjyY=";
stripRoot = false;
};
cargoSha256 = "sha256-5Ap/PU8IjAPKKiFxzHqWQMspWkbTYIwTNiSMWIceUPc=";
cargoSha256 = "sha256-idItRkymr+cxk3zv2mPBR/frCGvzEUdSAhY7gghfR3M=";
nativeBuildInputs = [ makeWrapper ];

12
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -1948,6 +1948,18 @@ final: prev:
meta.homepage = "https://github.com/Olical/conjure/";
};
context-vim = buildVimPluginFrom2Nix {
pname = "context.vim";
version = "2022-05-02";
src = fetchFromGitHub {
owner = "wellle";
repo = "context.vim";
rev = "c06541451aa94957c1c07a9f8a7130ad97d83a65";
sha256 = "1n9623cp8ljyrwnq0i4zqfaxp1fwsl5l3shg87ksn1xvj14fw66c";
};
meta.homepage = "https://github.com/wellle/context.vim/";
};
context_filetype-vim = buildVimPluginFrom2Nix {
pname = "context_filetype.vim";
version = "2021-08-08";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -163,6 +163,7 @@ https://github.com/nvim-treesitter/completion-treesitter/,,
https://github.com/chikatoike/concealedyank.vim/,,
https://github.com/rhysd/conflict-marker.vim/,,
https://github.com/Olical/conjure/,,
https://github.com/wellle/context.vim/,,
https://github.com/Shougo/context_filetype.vim/,,
https://github.com/github/copilot.vim/,,
https://github.com/ms-jpq/coq.artifacts/,HEAD,

6
pkgs/applications/graphics/epick/default.nix
View file

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "epick";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "vv9k";
repo = pname;
rev = version;
sha256 = "sha256-LJg68YY8PqKF7Thn181XRFsCNJA0DkYKVFbIR1UkxGU=";
sha256 = "sha256-sZ0ZPst6PE6KQ+pmjqLdcD7bWU/gLRsGH84PtWTLdSQ=";
};
cargoSha256 = "sha256-j6tim6dS++ECfBMdyQlS3CqN+Tr5ozHqyZ1bPKhDKV0=";
cargoSha256 = "sha256-kMVjX4AWn8XFRzI7P9NRW8B7AHcIC8TG8LQk7tzkz5o=";
nativeBuildInputs = lib.optional stdenv.isLinux python3;

10
pkgs/applications/misc/1password/default.nix
View file

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.6.2";
version = "2.7.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-3R2afGRSrwffhZNNJAszzmrwfHJ0/wy4/6j2cpvMosA=" "zip";
i686-linux = fetch "linux_386" "sha256-QhUIm+RAmPIS7HBUE/AxPvlx2s3Pk8KeIV9tEJ22+8c=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-/8iuQAyCA4srH/mUlbo7W5VdlR4At7TlFCVPaqH45og=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-HMGR2oBTzB7TwresCN0SYHqM7fcMSiMEu8aw7BN6wyI=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-6c8m+Gea52XpNrPtY7oi3gsALHwLiK5aD83rsJSp6x0=" "zip";
i686-linux = fetch "linux_386" "sha256-glcyQ1JWP7/cMpMY2/tTLnhPXy8nVmbzvIw4ZmP8SKg=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-CjHl3AzUaD7ESlXeFfreZgs5tc3C546GoEgkVJe+vv4=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-3HEvkGWqJQNloVpkMl64DIoee3e/sMGf+GpAmAnS1jI=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;

4
pkgs/applications/misc/gpsprune/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gpsprune";
version = "21.3";
version = "22";
src = fetchurl {
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
sha256 = "sha256-0uPCMMWixw1dZeG12kvFO4FTp8qrOsLyLTKtGSVJxuw=";
sha256 = "sha256-T4lzw3UupnSF+anrdZDhg68OxSJsD7M3djK7WpKXq6Q=";
};
dontUnpack = true;

6
pkgs/applications/misc/josm/default.nix
View file

@ -3,15 +3,15 @@
}:
let
pname = "josm";
version = "18531";
version = "18543";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "sha256-/esGbLbidQ60+auMC1W2GwH7V5qdTVzblDNsskuhcjs=";
hash = "sha256-AQmdBwgOVws8MDAX8i3P7bsk3r69g7x3jhADGwRWa2c=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
sha256 = "sha256-ldcTuacUUxsssJqJ8cRjbP+TWlxQdcNtVbj8clDNEGw=";
hash = "sha256-pGVn+NgfSlyYcT0BCTj+Ntbe7d0l6LJSeDi9xve0K4g=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

4
pkgs/applications/misc/logseq/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.8.3";
version = "0.8.4";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "sha256-OJ/1SFG/UNkNSYtAQprKlc9JhT9/co4XH941mu+YsXE=";
sha256 = "sha256-zzMowQnSyrxL/qCSAOB1tffizOmOpbnN6UePETAqIlM=";
name = "${pname}-${version}.AppImage";
};

4
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -184,8 +184,8 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
makeWrapper "${browserBinary}" "$out/bin/chromium" \
--add-flags ${escapeShellArg commandLineArgs} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
--add-flags ${escapeShellArg commandLineArgs}
ed -v -s "$out/bin/chromium" << EOF
2i

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -2,7 +2,7 @@
, fetchurl, zip, unzip, jq, xdg-utils, writeText
## various stuff that can be plugged in
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
, ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
, gnome/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
, tridactyl-native
@ -73,7 +73,7 @@ let
);
libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ]
++ lib.optional pipewireSupport pipewire
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional ffmpegSupport ffmpeg_5
++ lib.optional gssSupport libkrb5
++ lib.optional useGlvnd libglvnd
++ lib.optionals (cfg.enableQuakeLive or false)

4
pkgs/applications/networking/browsers/google-chrome/default.nix
View file

@ -148,8 +148,8 @@ in stdenv.mkDerivation {
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
--set CHROME_WRAPPER "google-chrome-$dist" \
--add-flags ${escapeShellArg commandLineArgs} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
--add-flags ${escapeShellArg commandLineArgs}
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do
patchelf --set-rpath $rpath $elf

2
pkgs/applications/networking/browsers/microsoft-edge/browser.nix
View file

@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
glib nss nspr
];
libGLESv2 = lib.makeLibraryPath [
xorg.libX11 xorg.libXext xorg.libxcb
xorg.libX11 xorg.libXext xorg.libxcb wayland
];
libsmartscreen = lib.makeLibraryPath [
libuuid stdenv.cc.cc.lib

12
pkgs/applications/networking/browsers/microsoft-edge/default.nix
View file

@ -1,20 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "103.0.1264.21";
version = "104.0.1293.44";
revision = "1";
sha256 = "sha256:1336i0hy7xnla0pi4vahaxshhmivi1zljhaxyg63352bc7w9j64f";
sha256 = "sha256:01accsknks9ss2v9sn5lx5w1nrmn90rindi9jkfn5i387ssf8p4v";
};
dev = import ./browser.nix {
channel = "dev";
version = "104.0.1287.1";
version = "105.0.1343.4";
revision = "1";
sha256 = "sha256:10h360vfsfql42i6mpdvf8d0219506ipbk3hdpwl0jhlsphmhw61";
sha256 = "sha256:0bz2zx11v52izv2sf6q40jnpajmzw3r67h4ggmg0pw6g0d4ridva";
};
stable = import ./browser.nix {
channel = "stable";
version = "102.0.1245.44";
version = "104.0.1293.54";
revision = "1";
sha256 = "sha256:10r12xlkcnag5jdmnwpqsbkjx1ih1027l573vxmcxmvpmj6y4373";
sha256 = "sha256:1i5h0y9dx3dlks6qnz466axbhyvrc0wfxncfz0n62a32fdj0aswi";
};
}

618
pkgs/applications/networking/n8n/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/video/qmplay2/default.nix
View file

@ -5,10 +5,10 @@
, cmake
, alsa-lib
, ffmpeg
, game-music-emu
, libass
, libcddb
, libcdio
, libgme
, libpulseaudio
, libsidplayfp
, libva
@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
buildInputs = [
alsa-lib
ffmpeg
game-music-emu
libXv
libass
libcddb
libcdio
libgme
libpulseaudio
libsidplayfp
libva

1
pkgs/development/compilers/nim/default.nix
View file

@ -143,6 +143,7 @@ in {
runHook preInstall
install -Dt $out/bin bin/*
ln -sf $out/nim/bin/nim $out/bin/nim
ln -sf $out/nim/lib $out/lib
./install.sh $out
runHook postInstall
'';

6
pkgs/development/interpreters/wasmtime/default.nix
View file

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "0.40.0";
version = "0.40.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
sha256 = "sha256-i3dtjKy5YTyNkEaDcGxsrd4lbyUBd25OARESbJVK9uY=";
sha256 = "sha256-VHDeK5BxRyw4AIPcVIzXGZgRdzuyFTZ0hL1u4NMJKBM=";
fetchSubmodules = true;
};
cargoSha256 = "sha256-wlcYdZ8Akkpicyw74sh4CNwSstCtUJxf+oSEL/mUtKc=";
cargoSha256 = "sha256-QAS9L7ZOiD/1+jkMC+ekHkOu9ONl5l/F/fmn6NX4qAQ=";
cargoBuildFlags = [
"--package wasmtime-cli"

4
pkgs/development/libraries/ffmpeg-full/default.nix
View file

@ -261,10 +261,6 @@ stdenv.mkDerivation rec {
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
substituteInPlace doc/filters.texi \
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
'' +
# ffmpeg 5.1 https://trac.ffmpeg.org/ticket/9841
''
substituteInPlace tests/Makefile --replace 'include $(SRC_PATH)/tests/fate/imf.mak' ""
'';
configurePlatforms = [];

10
pkgs/development/libraries/ffmpeg/5.nix
View file

@ -5,14 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
version = "5.1";
version = "5.1.1";
branch = version;
sha256 = "sha256-MrVvsBzpDUUpWK4l6RyVZKv0ntVFPBJ77CPGPlMKqPo=";
sha256 = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs=";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
# Newly introduced IPFS support in ffmpeg 5.1 relies on untrusted third
# party services, leading to consent and privacy issues. See upstream
# discussion for more information:
# https://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299924.html
patches = [ ./ipfs-remove-default-gateway.patch ];
} // args)

37
pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch
View file

@ -1,37 +0,0 @@
A gateway can see everything, and we should not be shipping a hardcoded
default from a third party company; it's a security risk.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
libavformat/ipfsgateway.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c
index 5a5178c563..907b61b017 100644
--- a/libavformat/ipfsgateway.c
+++ b/libavformat/ipfsgateway.c
@@ -240,13 +240,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD
ret = populate_ipfs_gateway(h);
if (ret < 1) {
- // We fallback on dweb.link (managed by Protocol Labs).
- snprintf(c->gateway_buffer, sizeof(c->gateway_buffer), "https://dweb.link");
-
- av_log(h, AV_LOG_WARNING,
- "IPFS does not appear to be running. "
- "You’re now using the public gateway at dweb.link.\n");
- av_log(h, AV_LOG_INFO,
+ av_log(h, AV_LOG_ERROR,
+ "IPFS does not appear to be running.\n\n"
"Installing IPFS locally is recommended to "
"improve performance and reliability, "
"and not share all your activity with a single IPFS gateway.\n"
@@ -259,6 +254,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD
"3. Define an $IPFS_PATH environment variable "
"and point it to the IPFS data path "
"- this is typically ~/.ipfs\n");
+ ret = AVERROR(EINVAL);
+ goto err;
}
}

10
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
View file

@ -2,6 +2,7 @@
, nv-codec-headers-11
, fetchFromGitHub
, lib
, fetchpatch
}:
(ffmpeg_5-full.override {
@ -21,6 +22,15 @@
"--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067
];
patches = old.patches ++ [
# fixed in upstream ffmpeg 5.1.1 https://trac.ffmpeg.org/ticket/9841
(fetchpatch {
name = "rename-imf-fate-target.patch";
url = "https://github.com/FFmpeg/FFmpeg/commit/80d1b8938eb227f0e9efde91050836b1e9a051a9.patch";
sha256 = "sha256-weUbLKSQ9iRYSQ3hgXcVpo8jfKajpXK21qD1GrZYHYQ=";
})
];
postPatch = ''
for file in $(cat debian/patches/series); do
patch -p1 < debian/patches/$file

4
pkgs/development/ocaml-modules/ssl/default.nix
View file

@ -10,13 +10,13 @@
buildDunePackage rec {
pname = "ssl";
version = "0.5.11";
version = "0.5.12";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-ssl";
rev = version;
sha256 = "sha256-uFr+XSKDGMHaM2o5DODYmt7+LkhnDzzlVX//CtAXBm4=";
sha256 = "sha256-cQUJ7t7C9R74lDy1/lt+up4E5CogiPbeZpaDveDzJ7c=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/python-modules/azure-multiapi-storage/default.nix
View file

@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "0.9.0";
version = "0.10.0";
pname = "azure-multiapi-storage";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-7uq8uRZ3MXI1Gy+DmMkRVNV7uZPw6j8r9KfhS8d+tCY=";
sha256 = "sha256-QhC2s/onnlbFVxMmK6SJg2hatxp4WTrYWtMV0pXtAZ8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/ducc0/default.nix
View file

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "ducc0";
version = "0.24.0";
version = "0.25.0";
disabled = pythonOlder "3.7";
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "mtr";
repo = "ducc";
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "sFgEO6f9D3AFV62yLEocgrPrj03H60e2NtdA/Ws6lQw=";
sha256 = "h+x6dakjyTyqOT9nzzZiCmjw5duZBGu+zpnQJnTnN1M=";
};
buildInputs = [ pybind11 ];

28
pkgs/development/python-modules/treex/default.nix
View file

@ -14,6 +14,9 @@
, rich
, tensorflow
, treeo
, torchmetrics
, pythonRelaxDepsHook
, torch
}:
buildPythonPackage rec {
@ -31,15 +34,16 @@ buildPythonPackage rec {
# At the time of writing (2022-03-29), rich is currently at version 11.0.0.
# The treeo dependency is compatible with a patch, but not marked as such in
# treex. See https://github.com/cgarciae/treex/issues/68.
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'rich = "^11.2.0"' 'rich = "*"' \
--replace 'treeo = "^0.0.10"' 'treeo = "*"' \
--replace 'certifi = "^2021.10.8"' 'certifi = "*"'
'';
pythonRelaxDeps = [
"certifi"
"flax"
"rich"
"treeo"
];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
buildInputs = [ jaxlib ];
@ -50,6 +54,7 @@ buildPythonPackage rec {
pyyaml
rich
treeo
torch
];
checkInputs = [
@ -59,17 +64,10 @@ buildPythonPackage rec {
keras
pytestCheckHook
tensorflow
torchmetrics
];
pythonImportsCheck = [
"treex"
];
disabledTestPaths = [
# Require `torchmetrics` which is not packaged in `nixpkgs`.
"tests/metrics/test_mean_absolute_error.py"
"tests/metrics/test_mean_square_error.py"
];
pythonImportsCheck = [ "treex" ];
meta = with lib; {
description = "Pytree Module system for Deep Learning in JAX";

23
pkgs/development/ruby-modules/bundler/default.nix
View file

@ -1,14 +1,31 @@
{ buildRubyGem, ruby }:
{ lib, buildRubyGem, ruby, writeScript }:
buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
version = "2.3.20";
source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw=";
version = "2.3.21";
source.sha256 = "sha256-+u3H/8Fno8U7ZMRj2me1DVvkOAR2HeWmjdo0TCG/0d4=";
dontPatchShebangs = true;
passthru.updateScript = writeScript "gem-update-script" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts jq
set -eu -o pipefail
latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version)
update-source-version ${gemName} "$latest_version"
'';
postFixup = ''
sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle
'';
meta = with lib; {
description = "Manage your Ruby application's gem dependencies";
homepage = "https://bundler.io";
license = licenses.mit;
maintainers = with maintainers; [anthonyroussel];
};
}

4
pkgs/development/tools/database/timescaledb-tune/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "timescaledb-tune";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = "v${version}";
sha256 = "sha256-veqsVqG2UCKRRXAcJVF0bPv2FwgC/0KQ49pU+ASuIhA=";
sha256 = "sha256-Met+bFvTlbn7JAE2A2IFBD4f6qVtS/4gXffwV71xvZI=";
};
vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E=";

6
pkgs/development/tools/kdash/default.nix
View file

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "kdash";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "kdash-rs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xKrgRUU0ENJ8CIQUaU/6dMbmxN9RX4jksQnBfgcsRYE=";
sha256 = "sha256-hh/Q3wUsA6HM0PwMlSfWx9LX+h/Y9w/fXm4HMYXexZU=";
};
nativeBuildInputs = [ perl python3 pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl xorg.xcbutil ]
++ lib.optional stdenv.isDarwin AppKit;
cargoSha256 = "sha256-7RQvd9zx6iXKmgYLp8N8hGDfq9IX0LoNf2jXwv+iOkM=";
cargoSha256 = "sha256-02AfMbR8TsIqEhkXAnslnxgO/XkyEuCW1IyBtrk1dDA=";
meta = with lib; {
description = "A simple and fast dashboard for Kubernetes";

4
pkgs/development/tools/oh-my-posh/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "8.36.6";
version = "8.36.7";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q2vp8NkWroU/p74oB3MeGYC+Ld6Z62fjEwIMiAGjHTo=";
sha256 = "sha256-K4+d7HIH7FDvXkjkf6YCJjbTgPYBBMFqKDHXUNkL2Jo=";
};
vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";

35
pkgs/games/gzdoom/default.nix
View file

@ -1,19 +1,18 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123
, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }:
let
zmusic-src = fetchFromGitHub {
owner = "coelckers";
repo = "zmusic";
rev = "bff02053bea30bd789e45f60b90db3ffc69c8cc8";
sha256 = "0vpr79gpdbhslg5qxyd1qxlv5akgli26skm1vb94yd8v69ymdcy2";
};
zmusic = stdenv.mkDerivation {
zmusic = stdenv.mkDerivation rec {
pname = "zmusic";
version = "1.1.3";
src = zmusic-src;
src = fetchFromGitHub {
owner = "ZDoom";
repo = "ZMusic";
rev = version;
hash = "sha256-wrNWfTIbNU/S2qFObUSkb6qyaceh+Y7Loxqudl86+W4=";
};
nativeBuildInputs = [ cmake pkg-config ];
@ -23,18 +22,17 @@ let
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
source/mididevices/music_fluidsynth_mididevice.cpp
'';
};
gzdoom = stdenv.mkDerivation rec {
pname = "gzdoom";
version = "4.7.1";
version = "4.8.2";
src = fetchFromGitHub {
owner = "coelckers";
owner = "ZDoom";
repo = "gzdoom";
rev = "g${version}";
sha256 = "sha256-3wO83RgxzeJnoxykKQxb1S1GA6QZlhZMw6GrV3YEm/0=";
hash = "sha256-aT7DUZih3EDqncaXYIPIyGsz4fI267N29PmN3qyVjyo=";
fetchSubmodules = true;
};
@ -48,6 +46,7 @@ let
zlib
libjpeg
libsndfile
libvpx
mpg123
game-music-emu
zmusic
@ -84,13 +83,11 @@ let
'';
meta = with lib; {
homepage = "https://github.com/coelckers/gzdoom";
description =
"A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
license = licenses.gpl3;
homepage = "https://github.com/ZDoom/gzdoom";
description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lassulus ];
maintainers = with maintainers; [ azahi lassulus ];
};
};
in gzdoom

6
pkgs/tools/graphics/vulkan-caps-viewer/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-caps-viewer";
version = "3.24";
version = "3.25";
src = fetchFromGitHub {
owner = "SaschaWillems";
repo = "VulkanCapsViewer";
rev = "${version}";
hash = "sha256-BSydAPZ74rGzW4UA/aqL2K/86NTK/eZqc3MZUbdq7iU=";
rev = if version == "3.25" then "${version}_fixed" else version;
hash = "sha256-JQMnR9WNR8OtcgVfE5iZebdvZ/JmZNDchET5cK/Bruc=";
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
# To help they put in a git-submodule.
# It works with older vulkan-loaders.

6
pkgs/tools/misc/opentelemetry-collector/contrib.nix
View file

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
version = "0.58.0";
version = "0.59.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "sha256-7gvtITPN7NqC4E8Z4nEFgz2jp1HD4HhuVrE8Qk3WM+A=";
sha256 = "sha256-snkrgitPtrdX5LuMscmeeY9KQeBGsPApaDc2LRfRKJ0=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-aCwySLvfseMBNU+Q1f7awiivChpPyn/V7osEwzieNxg=";
vendorSha256 = "sha256-u0JC/4Pav0ZZIvOzE22kdUWR5wgYAUN8/fKfjsDev0g=";
subPackages = [ "cmd/otelcontribcol" ];

6
pkgs/tools/misc/opentelemetry-collector/default.nix
View file

@ -12,17 +12,17 @@ let
in
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.58.0";
version = "0.59.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
sha256 = "sha256-qWRuVzRFuUBfnBkc6KDWTkPahk980KLdRqUnPbKJjpU=";
sha256 = "sha256-eNndY3BPdeFO9cihfkPWlDVwWfNZWnjL5gJCxlgJn9c=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorSha256 = "sha256-iK4oXNZe4/4/Yh9/Rq3St9MmeqEq6bVu8sTh4rdMi0c=";
vendorSha256 = "sha256-+i8uKR5EZXTmOnuwoeM6Vpt934v0egSjC951ryXaZS0=";
preBuild = ''
# set the build version, can't be done via ldflags