Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
- LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19.
|
||||
This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details.
|
||||
|
||||
- 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. -->
|
||||
|
||||
## New Modules {#sec-release-25.05-new-modules}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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")
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -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"
|
||||
+3
-3
@@ -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 = [
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
@@ -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/,,
|
||||
|
||||
@@ -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;
|
||||
@@ -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=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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 { };
|
||||
}
|
||||
@@ -20,17 +20,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.5.208";
|
||||
version = "1.5.220";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VfF8bQP7pFaTezOJpda4N9KbCHr5ST/wCvdNRiojio0=";
|
||||
hash = "sha256-XNLX5LDbL29Ko0zstgo+O5V0oe37dSChk8iJeVrYlLA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PBwI3S8ZvmVD57/ICALe+HvgtbPQpJKNPfkWo+uUeSo=";
|
||||
vendorHash = "sha256-tDQKU/1fKDPCrUHfFi79u4d2XwOqjvTuIlsUAB74e4c=";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aquamarine";
|
||||
version = "0.4.4";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "aquamarine";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6DQM7jT2CzfxYceyrtcBQSL9BOEGfuin8GAyMjCpAzc=";
|
||||
hash = "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.28.1";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-nMOj/oMJsBB0bI2RzxEytvEr0v+VmGIMY0uiK7ALEHM=";
|
||||
hash = "sha256-Fk46F1EBWSVFAUUDAtXcwq9iCSATW1CV/ul3NEa1YqA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-alOLdkgyrJQNg/JACredGmfs/dKxnOm9cSahvVBHzTM=";
|
||||
cargoHash = "sha256-5yJ248BSp9w/r1chQqIucxzfvFGy+jumSquF9gVmSUM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
dotnet-runtime,
|
||||
zlib,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avdump3";
|
||||
version = "8293_stable";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cdn.anidb.net/client/avdump3/avdump3_8293_stable.zip";
|
||||
hash = "sha256-H9Sn3I4S9CmymKIMHVagDy+7svHs285S3EJgYQo+ks0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/avdump3 $out/bin
|
||||
mv * $out/share/avdump3
|
||||
cat > $out/bin/avdump3 <<EOF
|
||||
#!${runtimeShell}
|
||||
export LD_LIBRARY_PATH="${lib.makeLibraryPath [ zlib ]}:\$LD_LIBRARY_PATH"
|
||||
exec ${dotnet-runtime}/bin/dotnet $out/share/avdump3/AVDump3CL.dll "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/avdump3
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = {
|
||||
mainProgram = "avdump3";
|
||||
description = "Tool for extracting audio/video metadata from media files and uploading it to AniDB";
|
||||
longDescription = ''
|
||||
AVDump is a tool to extract meta information from media files while at the
|
||||
same time calculating multiple hashes. Based on that information reports
|
||||
can be generated in multiple forms. Of particular interest is the ability
|
||||
to send those reports back to AniDB and thereby quickly filling in missing
|
||||
metadata for new files.
|
||||
'';
|
||||
homepage = "https://wiki.anidb.net/Avdump3";
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
binaryNativeCode
|
||||
binaryBytecode
|
||||
];
|
||||
# partial source code available under MIT license at https://github.com/DvdKhl/AVDump3
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
unfree
|
||||
];
|
||||
maintainers = with lib.maintainers; [ kini ];
|
||||
# NOTE: aarch64-linux may also work but hasn't been tested; co-maintainers welcome.
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -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";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "azurite";
|
||||
version = "3.31.0";
|
||||
version = "3.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "Azurite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WT1eprN6SBnsfITCopybEHCuxrHvKEhdmVs7xL3cUi0=";
|
||||
hash = "sha256-aH9FAT49y4k87lzerQdgLqi+ZlucORQX4w1NBFtEfMw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-+ptjsz2MDIB/aqu4UxkBLCcehtamFdmswNUsHs23LuE=";
|
||||
npmDepsHash = "sha256-jfa04iWz0aOiFD1YkXn5YEXqQcrY+rIDbVmmUaA5sYc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config python3 ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
+9
-6
@@ -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"
|
||||
Generated
+20
-3
@@ -104,6 +104,7 @@ name = "arm"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"bitvec",
|
||||
"config",
|
||||
"debugvault",
|
||||
"decoder",
|
||||
"tokenizing",
|
||||
@@ -381,7 +382,7 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
|
||||
|
||||
[[package]]
|
||||
name = "bite"
|
||||
version = "0.2.1"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"commands",
|
||||
"debugvault",
|
||||
@@ -696,8 +697,6 @@ dependencies = [
|
||||
"egui",
|
||||
"log 0.0.0",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"serde_yaml",
|
||||
"triple_accel",
|
||||
]
|
||||
|
||||
@@ -710,6 +709,18 @@ dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"dirs",
|
||||
"egui",
|
||||
"log 0.0.0",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"serde_yaml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "copypasta"
|
||||
version = "0.10.0"
|
||||
@@ -867,6 +878,7 @@ version = "0.0.0"
|
||||
dependencies = [
|
||||
"binformat",
|
||||
"bitflags 2.4.2",
|
||||
"config",
|
||||
"crossbeam-queue",
|
||||
"dashmap",
|
||||
"gimli",
|
||||
@@ -1662,6 +1674,7 @@ dependencies = [
|
||||
"bytemuck",
|
||||
"cc",
|
||||
"commands",
|
||||
"config",
|
||||
"copypasta",
|
||||
"crossbeam-queue",
|
||||
"debugvault",
|
||||
@@ -2045,6 +2058,7 @@ dependencies = [
|
||||
name = "mips"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"debugvault",
|
||||
"decoder",
|
||||
"tokenizing",
|
||||
@@ -2532,6 +2546,7 @@ dependencies = [
|
||||
"arm",
|
||||
"binformat",
|
||||
"commands",
|
||||
"config",
|
||||
"debugvault",
|
||||
"decoder",
|
||||
"log 0.0.0",
|
||||
@@ -2724,6 +2739,7 @@ dependencies = [
|
||||
name = "riscv"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"crc",
|
||||
"debugvault",
|
||||
"decoder",
|
||||
@@ -4153,6 +4169,7 @@ checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
|
||||
name = "x86_64"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"debugvault",
|
||||
"decoder",
|
||||
"tokenizing",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
apple-sdk_15,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
@@ -16,18 +17,17 @@
|
||||
pango,
|
||||
vulkan-loader,
|
||||
stdenv,
|
||||
darwin,
|
||||
wayland,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bite";
|
||||
version = "0.2.1";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WINSDK";
|
||||
repo = "bite";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-A5NII5pLnM4BBy2L+ylXU0anqw4DpKgXmc29fcTq2z8=";
|
||||
hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@@ -60,15 +60,11 @@ rustPlatform.buildRustPackage rec {
|
||||
pango
|
||||
vulkan-loader
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.CoreGraphics
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
darwin.apple_sdk.frameworks.Metal
|
||||
darwin.apple_sdk.frameworks.QuartzCore
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wayland
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_15
|
||||
];
|
||||
|
||||
runtimeDependencies =
|
||||
@@ -95,7 +91,10 @@ rustPlatform.buildRustPackage rec {
|
||||
icon = "bite";
|
||||
desktopName = "BiTE";
|
||||
comment = meta.description;
|
||||
categories = ["Development" "Utility"];
|
||||
categories = [
|
||||
"Development"
|
||||
"Utility"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
@@ -103,8 +102,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Disassembler focused on comprehensive rust support";
|
||||
homepage = "https://github.com/WINSDK/bite";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [vinnymeller];
|
||||
maintainers = with maintainers; [ vinnymeller ];
|
||||
mainProgram = "bite";
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "databricks-cli";
|
||||
version = "0.229.0";
|
||||
version = "0.234.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ap2IypBPFV4yJVXRS8zSXC0kW/QKpOvFS9Cod0pSlG0=";
|
||||
hash = "sha256-I1S31a1JvXFXWw4EkS40efKEE9wsQlMdjVxEJDRTzA8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yCwevuivIHZ0dns9QljiKvwws4cFknIydvfjs4Jib3s=";
|
||||
vendorHash = "sha256-Zih5NftJMbtLYG0Sej1BaErJ8NnU25mwhl3pfqSOSxc=";
|
||||
|
||||
excludedPackages = [ "bundle/internal" ];
|
||||
|
||||
@@ -29,6 +29,7 @@ buildGoModule rec {
|
||||
"-skip="
|
||||
+ (lib.concatStringsSep "|" [
|
||||
# Need network
|
||||
"TestConsistentDatabricksSdkVersion"
|
||||
"TestTerraformArchiveChecksums"
|
||||
"TestExpandPipelineGlobPaths"
|
||||
"TestRelativePathTranslationDefault"
|
||||
|
||||
@@ -21,20 +21,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "delfin";
|
||||
version = "0.4.7";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "avery42";
|
||||
repo = "delfin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F4ipIOqMS42nXHRSRpzIlTh61g2xjpog7Zmxn6D29nE=";
|
||||
hash = "sha256-2ussvPXMX4wGE9N+Zh8KYIjbbqEKkPaNymN1Oqj8w8U=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ciw178jBwz4I6I1x6iI45RJ2ITw0JfukLWNyBmE3FZg=";
|
||||
hash = "sha256-JEHiLdEU9QkCxWPoTFVn2c6UDqnRbTG1WPetdsW/N8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
, pkg-config
|
||||
, pnpm_9
|
||||
, python3
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, darwin
|
||||
, testers
|
||||
@@ -17,6 +18,20 @@
|
||||
}:
|
||||
|
||||
let
|
||||
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
|
||||
version = "1.148.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
|
||||
};
|
||||
};
|
||||
electron = electron_32;
|
||||
pnpm = pnpm_9;
|
||||
in
|
||||
@@ -47,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
deltachat-rpc-server
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
];
|
||||
|
||||
@@ -63,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
test \
|
||||
$(yq -r '.catalogs.default."@deltachat/jsonrpc-client".version' pnpm-lock.yaml) \
|
||||
= ${deltachat-rpc-server.version} \
|
||||
= ${deltachat-rpc-server'.version} \
|
||||
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
|
||||
|
||||
test \
|
||||
@@ -83,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pushd packages/target-electron/dist/*-unpacked/resources/app.asar.unpacked
|
||||
rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server
|
||||
ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-*
|
||||
ln -s ${lib.getExe deltachat-rpc-server'} node_modules/@deltachat/stdio-rpc-server-*
|
||||
popd
|
||||
|
||||
runHook postBuild
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deskflow";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deskflow";
|
||||
repo = "deskflow";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cEKG9MwENbZqrfRdwiZtRWmIfRndrWUoaZQ5O7YRpBs=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CHlvL/MC9clFrMxlfIXaCFoTkcLS7QsYK7MXMFW0188=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -87,22 +87,32 @@ stdenv.mkDerivation rec {
|
||||
lerc
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/applications/deskflow.desktop \
|
||||
--replace-fail "Path=/usr/bin" "Path=$out/bin" \
|
||||
--replace-fail "Exec=/usr/bin/deskflow" "Exec=deskflow"
|
||||
'';
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt6.qtwayland}/${qt6.qtbase.qtPluginPrefix}/platforms"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export HOME=$(mktemp -d)
|
||||
./bin/unittests
|
||||
./bin/integtests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/deskflow/deskflow";
|
||||
description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux";
|
||||
mainProgram = "deskflow";
|
||||
maintainers = with lib.maintainers; [ aucub ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
license = with lib; [
|
||||
licenses.gpl2Plus
|
||||
licenses.openssl
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
darwin,
|
||||
@@ -19,13 +18,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-0T5zvd78l3ghop/KoIgXYoGssVV9F+ppJV2pWyLnwxo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
SystemConfiguration
|
||||
]
|
||||
);
|
||||
|
||||
checkFlags = [
|
||||
# Tests failing due to networking errors in Nix build environment
|
||||
"--skip=local_generic_tiles"
|
||||
|
||||
+634
-316
File diff suppressed because it is too large
Load Diff
@@ -1,32 +1,33 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "emmet-language-server";
|
||||
version = "2.2.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olrtg";
|
||||
repo = "emmet-language-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-53FbZ0hC2s9o6yXPYAy0vqe4tLcYMHLqeBMNuNI8Nd0=";
|
||||
hash = "sha256-R20twrmfLz9FP87qkjgz1R/n+Nhzwn22l9t/2fyuVeM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-luE8iYfTsSrBVcv0sE1yYnAksE2+icx9K4yNzjUV7U4=";
|
||||
npmDepsHash = "sha256-yv+5/wBif75AaAsbJrwLNtlui9SHws2mu3jYOR1Z55M=";
|
||||
|
||||
# Upstream doesn't have a lockfile
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} ./package-lock.json
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Language server for emmet.io";
|
||||
homepage = "https://github.com/olrtg/emmet-language-server";
|
||||
changelog = "https://github.com/olrtg/emmet-language-server/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ stnley ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ stnley ];
|
||||
mainProgram = "emmet-language-server";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "endless-sky";
|
||||
version = "0.10.8";
|
||||
version = "0.10.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "endless-sky";
|
||||
repo = "endless-sky";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bqhltxkoqDdmddOBZ1f3I29AxGm5buUXpjjFwefemEM=";
|
||||
sha256 = "sha256-FjQluOFU+fPr4/3WveScRRabDjD/bq8YmXvCU9w9yo8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,28 +1,36 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "f2";
|
||||
version = "1.9.1";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayoisaiah";
|
||||
repo = "f2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vpyI6WtK/0UpPiB8y+HpPd0IsKKkMHa/eIreYo32iAA=";
|
||||
sha256 = "sha256-z2w+1dAwd3108J+ApHn2rj9duW9qObd3AZJXyt0811c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Bz3Igjcyq4rkMkgv1J3+JiAqroAjxyAvHw4d4eZJgAM=";
|
||||
vendorHash = "sha256-xKw9shfAtRjD0f4BGALM5VPjGOaYz1IqXWcctHcV/p8=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.Version=${version}"
|
||||
];
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Command-line batch renaming tool";
|
||||
homepage = "https://github.com/ayoisaiah/f2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ zendo ];
|
||||
mainProgram = "f2";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
, libintl
|
||||
, libpng
|
||||
, librsvg
|
||||
, libstroke
|
||||
, libxslt
|
||||
, perl
|
||||
, pkg-config
|
||||
@@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libintl
|
||||
libpng
|
||||
librsvg
|
||||
libstroke
|
||||
libxslt
|
||||
perl
|
||||
python3Packages.python
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghq";
|
||||
version = "1.6.3";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x-motemen";
|
||||
repo = "ghq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fL63e0URUiGkVLyLvNeXjIFYEjWF6Xd4FXFXrpqcduQ=";
|
||||
sha256 = "sha256-5elUUZxhKZArtToEDfjYam7GS6m30GpbBLlUNy6dIyo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8n0kAowtBSCavHI6y3I7ozJg74tA8bF80WVwe+znHhc=";
|
||||
vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGo123Module rec {
|
||||
pname = "git-spice";
|
||||
version = "0.7.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abhinav";
|
||||
repo = "git-spice";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ap0ZGRDdHQMVYSk9J8vsZNpvaAwpHFmPT5REiCxYepQ=";
|
||||
hash = "sha256-n/ETHsM0BjviDVbcQ67l9cBEzzZXm86jlnmc8EdjxF4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YJ8OxmonnxNu4W17tD1Z7K625LCINlh6ZgoxOpmtNC0=";
|
||||
vendorHash = "sha256-/qLknJ8cs7t5eZ0t+3kLwByxuTKWvnm9h9tuf5ueNds=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitnuro";
|
||||
version = "1.3.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl (
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
{
|
||||
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar";
|
||||
hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw=";
|
||||
hash = "sha256-1lwuLPR6b1+I2SWaYaVrZkMcYVRAf1R7j/AwjQf03UM=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
{
|
||||
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-arm_aarch64-${version}.jar";
|
||||
hash = "sha256-6TRQfIhaKBjNPn3tEVWoUF92JAmwlHUtQZE8gKEZ/ZI=";
|
||||
hash = "sha256-wnHW1YK4FKi5EDF/E0S+yr0tugtv3qVlCbT3+x9bM8s=";
|
||||
}
|
||||
else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"
|
||||
);
|
||||
|
||||
@@ -28,12 +28,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glamoroustoolkit";
|
||||
version = "1.1.4";
|
||||
version = "1.1.7";
|
||||
|
||||
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-/p/oCE1fmlPjy1Xg36rsczZ74L0M7qWsdcFm6cHPVVY=";
|
||||
hash = "sha256-ji77uc7UnfiDVCERWwDpMnBiSJjDrr84yYrobLhKWlE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.39.2";
|
||||
version = "3.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-task";
|
||||
repo = "task";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-B5o3oAey7zJg5JBf4GO69cLmVbnkKedkjWP108XRGR8=";
|
||||
hash = "sha256-SOXtzesS+luil8Q0iKlhWv4hqPyRU2V+Um6S/uzChas=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-P9J69WJ2C2xgdU9xydiaY8iSKB7ZfexLNYi7dyHDTIk=";
|
||||
vendorHash = "sha256-5AABVG+MHvw8f8tcphUqQFid/mzXeWjbsD9mHJfyxDw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goldwarden";
|
||||
version = "0.3.4";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quexten";
|
||||
repo = "goldwarden";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LAnhCQmyubWeZtTVaW8IoNmfipvMIlAnY4pKwrURPDs=";
|
||||
hash = "sha256-wAQFx0DKLLKztETAz1eM+eBFiAkSCgd8qqRtLV1Kz9g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -38,7 +38,7 @@ buildGoModule rec {
|
||||
--replace-fail "@PATH@" "$out/bin/goldwarden"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-rMs7FP515aClzt9sjgIQHiYo5SYa2tDHrVRhtT+I8aM=";
|
||||
vendorHash = "sha256-zWACjW/WZC0ZLmRV1VwcRROG218PCZ6aCPOreCG/5sE=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
@@ -69,10 +69,10 @@ buildGoModule rec {
|
||||
mkdir -p $out/share/goldwarden
|
||||
cp -r gui/* $out/share/goldwarden/
|
||||
ln -s $out/share/goldwarden/goldwarden_ui_main.py $out/bin/goldwarden-gui
|
||||
rm $out/share/goldwarden/{com.quexten.Goldwarden.desktop,com.quexten.Goldwarden.metainfo.xml,goldwarden.svg,python3-requirements.json,requirements.txt}
|
||||
rm $out/share/goldwarden/{com.quexten.Goldwarden.desktop,com.quexten.Goldwarden.metainfo.xml,com.quexten.Goldwarden.svg,python3-requirements.json,requirements.txt}
|
||||
|
||||
install -D gui/com.quexten.Goldwarden.desktop -t $out/share/applications
|
||||
install -D gui/goldwarden.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
install -D gui/com.quexten.Goldwarden.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
install -Dm644 gui/com.quexten.Goldwarden.metainfo.xml -t $out/share/metainfo
|
||||
install -Dm644 cli/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"branch": "main",
|
||||
"commit_hash": "a425fbebe4cf4238e48a42f724ef2208959d66cf",
|
||||
"commit_message": "version: bump to 0.45.0",
|
||||
"date": "2024-11-09",
|
||||
"tag": "v0.45.0"
|
||||
"branch": "v0.45.2-b",
|
||||
"commit_hash": "12f9a0d0b93f691d4d9923716557154d74777b0a",
|
||||
"commit_message": "[gha] Nix: update inputs",
|
||||
"date": "2024-11-19",
|
||||
"tag": "v0.45.2"
|
||||
}
|
||||
|
||||
@@ -82,14 +82,14 @@ assert assertMsg (!hidpiXWayland)
|
||||
|
||||
customStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + optionalString debug "-debug";
|
||||
version = "0.45.0";
|
||||
version = "0.45.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
fetchSubmodules = true;
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA=";
|
||||
hash = "sha256-1pNsLGNStCFjXiBc2zMUxKzKk45CePTf+GwKlzTmrCY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,21 +6,22 @@
|
||||
glib,
|
||||
pango,
|
||||
gtk4,
|
||||
gtk4-layer-shell,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyprlauncher";
|
||||
version = "0.1.2";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprutils";
|
||||
repo = "hyprlauncher";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SxsCfEHrJpFSi2BEFFqmJLGJIVzkluDU6ogKkTRT9e8=";
|
||||
hash = "sha256-E6/V9p5YIjg3/Svw70GwY1jibkg2xnzdAvmphc0xbQQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MENreS+DXdJIurWUqHbeb0cCJlRnjjW1bmGdg0QoxlQ=";
|
||||
cargoHash = "sha256-gkBpBlBR9Y2dkuqK7X/sxKdS9staFsbHv3Slg9UvP3A=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -32,6 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
glib
|
||||
pango
|
||||
gtk4
|
||||
gtk4-layer-shell
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -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{}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
hash,
|
||||
lts ? false,
|
||||
patches,
|
||||
patches ? [ ],
|
||||
updateScriptArgs ? "",
|
||||
vendorHash,
|
||||
version,
|
||||
|
||||
@@ -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 ];
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "sectordistrict";
|
||||
repo = "intentrace";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3Pbx/ZA9DYwNzsszSzodJub+G8uKuYuNZhlTDsvL0t4=";
|
||||
hash = "sha256-e47hauVg5Ncp0C5y6RkfKfxMHbBvpKrVoUq3aJxTf2E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RZMhmqETPdcG0ofLPQdynaOFQuIx3H8j0mKR+SbOQ6s=";
|
||||
cargoHash = "sha256-MAbOEJdMkt6efTGdmimMpYAx39JnQlnOlbIHIGICgp8=";
|
||||
|
||||
meta = {
|
||||
description = "Prettified Linux syscall tracing tool (like strace)";
|
||||
|
||||
@@ -1,25 +1,26 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk4
|
||||
, librsvg
|
||||
, libsecret
|
||||
, libadwaita
|
||||
, gtksourceview5
|
||||
, webkitgtk_6_0
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook4,
|
||||
appstream-glib,
|
||||
desktop-file-utils,
|
||||
glib,
|
||||
gtk4,
|
||||
librsvg,
|
||||
libsecret,
|
||||
libadwaita,
|
||||
gtksourceview5,
|
||||
webkitgtk_6_0,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "iotas";
|
||||
version = "0.2.10";
|
||||
version = "0.9.5";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -27,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "World";
|
||||
repo = "iotas";
|
||||
rev = version;
|
||||
hash = "sha256-aITt+TJb/LrVOyb/mAC7U6/NJ4stHD76jjBFC7Pt7fU=";
|
||||
hash = "sha256-SDapnAGPTi7tnzl3zeNJw2CABhVVAXMyn1bllg8fChw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -58,6 +59,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
linkify-it-py
|
||||
mdit-py-plugins
|
||||
pypandoc
|
||||
strenum
|
||||
packaging
|
||||
];
|
||||
|
||||
# prevent double wrapping
|
||||
@@ -66,12 +69,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Simple note taking with mobile-first design and Nextcloud sync";
|
||||
homepage = "https://gitlab.gnome.org/World/iotas";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "iotas";
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
maintainers = with lib.maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.32.5";
|
||||
version = "0.32.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-H0PimkPXs2/iirOpN82az3Bge71k1RZOhMtr0UmGOy8=";
|
||||
hash = "sha256-jJHlFrnyvGZ0/ykmZRbSAFwzvN0j2dqddLEQoiv3oys=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-U/tIsYpoog3S8V2yQGGqaQ+Av7TfvCYt3zn74qWuQKs=";
|
||||
vendorHash = "sha256-/DVQghwfiPKLO0LFPFmHFO5jfActoEnlMuQP2i60R9o=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
|
||||
|
||||
@@ -7,18 +7,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "klog-rs";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobifroe";
|
||||
repo = "klog";
|
||||
rev = version;
|
||||
hash = "sha256-MAHLTNKN0t0rUXd4f238/jcaUlcTdC3IvaviMRu6gKg=";
|
||||
hash = "sha256-GbYkTCo+MUKBz0AtfDSjOOe8j+v6gxRkbq1Dj1E2jl0=";
|
||||
};
|
||||
cargoHash = "sha256-u+kctG+38Z2xYTA9h0OY4L1zzKyAT2Wlwf08zSqxV0I=";
|
||||
cargoHash = "sha256-h68NEAPLlgzDTSerL+0DrvSSfB85RHtBvuoUhrxLDWU=";
|
||||
checkFlags = [
|
||||
# this integration test depends on a running kubernetes cluster
|
||||
"--skip=k8s::tests::test_get_pod_list"
|
||||
"--skip=k8s::tests::test_get_pod_list_for_resource"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
Generated
-7166
File diff suppressed because it is too large
Load Diff
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.148.7";
|
||||
version = "1.150.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=";
|
||||
hash = "sha256-lVMXW2fnpoa/iiypLhHl7WXLqouHfrRapEbXL37X7B8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
|
||||
hash = "sha256-nzAQEaTHkKjDmKDmwZEznpvVh1KfxTM83/82hjV/Cpw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,20 +21,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libkrun";
|
||||
version = "1.9.6";
|
||||
version = "1.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "libkrun";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-bseyOHgteLEUz93gL5G2zR0ssijMd86zmlvm02a7FSY=";
|
||||
hash = "sha256-a5ot5ad8boANK3achn6PJ52k/xmxawbTM0/hEEC/fss=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-OerD2SEJquv7bHEZw4jdxmrQn8SuIUJiYPu9E1u439o=";
|
||||
hash = "sha256-oa3M/HL0hWoXlqY0Wxy9jf6hIvMqevtpuYiTCrS1Q74=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.12";
|
||||
version = "2.0.13";
|
||||
pname = "lunatask";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lunatask.app/download/Lunatask-${version}.AppImage";
|
||||
hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs=";
|
||||
hash = "sha256-/OIIyl43oItg0XEbhEnB+rPBcY3XuQlurL5Ad+0T3aM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metacubexd";
|
||||
version = "1.168.0";
|
||||
version = "1.171.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "metacubexd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-HTHqf4R3eD+LlI9qmSz4id0SPVgid8Qp4P9JZzXGKlk=";
|
||||
hash = "sha256-9ST7MwvEMCa2bORffWvhSXSHKU1V3b5oFZ3ExZ2kZnk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-OFcXsAFMwY6BnyEVK9Px1g17CHCQWyPpr1My7u3XPpU=";
|
||||
hash = "sha256-ta5H1sNROP8nyLNno6C7p6NyXRFuD32tnN7B0nlLdOM=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -1,25 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mud";
|
||||
version = "1.0.1";
|
||||
version = "1.0.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasursadikov";
|
||||
repo = "mud";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pW4B4+RN7hKtG2enJ33OHBeGsLj8w20ylvjcOL6owAk=";
|
||||
hash = "sha256-UPlAA63iANuChpqWLUDHQrcRjYkHvLcwXW/lVrAfY20=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
hatchling
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
@@ -28,14 +27,9 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
pythonImportsCheck = [ "mud" ];
|
||||
|
||||
# Version checking fails on darwin with:
|
||||
# PermissionError: [Errno 1] Operation not permitted: '/var/empty/.mudsettings'
|
||||
# despite adding `export HOME=$(mktemp -d)` in the `preVersionCheck` phase.
|
||||
# The tool
|
||||
nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
# Removed versionCheckHook due to conflict with the new release,
|
||||
# a mud config file is required to run the version check command.
|
||||
# Mud can only be initialized in a directory containing git repos.
|
||||
|
||||
meta = {
|
||||
description = "multi-directory git runner which allows you to run git commands in a multiple repositories";
|
||||
|
||||
@@ -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/";
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.8.5";
|
||||
version = "1.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sZGKM6Dxz0bZkHIITujojSsKtRD4E+q1uReWRg5EfC8=";
|
||||
hash = "sha256-yJCUWRAntye3Dx2a+s/gNVa+XuCQak24TnFjSY+/3zc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o=";
|
||||
vendorHash = "sha256-MHdEY2nlUGTKybMPran5mTXlAlTFilfrY5K2sMlPe5U=";
|
||||
ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ];
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
-1
@@ -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
|
||||
];
|
||||
|
||||
+34
@@ -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
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ox";
|
||||
version = "0.6.10";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "curlpipe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-7PaAcVatm/gqeZRuzCjoF6ZGDP6mIjDTuhmJQ5wt7x8=";
|
||||
hash = "sha256-7rP/h3MlrMZl9yd655uRrnv1aUB57LzdyKs66wHp33Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0=";
|
||||
cargoHash = "sha256-z9pyMnYQZfCCVdVEakj3q27SFLahMDWRuAopYye6RIY=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "passepartui";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kardwen";
|
||||
repo = "passepartui";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ydX+Rjpfhi0K6f8pzjqWGF0O22gBco6Iot8fXSFNG5c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/lgEQ6PmHagt8TlGUV2A95MbV8IQzUwyQ/UkoaGIVHE=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "TUI for pass, the standard unix password manager";
|
||||
homepage = "https://github.com/kardwen/passepartui";
|
||||
changelog = "https://github.com/kardwen/passepartui/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
mainProgram = "passepartui";
|
||||
};
|
||||
}
|
||||
Generated
+733
-903
File diff suppressed because it is too large
Load Diff
@@ -5,13 +5,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polarity";
|
||||
version = "0-unstable-2024-06-28";
|
||||
version = "0-unstable-2024-11-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarity-lang";
|
||||
repo = "polarity";
|
||||
rev = "59bd7a2c3c3d0a61b25d3bb85b9d21f7b3fef343";
|
||||
hash = "sha256-85uo2GAGxWAWwN2vyhUqwz28Ofb+2eOSuetzovAle+A=";
|
||||
rev = "2f6ce455ec512f3b0cfff0f3ca9c5016e6a4e9de";
|
||||
hash = "sha256-viJGqtUsoAZznhfDN3PnPG+LJ5ppVL11eyhuEiTG+IQ=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "raycast";
|
||||
version = "1.85.2";
|
||||
version = "1.86.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
|
||||
hash = "sha256-pmzoRZ0EMEA0kU37skGuEDu6ggBuUdFYCLRpZty5kgs=";
|
||||
hash = "sha256-UvMPRLCaGgunpVwoF0Nbz+7Gma7zQP+nMMh5Cvqn0MA=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -7,20 +7,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rcp";
|
||||
version = "0.13.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wykurz";
|
||||
repo = "rcp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-INLXVruiaK5yv5old0NOWFcg9y13M6Dm7bBMmcPFY1I=";
|
||||
hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
IOKit
|
||||
]);
|
||||
|
||||
cargoHash = "sha256-JXDM97uGuGh3qHK3Gh8Nd/YSZq/Kcj81PpufJJMqQQI=";
|
||||
cargoHash = "sha256-loS55mQUVbIm+5VcQnPf6olERNTm3dbnQu5SPXe6a8I=";
|
||||
|
||||
RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
|
||||
+67
-57
@@ -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 ];
|
||||
};
|
||||
}
|
||||
@@ -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 { }
|
||||
+2
-2
@@ -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=";
|
||||
}
|
||||
+2
-2
@@ -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 = ".";
|
||||
|
||||
+2
-2
@@ -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=";
|
||||
}
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "StreamController";
|
||||
owner = "StreamController";
|
||||
rev = version;
|
||||
hash = "sha256-UBcsA9pAo7fONhk4vYXQU4EgSVKm1D7/7nvL9BaNIgo=";
|
||||
hash = "sha256-w2ElVus0dgA375lv58q3H8ZmQ+8iBxC4vxtJSlKssoM=";
|
||||
};
|
||||
|
||||
# The installation method documented upstream
|
||||
|
||||
@@ -17,16 +17,16 @@ let
|
||||
|
||||
tctl-next = buildGoModule rec {
|
||||
pname = "tctl-next";
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y0C2z2iMMQSG5+xGngZ98+ixIgbvaQxPdAWuPbEbBAY=";
|
||||
hash = "sha256-KDJtCqx9Yp/zhutSElFveWYAKwJCckiM9k3FOtYTlLo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zhGqDHdVGg7eGnw5L3eSyXKBTjp85ir5zrtf7HbXmC0=";
|
||||
vendorHash = "sha256-Vur3e6olkC0Ewz/RDZe2AIpcIs5GqeVgJa+KO9g8X7o=";
|
||||
|
||||
inherit overrideModAttrs;
|
||||
|
||||
|
||||
@@ -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/
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tex-fmt";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WGUNDERWOOD";
|
||||
repo = "tex-fmt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ii/z9ZmsWCHxxqUbkcu7HRBuN2LiLCxzUvqRexwQ/Co=";
|
||||
hash = "sha256-jVrd3yZ07+ppsdt+8sNKX1rdmU+UiRCyx80EMXdoK54=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2vPxsXKInH18h/AoOWfl0VteUBmxWDzZa6AtpKfY5Hs=";
|
||||
cargoHash = "sha256-XQ1oEF+axp8pC6OkLlab1qI7RJeAyeSb58oChgaaS1s=";
|
||||
|
||||
meta = {
|
||||
description = "LaTeX formatter written in Rust";
|
||||
|
||||
@@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation {
|
||||
dontInstall = true;
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-5f9lKRD6vc2FOnUeSxK/zlu/tshS1+RCSB0slGSO/Rc=";
|
||||
outputHash = "sha256-1poTBB9cm0EHeIvXhan6/kaxr22LXvhHD4Y+JBocioE=";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@ let args = rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.33.17";
|
||||
version = "0.33.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = "tilt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GzWnTq3X615A/jRjYhBriRYaH4tjv+yg2/zHIJuKXPE=";
|
||||
hash = "sha256-3LFsTaz47QAIDGId/Tl3G7xP5b9gc25X+ZeMaVhXf8w=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
full ? true,
|
||||
# see https://gitlab.com/jschx/ufetch for a list
|
||||
osName ? "nixos",
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "ufetch";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "jschx";
|
||||
repo = "ufetch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-icrf7OjDageBRSBD40wX2ZzCvB6T5n0jgd5aRROGqCA=";
|
||||
};
|
||||
|
||||
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 ];
|
||||
};
|
||||
})
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "varia";
|
||||
version = "2024.5.7";
|
||||
version = "2024.11.7-1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giantpinkrobots";
|
||||
repo = "varia";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-axBBJYIFCt3J0aCY8tMYehho0QN1eIcUMPhWb5g5uDc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Xx3rd+FwelE7yjW4dXTAEzCMVa25ojXuhOLjqc6H57c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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'" "
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.1.2",
|
||||
"rev": "f680b7d08f56183391b581077d4baf589e1cc8bd",
|
||||
"hash": "sha256-JoGGnlu2aioO6XbeUZDe23AHSBxciLSEKBWRedPuXjI="
|
||||
"version": "1.1.3",
|
||||
"rev": "19864453f7d0ed095256d848b46e7b8630989bac",
|
||||
"hash": "sha256-Inaawm6mAy1CPCPfGO5LNBgaF/QcZOTAjm1aGjrJp6w="
|
||||
}
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -13,16 +13,18 @@
|
||||
pytest-timeout,
|
||||
importlib-metadata,
|
||||
psutil,
|
||||
untangle,
|
||||
django,
|
||||
requests,
|
||||
flask,
|
||||
gevent,
|
||||
numpy,
|
||||
flask,
|
||||
requests,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "debugpy";
|
||||
version = "1.8.8";
|
||||
version = "1.8.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -31,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoft";
|
||||
repo = "debugpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zkNV+tFRAxTdl+lCPD4XYI1Oz0dVyX4GGuNdfzy2sJU=";
|
||||
hash = "sha256-JgYGdCGzzktigjEKMPbkcSJlFPYSEFEJvmIFfR0qSZM=";
|
||||
};
|
||||
|
||||
patches =
|
||||
@@ -104,6 +106,7 @@ buildPythonPackage rec {
|
||||
## Used by test helpers:
|
||||
importlib-metadata
|
||||
psutil
|
||||
untangle
|
||||
|
||||
## Used in Python code that is run/debugged by the tests:
|
||||
django
|
||||
@@ -111,6 +114,7 @@ buildPythonPackage rec {
|
||||
gevent
|
||||
numpy
|
||||
requests
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
preCheck =
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user