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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-24 00:16:18 +00:00
committed by GitHub
parent 41845d16d3 2206081622
commit 835ae0f7b0
64 changed files with 524 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/release-notes/rl-2505.section.md
+1 -1
View File
@@ -4,7 +4,7 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Create the first release note entry in this section!
- The default PHP version has been updated to 8.3.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
nixos/modules/services/web-apps/castopod.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
user = "castopod";
# https://docs.castopod.org/getting-started/install.html#requirements
phpPackage = pkgs.php.withExtensions ({ enabled, all }: with all; [
phpPackage = pkgs.php82.withExtensions ({ enabled, all }: with all; [
intl
curl
mbstring
nixos/tests/incus/container.nix
+9 -1
View File
@@ -36,7 +36,8 @@ in
networking.nftables.enable = true;
};
testScript = ''
testScript = # python
''
def instance_is_up(_) -> bool:
status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running")
return status == 0
@@ -94,6 +95,13 @@ in
meminfo_bytes = " ".join(meminfo.split(' ')[-2:])
assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'"
with subtest("virtual tpm can be configured"):
machine.succeed("incus config device add container vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0")
machine.succeed("incus exec container -- test -e /dev/tpm0")
machine.succeed("incus exec container -- test -e /dev/tpmrm0")
machine.succeed("incus config device remove container vtpm")
machine.fail("incus exec container -- test -e /dev/tpm0")
with subtest("lxc-generator"):
with subtest("lxc-container generator configures plain container"):
# reuse the existing container to save some time
nixos/tests/incus/storage.nix
+62 -32
View File
@@ -13,42 +13,72 @@ import ../make-test-python.nix (
maintainers = lib.teams.lxc.members;
};
nodes.machine =
{ lib, ... }:
{
boot.supportedFilesystems = [ "zfs" ];
boot.zfs.forceImportRoot = false;
environment.systemPackages = [ pkgs.parted ];
networking.hostId = "01234567";
networking.nftables.enable = true;
nodes.machine = {
boot.supportedFilesystems = [ "zfs" ];
boot.zfs.forceImportRoot = false;
virtualisation = {
emptyDiskImages = [ 2048 ];
incus = {
enable = true;
package = incus;
};
};
environment.systemPackages = [ pkgs.parted ];
networking.hostId = "01234567";
networking.nftables.enable = true;
services.lvm = {
boot.thin.enable = true;
dmeventd.enable = true;
};
testScript = ''
machine.wait_for_unit("incus.service")
virtualisation = {
emptyDiskImages = [
2048
2048
];
incus = {
enable = true;
package = incus;
};
};
};
with subtest("Verify zfs pool created and usable"):
machine.succeed(
"zpool status",
"parted --script /dev/vdb mklabel gpt",
"zpool create zfs_pool /dev/vdb",
)
testScript = # python
''
machine.wait_for_unit("incus.service")
machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
machine.succeed("zfs list zfs_pool/incus")
machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
machine.succeed("incus storage volume create zfs_pool test_vol --type block")
machine.succeed("incus storage show zfs_pool")
machine.succeed("incus storage volume list zfs_pool")
machine.succeed("incus storage volume show zfs_pool test_fs")
machine.succeed("incus storage volume show zfs_pool test_vol")
'';
with subtest("Verify zfs pool created and usable"):
machine.succeed(
"zpool status",
"parted --script /dev/vdb mklabel gpt",
"zpool create zfs_pool /dev/vdb",
)
machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
machine.succeed("zfs list zfs_pool/incus")
machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
machine.succeed("incus storage volume create zfs_pool test_vol --type block")
machine.succeed("incus storage show zfs_pool")
machine.succeed("incus storage volume list zfs_pool")
machine.succeed("incus storage volume show zfs_pool test_fs")
machine.succeed("incus storage volume show zfs_pool test_vol")
machine.succeed("incus create zfs1 --empty --storage zfs_pool")
machine.succeed("incus list zfs1")
with subtest("Verify lvm pool created and usable"):
machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool")
machine.succeed("vgs incus_pool")
machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem")
machine.succeed("incus storage volume create lvm_pool test_vol --type block")
machine.succeed("incus storage show lvm_pool")
machine.succeed("incus storage volume list lvm_pool")
machine.succeed("incus storage volume show lvm_pool test_fs")
machine.succeed("incus storage volume show lvm_pool test_vol")
machine.succeed("incus create lvm1 --empty --storage zfs_pool")
machine.succeed("incus list lvm1")
'';
}
)
nixos/tests/incus/virtual-machine.nix
+2 -4
View File
@@ -30,9 +30,6 @@ in
memorySize = 1024;
diskSize = 4096;
# Provide a TPM to test vTPM support for guests
tpm.enable = true;
incus = {
enable = true;
package = incus;
@@ -41,7 +38,8 @@ in
networking.nftables.enable = true;
};
testScript = ''
testScript = # python
''
def instance_is_up(_) -> bool:
status, _ = machine.execute("incus exec ${instance-name} --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running")
return status == 0
pkgs/applications/blockchains/bisq-desktop/default.nix
-128
View File
@@ -1,128 +0,0 @@
{ stdenv
, lib
, makeWrapper
, fetchurl
, makeDesktopItem
, copyDesktopItems
, imagemagick
, openjdk11
, dpkg
, writeScript
, bash
, stripJavaArchivesHook
, tor
, zip
, xz
, findutils
}:
let
bisq-launcher = args: writeScript "bisq-launcher" ''
#! ${bash}/bin/bash
# This is just a comment to convince Nix that Tor is a
# runtime dependency; The Tor binary is in a *.jar file,
# whereas Nix only scans for hashes in uncompressed text.
# ${bisq-tor}
classpath=@out@/lib/desktop.jar:@out@/lib/*
exec "${openjdk11}/bin/java" -Djpackage.app-version=@version@ -XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication -Djava.net.preferIPv4Stack=true -classpath $classpath ${args} bisq.desktop.app.BisqAppMain "$@"
'';
bisq-tor = writeScript "bisq-tor" ''
#! ${bash}/bin/bash
exec ${tor}/bin/tor "$@"
'';
in
stdenv.mkDerivation rec {
pname = "bisq-desktop";
version = "1.9.17";
src = fetchurl {
url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb";
sha256 = "1wqzgxsm9p6lh0bmvw0byaxx1r5v64d024jf1pg9mykb1dnnx0wy";
};
nativeBuildInputs = [
copyDesktopItems
dpkg
imagemagick
makeWrapper
stripJavaArchivesHook
xz
zip
findutils
];
desktopItems = [
(makeDesktopItem {
name = "Bisq";
exec = "bisq-desktop";
icon = "bisq";
desktopName = "Bisq ${version}";
genericName = "Decentralized bitcoin exchange";
categories = [ "Network" "P2P" ];
})
(makeDesktopItem {
name = "Bisq-hidpi";
exec = "bisq-desktop-hidpi";
icon = "bisq";
desktopName = "Bisq ${version} (HiDPI)";
genericName = "Decentralized bitcoin exchange";
categories = [ "Network" "P2P" ];
})
];
unpackPhase = ''
dpkg -x $src .
'';
buildPhase = ''
# Replace the embedded Tor binary (which is in a Tar archive)
# with one from Nixpkgs.
mkdir -p native/linux/x64/
cp ${bisq-tor} ./tor
tar --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cJf native/linux/x64/tor.tar.xz tor
tor_jar_file=$(find ./opt/bisq/lib/app -name "tor-binary-linux64-*.jar")
zip -r $tor_jar_file native
'';
installPhase = ''
runHook preInstall
mkdir -p $out $out/bin
cp -r opt/bisq/lib/app $out/lib
install -D -m 777 ${bisq-launcher ""} $out/bin/bisq-desktop
substituteAllInPlace $out/bin/bisq-desktop
install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi
substituteAllInPlace $out/bin/bisq-desktop-hidpi
for n in 16 24 32 48 64 96 128 256; do
size=$n"x"$n
convert opt/bisq/lib/Bisq.png -resize $size bisq.png
install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq.png
done;
runHook postInstall
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Decentralized bitcoin exchange network";
homepage = "https://bisq.network";
changelog = "https://github.com/bisq-network/bisq/releases/tag/v${version}";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.mit;
maintainers = with maintainers; [ juaningan emmanuelrosa ];
platforms = [ "x86_64-linux" ];
# Requires OpenJFX 11 or 16, which are both EOL.
broken = true;
};
}
pkgs/applications/blockchains/bisq-desktop/update.sh
-21
View File
@@ -1,21 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq gnused gnupg common-updater-scripts
set -eu -o pipefail
version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq '.[] | {name,prerelease} | select(.prerelease==false) | limit(1;.[])' | sed 's/[\"v]//g' | head -n 1)"
depname="Bisq-64bit-$version.deb"
src="https://github.com/bisq-network/bisq/releases/download/v$version/$depname"
signature="$src.asc"
pushd $(mktemp -d --suffix=-bisq-updater)
export GNUPGHOME=$PWD/gnupg
mkdir -m 700 -p "$GNUPGHOME"
curl -L -o "$depname" -- "$src"
curl -L -o signature.asc -- "$signature"
curl https://bisq.network/pubkey/E222AA02.asc | gpg --import
gpg --batch --verify signature.asc "$depname"
sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname")
popd
update-source-version bisq-desktop "$version" "$sha256"
pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
melpaBuild {
pname = "voicemacs";
version = "0-unstable-2024-01-03";
version = "0-unstable-2024-10-11";
src = fetchFromGitHub {
owner = "jcaw";
repo = "voicemacs";
rev = "d93f15d855d61f78827d78c9ca3508766266366c";
hash = "sha256-D/5+3SgECEb7A8qQqsAV1TQr+lA8EyOjf6NesnV2gos=";
rev = "d8dade06a48994ff04f48e1177eed4e9243cbcb1";
hash = "sha256-kCuwjMl3pPWQNoXEl+oK6YoOLpk8kazLb69RwiGltAA=";
};
patches = [
pkgs/applications/editors/vim/plugins/generated.nix
+12
View File
@@ -12823,6 +12823,18 @@ final: prev:
meta.homepage = "https://github.com/folke/ts-comments.nvim/";
};
tsc-nvim = buildVimPlugin {
pname = "tsc.nvim";
version = "2024-08-14";
src = fetchFromGitHub {
owner = "dmmulroy";
repo = "tsc.nvim";
rev = "82c37ebfe45d30763db6f45b54e18f1e485bb52c";
sha256 = "14fa5w73bxpvwy3jm25mmx08l2v6c1w35ca8gc61mayxja55d4ls";
};
meta.homepage = "https://github.com/dmmulroy/tsc.nvim/";
};
tslime-vim = buildVimPlugin {
pname = "tslime.vim";
version = "2020-09-09";
pkgs/applications/editors/vim/plugins/overrides.nix
+9
View File
@@ -57,6 +57,7 @@
taskwarrior3,
tmux,
tup,
typescript,
vim,
which,
xkb-switch,
@@ -2610,6 +2611,14 @@ in
nvimRequireCheck = "todo-comments";
};
tsc-nvim = super.tsc-nvim.overrideAttrs {
patches = [ ./patches/tsc.nvim/fix-path.patch ];
postPatch = ''
substituteInPlace lua/tsc/utils.lua --replace '@tsc@' ${typescript}/bin/tsc
'';
};
tssorter-nvim = super.tssorter-nvim.overrideAttrs {
dependencies = with self; [ nvim-treesitter ];
nvimRequireCheck = "tssorter";
pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/lua/tsc/utils.lua b/lua/tsc/utils.lua
index 6433bcb..75760f9 100644
--- a/lua/tsc/utils.lua
+++ b/lua/tsc/utils.lua
@@ -16,7 +16,7 @@ M.find_tsc_bin = function()
return node_modules_tsc_binary
end
- return "tsc"
+ return "@tsc@"
end
--- @param run_mono_repo boolean
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -1065,6 +1065,7 @@ https://github.com/folke/trouble.nvim/,,
https://github.com/Pocco81/true-zen.nvim/,,
https://github.com/tesaguri/trust.vim/,HEAD,
https://github.com/folke/ts-comments.nvim/,HEAD,
https://github.com/dmmulroy/tsc.nvim/,HEAD,
https://github.com/jgdavey/tslime.vim/,,
https://github.com/mtrajano/tssorter.nvim/,HEAD,
https://github.com/Quramy/tsuquyomi/,,
pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch
-21
View File
@@ -1,21 +0,0 @@
Fix build with cgal 5.6.1+
diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
index 50bbc099..b05245d3 100644
--- a/src/libslic3r/MeshBoolean.cpp
+++ b/src/libslic3r/MeshBoolean.cpp
@@ -200,12 +200,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh)
const auto &vertices = cgalmesh.vertices();
int vsize = int(vertices.size());
- for (auto &vi : vertices) {
+ for (const auto &vi : vertices) {
auto &v = cgalmesh.point(vi); // Don't ask...
its.vertices.emplace_back(to_vec3f(v));
}
- for (auto &face : faces) {
+ for (const auto &face : faces) {
auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face));
int i = 0;
pkgs/applications/networking/browsers/librewolf/src.json
+5 -5
View File
@@ -1,11 +1,11 @@
{
"packageVersion": "132.0.1-1",
"packageVersion": "132.0.2-1",
"source": {
"rev": "132.0.1-1",
"sha256": "qqwuqEw5wfUvOukdhUivTLbER0R7Ohscix791vAt73E="
"rev": "132.0.2-1",
"sha256": "7DB0QSQHNRw991yRR5+/Oo4fpXCR/Zklxb7ILRIH0WM="
},
"firefox": {
"version": "132.0.1",
"sha512": "ENWwX2Fijeuaacs0ss88dbtrh2j1pxjO8hV9X+sWce3g1YNDlWLhwSIZFOtu03/fQV3WUbFGXAVr4XQTbNgLnQ=="
"version": "132.0.2",
"sha512": "nqldn7GpQaxaW1DaZ+Ik88z4xAHybLYbt0rX9OHocG1GnEtjJXFPLLnN9QwycQN31ryhjdZbVdssOe8rJ6V/rg=="
}
}
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+2 -1
View File
@@ -8,7 +8,7 @@
, nodejs
, fetchYarnDeps
, jq
, electron
, electron_33
, element-web
, sqlcipher
, callPackage
@@ -27,6 +27,7 @@ let
executableName = "element-desktop";
keytar = callPackage ./keytar { inherit Security AppKit; };
seshat = callPackage ./seshat { inherit CoreServices; };
electron = electron_33;
in
stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
pname = "element-desktop";
pkgs/applications/networking/instant-messengers/element/pin.nix
+5 -5
View File
@@ -1,9 +1,9 @@
{
"version" = "1.11.85";
"version" = "1.11.86";
"hashes" = {
"desktopSrcHash" = "sha256-KNt7UgQBKoieV3IV/qFjk6PKYlgjHk4tLA8cZZlYtIw=";
"desktopYarnHash" = "1wh867yw7ic3nx623c5dknn9wk4zgq9b000p9mdf79spfp57lqlw";
"webSrcHash" = "sha256-JR7kA2thttBle+BT/zH8QjIjp5mJPsRMYx8nd/I3IEw=";
"webYarnHash" = "0f38gizj9cnb7dqj10wljxkbjfabznh3s407n9vsl7ig0hm91zf9";
"desktopSrcHash" = "sha256-GP5KnXL63J0076cVu0OpodlNT7Ypeso4iGrQNKq/17M=";
"desktopYarnHash" = "0bcq89nmx03h106hp875mv482d4r1xahdsimw3cs5c592zl50kx2";
"webSrcHash" = "sha256-cqB77ffTbFLoNsGjXUOb2tdlXhSIS3X1/oDXOzOn99s=";
"webYarnHash" = "1cwj77a997lb4229ngry0b6kip1ggs82b9v126rzfgzavvwh9k1v";
};
}
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
-10
View File
@@ -1,10 +0,0 @@
{ stdenv, callPackage }:
{
signal-desktop =
if stdenv.hostPlatform.system == "aarch64-linux" then
callPackage ./signal-desktop-aarch64.nix { }
else if stdenv.hostPlatform.isDarwin then
callPackage ./signal-desktop-darwin.nix { }
else
callPackage ./signal-desktop.nix { };
}
pkgs/by-name/aw/await/package.nix
+4 -3
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "await";
version = "1.0.5";
version = "1.0.7";
src = fetchFromGitHub {
owner = "slavaGanzin";
repo = "await";
rev = "v${version}";
hash = "sha256-0U9eLQDvHnRUJt46AI4bDWZfGynqjaWs9teidWP3RsA=";
rev = version;
hash = "sha256-Yrit1WdWIfjwqbjvyjrPT3EqSSkooYX+uoOstbxy//I=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
meta = with lib; {
description = "Small binary that runs a list of commands in parallel and awaits termination";
pkgs/applications/misc/bambu-studio/default.nix → pkgs/by-name/ba/bambu-studio/package.nix
+9 -6
View File
@@ -8,11 +8,12 @@
wrapGAppsHook3,
boost180,
cereal,
cgal_5,
cgal,
curl,
dbus,
eigen,
expat,
ffmpeg,
gcc-unwrapped,
glew,
glfw,
@@ -55,13 +56,13 @@ let
in
stdenv.mkDerivation rec {
pname = "bambu-studio";
version = "01.09.07.52";
version = "01.10.01.50";
src = fetchFromGitHub {
owner = "bambulab";
repo = "BambuStudio";
rev = "v${version}";
hash = "sha256-fhH4N29P/ysdHHbZt+FnBl3+QtTNhbVE3j4ZnFJyJH0=";
hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30=";
};
nativeBuildInputs = [
@@ -74,11 +75,12 @@ stdenv.mkDerivation rec {
binutils
boost180
cereal
cgal_5
cgal
curl
dbus
eigen
expat
ffmpeg
gcc-unwrapped
glew
glfw
@@ -109,8 +111,6 @@ stdenv.mkDerivation rec {
patches = [
# Fix for webkitgtk linking
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
# Fix build with cgal-5.6.1+
./patches/meshboolean-const.patch
# Fix an issue with
./patches/dont-link-opencv-world-bambu.patch
];
@@ -149,6 +149,9 @@ stdenv.mkDerivation rec {
"-DSLIC3R_FHS=1"
"-DSLIC3R_GTK=3"
# Skips installing ffmpeg, since we BYO.
"-DFLATPAK=1"
# BambuStudio-specific
"-DBBL_RELEASE_TO_PUBLIC=1"
"-DBBL_INTERNAL_TESTING=0"
pkgs/applications/misc/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch → pkgs/by-name/ba/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
View File
pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-bambu.patch → pkgs/by-name/ba/bambu-studio/patches/dont-link-opencv-world-bambu.patch
View File
pkgs/by-name/co/codeberg-pages/package.nix
+3 -3
View File
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "codeberg-pages";
version = "5.1";
version = "6.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "Codeberg";
repo = "pages-server";
rev = "v${version}";
hash = "sha256-txWRYQnJCGVZ0/6pZdKkRFsdUe2B+A0Fy0/WJCiBVa0=";
hash = "sha256-zG+OicdwtiHm/Ji+xfB61leCq9Ni0ysXkh4pQRju7IA=";
};
vendorHash = "sha256-0JPnBf4NA4t+63cNMZYnB56y93nOc8Wn7TstRiHgvhk=";
vendorHash = "sha256-OmrkO++2vnIY7ay4q3oplDYDPWH1d5VSpDCBM6nD4rk=";
postPatch = ''
# disable httptest
pkgs/by-name/gh/gh-gei/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "gh-gei";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "github";
repo = pname;
rev = "v${version}";
hash = "sha256-F1sxT9wh/K6VP7n1SlmmvmHlcgxDJw6Rht2hPIiRFjE=";
hash = "sha256-6lEEeAYrMB9wwATsORuaS21wLOB+gq/od88FobSse50=";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
pkgs/by-name/gi/gitlab-ci-local/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "gitlab-ci-local";
version = "4.53.0";
version = "4.55.0";
src = fetchFromGitHub {
owner = "firecow";
repo = "gitlab-ci-local";
rev = version;
hash = "sha256-VLBVfA4x4gaj7e37W7EqehJpYhmEgTatIL2IrO4i+Z8=";
hash = "sha256-rfe2vvg6F4MzV/FN52cf31Ef0XlMGM+UpbSRq2vinsM=";
};
npmDepsHash = "sha256-HAat2D45XeIjDW207Fn5M7O1sqjHOV2gxm2Urzxw+PU=";
npmDepsHash = "sha256-uv0/pasytEKEhkQXhjh51YWPMaskTEb3w4vMaMpspmI=";
postPatch = ''
# remove cleanup which runs git commands
pkgs/by-name/hu/hugo/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.138.0";
version = "0.139.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
hash = "sha256-IDWQRPJrTCkvcTcsaGuyQraVoWWUe0d6FTQvvYHZcD0=";
hash = "sha256-UXOZCiwYpMnJsNSO7y3CsB8nmPxtBErYYl8YwWO3Hts=";
};
vendorHash = "sha256-5YS76L7kisyPz8yv2RCgZHpY/AkjdHE+SUwMOuo3uLg=";
vendorHash = "sha256-qhiCZMSLRnLbyHplcaPn/BGJ3Lv8O8eEvCuIHwA4sMs=";
doCheck = false;
pkgs/by-name/in/incus/1377-reverse.patch
+77
View File
@@ -0,0 +1,77 @@
--- b/internal/server/device/tpm.go
+++ a/internal/server/device/tpm.go
@@ -202,13 +202,11 @@
},
}
+ proc, err := subprocess.NewProcess("swtpm", []string{"socket", "--tpm2", "--tpmstate", fmt.Sprintf("dir=%s", tpmDevPath), "--ctrl", fmt.Sprintf("type=unixio,path=%s", socketPath)}, "", "")
- proc, err := subprocess.NewProcess("swtpm", []string{"socket", "--tpm2", "--tpmstate", fmt.Sprintf("dir=%s", tpmDevPath), "--ctrl", fmt.Sprintf("type=unixio,path=swtpm-%s.sock", d.name)}, "", "")
if err != nil {
return nil, err
}
- proc.Cwd = tpmDevPath
-
// Start the TPM emulator.
err = proc.Start(context.Background())
if err != nil {
--- b/internal/server/instance/drivers/driver_qemu.go
+++ a/internal/server/instance/drivers/driver_qemu.go
@@ -3668,7 +3668,7 @@
// Add TPM device.
if len(runConf.TPMDevice) > 0 {
+ err = d.addTPMDeviceConfig(&cfg, runConf.TPMDevice)
- err = d.addTPMDeviceConfig(&cfg, runConf.TPMDevice, fdFiles)
if err != nil {
return "", nil, err
}
@@ -4852,7 +4852,7 @@
return monHook, nil
}
+func (d *qemu) addTPMDeviceConfig(cfg *[]cfgSection, tpmConfig []deviceConfig.RunConfigItem) error {
-func (d *qemu) addTPMDeviceConfig(cfg *[]cfgSection, tpmConfig []deviceConfig.RunConfigItem, fdFiles *[]*os.File) error {
var devName, socketPath string
for _, tpmItem := range tpmConfig {
@@ -4863,16 +4863,9 @@
}
}
- fd, err := unix.Open(socketPath, unix.O_PATH, 0)
- if err != nil {
- return err
- }
-
- tpmFD := d.addFileDescriptor(fdFiles, os.NewFile(uintptr(fd), socketPath))
-
tpmOpts := qemuTPMOpts{
devName: devName,
+ path: socketPath,
- path: fmt.Sprintf("/proc/self/fd/%d", tpmFD),
}
*cfg = append(*cfg, qemuTPM(&tpmOpts)...)
--- b/shared/subprocess/proc.go
+++ a/shared/subprocess/proc.go
@@ -27,7 +27,6 @@
Name string `yaml:"name"`
Args []string `yaml:"args,flow"`
Apparmor string `yaml:"apparmor"`
- Cwd string `yaml:"cwd"`
PID int64 `yaml:"pid"`
Stdin io.ReadCloser `yaml:"-"`
Stdout io.WriteCloser `yaml:"-"`
@@ -154,11 +153,6 @@
cmd.Stderr = p.Stderr
cmd.Stdin = p.Stdin
cmd.SysProcAttr = p.SysProcAttr
-
- if p.Cwd != "" {
- cmd.Dir = p.Cwd
- }
-
if cmd.SysProcAttr == nil {
cmd.SysProcAttr = &syscall.SysProcAttr{}
}
pkgs/by-name/in/incus/generic.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{
hash,
lts ? false,
patches,
patches ? [ ],
updateScriptArgs ? "",
vendorHash,
version,
pkgs/by-name/in/incus/package.nix
+4 -4
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
hash = "sha256-hjBJGtIBYwgPpnWb1337RP1jU9rQNLQ3yp1AnwBH13o=";
version = "6.6.0";
vendorHash = "sha256-Cpbgn2WHMVKtPrAzuNnXkS1rYvzLwde6oTcKTKW3XHs=";
patches = [ ];
hash = "sha256-k7DHJRbhUJwamEOW8B7wdCWQyYEUtsIHwuHh20lpLmA=";
version = "6.7.0";
vendorHash = "sha256-u12zYcKiHNUH1kWpkMIyixtK9t+G4N2QerzOGsujjFQ=";
patches = [ ./1377-reverse.patch ];
}
pkgs/by-name/ln/lnav/package.nix
+26 -15
View File
@@ -1,17 +1,21 @@
{ lib
, stdenv
, fetchFromGitHub
, pcre2
, sqlite
, ncurses
, readline
, zlib
, bzip2
, autoconf
, automake
, curl
, buildPackages
, nix-update-script
{
lib,
stdenv,
fetchFromGitHub,
pcre2,
sqlite,
ncurses,
readline,
zlib,
bzip2,
autoconf,
automake,
curl,
buildPackages,
re2c,
gpm,
libarchive,
nix-update-script,
}:
stdenv.mkDerivation rec {
@@ -26,6 +30,7 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
separateDebugInfo = true;
strictDeps = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -34,6 +39,7 @@ stdenv.mkDerivation rec {
automake
zlib
curl.dev
re2c
];
buildInputs = [
bzip2
@@ -42,6 +48,8 @@ stdenv.mkDerivation rec {
readline
sqlite
curl
gpm
libarchive
];
preConfigure = ''
@@ -64,7 +72,10 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/tstack/lnav/releases";
license = licenses.bsd2;
maintainers = with maintainers; [ dochang ];
maintainers = with maintainers; [
dochang
symphorien
];
platforms = platforms.unix;
mainProgram = "lnav";
};
pkgs/by-name/ma/markdownlint-cli/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "markdownlint-cli";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "igorshubovych";
repo = "markdownlint-cli";
rev = "v${version}";
hash = "sha256-bT/6bRzpXa86e6T0bJSUm624dbRAux4qgmCc+lOtl3c=";
hash = "sha256-x9ind66qFS7k6rBDOiJ6amtVf7LTXmXsNKlnJmF6cJY=";
};
npmDepsHash = "sha256-g2+kieF+cq8olfQ5rElNNvp5NYJcg+eTNWnMxSXqlKk=";
npmDepsHash = "sha256-oAUhSdbEMv96dS0lhZMSNXs9sQbu06Lwf45GVj0m+2U=";
dontNpmBuild = true;
pkgs/by-name/n9/n98-magerun2/package.nix
+1 -1
View File
@@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: {
hash = "sha256-OPvyZ0r7Zt4PC+rmRtBm9EkbaE4PeovnUHrhzXUqT8E=";
};
vendorHash = "sha256-E2V5ARNCmGOmGGctfcjpW49cxFBcWyJEodBNjHhKQ+w=";
vendorHash = "sha256-604n3Z4R2+zca+NN75Y7afa2Y6Y6ussxE+MEQsDLWsg=";
meta = {
changelog = "https://magerun.net/category/magerun/";
pkgs/by-name/op/open62541pp/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "open62541pp";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "open62541pp";
repo = "open62541pp";
rev = "v${finalAttrs.version}";
hash = "sha256-6HQ8j23+xqJCOwCRK1GgNAoz/wXUBqdulfeQFFXSjEo=";
hash = "sha256-9sxfM1BH6f29JRckNJi+t2TWNvtHmfyc6WO93PR2ofY=";
};
cmakeFlags = [
pkgs/applications/misc/bambu-studio/orca-slicer.nix → pkgs/by-name/or/orca-slicer/package.nix
-1
View File
@@ -18,7 +18,6 @@ bambu-studio.overrideAttrs (
patches = [
# Fix for webkitgtk linking
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
./patches/dont-link-opencv-world-orca.patch
];
pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
+34
View File
@@ -0,0 +1,34 @@
From 7eed499898226222a949a792e0400ec10db4a1c9 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Tue, 22 Nov 2022 13:00:39 -0700
Subject: [PATCH] [not for upstream] CMakeLists: Link against webkit2gtk in
libslic3r_gui
WebView.cpp uses symbols from webkitgtk directly. Upstream setup
links wxGTK statically so webkitgtk is already pulled in.
> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(WebView.cpp.o): undefined reference to symbol 'webkit_web_view_run_javascript_finish'
> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/8yvy428jy2nwq4dhmrcs7gj5r27a2pv6-webkitgtk-2.38.2+abi=4.0/lib/libwebkit2gtk-4.0.so.37: error adding symbols: DSO missing from command line
---
src/CMakeLists.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c5cb96..e92a0e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -175,6 +175,11 @@ if (WIN32)
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
endif ()
+# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.0")
+endif ()
+
# Link the resources dir to where Slic3r GUI expects it
set(output_dlls_Release "")
set(output_dlls_Debug "")
--
2.38.1
pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-orca.patch → pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
View File
pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py → pkgs/by-name/si/signal-desktop/copy-noto-emoji.py
View File
pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix → pkgs/by-name/si/signal-desktop/generic.nix
+67 -57
View File
@@ -1,61 +1,62 @@
{ stdenv
, lib
, callPackage
, fetchurl
, autoPatchelfHook
, noto-fonts-color-emoji
, dpkg
, asar
, rsync
, python3
, buildPackages
, nixosTests
, gtk3
, atk
, at-spi2-atk
, cairo
, pango
, pipewire
, gdk-pixbuf
, glib
, freetype
, fontconfig
, dbus
, libX11
, xorg
, libXi
, libXcursor
, libXdamage
, libXrandr
, libXcomposite
, libXext
, libXfixes
, libXrender
, libXtst
, libXScrnSaver
, nss
, nspr
, alsa-lib
, cups
, expat
, libuuid
, at-spi2-core
, libappindicator-gtk3
, mesa
{
stdenv,
lib,
fetchurl,
autoPatchelfHook,
noto-fonts-color-emoji,
dpkg,
asar,
rsync,
python3,
buildPackages,
nixosTests,
gtk3,
atk,
at-spi2-atk,
cairo,
pango,
pipewire,
gdk-pixbuf,
glib,
freetype,
fontconfig,
dbus,
libX11,
xorg,
libXi,
libXcursor,
libXdamage,
libXrandr,
libXcomposite,
libXext,
libXfixes,
libXrender,
libXtst,
libXScrnSaver,
nss,
nspr,
alsa-lib,
cups,
expat,
libuuid,
at-spi2-core,
libappindicator-gtk3,
mesa,
# Runtime dependencies:
, systemd
, libnotify
, libdbusmenu
, libpulseaudio
, xdg-utils
, wayland
systemd,
libnotify,
libdbusmenu,
libpulseaudio,
xdg-utils,
wayland,
}:
{ pname
, dir
, version
, hash
, url
{
pname,
dir,
version,
hash,
url,
}:
let
@@ -98,7 +99,10 @@ stdenv.mkDerivation rec {
inherit url hash;
recursiveHash = true;
downloadToTemp = true;
nativeBuildInputs = [ dpkg asar ];
nativeBuildInputs = [
dpkg
asar
];
# Signal ships the Apple emoji set without a licence via an npm
# package and upstream does not seem terribly interested in fixing
# this; see:
@@ -271,9 +275,15 @@ stdenv.mkDerivation rec {
bkchr
teutat3s
emily
Gliczy
];
mainProgram = pname;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
pkgs/by-name/si/signal-desktop/package.nix
+7
View File
@@ -0,0 +1,7 @@
{ stdenv, callPackage }:
if stdenv.hostPlatform.system == "aarch64-linux" then
callPackage ./signal-desktop-aarch64.nix { }
else if stdenv.hostPlatform.isDarwin then
callPackage ./signal-desktop-darwin.nix { }
else
callPackage ./signal-desktop.nix { }
pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml → pkgs/by-name/si/signal-desktop/pyproject.toml
View File
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix → pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix
+2 -2
View File
@@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.33.0";
version = "7.34.0";
url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
hash = "sha256-2PwEPwQkoNrnSI00CVeTjF7QvxQb9NxQqrcOVisWwFU=";
hash = "sha256-feNjNhKGIJsV6LH2mKAXd7TEnmvcKXheXmqJZEBqXvE=";
}
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix → pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "signal-desktop";
version = "7.33.0";
version = "7.34.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
hash = "sha256-kq4HkLlTWTE8CLPnZ0o4XYDUC0n5LmgJiGdiIDTtdTI=";
hash = "sha256-UfyD2R78SkvAn7PppOfAK/zzPPpRVdI3y2T/F07ad1E=";
};
sourceRoot = ".";
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix → pkgs/by-name/si/signal-desktop/signal-desktop.nix
+2 -2
View File
@@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.33.0";
version = "7.34.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-/7G3KocmkKBochwjF0iavqeQjXXc9AlFocsERAh8mKs=";
hash = "sha256-q0vv96esQ6LRVVwxSQDh4BdbOZrc+caB+TRDWKfDlZ8=";
}
pkgs/applications/networking/instant-messengers/signal-desktop/update.sh → pkgs/by-name/si/signal-desktop/update.sh
View File
pkgs/by-name/te/tetragon/package.nix
+6 -1
View File
@@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tetragon";
version = "0.11.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "cilium";
@@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
runHook postBuild
'';
# For BPF compilation
hardeningDisable = [
"zerocallusedregs"
];
postPatch = ''
substituteInPlace bpf/Makefile --replace '/bin/bash' '${lib.getExe bash}'
substituteInPlace pkg/defaults/defaults.go --replace '/var/lib/tetragon/' $out/lib/tetragon/bpf/
pkgs/by-name/uf/ufetch/0001-optimize-packages-command.patch
+20
View File
@@ -0,0 +1,20 @@
diff --git a/ufetch-nixos b/ufetch-nixos
index 2ca8f9d..5102cd7 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -9,9 +9,14 @@ host="$(hostname)"
os="$(nixos-version)"
kernel="$(uname -sr)"
uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
-packages="$(ls -d -1 /nix/store/*/ | wc -l)"
shell="$(basename "${SHELL}")"
+for profile in $NIX_PROFILES; do
+ if [ -d "$profile" ]; then
+ packages="$((packages + $( (nix-store -q --requisites "$profile" 2>/dev/null || true) | wc -l)))"
+ fi
+done
+
## UI DETECTION
parse_rcs() {
pkgs/by-name/uf/ufetch/package.nix
+47
View File
@@ -0,0 +1,47 @@
{
stdenvNoCC,
fetchFromGitLab,
lib,
full ? true,
# see https://gitlab.com/jschx/ufetch for a list
osName ? "nixos",
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "ufetch";
version = "0.3";
src = fetchFromGitLab {
owner = "jschx";
repo = "ufetch";
rev = "v${finalAttrs.version}";
hash = "sha256-1LtVCJrkdI2AUdF5d/OBCoSqjlbZI810cxtcuOs/YWs=";
};
patches = [ ./0001-optimize-packages-command.patch ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/licenses/${finalAttrs.pname}
${
if !full then
"install -Dm755 ufetch-${osName} $out/bin/ufetch"
else
''
install -Dm755 ufetch-* $out/bin
ln -s $out/bin/ufetch-${osName} $out/bin/ufetch
''
}
install -Dm644 LICENSE $out/share/licenses/${finalAttrs.pname}/LICENSE
runHook postInstall
'';
meta = {
description = "Tiny system info for Unix-like operating systems";
homepage = "https://gitlab.com/jschx/ufetch";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
mainProgram = "ufetch";
maintainers = with lib.maintainers; [ mrtnvgr ];
};
})
pkgs/development/compilers/swift/swiftpm2nix/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, makeWrapper, jq, nix-prefetch-git }:
{ lib, stdenv, callPackage, makeWrapper, jq, nurl }:
stdenv.mkDerivation {
name = "swiftpm2nix";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
installPhase = ''
install -vD ${./swiftpm2nix.sh} $out/bin/swiftpm2nix
wrapProgram $out/bin/$name \
--prefix PATH : ${lib.makeBinPath [ jq nix-prefetch-git ]} \
--prefix PATH : ${lib.makeBinPath [ jq nurl ]} \
'';
preferLocalBuild = true;
pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh
+3 -3
View File
@@ -23,9 +23,9 @@ hashes=""
jq -r '.object.dependencies[] | "\(.subpath) \(.packageRef.location) \(.state.checkoutState.revision)"' $stateFile \
| while read -r name url rev; do
echo >&2 "-- Fetching $name"
sha256="$(nix-prefetch-git --fetch-submodules $url $rev | jq -r .sha256)"
hashes+="
\"$name\" = \"$sha256\";"
hash="$(nurl "$url" "$rev" --json --submodules=true --fetcher=fetchgit | jq -r .args.hash)"
hashes+="
\"$name\" = \"$hash\";"
echo >&2
done
hashes+=$'\n'" "
pkgs/development/python-modules/boltons/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "boltons";
version = "24.0.0";
version = "24.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mahmoud";
repo = "boltons";
rev = "refs/tags/${version}";
hash = "sha256-Ie5CPT2u/2/hAIhDzXT6CPzJwmbgt3B6q3oxqKYb27o=";
hash = "sha256-rKBuqJ4EAm0OH97oeGOgcTcMWsloyU2u/PaBEKhm8dA=";
};
nativeCheckInputs = [ pytestCheckHook ];
pkgs/development/python-modules/crc/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "crc";
version = "7.0.0";
version = "7.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Nicoretti";
repo = "crc";
rev = "refs/tags/${version}";
hash = "sha256-y30tnGG+G9dWBO8MUFYm2IGHiGIPbv4kB2VwhV0/C74=";
hash = "sha256-Oa2VSzNT+8O/rWZurIr7RnP8m3xAEVOQLs+ObT4xIa0=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/fastembed/default.nix
+4 -2
View File
@@ -38,7 +38,6 @@ buildPythonPackage rec {
build-system = [ poetry-core ];
dependencies = [
huggingface-hub
loguru
@@ -56,7 +55,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "fastembed" ];
pythonRelaxDeps = [ "onnxruntime" ];
pythonRelaxDeps = [
"onnxruntime"
"pillow"
];
# there is one test and it requires network
doCheck = false;
pkgs/development/python-modules/marisa-trie/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "marisa-trie";
version = "1.2.0";
version = "1.2.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "marisa_trie";
inherit version;
hash = "sha256-/t/GdJf4qidXdWtc9JN1nyRdMh+3iRTOElttddqom18=";
hash = "sha256-OifECOKu/APg8dJbL/KvuFqsNWj2+iripTtXouh84p0=";
};
build-system = [
pkgs/development/python-modules/pymupdf/default.nix
+2 -2
View File
@@ -42,7 +42,7 @@ let
in
buildPythonPackage rec {
pname = "pymupdf";
version = "1.24.10";
version = "1.24.14";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -51,7 +51,7 @@ buildPythonPackage rec {
owner = "pymupdf";
repo = "PyMuPDF";
rev = "refs/tags/${version}";
hash = "sha256-QAcQPWzPTnTg3l5lGJ8me4FUbK7xgXgyYHep+rF3wf4=";
hash = "sha256-M7Ca3nqnqeClp4MGJqTAVGZhAGRniregjRrjtAhRkBc=";
};
# swig is not wrapped as Python package
pkgs/development/python-modules/setuptools-odoo/default.nix
+3
View File
@@ -5,6 +5,7 @@
git,
pytestCheckHook,
pythonOlder,
distutils,
setuptools-scm,
writeScript,
}:
@@ -23,6 +24,8 @@ buildPythonPackage rec {
hash = "sha256-38YlkDH/PuJ1yvQ43OYmdnRd1SGJULv6fC/+fitLDJ8=";
};
nativeBuildInputs = [ distutils ];
propagatedBuildInputs = [ setuptools-scm ];
# HACK https://github.com/NixOS/nixpkgs/pull/229460
pkgs/development/python-modules/slack-bolt/default.nix
+26 -24
View File
@@ -1,33 +1,42 @@
{
lib,
aiohttp,
bottle,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
slack-sdk,
# optional-dependencies
# - async
aiohttp,
websockets,
# - adapter
bottle,
chalice,
cherrypy,
django,
docker,
falcon,
fastapi,
fetchFromGitHub,
flask,
flask-sockets,
gunicorn,
moto,
pyramid,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
sanic,
setuptools,
sanic-testing,
slack-sdk,
starlette,
tornado,
uvicorn,
websocket-client,
websockets,
werkzeug,
# tests
docker,
pytest-asyncio,
pytestCheckHook,
}:
buildPythonPackage rec {
@@ -35,8 +44,6 @@ buildPythonPackage rec {
version = "1.21.2";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "slackapi";
repo = "bolt-python";
@@ -80,6 +87,8 @@ buildPythonPackage rec {
];
};
pythonImportsCheck = [ "slack_bolt" ];
nativeCheckInputs = [
docker
pytest-asyncio
@@ -90,30 +99,23 @@ buildPythonPackage rec {
export HOME="$(mktemp -d)"
'';
__darwinAllowLocalNetworking = true;
disabledTestPaths = [
# boddle is not packaged as of 2023-07-15
"tests/adapter_tests/bottle/"
# Tests are blocking at some point. Blocking could be performance-related.
"tests/scenario_tests_async/"
"tests/slack_bolt_async/"
];
disabledTests = [
# Require network access
"test_events"
"test_interactions"
"test_lazy_listener_calls"
"test_lazy_listeners"
"test_failure"
];
pythonImportsCheck = [ "slack_bolt" ];
meta = with lib; {
meta = {
description = "Framework to build Slack apps using Python";
homepage = "https://github.com/slackapi/bolt-python";
changelog = "https://github.com/slackapi/bolt-python/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ samuela ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ samuela ];
};
}
pkgs/development/python-modules/slack-sdk/default.nix
+11 -18
View File
@@ -8,7 +8,6 @@
flake8,
flask-sockets,
moto,
pythonOlder,
psutil,
pytest-asyncio,
pytestCheckHook,
@@ -20,16 +19,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.33.3";
version = "3.33.4";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-ewNEo8kcxdrd6mVze/UbKdnTIIf59s7OnMP42St1www=";
hash = "sha256-WIUhkIFWbIcxjTjzZ2C3VNFhGftBmyYO3iaHpz6d+Sc=";
};
postPatch = ''
@@ -48,6 +45,8 @@ buildPythonPackage rec {
websockets
];
pythonImportsCheck = [ "slack_sdk" ];
nativeCheckInputs = [
flake8
flask-sockets
@@ -61,26 +60,20 @@ buildPythonPackage rec {
export HOME=$(mktemp -d)
'';
disabledTestPaths = [
# Exclude tests that requires network features
"integration_tests"
];
disabledTests = [
# Requires network features
# Requires internet access (to slack API)
"test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
"test_org_installation"
"test_interactions"
"test_issue_690_oauth_access"
# Requires network access: [Errno 111] Connection refused
"test_send_message_while_disconnection"
];
pythonImportsCheck = [ "slack_sdk" ];
__darwinAllowLocalNetworking = true;
meta = with lib; {
meta = {
description = "Slack Developer Kit for Python";
homepage = "https://slack.dev/python-slack-sdk/";
changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
pkgs/development/python-modules/sphinx-multiversion/default.nix
-1
View File
@@ -22,7 +22,6 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [ sphinx ];
nativeCheckInputs = [ unittestCheckHook ];
pythonImportsCheck = [ "sphinx_multiversion" ];
pkgs/development/python-modules/uarray/default.nix
+5 -2
View File
@@ -11,20 +11,21 @@
numpy,
astunparse,
typing-extensions,
nix-update-script,
pytestCheckHook,
pytest-cov-stub,
}:
buildPythonPackage rec {
pname = "uarray";
version = "0.9.0";
version = "0.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Quansight-Labs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-q9lMU/xA+G2x38yZy3DxCpXTEmg1lZhZ8GFIHDIKE24=";
hash = "sha256-6dOi7+quWvASl2RHetULK5zixHFJlj/D6667o99ceSs=";
};
build-system = [
@@ -61,6 +62,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "uarray" ];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Universal array library";
homepage = "https://github.com/Quansight-Labs/uarray";
pkgs/development/python-modules/unicorn/default.nix
+4 -4
View File
@@ -3,20 +3,20 @@
stdenv,
buildPythonPackage,
setuptools,
unicorn-emu,
unicorn,
}:
buildPythonPackage rec {
pname = "unicorn";
version = lib.getVersion unicorn-emu;
version = lib.getVersion unicorn;
pyproject = true;
src = unicorn-emu.src;
src = unicorn.src;
sourceRoot = "${src.name}/bindings/python";
prePatch = ''
ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/
ln -s ${unicorn}/lib/libunicorn.* prebuilt/
'';
# Needed on non-x86 linux
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+4 -4
View File
@@ -14,12 +14,12 @@ let
# kernel config in the xanmod version commit
variants = {
lts = {
version = "6.6.62";
hash = "sha256-KbD5YaaZLDDsp5wuEkenUe+/KrFjOgUomXtLKHtQzvs=";
version = "6.6.63";
hash = "sha256-P4B6r3p+Buu1Hf+RQsw5h2oUANVvQvQ4e/2gQcZ0vKw=";
};
main = {
version = "6.11.9";
hash = "sha256-lR7GXFy3eYq75+LwVlXScPYWbdVW6wAV+He0YZ+5AF4=";
version = "6.11.10";
hash = "sha256-WNzMM+P8c8Mv+FdrwcEPHwv/ppvgN2fiM+SHMmlAPYw=";
};
};
pkgs/servers/sql/postgresql/generic.nix
+1 -1
View File
@@ -297,7 +297,7 @@ let
description = "Powerful, open source object-relational database system";
license = licenses.postgresql;
changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/";
maintainers = with maintainers; [ globin ivan ] ++ teams.postgres.members;
maintainers = with maintainers; teams.postgres.members;
pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ];
platforms = platforms.unix;
pkgs/top-level/aliases.nix
+1
View File
@@ -143,6 +143,7 @@ mapAliases {
bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
bird2 = bird; # Added 2022-02-21
bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
bitwarden = bitwarden-desktop; # Added 2024-02-25
blender-with-packages = args:
lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"
pkgs/top-level/all-packages.nix
+1 -10
View File
@@ -1749,8 +1749,6 @@ with pkgs;
python3Packages = python311Packages;
};
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { };
inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector;
bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { };
@@ -2313,7 +2311,6 @@ with pkgs;
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_32;
};
element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh
@@ -5251,8 +5248,6 @@ with pkgs;
sigil = libsForQt5.callPackage ../applications/editors/sigil { };
inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop;
slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
# aka., pgp-tools
@@ -7443,7 +7438,7 @@ with pkgs;
# PHP interpreters, packages and extensions.
#
# Set default PHP interpreter, extensions and packages
php = php82;
php = php83;
phpExtensions = php.extensions;
phpPackages = php.packages;
@@ -15787,10 +15782,6 @@ with pkgs;
super-slicer-latest = super-slicer.latest;
bambu-studio = callPackage ../applications/misc/bambu-studio { };
orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {};
skrooge = libsForQt5.callPackage ../applications/office/skrooge { };
smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { };
pkgs/top-level/python-packages.nix
+1 -1
View File
@@ -17260,7 +17260,7 @@ self: super: with self; {
unicode-slugify = callPackage ../development/python-modules/unicode-slugify { };
unicorn = callPackage ../development/python-modules/unicorn {
unicorn-emu = pkgs.unicorn;
inherit (pkgs) unicorn;
};
unicurses = callPackage ../development/python-modules/unicurses { };