Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-03-04 00:15:28 +00:00
committed by GitHub
135 changed files with 1712 additions and 10799 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+2 -2
View File
@@ -63,7 +63,7 @@ jobs:
- name: Build codeowners validator
run: nix-build base/ci -A codeownersValidator
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
id: app-token
with:
app-id: ${{ vars.OWNER_RO_APP_ID }}
@@ -96,7 +96,7 @@ jobs:
# This is intentional, because we need to request the review of owners as declared in the base branch.
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}
+1 -1
View File
@@ -241,7 +241,7 @@ jobs:
steps:
# See ./codeowners-v2.yml, reuse the same App because we need the same permissions
# Can't use the token received from permissions above, because it can't get enough permissions
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}
+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+12 -12
View File
@@ -27,20 +27,20 @@
/shell.nix @infinisil @NixOS/Security
# Libraries
/lib @infinisil
/lib @infinisil @hsjobeki
/lib/systems @alyssais @ericson2314 @NixOS/stdenv
/lib/generators.nix @infinisil @Profpatsch
/lib/cli.nix @infinisil @Profpatsch
/lib/debug.nix @infinisil @Profpatsch
/lib/asserts.nix @infinisil @Profpatsch
/lib/path/* @infinisil
/lib/fileset @infinisil
/lib/generators.nix @infinisil @hsjobeki @Profpatsch
/lib/cli.nix @infinisil @hsjobeki @Profpatsch
/lib/debug.nix @infinisil @hsjobeki @Profpatsch
/lib/asserts.nix @infinisil @hsjobeki @Profpatsch
/lib/path/* @infinisil @hsjobeki
/lib/fileset @infinisil @hsjobeki
## Libraries / Module system
/lib/modules.nix @infinisil @roberth
/lib/types.nix @infinisil @roberth
/lib/options.nix @infinisil @roberth
/lib/tests/modules.sh @infinisil @roberth
/lib/tests/modules @infinisil @roberth
/lib/modules.nix @infinisil @roberth @hsjobeki
/lib/types.nix @infinisil @roberth @hsjobeki
/lib/options.nix @infinisil @roberth @hsjobeki
/lib/tests/modules.sh @infinisil @roberth @hsjobeki
/lib/tests/modules @infinisil @roberth @hsjobeki
# Nixpkgs Internals
/default.nix @Ericson2314
+19 -13
View File
@@ -19,21 +19,23 @@
python3.pkgs.buildPythonApplication rec {
pname = "retext";
version = "8.0.2";
format = "setuptools";
version = "8.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "retext-project";
repo = pname;
repo = "retext";
tag = version;
hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68=";
hash = "sha256-npQ1eVb2iyswbqxi262shC9u/g9oE0ofkLbisFgqQM4=";
};
toolbarIcons = fetchzip {
url = "https://github.com/retext-project/retext/archive/icons.zip";
hash = "sha256-LQtSFCGWcKvXis9pFDmPqAMd1m6QieHQiz2yykeTdnI=";
hash = "sha256-nqKAUg9nTzGPPxr80KTn6JX9JgCUJwpcwp8aOIlcxPY=";
};
build-system = with python3.pkgs; [ setuptools ];
nativeBuildInputs = [
wrapQtAppsHook
qttools.dev
@@ -44,7 +46,7 @@ python3.pkgs.buildPythonApplication rec {
qtsvg
];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
chardet
docutils
markdown
@@ -55,7 +57,11 @@ python3.pkgs.buildPythonApplication rec {
pyqt6-webengine
];
patches = [ ./remove-wheel-check.patch ];
# disable wheel check
postPatch = ''
substituteInPlace setup.py \
--replace-fail "self.root and self.root.endswith('/wheel')" "False"
'';
preConfigure = ''
lrelease ReText/locale/*.ts
@@ -78,8 +84,8 @@ python3.pkgs.buildPythonApplication rec {
cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons
substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
--replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \
--replace "Icon=ReText/icons/retext.svg" "Icon=retext"
--replace-fail "Exec=ReText-${version}.data/scripts/retext %F" "Exec=retext %F" \
--replace-fail "Icon=./ReText/icons/retext.svg" "Icon=retext"
'';
doCheck = false;
@@ -88,12 +94,12 @@ python3.pkgs.buildPythonApplication rec {
"ReText"
];
meta = with lib; {
meta = {
description = "Editor for Markdown and reStructuredText";
homepage = "https://github.com/retext-project/retext/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ klntsky ];
platforms = platforms.unix;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ klntsky ];
platforms = lib.platforms.unix;
mainProgram = "retext";
};
}
@@ -1,28 +0,0 @@
From f07d08d3056c46f62674f65eabae0efa2b65d681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Oct 2022 16:53:27 +0200
Subject: [PATCH] disable wheel check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index a9cae37..e0e1e5b 100755
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,7 @@ def run(self):
desktop_file_path = join(self.install_data, 'share', 'applications',
'me.mitya57.ReText.desktop')
- if self.root and self.root.endswith('/wheel'):
+ if False and self.root and self.root.endswith('/wheel'):
# Desktop files don't allow relative paths, and we don't know the
# absolute path when building a wheel.
log.info('removing the .desktop file from the wheel')
--
2.37.3
+8 -5
View File
@@ -2,6 +2,7 @@
lib,
mkDerivation,
fetchFromGitHub,
nix-update-script,
libkiwix,
pkg-config,
qmake,
@@ -12,15 +13,15 @@
aria2,
}:
mkDerivation {
mkDerivation rec {
pname = "kiwix";
version = "2.3.1-unstable-2024-02-20";
version = "2.4.1";
src = fetchFromGitHub {
owner = "kiwix";
repo = "kiwix-desktop";
rev = "17ac566b07814aefb1decf108e4ba6d7ad9ef7bc";
hash = "sha256-BZzFnQE8/dyZkpY0X3zZ6yC6yLZ002Q/RoDzEhSOa/g=";
rev = version;
hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
};
nativeBuildInputs = [
@@ -40,12 +41,14 @@ mkDerivation {
"--prefix PATH : ${lib.makeBinPath [ aria2 ]}"
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Offline reader for Web content";
mainProgram = "kiwix-desktop";
homepage = "https://kiwix.org";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ ];
maintainers = with maintainers; [ greg ];
};
}
+8 -2
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
meson,
ninja,
pkg-config,
@@ -18,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libkiwix";
version = "13.1.0";
version = "14.0.0";
src = fetchFromGitHub {
owner = "kiwix";
repo = "libkiwix";
rev = finalAttrs.version;
hash = "sha256-DKOwzfGyad/3diOaV1K8hXqT8YGfqCP6QDKDkxWu/1U=";
hash = "sha256-QP23ZS0FJsMVtnWOofywaAPIU0GJ2L+hLP/x0LXMKiU=";
};
nativeBuildInputs = [
@@ -55,8 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs scripts
substituteInPlace meson.build \
--replace-fail "libicu_dep = dependency('icu-i18n', static:static_deps)" \
"libicu_dep = [dependency('icu-i18n', static:static_deps), dependency('icu-uc', static:static_deps)]"
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Common code base for all Kiwix ports";
homepage = "https://kiwix.org";
@@ -135,11 +135,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-DI3/ouxbuIY7r/C13IEO4yyADZhY9nEmFZN8Htqsplg=",
"hash": "sha256-SiYM4G0GTvWlpB+6/bDINB0COFplR/fdFfrIf9DPhoA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v4.19.0",
"rev": "v4.21.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -904,11 +904,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-Mj6EowBi0jGY0Pma3xlEWCR+RIyMH72CGDMYZWNcecc=",
"hash": "sha256-S6Av7n7Lg8mxF2TOkMstCDfkD1E3VY2ozOFtcUmM+nw=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v6.26.0",
"rev": "v6.28.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
+157 -94
View File
@@ -1,111 +1,173 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qt5, cmake
, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsa-lib, python3
, rnnoise
, nixosTests
, poco
, flac
, libogg
, libvorbis
, stdenv_32bit
, iceSupport ? true, zeroc-ice
, jackSupport ? false, libjack2
, pipewireSupport ? true, pipewire
, pulseSupport ? true, libpulseaudio
, speechdSupport ? false, speechd-minimal
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
pkg-config,
qt5,
cmake,
avahi,
boost,
libopus,
libsndfile,
protobuf,
speex,
libcap,
utf8proc,
alsa-lib,
python3,
rnnoise,
nixosTests,
poco,
flac,
libogg,
libvorbis,
stdenv_32bit,
iceSupport ? true,
zeroc-ice,
jackSupport ? false,
libjack2,
pipewireSupport ? true,
pipewire,
pulseSupport ? true,
libpulseaudio,
speechdSupport ? false,
speechd-minimal,
}:
let
generic = overrides: source: (overrides.stdenv or stdenv).mkDerivation (source // overrides // {
pname = overrides.type;
version = source.version;
generic =
overrides: source:
(overrides.stdenv or stdenv).mkDerivation (
source
// overrides
// {
pname = overrides.type;
version = source.version;
nativeBuildInputs = [ cmake pkg-config python3 qt5.wrapQtAppsHook qt5.qttools ]
++ (overrides.nativeBuildInputs or [ ]);
nativeBuildInputs = [
cmake
pkg-config
python3
qt5.wrapQtAppsHook
qt5.qttools
] ++ (overrides.nativeBuildInputs or [ ]);
buildInputs = [ avahi boost poco protobuf ]
++ (overrides.buildInputs or [ ]);
buildInputs = [
avahi
boost
poco
protobuf
] ++ (overrides.buildInputs or [ ]);
cmakeFlags = [
"-D g15=OFF"
"-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
] ++ (overrides.configureFlags or [ ]);
cmakeFlags = [
"-D g15=OFF"
"-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
] ++ (overrides.configureFlags or [ ]);
preConfigure = ''
patchShebangs scripts
'';
preConfigure = ''
patchShebangs scripts
'';
passthru.tests.connectivity = nixosTests.mumble;
passthru.tests.connectivity = nixosTests.mumble;
meta = with lib; {
description = "Low-latency, high quality voice chat software";
homepage = "https://mumble.info";
license = licenses.bsd3;
maintainers = with maintainers; [ felixsinger lilacious ];
platforms = platforms.linux;
};
});
meta = with lib; {
description = "Low-latency, high quality voice chat software";
homepage = "https://mumble.info";
license = licenses.bsd3;
maintainers = with maintainers; [
felixsinger
lilacious
];
platforms = platforms.linux;
};
}
);
client = source: generic {
type = "mumble";
client =
source:
generic {
type = "mumble";
nativeBuildInputs = [ qt5.qttools ];
buildInputs = [ flac libogg libopus libsndfile libvorbis qt5.qtsvg rnnoise speex ]
++ lib.optional (!jackSupport) alsa-lib
++ lib.optional jackSupport libjack2
++ lib.optional speechdSupport speechd-minimal
++ lib.optional pulseSupport libpulseaudio
++ lib.optional pipewireSupport pipewire;
nativeBuildInputs = [ qt5.qttools ];
buildInputs =
[
flac
libogg
libopus
libsndfile
libvorbis
qt5.qtsvg
rnnoise
speex
utf8proc
]
++ lib.optional (!jackSupport) alsa-lib
++ lib.optional jackSupport libjack2
++ lib.optional speechdSupport speechd-minimal
++ lib.optional pulseSupport libpulseaudio
++ lib.optional pipewireSupport pipewire;
configureFlags = [
"-D server=OFF"
"-D bundled-celt=ON"
"-D bundled-opus=OFF"
"-D bundled-speex=OFF"
"-D bundle-qt-translations=OFF"
"-D update=OFF"
"-D overlay-xcompile=OFF"
"-D oss=OFF"
"-D warnings-as-errors=OFF" # conversion error workaround
] ++ lib.optional (!speechdSupport) "-D speechd=OFF"
++ lib.optional (!pulseSupport) "-D pulseaudio=OFF"
++ lib.optional (!pipewireSupport) "-D pipewire=OFF"
++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON";
configureFlags =
[
"-D server=OFF"
"-D bundled-celt=ON"
"-D bundled-opus=OFF"
"-D bundled-speex=OFF"
"-D bundle-qt-translations=OFF"
"-D update=OFF"
"-D overlay-xcompile=OFF"
"-D oss=OFF"
"-D warnings-as-errors=OFF" # conversion error workaround
]
++ lib.optional (!speechdSupport) "-D speechd=OFF"
++ lib.optional (!pulseSupport) "-D pulseaudio=OFF"
++ lib.optional (!pipewireSupport) "-D pipewire=OFF"
++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON";
env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher";
env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher";
postFixup = ''
wrapProgram $out/bin/mumble \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire)}"
'';
} source;
postFixup = ''
wrapProgram $out/bin/mumble \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath (
lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire
)
}"
'';
} source;
server = source: generic {
type = "murmur";
server =
source:
generic {
type = "murmur";
configureFlags = [
"-D client=OFF"
] ++ lib.optional (!iceSupport) "-D ice=OFF"
++ lib.optionals iceSupport [
"-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
"-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
"-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice"
configureFlags =
[
"-D client=OFF"
]
++ lib.optional (!iceSupport) "-D ice=OFF"
++ lib.optionals iceSupport [
"-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
"-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
"-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice"
];
buildInputs = [ libcap ] ++ lib.optional iceSupport zeroc-ice;
} source;
overlay =
source:
generic {
stdenv = stdenv_32bit;
type = "mumble-overlay";
configureFlags = [
"-D server=OFF"
"-D client=OFF"
"-D overlay=ON"
];
buildInputs = [ libcap ]
++ lib.optional iceSupport zeroc-ice;
} source;
overlay = source: generic {
stdenv = stdenv_32bit;
type = "mumble-overlay";
configureFlags = [
"-D server=OFF"
"-D client=OFF"
"-D overlay=ON"
];
} source;
} source;
source = rec {
version = "1.5.735";
@@ -119,8 +181,9 @@ let
fetchSubmodules = true;
};
};
in {
mumble = lib.recursiveUpdate (client source) {meta.mainProgram = "mumble";};
murmur = lib.recursiveUpdate (server source) {meta.mainProgram = "mumble-server";};
in
{
mumble = lib.recursiveUpdate (client source) { meta.mainProgram = "mumble"; };
murmur = lib.recursiveUpdate (server source) { meta.mainProgram = "mumble-server"; };
overlay = overlay source;
}
@@ -0,0 +1,50 @@
Submodule blocks contains modified content
diff --git a/blocks/file/BinaryFileSink.cpp b/blocks/file/BinaryFileSink.cpp
index 31c9a41..0083b0d 100644
--- a/blocks/file/BinaryFileSink.cpp
+++ b/blocks/file/BinaryFileSink.cpp
@@ -13,6 +13,7 @@
#endif //_MSC_VER
#include <stdio.h>
#include <cerrno>
+#include <cstring>
#ifndef O_BINARY
#define O_BINARY 0
diff --git a/blocks/file/BinaryFileSource.cpp b/blocks/file/BinaryFileSource.cpp
index 0151231..379d383 100644
--- a/blocks/file/BinaryFileSource.cpp
+++ b/blocks/file/BinaryFileSource.cpp
@@ -13,6 +13,7 @@
#endif //_MSC_VER
#include <stdio.h>
#include <cerrno>
+#include <cstring>
#ifndef O_BINARY
#define O_BINARY 0
diff --git a/blocks/file/TextFileSink.cpp b/blocks/file/TextFileSink.cpp
index b4b2f08..2be66e2 100644
--- a/blocks/file/TextFileSink.cpp
+++ b/blocks/file/TextFileSink.cpp
@@ -6,6 +6,7 @@
#include <complex>
#include <fstream>
#include <cerrno>
+#include <cstring>
/***********************************************************************
* |PothosDoc Text File Sink
Submodule soapy contains modified content
diff --git a/soapy/DemoController.cpp b/soapy/DemoController.cpp
index 4ce8ead..9a4e742 100644
--- a/soapy/DemoController.cpp
+++ b/soapy/DemoController.cpp
@@ -6,6 +6,7 @@
#include <iostream>
#include <chrono>
#include <algorithm> //min/max
+#include <cstring>
/***********************************************************************
* |PothosDoc SDR Demo Controller
@@ -18,6 +18,7 @@
alsa-lib,
muparserx,
python3,
utf8proc,
}:
mkDerivation rec {
@@ -41,8 +42,14 @@ mkDerivation rec {
url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch";
hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA=";
})
# various source files are missing imports of <cstring>
# https://github.com/pothosware/PothosBlocks/issues/80
./cstring.patch
];
# poco 1.14 requires c++17
NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];
nativeBuildInputs = [
cmake
pkg-config
@@ -62,6 +69,7 @@ mkDerivation rec {
alsa-lib
muparserx
python3
utf8proc
];
postInstall = ''
@@ -3,6 +3,7 @@
lib,
fetchFromGitHub,
makeDesktopItem,
cmake,
python3Packages,
netcdf,
glew,
@@ -10,6 +11,7 @@
libpng,
libxml2,
freetype,
mmtf-cpp,
msgpack,
qt5,
}:
@@ -43,37 +45,51 @@ let
in
python3Packages.buildPythonApplication rec {
inherit pname;
version = "3.0.0";
version = "3.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "schrodinger";
repo = "pymol-open-source";
rev = "v${version}";
hash = "sha256-GhTHxacjGN7XklZ6gileBMRZAGq4Pp4JknNL+qGqrVE=";
hash = "sha256-2C9kUpNfK9g7ehmk83iUVqqz4gn4wKO3lW5rSduFP6U=";
};
# A script is already created by the `[project.scripts]` directive
# in `pyproject.toml`.
patches = [ ./script-already-exists.patch ];
postPatch = ''
substituteInPlace setup.py \
--replace-fail "self.install_libbase" '"${placeholder "out"}/${python3Packages.python.sitePackages}"'
'';
build-system = [
python3Packages.setuptools
env.PREFIX_PATH = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${msgpack}";
build-system = [ python3Packages.setuptools ];
dontUseCmakeConfigure = true;
nativeBuildInputs = [
cmake
qt5.wrapQtAppsHook
];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
buildInputs = [
python3Packages.numpy
python3Packages.pyqt5
glew
glm
libpng
libxml2
freetype
msgpack
netcdf
];
buildInputs =
[
python3Packages.numpy_1
python3Packages.pyqt5
qt5.qtbase
glew
glm
libpng
libxml2
freetype
netcdf
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
mmtf-cpp
msgpack
];
env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
postInstall =
@@ -94,9 +110,7 @@ python3Packages.buildPythonApplication rec {
cp -r "${desktopItem}/share/applications/" "$out/share/"
'';
pythonImportsCheck = [
"pymol"
];
pythonImportsCheck = [ "pymol" ];
nativeCheckInputs = with python3Packages; [
python3Packages.msgpack
@@ -112,17 +126,22 @@ python3Packages.buildPythonApplication rec {
"tests/api/seqalign.py"
];
disabledTests = [
# the output image does not exactly match
"test_commands"
# touch the network
"testFetch"
# requires collada2gltf which is not included in nixpkgs
"testglTF"
# require mmtf-cpp which does not support darwin
"testMMTF"
"testSave_symmetry__mmtf"
];
disabledTests =
[
# the output image does not exactly match
"test_commands"
# touch the network
"testFetch"
# requires collada2gltf which is not included in nixpkgs
"testglTF"
]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
# require mmtf-cpp which does not support darwin
"test_bcif"
"test_bcif_array"
"testMMTF"
"testSave_symmetry__mmtf"
];
preCheck = ''
cd testing
@@ -0,0 +1,23 @@
diff --git a/setup.py b/setup.py
index 507dd32d..bf258897 100644
--- a/setup.py
+++ b/setup.py
@@ -435,9 +435,6 @@ class install_pymol(install):
super().run()
self.install_pymol_path()
- if not self.no_launcher:
- self.make_launch_script()
-
if self.bundled_pmw:
raise Exception(
"--bundled-pmw has been removed, please install Pmw from "
@@ -487,7 +484,7 @@ class install_pymol(install):
launch_script = os.path.join(self.install_scripts, launch_script)
python_exe = os.path.abspath(sys.executable)
- site_packages_dir = sysconfig.get_path('purelib')
+ site_packages_dir = sysconfig.get_path("purelib")
pymol_file = self.unchroot(
os.path.join(site_packages_dir, "pymol", "__init__.py")
)
@@ -5,12 +5,10 @@
awscli,
}:
with python3Packages;
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "git-remote-codecommit";
version = "1.15.1";
disabled = !isPy3k;
version = "1.17";
disabled = !python3Packages.isPy3k;
# The check dependency awscli has some overrides
# which yield a different botocore.
@@ -21,24 +19,23 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = version;
sha256 = "1vvp7i8ghmq72v57f6smh441h35xnr5ar628q2mr40bzvcifwymw";
repo = "git-remote-codecommit";
tag = version;
hash = "sha256-8heI0Oyfhuvshedw+Eqmwd+e9cOHdDt4O588dplqv/k=";
};
propagatedBuildInputs = [ botocore ];
dependencies = with python3Packages; [ botocore ];
nativeCheckInputs = [
pytest
mock
flake8
tox
awscli
];
checkPhase = ''
pytest
'';
nativeCheckInputs =
[
awscli
]
++ (with python3Packages; [
pytestCheckHook
mock
flake8
tox
]);
meta = {
description = "Git remote prefix to simplify pushing to and pulling from CodeCommit";
@@ -11,9 +11,9 @@
makeWrapper,
nettools,
nixosTests,
nodejs,
nodejs_20,
replace,
ruby_3_2,
ruby_3_3,
stdenv,
tzdata,
yarn,
@@ -53,7 +53,7 @@ let
rubyEnv = bundlerEnv rec {
name = "gitlab-env-${version}";
ruby = ruby_3_2;
ruby = ruby_3_3;
gemdir = ./rubyEnv;
gemset = import (gemdir + "/gemset.nix") src;
gemConfig = defaultGemConfig // {
@@ -150,7 +150,7 @@ let
nativeBuildInputs = [
rubyEnv.wrappedRuby
rubyEnv.bundler
nodejs
nodejs_20
yarn
git
cacert
@@ -200,6 +200,12 @@ let
patchShebangs node_modules/
patchShebangs scripts/frontend/
# TODO: Try to remove --ignore-scripts
# Needed for the js dependency pinia to work
pushd node_modules/vue-demi
yarn run postinstall
popd
runHook postConfigure
'';
@@ -12,17 +12,18 @@
lvm2,
pkg-config,
nixosTests,
go-md2man,
}:
buildGoModule rec {
pname = "cri-o";
version = "1.31.3";
version = "1.32.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
hash = "sha256-uoB5v+dl3895sW597f/Y49E2BJvy89871xu/rqWd7kw=";
hash = "sha256-bjZjmgIYFroyUdBeUbrRz7dD0yQOqc9TDsGxvle1PnE=";
};
vendorHash = null;
@@ -34,6 +35,7 @@ buildGoModule rec {
];
nativeBuildInputs = [
installShellFiles
go-md2man
pkg-config
];
@@ -54,6 +56,7 @@ buildGoModule rec {
BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
buildPhase = ''
runHook preBuild
sed -i 's;\thack/;\tbash ./hack/;g' Makefile
make binaries docs BUILDTAGS="$BUILDTAGS"
runHook postBuild
'';
@@ -75,6 +75,16 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-good
spice-gtk
];
postInstall = ''
if ! grep -q StartupWMClass= "$out/share/applications/virt-manager.desktop"; then
echo "StartupWMClass=.virt-manager-wrapped" >> "$out/share/applications/virt-manager.desktop"
else
echo "error: upstream desktop file already contains StartupWMClass=, please update Nix expr" >&2
exit 1
fi
'';
preFixup = ''
glib-compile-schemas $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+2 -2
View File
@@ -13,7 +13,7 @@
python3Packages.buildPythonApplication rec {
pname = "adwsteamgtk";
version = "0.7.2";
version = "0.8.0";
# built with meson, not a python format
format = "other";
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
owner = "Foldex";
repo = "AdwSteamGtk";
tag = "v${version}";
hash = "sha256-DI5WK8CtoyH8hSogQx5/oDCrGoLxE06cy63ubU+e3bQ=";
hash = "sha256-n+BNqa+SHB1V1INHooc0VpeqZ2Dy1Byt7mrbJc2MXts=";
};
buildInputs = [
+2 -2
View File
@@ -34,13 +34,13 @@ let
in
buildGoModule rec {
pname = "argo-workflows";
version = "3.6.3";
version = "3.6.4";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
tag = "v${version}";
hash = "sha256-FbhF/oPWtcDqukeQf+NjfSCieQmrSTKBn3vbRr9IQIE=";
hash = "sha256-R6njT6Lae+8KiTyXjxE5/U922pP0VqgCIRwGhWBOZUI=";
};
vendorHash = "sha256-uCIdZkoPgppJtrFf7nOVIyEXo1bVILYXNs5LtLLLmsY=";
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.100";
version = "1.0.101";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
hash = "sha256-nbzQmZ8hAiU8K+/VHwbEniTsioCgQhbADIxV9tL3M1k=";
hash = "sha256-967IriPa3TpkZV+40BMVuXgq8hzp4fZCQ69a4RW/wS0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-aLHeGAIVm6hY+sRymQjQf2WwiwkIDKl+GSvI/D6JOCo=";
cargoHash = "sha256-cLfXmsQXYMneG6UJv0RVX8pIPbmwIfCkrcTb+yodxpk=";
meta = with lib; {
description = "Cargo subcommand to show result of macro expansion";
+3 -3
View File
@@ -6,17 +6,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.22.0";
version = "0.22.1";
src = fetchFromGitHub {
owner = "regexident";
repo = "cargo-modules";
tag = "v${version}";
hash = "sha256-dtL4vcNPtZc1FQ6LnlovXX0bQkyzkfhPDaJvf/SVmaU=";
hash = "sha256-TlnuEurPCcQb3CXr1ffmDv3WQxSZ27qG9erLyHgF7nk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Mc+fAb46JiS2wH1Ybksj75qHf6JU26NFrHUv/drca5k=";
cargoHash = "sha256-42nhyEAC9KKD3of0BBTYoVpFYx/+oXS7Ro1Hzxgvr+E=";
checkFlags = [
"--skip=cfg_test::with_tests::smoke"
+10 -1
View File
@@ -3,6 +3,7 @@
cairo,
cppunit,
fetchFromGitHub,
fetchpatch,
fetchNpmDeps,
lib,
libcap,
@@ -63,7 +64,15 @@ stdenv.mkDerivation (finalAttrs: {
"--with-lokit-path=${libreoffice-collabora.src}/include"
];
patches = [ ./fix-file-server-regex.patch ];
patches = [
./fix-file-server-regex.patch
# Remove after next release
(fetchpatch {
name = "add-missing-includes-for-poco-1.14.1";
url = "https://patch-diff.githubusercontent.com/raw/CollaboraOnline/online/pull/11196.patch";
hash = "sha256-ke4dOxITFHK3xMXIdp+zzUEGYMyDxMJrbbXTN+LaoVU=";
})
];
postPatch = ''
cp ${./package-lock.json} ${finalAttrs.npmRoot}/package-lock.json
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "commons-logging";
version = "1.3.4";
version = "1.3.5";
src = fetchurl {
url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz";
sha256 = "sha256-asHQ0i4bBICkRK2Hzfo7+/EmT9gX5jcv8KmFMz1qCGI=";
sha256 = "sha256-4s/DfNYp/CXSIAtUAUHC2GReQrmlhpN8tRwvpHmB2G0=";
};
installPhase = ''
+2 -8
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "confy";
version = "0.7.1";
version = "0.8.0";
src = fetchFromSourcehut {
owner = "~fabrixxm";
repo = "confy";
rev = finalAttrs.version;
hash = "sha256-BXQDnRRt2Kuqc1Gwx6Ba6BoEWhICTCsWWkGlBsStyT8=";
hash = "sha256-lQZ9joLK6w+sIjCVOEHstnnQomUl2E4F8FXCZukMUkI=";
};
nativeBuildInputs = [
@@ -48,12 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
))
];
postPatch = ''
substituteInPlace build-aux/meson/postinstall.py \
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
patchShebangs build-aux/meson/postinstall.py
'';
meta = with lib; {
changelog = "https://git.sr.ht/~fabrixxm/confy/refs/${finalAttrs.version}";
description = "Conferences schedule viewer";
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "coroot-node-agent";
version = "1.23.11";
version = "1.23.12";
src = fetchFromGitHub {
owner = "coroot";
repo = "coroot-node-agent";
rev = "v${version}";
hash = "sha256-gO7vuaGSsxvF8ltuAlx8b6pbovauX0GVAqYcBseXAd8=";
hash = "sha256-LIDb3kMaJzYqAo2RR1pVtNwu7WPh5+2U/D27ZiRUMrI=";
};
vendorHash = "sha256-SxyIlyDHuu8Ls1+/rujWE9elZiTfSYWIrV8vP5xsqTU=";
+1 -1
View File
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
(placeholder "out")
];
env.XDP_COSMIC = lib.getExe xdg-desktop-portal-cosmic;
env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic";
passthru.providedSessions = [ "cosmic" ];
+2 -2
View File
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cpm-cmake";
version = "0.40.5";
version = "0.40.6";
src = fetchFromGitHub {
owner = "cpm-cmake";
repo = "cpm.cmake";
rev = "v${finalAttrs.version}";
hash = "sha256-wJsQNLCwWl4RiheDK36m3O8N4fmdmNazEo4gLdbTEzQ=";
hash = "sha256-0uyCEHh2wje7ogWe7brlalFHi9SVTkPikkoPceugZ2I=";
};
postPatch = ''
@@ -0,0 +1,37 @@
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 2196121..0c5cf27 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -11,6 +11,7 @@
#include <fstream>
#include <unordered_map>
#include <configuration.hpp>
+#include <Poco/JSON/JSONException.h>
#include "platform.hpp"
#include "runtime.hpp"
#include "terminal/SDLTerminal.hpp"
diff --git a/src/main.cpp b/src/main.cpp
index 9ab0814..38976a2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,6 +34,7 @@ static void* releaseNotesThread(void* data);
#include <Poco/URI.h>
#include <Poco/Checksum.h>
#include <Poco/JSON/Parser.h>
+#include <Poco/JSON/JSONException.h>
#ifndef __EMSCRIPTEN__
#include <Poco/Net/HTTPSClientSession.h>
#include <Poco/Net/HTTPRequest.h>
diff --git a/src/util.hpp b/src/util.hpp
index b8ab2d1..c643b96 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -21,6 +21,8 @@ extern "C" {
#include <string>
#include <vector>
#include <Poco/JSON/JSON.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Array.h>
#include <Poco/JSON/Parser.h>
#include <Poco/Net/HTTPResponse.h>
#include <Computer.hpp>
+43 -18
View File
@@ -1,17 +1,18 @@
{ lib
, stdenv
, fetchFromGitHub
, callPackage
, patchelf
, unzip
, poco
, openssl
, SDL2
, SDL2_mixer
, ncurses
, libpng
, pngpp
, libwebp
{
lib,
stdenv,
fetchFromGitHub,
callPackage,
patchelf,
unzip,
poco,
openssl,
SDL2,
SDL2_mixer,
ncurses,
libpng,
pngpp,
libwebp,
}:
let
@@ -41,8 +42,20 @@ stdenv.mkDerivation rec {
hash = "sha256-DbxAsXxpsa42dF6DaLmgIa+Hs/PPqJ4dE97PoKxG2Ig=";
};
nativeBuildInputs = [ patchelf unzip ];
buildInputs = [ poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ];
nativeBuildInputs = [
patchelf
unzip
];
buildInputs = [
poco
openssl
SDL2
SDL2_mixer
ncurses
libpng
pngpp
libwebp
];
strictDeps = true;
preBuild = ''
@@ -57,6 +70,12 @@ stdenv.mkDerivation rec {
runHook postBuild
'';
patches = [
# fix includes of poco headers
# https://github.com/MCJack123/craftos2/issues/391
./fix-poco-header-includes.patch
];
dontStrip = true;
installPhase = ''
@@ -87,9 +106,15 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Implementation of the CraftOS-PC API written in C++ using SDL";
homepage = "https://www.craftos-pc.cc";
license = with licenses; [ mit free ];
license = with licenses; [
mit
free
];
platforms = platforms.linux;
maintainers = with maintainers; [ siraben tomodachi94 ];
maintainers = with maintainers; [
siraben
tomodachi94
];
mainProgram = "craftos";
};
}
+35 -4
View File
@@ -2,6 +2,8 @@
lib,
stdenv,
fetchFromGitea,
fetchFromGitLab,
fetchpatch,
cmake,
git,
pkg-config,
@@ -15,18 +17,19 @@
xorg,
ilmbase,
llvmPackages,
unstableGitUpdater,
}:
stdenv.mkDerivation rec {
pname = "curv";
version = "0.5-unstable-2025-01-06";
version = "0.5-unstable-2025-01-20";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "doug-moen";
repo = "curv";
rev = "a496d98459b65d15feae8e69036944dafb7ec26e";
hash = "sha256-2pe76fBU78xRvHxol8O1xv0bBVwbpKDVPLQqqUCTO0Y=";
rev = "ef082c6612407dd8abce06015f9a16b1ebf661b8";
hash = "sha256-BGL07ZBA+ao3fg3qp56sVTe+3tM2SOp8TGu/jF7SVlM=";
fetchSubmodules = true;
};
@@ -40,7 +43,33 @@ stdenv.mkDerivation rec {
buildInputs =
[
boost
eigen
# https://codeberg.org/doug-moen/curv/issues/228
# reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19'
# https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c
(eigen.overrideAttrs (old: rec {
version = "3.4.0";
src = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
rev = version;
hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw=";
};
patches = (old.patches or [ ]) ++ [
# Fixes e.g. onnxruntime on aarch64-darwin:
# https://hydra.nixos.org/build/248915128/nixlog/1,
# originally suggested in https://github.com/NixOS/nixpkgs/pull/258392.
#
# The patch is from
# ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699)
# which is two years old,
# but Eigen hasn't had a release in two years either:
# https://gitlab.com/libeigen/eigen/-/issues/2699.
(fetchpatch {
url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch";
hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0=";
})
];
}))
glm
libGL
libpng
@@ -70,6 +99,8 @@ stdenv.mkDerivation rec {
runHook postInstallCheck
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "2D and 3D geometric modelling programming language for creating art with maths";
homepage = "https://codeberg.org/doug-moen/curv";
+24 -1
View File
@@ -1,4 +1,12 @@
{ lib, buildGoModule, fetchFromGitHub, testers, ddev }:
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
testers,
ddev,
}:
buildGoModule rec {
pname = "ddev";
@@ -11,6 +19,10 @@ buildGoModule rec {
hash = "sha256-q1bLnwVNFAtnG5tCn7ox4lgaXM60rrVEcWgBNuRJcSU=";
};
nativeBuildInputs = [
installShellFiles
];
vendorHash = null;
ldflags = [
@@ -22,6 +34,17 @@ buildGoModule rec {
# Tests need docker.
doCheck = false;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# DDEV will try to create $HOME/.ddev, so we set $HOME to a temporary
# directory.
export HOME=$(mktemp -d)
$out/bin/ddev_gen_autocomplete
installShellCompletion --cmd ddev \
--bash .gotmp/bin/completions/ddev_bash_completion.sh \
--fish .gotmp/bin/completions/ddev_fish_completion.sh \
--zsh .gotmp/bin/completions/ddev_zsh_completion.sh
'';
passthru.tests.version = testers.testVersion {
package = ddev;
command = ''
+147
View File
@@ -0,0 +1,147 @@
{
stdenv,
lib,
fetchFromGitHub,
fetchYarnDeps,
nodejs,
electron_34,
yarnConfigHook,
copyDesktopItems,
vips,
ffmpeg,
makeWrapper,
autoPatchelfHook,
makeDesktopItem,
imagemagick,
}:
let
electron = electron_34;
in
stdenv.mkDerivation (finalAttrs: {
pname = "ente-desktop";
version = "1.7.10";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
fetchSubmodules = true;
sparseCheckout = [
"desktop"
"web"
];
tag = "photosd-v${finalAttrs.version}";
hash = "sha256-iH9fbeUOd/8oVVQbMCSlWyruQZKgSjexNrOuS7szJ9w=";
};
sourceRoot = "${finalAttrs.src.name}/desktop";
offlineCache = fetchYarnDeps {
name = "ente-desktop-${finalAttrs.version}-offline-cache";
inherit (finalAttrs) src sourceRoot;
hash = "sha256-kiL2XQPPN9VkDa3rzO1rLwUZVTbwEz0zeqpgpWOSy7Y=";
};
webOfflineCache = fetchYarnDeps {
name = "ente-desktop-${finalAttrs.version}-web-offline-cache";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/web";
hash = "sha256-7epwOEWi5lZNo6Z7Rf+QZtGvVCZxk5bXU2aN+9KDYCc=";
};
nativeBuildInputs = [
nodejs
yarnConfigHook
makeWrapper
autoPatchelfHook # for onnxruntime
copyDesktopItems
imagemagick
];
buildInputs = [
(lib.getLib stdenv.cc.cc) # for onnxruntime
];
# Path to vips (otherwise it looks within the electron derivation)
postPatch = ''
substituteInPlace src/main/services/image.ts --replace-fail "process.resourcesPath" "\"$out/share/ente-desktop/resources\""
'';
postConfigure = ''
chmod u+w -R ..
pushd ../web
offlineCache=$webOfflineCache yarnConfigHook
popd
cp -r ${electron.dist} ./electron_dist
chmod u+w -R ./electron_dist
'';
buildPhase = ''
runHook preBuild
pushd ../web
_ENTE_IS_DESKTOP=1 yarn build
popd
cp -r ../web/apps/photos/out out
yarn run tsc
yarn run electron-builder --dir -c.electronDist=./electron_dist -c.electronVersion=${electron.version}
runHook postBuild
'';
installPhase = ''
runHook preInstall
for size in 16 32 48 64 72 96 128 192 256 512 1024; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
convert -resize "$size"x"$size" build/icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/ente-desktop.png
done
mkdir -p $out/share/ente-desktop
cp -r dist/*/resources $out/share/ente-desktop
ln -s ${vips}/bin/vips $out/share/ente-desktop/resources/vips
ln -s ${ffmpeg}/bin/ffmpeg $out/share/ente-desktop/resources/app.asar.unpacked/node_modules/ffmpeg-static/ffmpeg
# executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/ente-desktop" \
--set ELECTRON_FORCE_IS_PACKAGED 1 \
--set ELECTRON_IS_DEV 0 \
--add-flags "$out/share/ente-desktop/resources/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
runHook postInstall
'';
# The desktop item properties should be kept in sync with data from upstream:
# https://github.com/ente-io/ente/blob/main/desktop/electron-builder.yml
desktopItems = [
(makeDesktopItem {
name = "ente-desktop";
desktopName = "Ente";
exec = "ente-desktop %U";
terminal = false;
type = "Application";
icon = "ente-desktop";
mimeTypes = [
"x-scheme-handler/ente"
];
categories = [
"Photography"
];
})
];
meta = {
description = "Desktop (Electron) client for Ente Photos";
homepage = "https://ente.io/";
changelog = "https://github.com/ente-io/photos-desktop/releases";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [
pinpox
yuka
];
platforms = lib.platforms.all;
};
})
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "ets";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "gdubicki";
repo = "ets";
rev = "v${version}";
hash = "sha256-PowJ3ig8TfGx9P/PJPVBL8GsMh+gGZVt9l4Rf7Mqk00=";
hash = "sha256-LnNd4rAMJliWKbL4uVl11BAa9FPUcLwVSWnFe1vEk7g=";
};
vendorHash = "sha256-XHgdiXdp9aNEAc/Apvb64ExnpywjddWOw1scNKy+ico=";
vendorHash = "sha256-lzukgI/7gxlWHY81MkK1CzpUUaZ4B+4xZ0RSZUpL62c=";
ldflags = [
"-s"
+4 -2
View File
@@ -7,19 +7,21 @@
buildGoModule rec {
pname = "exoscale-cli";
version = "1.77.2";
version = "1.83.1";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-hVuQBdmVBEwioNYHPUneF5Ink12Lh5cdS7UU2hd6SXs=";
sha256 = "sha256-gs6fLczd4BhiiwXPAFICSwPtDOQGsPZf7KVL3K+782s=";
};
vendorHash = null;
nativeBuildInputs = [ installShellFiles ];
excludedPackages = [ "internal/integ" ];
ldflags = [
"-s"
"-w"
@@ -0,0 +1,32 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
pname = "fake-gcs-server";
version = "1.52.2";
src = fetchFromGitHub {
owner = "fsouza";
repo = "fake-gcs-server";
tag = "v${version}";
hash = "sha256-sidMCbJAK3bRGJyyFIUn7e5y0z4O72JWCICHf4JL4yo=";
};
vendorHash = "sha256-oTJ4DCsDazo58ozsAKI0BG7rxfF8oeiIl6vQpRng+LM=";
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Google Cloud Storage emulator & testing library";
homepage = "https://github.com/fsouza/fake-gcs-server";
license = lib.licenses.bsd2;
mainProgram = "fake-gcs-server";
maintainers = with lib.maintainers; [ jpetrucciani ];
};
}
+2 -2
View File
@@ -45,13 +45,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.37.0";
version = "2.38.0";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
tag = finalAttrs.version;
hash = "sha256-wcDMr0I4Y2iSR5gsJ4ATe2T4CHV+hHXEKScUpB9ncMs=";
hash = "sha256-9ph6Zp1x/MP0apB39L+HFUCl7qQ9UfIU89/78+qy6Vc=";
};
outputs = [
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "filesender";
version = "2.52";
version = "2.53";
src = fetchFromGitHub {
owner = "filesender";
repo = "filesender";
tag = "filesender-${finalAttrs.version}";
hash = "sha256-Nl/3Kpo67dr5t/9+EWTyPmzi+sqW8pg5lzLC/jVtCkg=";
hash = "sha256-a9hA1aHuuSbFHggeKlh374/rEVszDdRToKLSiuVb66Q=";
};
patches = [
+3 -3
View File
@@ -8,16 +8,16 @@
}:
buildNpmPackage rec {
pname = "firebase-tools";
version = "13.30.0";
version = "13.32.0";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-QeFkZJAdXs9+buE1qQqKZkEh9LYTlR1IQiueLx3rUbs=";
hash = "sha256-KImt8se4pf/W1XAV8PprYmJRWQqMIAH9FVCEFSV/3Ys=";
};
npmDepsHash = "sha256-IIYHtePMsgh3WfuspYaQEGMYnn9KrAg0pE39mlhldO8=";
npmDepsHash = "sha256-/EWfXiITSV1r4zVvnHk+9U7MpcUlp7/MNUBJWRw3wRk=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
@@ -19,13 +19,13 @@
flutter327.buildFlutterApplication rec {
pname = "flet-client-flutter";
version = "0.26.0";
version = "0.27.4";
src = fetchFromGitHub {
owner = "flet-dev";
repo = "flet";
tag = "v${version}";
hash = "sha256-KmZ13QiZeZ6jljs2wibetbACfNODGJ47II8XcRAxoX4=";
hash = "sha256-YwRxkubkpFHKmTzb+RKZFumey3153lAtg2NO3dDKWG4=";
};
sourceRoot = "${src.name}/client";
@@ -327,7 +327,7 @@
"relative": true
},
"source": "path",
"version": "0.26.0"
"version": "0.27.1"
},
"flet_ads": {
"dependency": "direct main",
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "fn";
version = "0.6.38";
version = "0.6.39";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
hash = "sha256-JzOt0wjlChK07NhZ0y5kFtsmN5cLL4dJStogmGucAgc=";
hash = "sha256-AInZh/e2cA7TUlbSrN5peTmGF9of+3fbWrJI29tBjd8=";
};
vendorHash = null;
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.51";
version = "2.52";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
hash = "sha256-A0mLb3QYI3Eapv5xBMPHcoiaR9np8dx5EAQKXIlhYBg=";
hash = "sha256-x8i09tqxfwek6z351ZJ2l/CdTx1p2EtbHX38Lu8mge0=";
};
# Fix 'NameError: name 'ssl' is not defined'
+2 -2
View File
@@ -29,12 +29,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glamoroustoolkit";
version = "1.1.13";
version = "1.1.14";
src = fetchzip {
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
stripRoot = false;
hash = "sha256-2Rr5x7gVwyksJ19t6Ho8UQGbTmv0yvZuZou1FTfHUbE=";
hash = "sha256-3W3UgJiXN2ryL5MXkf7ZMtlBndp8Iy7jP2CfSWm4c9s=";
};
nativeBuildInputs = [
@@ -53,7 +53,7 @@
"@types/express": "^4.17.14",
"@types/jest": "^29.5.12",
"@types/jsdom": "20.0.0",
"@types/multer": "1.4.7",
"@types/multer": "^1.4.7",
"@types/node": "^18.7.18",
"@types/pixelmatch": "^5.2.6",
"@types/supertest": "^2.0.15",
@@ -75,6 +75,7 @@
"typescript": "4.8.3"
},
"resolutions": {
"@types/express": "^4.17.14",
"xml2js": "^0.6.2"
},
"lint-staged": {
@@ -14,18 +14,18 @@
mkYarnPackage rec {
pname = "grafana-image-renderer";
version = "3.12.0";
version = "3.12.1";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafana-image-renderer";
rev = "v${version}";
hash = "sha256-iTWkr7mruGda7CVz0L6puHeObnogXHfqjF9KAY+ExJg=";
hash = "sha256-j01C5h8RKZi/jcJyzXqgw0sAiBdVphi1kLxgqygVhkg=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-h4i27yNnVU+h5/oboAq6S4+dqjkvJ6TFqtljM3ffgTI=";
hash = "sha256-eYn69tlwCu3ohSCFdifMifvLgHgogv9aq6n8N363Hbw=";
};
packageJSON = ./package.json;
+4 -2
View File
@@ -6,16 +6,17 @@
guile-fibers,
guile-gcrypt,
guile-gnutls,
guile-websocket,
texinfo,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "guile-goblins";
version = "0.14.0";
version = "0.15.0";
src = fetchurl {
url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz";
hash = "sha256-jR+pWk7NXvOF0CvDwa1rYg0yu5ktyq440qyRgivqHr8=";
hash = "sha256-H4mBn0Fe32J99pybfa7jMfxBBvmTfffbAcchujuC3bc=";
};
strictDeps = true;
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
guile-fibers
guile-gcrypt
guile-gnutls
guile-websocket
];
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kitex";
version = "0.12.2";
version = "0.12.3";
src = fetchFromGitHub {
owner = "cloudwego";
repo = "kitex";
rev = "v${version}";
hash = "sha256-95b3LyOX6B+zRq1cIm5fMriEVol36k/RfgoG0tXgMTg=";
hash = "sha256-YJq/aE8M/yRed2ZH7zf6i5wRl9KKXxAncD0lNAmJXUM=";
};
vendorHash = "sha256-FVxo1ww3iCSYrxXpMjSwvE8+PFKyFD3fTdIHna7gpiA=";
vendorHash = "sha256-yIPcH1arDSYfCqSbBTvbnp4UORx11bbuT//fy89bzF0=";
subPackages = [ "tool/cmd/kitex" ];
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libblake3";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "BLAKE3-team";
repo = "BLAKE3";
tag = finalAttrs.version;
hash = "sha256-Ijen3IacwohI2tKxTWv0JWgRfiCQS/SDtkkqEUWiOzk=";
hash = "sha256-YJ3rRzpmF6oS8p377CEoRteARCD1lr/L7/fbN5poUXw=";
};
sourceRoot = finalAttrs.src.name + "/c";
+10
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
icu,
meson,
ninja,
@@ -23,6 +24,15 @@ stdenv.mkDerivation rec {
hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc=";
};
patches = [
# Upstream patch for ICU76 compatibility.
# https://github.com/openzim/libzim/pull/936
(fetchpatch {
url = "https://github.com/openzim/libzim/commit/4a42b3c6971c9534b104f48f6d13db8630a97d2f.patch";
hash = "sha256-FjaGZ2bI1ROLg3rvWIGLbVoImGr51MbWjbBj+lGj1rs=";
})
];
nativeBuildInputs = [
ninja
meson
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "livekit";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "livekit";
repo = "livekit";
rev = "v${version}";
hash = "sha256-YzyrALWFdrnP6iAT0zTYKzhf16I3Xf39WsgLXz8rDCw=";
hash = "sha256-j8alEPvSMdYpQLdWwaoSG5ZYgO17O1BMa71omeCb2Ug=";
};
vendorHash = "sha256-v+K4+BbwYKQD4q5egJaxLYozK8tbTra6c22ZzSlwvPE=";
vendorHash = "sha256-7Zs7b0vaXyho1X33obsHh5f7sIUyhJKfJmHsFf/IuPY=";
subPackages = [ "cmd/server" ];
+5 -4
View File
@@ -2,8 +2,8 @@
lib,
stdenv,
callPackage,
version ? "0.3.6",
rev ? "8",
version ? "0.3.11",
rev ? "1",
...
}@args:
let
@@ -23,6 +23,7 @@ let
"aarch64-darwin"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
broken = stdenv.hostPlatform.isDarwin; # Upstream issue: https://github.com/lmstudio-ai/lmstudio-bug-tracker/issues/347
};
in
if stdenv.hostPlatform.isDarwin then
@@ -35,7 +36,7 @@ if stdenv.hostPlatform.isDarwin then
url =
args.url
or "https://installers.lmstudio.ai/darwin/arm64/${version}-${rev}/LM-Studio-${version}-${rev}-arm64.dmg";
hash = args.hash or "sha256-x4IRT1PjBz9eafmwNRyLVq+4/Rkptz6RVWDFdRrGnGY=";
hash = args.hash or "sha256-kXH3tAazEtl019IBxuavEI9QUamEH3b6UFYRYAO3Fxs=";
}
else
callPackage ./linux.nix {
@@ -47,5 +48,5 @@ else
url =
args.url
or "https://installers.lmstudio.ai/linux/x64/${version}-${rev}/LM-Studio-${version}-${rev}-x64.AppImage";
hash = args.hash or "sha256-laROBUr1HLoaQT6rYhhhulR1KZuKczNomKbrXXkDANY=";
hash = args.hash or "sha256-T8j0l2ZP53Zc0hgb2EyFeR0mH5YrNlz4UfzN0rO7bKU=";
}
+4 -2
View File
@@ -12,6 +12,7 @@
libadwaita,
glib,
libgee,
pciutils,
wrapGAppsHook4,
mangohud,
@@ -55,8 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
let
path = lib.makeBinPath [
mangohud
mesa-demos
vulkan-tools
mesa-demos # glxgears
pciutils # lspci
vulkan-tools # vkcube
];
in
''
+2 -2
View File
@@ -5,13 +5,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "markdown-oxide";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "Feel-ix-343";
repo = "markdown-oxide";
rev = "v${version}";
hash = "sha256-rqwtrW5SXbml+Gi1MMlYgkzftVkrQOn07LrYV6TWijo=";
hash = "sha256-hgXqJwmIpXJNIl67Jjbg5MR4PlwB5XbqnFo+rNLoqbE=";
};
cargoLock = {
+39
View File
@@ -0,0 +1,39 @@
{
lib,
buildGoModule,
fetchFromGitHub,
olm,
nix-update-script,
versionCheckHook,
}:
buildGoModule rec {
pname = "meowlnir";
version = "0.2.0";
src = fetchFromGitHub {
owner = "maunium";
repo = "meowlnir";
tag = "v${version}";
hash = "sha256-Fzi9KI6bPrmKMku176rAnLpfVcAjYlKUQ8MiSQB9hpU=";
};
buildInputs = [ olm ];
vendorHash = "sha256-G1+KDssamPRFlGs/moBk0qJDT/IctiKgnM+mVfCDMwg=";
doCheck = true;
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://github.com/maunium/meowlnir";
description = "Opinionated Matrix moderation bot";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ sumnerevans ];
mainProgram = "meowlnir";
};
}
+2
View File
@@ -24,6 +24,7 @@
qt6,
slang,
stdenv,
utf8proc,
xterm,
}:
@@ -120,6 +121,7 @@ stdenv.mkDerivation {
protobuf
qt6.qtbase
qt6.qtwayland
utf8proc
];
nativeBuildInputs = [
+16 -1
View File
@@ -4,9 +4,22 @@
makeDesktopItem,
copyDesktopItems,
fetchFromGitHub,
writeText,
qt6,
libusb1,
}:
let
# Based on upstream instructions: https://github.com/TechxArtisanStudio/Openterface_QT#for-linux-users
udevRules = writeText "60-openterface.rules" ''
# Serial to HID converter for keyboard/mouse control.
# ID 1a86:7523 QinHeng Electronics CH340 serial converter
KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", TAG+="uaccess"
# "hidraw" device for accessing the host-target toggleable USB port.
# ID 534d:2109 MacroSilicon Openterface
KERNEL=="hidraw*", ATTRS{idVendor}=="534d", ATTRS{idProduct}=="2109", TAG+="uaccess"
'';
in
stdenv.mkDerivation (final: {
pname = "openterface-qt";
version = "0.1.0";
@@ -33,7 +46,9 @@ stdenv.mkDerivation (final: {
mkdir -p $out/bin
cp ./openterfaceQT $out/bin/
mkdir -p $out/share/pixmaps
cp ./images/icon_256.png $out/share/pixmaps/${final.pname}.png
cp ./images/icon_256.png $out/share/pixmaps/openterface-qt.png
mkdir -p $out/etc/udev/rules.d
cp ${udevRules} $out/etc/udev/rules.d/60-openterface.rules
runHook postInstall
'';
-46
View File
@@ -1,46 +0,0 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "pacup";
version = "2.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "pacstall";
repo = "pacup";
tag = version;
hash = "sha256-ItO38QyxNHftKPQZAPO7596ddBfX0a1nfVVqgx7BfwI=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'httpx = ">=0.24,<0.25"' 'httpx = "*"'
'';
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
httpx
rich
typer
packaging
];
meta = with lib; {
description = "Help maintainers update pacscripts";
longDescription = ''
Pacup (Pacscript Updater) is a maintainer helper tool to help maintainers update their pacscripts.
It semi-automates the tedious task of updating pacscripts, and aims to make it a fun process for the maintainer!
'';
homepage = "https://github.com/pacstall/pacup";
changelog = "https://github.com/pacstall/pacup/releases/tag/${version}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ zahrun ];
mainProgram = "pacup";
};
}
@@ -0,0 +1,47 @@
{
python3Packages,
fetchFromGitHub,
nix-update-script,
callPackage,
lib,
}:
python3Packages.buildPythonApplication rec {
pname = "pandoc-mustache";
version = "0.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "michaelstepner";
repo = "pandoc-mustache";
tag = "${version}";
hash = "sha256-lgbQV4X2N4VuIEtjeSA542yqGdIs5QQ7+bdCoy/aloE=";
};
build-system = with python3Packages; [
setuptools
pyparsing
];
dependencies = with python3Packages; [
panflute
pystache
pyyaml
future
];
passthru = {
updateScript = nix-update-script { };
tests = callPackage ./tests { };
};
meta = {
description = "Pandoc Mustache Filter";
homepage = "https://github.com/michaelstepner/pandoc-mustache";
changelog = "https://github.com/michaelstepner/pandoc-mustache/releases/tag/${version}/CHANGELOG.md";
maintainers = with lib.maintainers; [ averdow ];
license = with lib.licenses; [
cc-by-10
];
};
}
@@ -0,0 +1,30 @@
{
pkgs,
pandoc-mustache,
runCommand,
}:
let
vars = pkgs.writeText "vars.yaml" ''
place: Montreal
temperature: '7'
'';
markdown = pkgs.writeText "markdown.md" ''
---
title: My Report
author: Jane Smith
mustache: ${vars}
---
The temperature in {{place}} was {{temperature}} degrees.
'';
in
runCommand "pandoc-mustache-test"
{
nativeBuildInputs = [
pandoc-mustache
pkgs.pandoc
];
}
''
pandoc --filter pandoc-mustache ${markdown} --to plain | grep 'The temperature in Montreal was 7 degrees.' || exit 1
touch $out
''
File diff suppressed because it is too large Load Diff
+9 -12
View File
@@ -1,11 +1,11 @@
{
lib,
stdenv,
fetchFromGitHub,
gtk4,
libadwaita,
tdlib,
rlottie,
stdenv,
rustPlatform,
meson,
ninja,
@@ -28,7 +28,7 @@ let
src = fetchFromGitHub {
owner = "paper-plane-developers";
repo = "paper-plane";
rev = "v${version}";
tag = "v${version}";
hash = "sha256-qcAHxNnF980BHMqLF86M06YQnEN5L/8nkyrX6HQjpBA=";
};
@@ -71,12 +71,9 @@ in
stdenv.mkDerivation {
inherit pname version src;
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"gtk-rlottie-0.1.0" = "sha256-/F0VSXU0Z59QyFYXrB8NLe/Nw/uVjGY68BriOySSXyI=";
"origami-0.1.0" = "sha256-xh7eBjumqCOoAEvRkivs/fgvsKXt7UU67FCFt20oh5s=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-QEX7w8eMV7DJFONjq23o8eCV+lliugS0pcdufFhcZrM=";
};
nativeBuildInputs = [
@@ -122,7 +119,7 @@ stdenv.mkDerivation {
stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"
) "-Wno-error=incompatible-function-pointer-types";
meta = with lib; {
meta = {
homepage = "https://github.com/paper-plane-developers/paper-plane";
description = "Chat over Telegram on a modern and elegant client";
longDescription = ''
@@ -130,9 +127,9 @@ stdenv.mkDerivation {
for its user interface and strives to meet the design principles
of the GNOME desktop.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ aleksana ];
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aleksana ];
mainProgram = "paper-plane";
platforms = platforms.unix;
platforms = lib.platforms.unix;
};
}
+24 -2
View File
@@ -1,4 +1,10 @@
{ lib, buildGoModule, fetchFromGitHub }:
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
stdenv,
}:
buildGoModule rec {
pname = "pathvector";
@@ -11,14 +17,30 @@ buildGoModule rec {
sha256 = "sha256-TqGasguEAcA5ET2E/uFjgIl7IHI2v9m5EaXpIMG3T8c=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-hgUuntT6jMWI14qDE3Yjm5W8UqQ6CcvoILmSDaVEZac=";
env.CGO_ENABLED = 0;
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ];
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.commit=${src.rev}"
"-X main.date=unknown"
];
doCheck = false;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
local INSTALL="$out/bin/pathvector"
installShellCompletion --cmd pathvector \
--bash <($out/bin/pathvector completion bash) \
--fish <($out/bin/pathvector completion fish) \
--zsh <($out/bin/pathvector completion zsh)
'';
meta = with lib; {
description = "Declarative edge routing platform that automates route optimization and control plane configuration";
homepage = "https://pathvector.io";
+2 -2
View File
@@ -9,13 +9,13 @@
python3Packages.buildPythonApplication rec {
pname = "patroni";
version = "4.0.4";
version = "4.0.5";
src = fetchFromGitHub {
owner = "zalando";
repo = "patroni";
tag = "v${version}";
sha256 = "sha256-if3azfBb6/OegahZYAM2RMxmWRDsCX5DNkUATTcAUrw=";
sha256 = "sha256-1Afwdv1kX8/zc9TB4kbA2NakXycJlf/wUcYAYKWwITM=";
};
dependencies = with python3Packages; [
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "pkgsite";
version = "0-unstable-2025-02-14";
version = "0-unstable-2025-02-18";
src = fetchFromGitHub {
owner = "golang";
repo = "pkgsite";
rev = "dd488e5da97a2d18430760c4558bf0b6be1a4bfd";
hash = "sha256-1tzoHN9kXFkTwwH6loMnagbYX6s9YPhSPXgw/groklE=";
rev = "224a1368cf027909a3112d3267c37a34cec9ef38";
hash = "sha256-04hGf60bhh7TLHjGLz2yRPsHI8bxGBkbSpJQLJsilt4=";
};
vendorHash = "sha256-Zb0rhIgdP5Ct8ypuEwRBrN2k+UZ6bZceI3B1XAMC0dk=";
+19 -4
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
zlib,
@@ -10,18 +11,19 @@
sqlite,
openssl,
unixODBC,
utf8proc,
libmysqlclient,
}:
stdenv.mkDerivation rec {
pname = "poco";
version = "1.13.3";
version = "1.14.1";
src = fetchFromGitHub {
owner = "pocoproject";
repo = "poco";
sha256 = "sha256-ryBQjzg1DyYd/LBZzjHxq8m/7ZXRSKNNGRkIII0eHK0=";
hash = "sha256-acq2eja61sH/QHwMPmiDNns2jvXRTk0se/tHj9XRSiU=";
rev = "poco-${version}-release";
};
@@ -32,8 +34,10 @@ stdenv.mkDerivation rec {
buildInputs = [
unixODBC
utf8proc
libmysqlclient
];
propagatedBuildInputs = [
zlib
pcre2
@@ -50,8 +54,19 @@ stdenv.mkDerivation rec {
MYSQL_DIR = libmysqlclient;
MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
configureFlags = [
"--unbundled"
cmakeFlags = [
# use nix provided versions of sqlite, zlib, pcre, expat, ... instead of bundled versions
(lib.cmakeBool "POCO_UNBUNDLED" true)
];
patches = [
# Remove on next release
(fetchpatch {
name = "disable-included-pcre-if-pcre-is-linked-staticly";
# this happens when building pkgsStatic.poco
url = "https://patch-diff.githubusercontent.com/raw/pocoproject/poco/pull/4879.patch";
hash = "sha256-VFWuRuf0GPYFp43WKI8utl+agP+7a5biLg7m64EMnVo=";
})
];
postFixup = ''
-2946
View File
File diff suppressed because it is too large Load Diff
+10 -12
View File
@@ -24,16 +24,14 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "marhkb";
repo = pname;
rev = "v${version}";
sha256 = "sha256-S84Qb+hySjIxcznuA7Sh8n9XFvdZpf32Yznb1Sj+owY=";
repo = "pods";
tag = "v${version}";
hash = "sha256-S84Qb+hySjIxcznuA7Sh8n9XFvdZpf32Yznb1Sj+owY=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"podman-api-0.10.0" = "sha256-nbxK/U5G+PlbytpHdr63x/C69hBgedPXBFfgdzT9fdc=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-UBInZdoluWXq1jm2rhS5wBwXQ/zYFPSEeWhpSmkc2aY=";
};
nativeBuildInputs = [
@@ -57,13 +55,13 @@ stdenv.mkDerivation rec {
vte-gtk4
];
meta = with lib; {
meta = {
description = "Podman desktop application";
homepage = "https://github.com/marhkb/pods";
changelog = "https://github.com/marhkb/pods/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ figsoda ];
platforms = platforms.linux;
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ figsoda ];
platforms = lib.platforms.linux;
mainProgram = "pods";
};
}
@@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "portfolio";
version = "1.0.1";
version = "1.0.2";
format = "other";
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "tchx84";
repo = "Portfolio";
rev = "v${version}";
hash = "sha256-IbzAkHlD6duXkPJRSyD9HJ/JHP8+IR7vIGFp2ESbBug=";
hash = "sha256-v86pQbj5+SqdzsW0Ko5TW/12NsFVNSPyX6g0e+MdzHE=";
};
postPatch = ''
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "prometheus-borgmatic-exporter";
version = "0.2.7";
version = "0.2.8";
pyproject = true;
src = fetchFromGitHub {
owner = "maxim-mityutko";
repo = "borgmatic-exporter";
tag = "v${version}";
hash = "sha256-ZZdCuIavJrIHO/ayMnirNRYyqovKQaW5jTRRrSOhofQ=";
hash = "sha256-/d9XX/7w6hod7udB9tlCqOVpcpWZzU0Kir9RSoQiQBs=";
};
pythonRelaxDeps = [ "prometheus-client" ];
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Prometheus exporter for Borgmatic";
homepage = "https://github.com/maxim-mityutko/borgmatic-exporter";
changelog = "https://github.com/maxim-mityutko/borgmatic-exporter/releases/tag/v${version}";
changelog = "https://github.com/maxim-mityutko/borgmatic-exporter/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ flandweber ];
mainProgram = "borgmatic-exporter";
File diff suppressed because it is too large Load Diff
+6 -8
View File
@@ -28,27 +28,25 @@ let
domain = "gitlab.freedesktop.org";
owner = "pipewire";
repo = "wireplumber";
rev = version;
tag = version;
hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
};
});
in
stdenv.mkDerivation (finalAttrs: {
pname = "pwvucontrol";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitHub {
owner = "saivert";
repo = "pwvucontrol";
tag = finalAttrs.version;
hash = "sha256-v8xANTbaIPIAPoukP8rcVzM6NHNpS2Ej/nfdmg3Vgvg=";
hash = "sha256-E3UfZO0R6WGeUffgGQ2ceHiG4hwIuFntTdCpojaWL8E=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"wireplumber-0.1.0" = "sha256-ocagwmjyhfx6n/9xKxF2vhylqy2HunKQRx3eMo6m/l4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-uaRpaiVjxc0j4oDbmmwt8SPS7O7hWzoYO62jLYzHl1c=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "reindeer";
version = "2025.02.17.00";
version = "2025.02.24.00";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "reindeer";
tag = "v${version}";
hash = "sha256-ANoqccJaVVybRZ9al2PAoWSDgYscSKJNZEp/2kxDNwg=";
hash = "sha256-+uiVUEaBDO7c2QYo0NcCy9Ms+wz+09p6kD0muRAvOlo=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-3dYg2FqTj73L/EpUNEt9PhkRXyAUxeKT2n9/IDi9QPM=";
cargoHash = "sha256-G+NAljFX0R73+sj30KHHkU78AfQCg7e3PM5oOB9iTbE=";
nativeBuildInputs = [ pkg-config ];
+3 -2
View File
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
owner = "raspberrypi";
repo = "usbboot";
rev = version;
hash = "sha256-nUwero1BLSx+JORqJVWIXi2ElnN17al1jA+I4Cqe9hM=";
hash = "sha256-m11SX31GLmb/LGiO7X8P7eL88zvLfoJ/anAVEpg8WL4=";
fetchSubmodules = true;
};
buildInputs = [ libusb1 ];
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
mkdir -p $out/share/rpiboot
cp rpiboot $out/bin
cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-imager-embedded $out/share/rpiboot
cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-eeprom rpi-imager-embedded $out/share/rpiboot
'';
passthru.updateScript = gitUpdater { };
+12 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "scheme48";
version = "1.9.2";
version = "1.9.3";
src = fetchurl {
url = "https://s48.org/${version}/scheme48-${version}.tgz";
sha256 = "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw";
sha256 = "bvWp8/yhQRCw+DG0WAHRH5vftnmdl2qhLk+ICdrzkEw=";
};
# Make more reproducible by removing build user and date.
@@ -27,6 +27,16 @@ stdenv.mkDerivation rec {
];
};
# Don't build or install documentation, which depends on pdflatex,
# tex2page, and probably other things for which there is no nixpkgs
# derivation available
buildPhase = ''
runHook preBuild
make vm image libscheme48 script-interpreter go
runHook postBuild
'';
installTargets = "install-no-doc";
meta = with lib; {
homepage = "https://s48.org/";
description = "Scheme 48 interpreter for R5RS";
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20250224-1";
version = "20250303-2";
src = fetchFromGitHub {
owner = "bepaald";
repo = "signalbackup-tools";
rev = version;
hash = "sha256-HUwx+Vt+o68Zo+dKa7E5wDkYK12kGqntlImD86fqOLw=";
hash = "sha256-sBhkD68SC5puovPe8XyiBFWYAt/ADddVyKm4thB9dtw=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "slumber";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "LucasPickering";
repo = "slumber";
tag = "v${version}";
hash = "sha256-iahhmoRcUvyX2QMW7SuIXcS1a7NXg/df8XarPHrTP8o=";
hash = "sha256-7MPNs2vAzCo5TPJZFhd3xaZW0YbF724gfKNLB08IU8A=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-v8yl71rpePlqNwXRU3Ak3x5796qYtO95H3ipvwEeFww=";
cargoHash = "sha256-eWox5NrvZr+mEGGwxYbAW5EgEOQ8WQUy2pughBlpXgM=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
+130 -284
View File
@@ -122,9 +122,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.95"
version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
[[package]]
name = "async-broadcast"
@@ -292,7 +292,7 @@ dependencies = [
"miniz_oxide",
"object",
"rustc-demangle",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -336,9 +336,9 @@ dependencies = [
[[package]]
name = "block2"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
checksum = "1d59b4c170e16f0405a2e95aff44432a0d41aa97675f3d52623effe95792a037"
dependencies = [
"objc2",
]
@@ -480,9 +480,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.14"
version = "1.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
dependencies = [
"shlex",
]
@@ -521,7 +521,7 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -536,9 +536,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.29"
version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184"
checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
dependencies = [
"clap_builder",
"clap_derive",
@@ -546,9 +546,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.29"
version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9"
checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
dependencies = [
"anstream",
"anstyle",
@@ -599,46 +599,12 @@ dependencies = [
"libc",
]
[[package]]
name = "core-foundation"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "core-graphics"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [
"bitflags 2.8.0",
"core-foundation 0.10.0",
"core-graphics-types",
"foreign-types 0.5.0",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [
"bitflags 2.8.0",
"core-foundation 0.10.0",
"libc",
]
[[package]]
name = "cpufeatures"
version = "0.2.17"
@@ -774,23 +740,23 @@ dependencies = [
[[package]]
name = "dirs"
version = "5.0.1"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.4.1"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.48.0",
"redox_users 0.5.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -800,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [
"libc",
"redox_users",
"redox_users 0.4.6",
"winapi",
]
@@ -959,28 +925,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
"foreign-types-shared 0.1.1",
]
[[package]]
name = "foreign-types"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
dependencies = [
"foreign-types-macros",
"foreign-types-shared 0.3.1",
]
[[package]]
name = "foreign-types-macros"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.98",
"foreign-types-shared",
]
[[package]]
@@ -989,12 +934,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "foreign-types-shared"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]]
name = "form_urlencoded"
version = "1.2.1"
@@ -1194,7 +1133,7 @@ dependencies = [
"cfg-if",
"libc",
"wasi 0.13.3+wasi-0.2.2",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -1353,9 +1292,9 @@ dependencies = [
[[package]]
name = "h2"
version = "0.4.7"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
dependencies = [
"atomic-waker",
"bytes",
@@ -1720,9 +1659,9 @@ dependencies = [
[[package]]
name = "inout"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
dependencies = [
"block-padding",
"generic-array",
@@ -1746,7 +1685,7 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "isakmp"
version = "0.1.0"
source = "git+https://github.com/ancwrd1/isakmp.git#bd536ce6b3c2deafc219a9f725814dc2cefec414"
source = "git+https://github.com/ancwrd1/isakmp.git#d189fbcae8fe3806e1601d3ec59293e459b32ebd"
dependencies = [
"anyhow",
"async-trait",
@@ -1869,7 +1808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [
"cfg-if",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -1906,9 +1845,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.25"
version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
[[package]]
name = "memchr"
@@ -1954,9 +1893,9 @@ dependencies = [
[[package]]
name = "muda"
version = "0.15.3"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdae9c00e61cc0579bcac625e8ad22104c60548a025bfc972dc83868a28e1484"
checksum = "89fed9ce3e5c01700e3a129d3d74619bbf468645b58274b420885107e496ecff"
dependencies = [
"crossbeam-channel",
"dpi",
@@ -1964,18 +1903,19 @@ dependencies = [
"keyboard-types",
"objc2",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-foundation",
"once_cell",
"png",
"thiserror 1.0.69",
"thiserror 2.0.11",
"windows-sys 0.59.0",
]
[[package]]
name = "native-tls"
version = "0.2.13"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
dependencies = [
"libc",
"log",
@@ -2099,60 +2039,45 @@ dependencies = [
"autocfg",
]
[[package]]
name = "objc-sys"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
[[package]]
name = "objc2"
version = "0.5.2"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59"
dependencies = [
"objc-sys",
"objc2-encode",
]
[[package]]
name = "objc2-app-kit"
version = "0.2.2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb"
dependencies = [
"bitflags 2.8.0",
"block2",
"libc",
"objc2",
"objc2-core-data",
"objc2-core-image",
"objc2-foundation",
"objc2-quartz-core",
]
[[package]]
name = "objc2-core-data"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
"bitflags 2.8.0",
"block2",
"objc2",
"objc2-core-foundation",
"objc2-foundation",
]
[[package]]
name = "objc2-core-image"
version = "0.2.2"
name = "objc2-core-foundation"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925"
dependencies = [
"block2",
"bitflags 2.8.0",
"objc2",
"objc2-foundation",
"objc2-metal",
]
[[package]]
name = "objc2-core-graphics"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8dca602628b65356b6513290a21a6405b4d4027b8b250f0b98dddbb28b7de02"
dependencies = [
"bitflags 2.8.0",
"objc2-core-foundation",
]
[[package]]
@@ -2163,39 +2088,14 @@ checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
[[package]]
name = "objc2-foundation"
version = "0.2.2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
"bitflags 2.8.0",
"block2",
"libc",
"objc2",
]
[[package]]
name = "objc2-metal"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998"
dependencies = [
"bitflags 2.8.0",
"block2",
"objc2",
"objc2-foundation",
]
[[package]]
name = "objc2-quartz-core"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
"bitflags 2.8.0",
"block2",
"objc2",
"objc2-foundation",
"objc2-metal",
"objc2-core-foundation",
]
[[package]]
@@ -2233,7 +2133,7 @@ checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
dependencies = [
"bitflags 2.8.0",
"cfg-if",
"foreign-types 0.3.2",
"foreign-types",
"libc",
"once_cell",
"openssl-macros",
@@ -2352,7 +2252,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -2626,8 +2526,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.0",
"zerocopy 0.8.18",
"rand_core 0.9.1",
"zerocopy 0.8.20",
]
[[package]]
@@ -2647,7 +2547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
"rand_core 0.9.0",
"rand_core 0.9.1",
]
[[package]]
@@ -2661,19 +2561,19 @@ dependencies = [
[[package]]
name = "rand_core"
version = "0.9.0"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff"
checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3"
dependencies = [
"getrandom 0.3.1",
"zerocopy 0.8.18",
"zerocopy 0.8.20",
]
[[package]]
name = "redox_syscall"
version = "0.5.8"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
dependencies = [
"bitflags 2.8.0",
]
@@ -2689,6 +2589,17 @@ dependencies = [
"thiserror 1.0.69",
]
[[package]]
name = "redox_users"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
dependencies = [
"getrandom 0.2.15",
"libredox",
"thiserror 2.0.11",
]
[[package]]
name = "regex"
version = "1.11.1"
@@ -2764,9 +2675,9 @@ dependencies = [
[[package]]
name = "ring"
version = "0.17.9"
version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24"
checksum = "d34b5020fcdea098ef7d95e9f89ec15952123a4a039badd09fabebe9e963e839"
dependencies = [
"cc",
"cfg-if",
@@ -2927,7 +2838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
dependencies = [
"bitflags 2.8.0",
"core-foundation 0.9.4",
"core-foundation",
"core-foundation-sys",
"libc",
"security-framework-sys",
@@ -2951,18 +2862,18 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
[[package]]
name = "serde"
version = "1.0.217"
version = "1.0.218"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.217"
version = "1.0.218"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
dependencies = [
"proc-macro2",
"quote",
@@ -2971,9 +2882,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.138"
version = "1.0.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
dependencies = [
"itoa",
"memchr",
@@ -3088,7 +2999,7 @@ checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
[[package]]
name = "snx-rs"
version = "3.0.6"
version = "3.1.0"
dependencies = [
"anyhow",
"clap",
@@ -3103,7 +3014,7 @@ dependencies = [
[[package]]
name = "snx-rs-gui"
version = "3.0.6"
version = "3.1.0"
dependencies = [
"anyhow",
"async-channel",
@@ -3124,7 +3035,7 @@ dependencies = [
[[package]]
name = "snxcore"
version = "3.0.6"
version = "3.1.0"
dependencies = [
"anyhow",
"async-recursion",
@@ -3169,7 +3080,7 @@ dependencies = [
[[package]]
name = "snxctl"
version = "3.0.6"
version = "3.1.0"
dependencies = [
"anyhow",
"clap",
@@ -3262,7 +3173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
dependencies = [
"bitflags 2.8.0",
"core-foundation 0.9.4",
"core-foundation",
"system-configuration-sys",
]
@@ -3297,9 +3208,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
version = "3.16.0"
version = "3.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
dependencies = [
"cfg-if",
"fastrand",
@@ -3485,7 +3396,7 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"winnow 0.7.2",
"winnow 0.7.3",
]
[[package]]
@@ -3574,21 +3485,22 @@ dependencies = [
[[package]]
name = "tray-icon"
version = "0.19.2"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b"
checksum = "d433764348e7084bad2c5ea22c96c71b61b17afe3a11645710f533bd72b6a2b5"
dependencies = [
"core-graphics",
"crossbeam-channel",
"dirs",
"libappindicator",
"muda",
"objc2",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-core-graphics",
"objc2-foundation",
"once_cell",
"png",
"thiserror 1.0.69",
"thiserror 2.0.11",
"windows-sys 0.59.0",
]
@@ -3621,9 +3533,9 @@ dependencies = [
[[package]]
name = "typenum"
version = "1.17.0"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
[[package]]
name = "ucd-trie"
@@ -3644,9 +3556,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.16"
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
[[package]]
name = "unicode-segmentation"
@@ -3691,9 +3603,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "1.13.1"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1"
dependencies = [
"getrandom 0.3.1",
"sha1_smol",
@@ -3866,7 +3778,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -3877,7 +3789,7 @@ checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
dependencies = [
"windows-result",
"windows-strings",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -3886,7 +3798,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
dependencies = [
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -3896,16 +3808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
"windows-result",
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.5",
"windows-targets",
]
[[package]]
@@ -3914,7 +3817,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@@ -3923,22 +3826,7 @@ version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-targets"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
"windows_aarch64_gnullvm 0.48.5",
"windows_aarch64_msvc 0.48.5",
"windows_i686_gnu 0.48.5",
"windows_i686_msvc 0.48.5",
"windows_x86_64_gnu 0.48.5",
"windows_x86_64_gnullvm 0.48.5",
"windows_x86_64_msvc 0.48.5",
"windows-targets",
]
[[package]]
@@ -3947,46 +3835,28 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
@@ -3999,48 +3869,24 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
@@ -4058,9 +3904,9 @@ dependencies = [
[[package]]
name = "winnow"
version = "0.7.2"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603"
checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
dependencies = [
"memchr",
]
@@ -4202,7 +4048,7 @@ dependencies = [
"tracing",
"uds_windows",
"windows-sys 0.59.0",
"winnow 0.7.2",
"winnow 0.7.3",
"xdg-home",
"zbus_macros 5.5.0",
"zbus_names 4.2.0",
@@ -4256,7 +4102,7 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
dependencies = [
"serde",
"static_assertions",
"winnow 0.7.2",
"winnow 0.7.3",
"zvariant 5.4.0",
]
@@ -4272,11 +4118,11 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.18"
version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79386d31a42a4996e3336b0919ddb90f81112af416270cff95b5f5af22b839c2"
checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
dependencies = [
"zerocopy-derive 0.8.18",
"zerocopy-derive 0.8.20",
]
[[package]]
@@ -4292,9 +4138,9 @@ dependencies = [
[[package]]
name = "zerocopy-derive"
version = "0.8.18"
version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76331675d372f91bf8d17e13afbd5fe639200b73d01f0fc748bb059f9cca2db7"
checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
dependencies = [
"proc-macro2",
"quote",
@@ -4373,7 +4219,7 @@ dependencies = [
"enumflags2",
"serde",
"static_assertions",
"winnow 0.7.2",
"winnow 0.7.3",
"zvariant_derive 5.4.0",
"zvariant_utils 3.2.0",
]
@@ -4426,5 +4272,5 @@ dependencies = [
"serde",
"static_assertions",
"syn 2.0.98",
"winnow 0.7.2",
"winnow 0.7.3",
]
+3 -3
View File
@@ -18,13 +18,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "snx-rs";
version = "3.0.6";
version = "3.1.0";
src = fetchFromGitHub {
owner = "ancwrd1";
repo = "snx-rs";
tag = "v${version}";
hash = "sha256-TAUxXeqaMKN2EAolYBzYo/4xlZhTs5CSirGqtDV/PZ4=";
hash = "sha256-5kPXwnPjWoBHTzgSCkyaTvkKfPzaNkzjwnB/zSXnyiA=";
};
passthru.updateScript = nix-update-script { };
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"isakmp-0.1.0" = "sha256-L98P7H7z9GBWht/3gTdFP4yrFi0llpBKgLB+ZNX/R/A=";
"isakmp-0.1.0" = "sha256-3ZiJS+JI8c3Segv3UmVY/f2Ms5/u6sH3iR9Y8L7fGj4=";
};
};
-3688
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -27,12 +27,8 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"swim-0.12.0" = "sha256-9uqla3MRweQvMVLn31yHJJjRtY7YuDtofsHRE/Xqz5E=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-YMUeHr9eUOYIcO7PbaFgZa0Ib10GMF+jT10ZCSG7PNo=";
# TODO: somehow respect https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit
passthru.updateScript = _experimental-update-script-combinators.sequence [
+20 -2
View File
@@ -2,12 +2,14 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
SDL2,
SDL2_image,
rtaudio,
rtmidi,
glew,
alsa-lib,
angelscript,
cmake,
pkg-config,
zenity,
@@ -20,15 +22,23 @@ let
in
stdenv.mkDerivation rec {
pname = "theforceengine";
version = "1.10.000";
version = "1.15.000";
src = fetchFromGitHub {
owner = "luciusDXL";
repo = "TheForceEngine";
rev = "v${version}";
hash = "sha256-oEcjHb6HY5qxKuPoNBuobPbdi39hUUWtKSb7FbAfEpc=";
hash = "sha256-pcPR2KCGbyL1JABF30yJrlcLPGU2h0//Ghf7e7zYO0s=";
};
patches = [
# https://github.com/luciusDXL/TheForceEngine/pull/493 -- fixes finding data files outside program directory
(fetchpatch {
url = "https://github.com/luciusDXL/TheForceEngine/commit/476a5277666bfdffb33ed10bdd1177bfe8ec3a70.diff";
hash = "sha256-ZcfKIXQMcWMmnM4xfQRd/Ozl09vkQr3jUxZ5e4Mw5CU=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@@ -41,6 +51,14 @@ stdenv.mkDerivation rec {
rtmidi
glew
alsa-lib
angelscript
];
hardeningDisable = [ "format" ];
cmakeFlags = [
(lib.cmakeBool "ENABLE_EDITOR" true)
(lib.cmakeBool "ENABLE_FORCE_SCRIPT" true)
];
prePatch = ''
@@ -2,26 +2,47 @@
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
pname = "timescaledb-parallel-copy";
version = "0.4.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HxaGKJnLZjPPJXoccAx0XUsCrZiG09c40zeSbHYXm04=";
repo = "timescaledb-parallel-copy";
tag = "v${version}";
hash = "sha256-vd+2KpURyVhcVf2ESHcyZLJCw+z+WbnTJX9Uy4ZAPoE=";
};
vendorHash = "sha256-muxtr80EjnRoHG/TCEQwrBwlnARsfqWoYlR0HavMe6U=";
vendorHash = "sha256-MRso2uihMUc+rLwljwZZR1+1cXADCNg+JUpRcRU918g=";
meta = with lib; {
checkFlags =
let
# need Docker daemon
skippedTests = [
"TestWriteDataToCSV"
"TestErrorAtRow"
"TestErrorAtRowWithHeader"
"TestWriteReportProgress"
"TestFailedBatchHandler"
"TestFailedBatchHandlerFailure"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "-version";
meta = {
description = "Bulk, parallel insert of CSV records into PostgreSQL";
mainProgram = "timescaledb-parallel-copy";
homepage = "https://github.com/timescale/timescaledb-parallel-copy";
license = licenses.asl20;
maintainers = with maintainers; [ thoughtpolice ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ thoughtpolice ];
};
}
+3 -3
View File
@@ -11,17 +11,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "tuicam";
version = "0.0.2";
version = "0.0.3";
src = fetchFromGitHub {
owner = "hlsxx";
repo = "tuicam";
tag = "v${version}";
hash = "sha256-4Ae9SIhKNIdHReQbAwZbxErBA66Y7IxKj5M4kEFrplA=";
hash = "sha256-Ry64sd0OYGqbiVqveU05gsmf1c9kQy2QMN9Z5seMedc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Mvf5isXN8DQhL8fpYUn0seAFlqVeBF8apaL7RQqtjmU=";
cargoHash = "sha256-z+5fVSl9zFdOFNCCf49iVltAm+rZcJtLsz+zLCUlC6o=";
nativeBuildInputs = [
autoPatchelfHook
+2 -2
View File
@@ -6,12 +6,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "unrar";
version = "7.1.4";
version = "7.1.5";
src = fetchzip {
url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
stripRoot = false;
hash = "sha256-vO6tVwoIq3mI3YcuaJW8mIcjG1DsWiQmJ50nlZT/OZs=";
hash = "sha256-D5FrzE3zkAFPOzAw+jt6+KVjNVbUcsjiPlIqOe/XZ8A=";
};
sourceRoot = finalAttrs.src.name;
+8 -3
View File
@@ -11,18 +11,18 @@
rustPlatform.buildRustPackage rec {
pname = "veryl";
version = "0.13.2";
version = "0.13.5";
src = fetchFromGitHub {
owner = "veryl-lang";
repo = "veryl";
rev = "v${version}";
hash = "sha256-LSQ3ZM7BWXiwBqlw6usImpt+w+wC2EvkoAMblTb0pvg=";
hash = "sha256-rZ2Psbs3s5NfY1Mktr3RLGwQYciMh5FCs4d0I1zBaA8=";
fetchSubmodules = true;
};
useFetchCargoVendor = true;
cargoHash = "sha256-DEq67oPEo5CZYtX7kaqWNXzgbOiyvN3n+Qs9fiMHgUw=";
cargoHash = "sha256-syvW5Lm2ed/AXksDmIAEAbrw+mW1aA0FugJirBZLtLw=";
nativeBuildInputs = [
pkg-config
@@ -63,6 +63,11 @@ rustPlatform.buildRustPackage rec {
"--skip=analyzer::test_68_std"
"--skip=emitter::test_25_dependency"
"--skip=emitter::test_68_std"
"--skip=filelist::test"
"--skip=path::directory_directory"
"--skip=path::directory_target"
"--skip=path::source_directory"
"--skip=path::source_target"
];
meta = {
-8
View File
@@ -47,11 +47,6 @@
writeShellScript,
}:
let
# zerocallusedregs hardening breaks WeChat
glibcWithoutHardening = stdenv.cc.libc.overrideAttrs (old: {
hardeningDisable = (old.hardeningDisable or [ ]) ++ [ "zerocallusedregs" ];
});
wechat-uos-env = stdenvNoCC.mkDerivation {
meta.priority = 1;
name = "wechat-uos-env";
@@ -68,9 +63,6 @@ let
};
wechat-uos-runtime = with xorg; [
# Make sure our glibc without hardening gets picked up first
(lib.hiPrio glibcWithoutHardening)
stdenv.cc.cc
stdenv.cc.libc
pango
+8 -8
View File
@@ -1,11 +1,11 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2024-12-18
# Last updated: 2025-02-21
{
version = "4.0.1.7";
amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.7_amd64.deb";
arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.7_arm64.deb";
loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.7_loongarch64.deb";
amd64_hash = "sha256-v9WioyAoAUj/Nfep020bqY9KaF9B3yUY+7EPdjbfO7I=";
arm64_hash = "sha256-QD+8x8ss1VVG4BiotuZoWspzTJAZsr3MCcGbZgjmOF4=";
loongarch64_hash = "sha256-M+q+Kr/UZ2mdhXqpgH/XPBfwWMjVR/3DFB7geOporco=";
version = "4.0.1.12";
amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb";
arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb";
loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb";
amd64_hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU=";
arm64_hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8=";
loongarch64_hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo=";
}
+2 -2
View File
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "wiremock";
version = "3.12.0";
version = "3.12.1";
src = fetchurl {
url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar";
hash = "sha256-xBylDIazUsvIVGitrdF/cdHiTm3N4yh032sPESmfe0E=";
hash = "sha256-OoyH8wqvMQvLHPi4bTRodINMpqzZAdsvixm5qmqAZuI=";
};
dontUnpack = true;
@@ -1,72 +1,94 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
gst_all_1,
libgbm,
fetchpatch,
libcosmicAppHook,
pkg-config,
libglvnd,
libxkbcommon,
util-linux,
libgbm,
pipewire,
wayland,
gst_all_1,
coreutils,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xdg-desktop-portal-cosmic";
version = "1.0.0-alpha.5.1";
version = "1.0.0-alpha.6";
src = fetchFromGitHub {
owner = "pop-os";
repo = "xdg-desktop-portal-cosmic";
rev = "epoch-${version}";
hash = "sha256-wff805IIXrXC/kn5l4HrYenxNRTGDYHPmT7qTTtBi/c=";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-ymBmnSEXGCNbLTIVzHP3tjKAG0bgvEFU1C8gnxiow98=";
};
env.VERGEN_GIT_COMMIT_DATE = "2025-01-14";
env.VERGEN_GIT_SHA = src.rev;
env = {
VERGEN_GIT_COMMIT_DATE = "2025-02-20";
VERGEN_GIT_SHA = finalAttrs.src.rev;
};
useFetchCargoVendor = true;
cargoHash = "sha256-Dwlow5nUl7qHLfu4Acic2CRCJViylpPLyLBVtBgWd9A=";
cargoHash = "sha256-FO/GIzv9XVu8SSV+JbOf98UX/XriRgqTthtzvRIWNjo=";
separateDebugInfo = true;
nativeBuildInputs = [
libcosmicAppHook
rustPlatform.bindgenHook
pkg-config
util-linux
];
buildInputs = [
libglvnd
libxkbcommon
libgbm
pipewire
wayland
];
checkInputs = [ gst_all_1.gstreamer ];
# Force linking to libEGL, which is always dlopen()ed, and to
# libwayland-client, which is always dlopen()ed except by the
# obscure winit backend.
RUSTFLAGS = map (a: "-C link-arg=${a}") [
"-Wl,--push-state,--no-as-needed"
"-lEGL"
"-lwayland-client"
"-Wl,--pop-state"
# TODO: Remove this when updating to the next version
patches = [
(fetchpatch {
name = "cosmic-portal-fix-examples-after-ashpd-api-update.patch";
url = "https://github.com/pop-os/xdg-desktop-portal-cosmic/commit/df831ce7a48728aa9094fa1f30aed61cf1cc6ac3.diff?full_index=1";
hash = "sha256-yRrB3ds9TtN1OBZEZbnE6h2fkPyP4PP2IJ17n+0ugEo=";
})
];
postInstall = ''
mkdir -p $out/share/{dbus-1/services,icons,xdg-desktop-portal/portals}
cp -r data/icons $out/share/icons/hicolor
cp data/*.service $out/share/dbus-1/services/
cp data/cosmic-portals.conf $out/share/xdg-desktop-portal/
cp data/cosmic.portal $out/share/xdg-desktop-portal/portals/
# Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly.
postPatch = ''
substituteInPlace data/org.freedesktop.impl.portal.desktop.cosmic.service \
--replace-fail 'Exec=/bin/false' 'Exec=${lib.getExe' coreutils "true"}'
'';
meta = with lib; {
dontCargoInstall = true;
makeFlags = [
"prefix=${placeholder "out"}"
"CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"unstable"
"--version-regex"
"epoch-(.*)"
];
};
meta = {
homepage = "https://github.com/pop-os/xdg-desktop-portal-cosmic";
description = "XDG Desktop Portal for the COSMIC Desktop Environment";
license = licenses.gpl3Only;
maintainers = with maintainers; [ nyabinary ];
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
nyabinary
HeitorAugustoLN
];
mainProgram = "xdg-desktop-portal-cosmic";
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
}
})
+3 -3
View File
@@ -20,14 +20,14 @@
stdenv.mkDerivation {
pname = "xrgears";
version = "1.0.1-unstable-2024-07-09";
version = "1.0.1-unstable-2025-03-03";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "demos/xrgears";
rev = "9cabbd34b1f60f27402a9a50fc260f77a41b835b";
sha256 = "sha256-9VV1zAOZKkl1zzjnsQQQOINi+T+wpbltdWpJ/d66+cM=";
rev = "caa21e13c2de83d33fb617c8f9b70a0d77c82453";
sha256 = "sha256-VAcH+3yokDnUbFYldQOrkUi+WgcTnk6gBeKScyAyv6c=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -8,16 +8,16 @@
buildGoModule {
pname = "zoekt";
version = "3.7.2-2-unstable-2025-02-17";
version = "3.7.2-2-unstable-2025-02-21";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "zoekt";
rev = "914a27d7d2e2b489a70e0fc1c6ce64aae8e7964b";
hash = "sha256-kUCFAWIyHPzHdhMshrSYSGBIyGD0Nh9HNJRqia5qh/Q=";
rev = "3d43fdf3b1c9f93f384f126901f069ebb5efdd32";
hash = "sha256-qex38HoQ40S61fdjdKm5qgbSwOKvmu3gnsqrw+B2MSQ=";
};
vendorHash = "sha256-7bpoUxhoVc74bN9/B6TWyufSvDRD90KpIXUMKK+3BcU=";
vendorHash = "sha256-B45Q9G+p/idqqz45lLQQuDGLwAzhKuo9Ev+cISGbKUo=";
nativeCheckInputs = [
gitMinimal
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "3.2.7";
version = "3.2.8";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = "aiohomekit";
tag = version;
hash = "sha256-E7N/FFUFsur0y9H5Pp7ol/9bytwUU5EG8E68TMF5tJ8=";
hash = "sha256-b197P2hTk6lhLKm+4VvyvyPZDqb7NqO0aqoIf3BQBfs=";
};
build-system = [ poetry-core ];
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiosseclient";
version = "0.1.3";
version = "0.1.6";
pyproject = true;
src = fetchFromGitHub {
owner = "ebraminio";
repo = "aiosseclient";
rev = version;
hash = "sha256-T97HmO53w1zNpASPU+LRcnqtnQVqPWtlOXycpBw4WmY=";
tag = version;
hash = "sha256-jXDZPVkCTVwcz1TCiPRGJZkq2KeqOglAZNY//LmLuNg=";
};
build-system = [ setuptools ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = {
description = "Asynchronous Server Side Events (SSE) client";
homepage = "https://github.com/ebraminio/aiosseclient";
changelog = "https://github.com/ebraminio/aiosseclient/releases/tag/${version}";
changelog = "https://github.com/ebraminio/aiosseclient/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
@@ -6,6 +6,7 @@
fetchFromGitHub,
poetry-core,
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
@@ -26,11 +27,6 @@ buildPythonPackage rec {
hash = "sha256-YWTGEOSSkZ0XbZUE3k+Dn9qg8Pmwip9wCp8e/j1D9io=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "--cov" ""
'';
build-system = [ poetry-core ];
dependencies = [
@@ -41,6 +37,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
aresponses
pytest-asyncio
pytest-cov-stub
pytestCheckHook
syrupy
];
@@ -6,6 +6,7 @@
fetchFromGitHub,
poetry-core,
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
@@ -26,11 +27,6 @@ buildPythonPackage rec {
hash = "sha256-YC1rUyPXWbJ/xfUus5a7vw44gw7PIAdwhrUstXB/+nI=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov" ""
'';
build-system = [ poetry-core ];
dependencies = [
@@ -41,6 +37,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
aioresponses
pytest-asyncio
pytest-cov-stub
pytestCheckHook
syrupy
];
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "airportsdata";
version = "20241001";
version = "20250224";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-+gvRQ7T0vjVXy4kvoGEu8hD9kakr1yC02CId5Xak+gA=";
hash = "sha256-f0U4phNQREShMUm+cBqsX5WZuG2kdtJrRqok/VRxTto=";
};
build-system = [ setuptools ];
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
setuptools-scm,
@@ -12,7 +13,7 @@ buildPythonPackage rec {
version = "1.0.6";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "lmfit";
@@ -21,14 +22,12 @@ buildPythonPackage rec {
hash = "sha256-DzLVe8TlWAPQXzai9CJlDAow6UTSmkA/DW3fT30YfZY=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "--cov=asteval --cov-report html" ""
'';
build-system = [ setuptools-scm ];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
];
pythonImportsCheck = [ "asteval" ];
@@ -41,7 +40,7 @@ buildPythonPackage rec {
description = "AST evaluator of Python expression using ast module";
homepage = "https://github.com/lmfit/asteval";
changelog = "https://github.com/lmfit/asteval/releases/tag/${version}";
license = with licenses; [ mit ];
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
@@ -8,6 +8,7 @@
parameterized,
poetry-core,
pytest-mock,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
requests,
@@ -30,14 +31,7 @@ buildPythonPackage rec {
hash = "sha256-OP7+jSt4xS71Kcjy5hFzeZ5rlTPtDx22rPr3UwjI5dk=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace-fail "--cov" ""
'';
build-system = [
poetry-core
];
build-system = [ poetry-core ];
dependencies = [
argcomplete
@@ -50,6 +44,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
parameterized
pytest-mock
pytest-cov-stub
pytestCheckHook
requests-mock
responses

Some files were not shown because too many files have changed in this diff Show More