mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-21 11:34:13 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
2ec05b7ea9
@ -800,6 +800,12 @@
|
||||
githubId = 20405311;
|
||||
name = "Aksh Gupta";
|
||||
};
|
||||
aktaboot = {
|
||||
email = "akhtaboo@protonmail.com";
|
||||
github = "aktaboot";
|
||||
githubId = 120214979;
|
||||
name = "aktaboot";
|
||||
};
|
||||
al3xtjames = {
|
||||
email = "nix@alextjam.es";
|
||||
github = "al3xtjames";
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, gcc-unwrapped
|
||||
, dpkg
|
||||
, util-linux
|
||||
, bash
|
||||
@ -57,8 +56,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
|
||||
--add-flags $out/share/${pname}/resources/app.aasar
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, dpkg, makeWrapper, electron, libsecret
|
||||
, desktop-file-utils , callPackage }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, electron
|
||||
, desktop-file-utils
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@ -33,8 +40,7 @@ stdenv.mkDerivation rec {
|
||||
cp -R opt/Standard\ Notes/resources/app.asar $out/share/standardnotes/
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/standardnotes \
|
||||
--add-flags $out/share/standardnotes/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret stdenv.cc.cc.lib ]}
|
||||
--add-flags $out/share/standardnotes/app.asar
|
||||
|
||||
${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \
|
||||
--set-key Exec --set-value standardnotes usr/share/applications/standard-notes.desktop
|
||||
|
||||
@ -15,21 +15,27 @@
|
||||
, qhull
|
||||
, cmake
|
||||
, cgal
|
||||
, boost179
|
||||
, boost
|
||||
, mpfr
|
||||
, xercesc
|
||||
, tbb
|
||||
, embree
|
||||
, vcg
|
||||
, libigl
|
||||
, corto
|
||||
, openctm
|
||||
, structuresynth
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "meshlab";
|
||||
version = "2022.02";
|
||||
version = "2023.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cnr-isti-vclab";
|
||||
repo = "meshlab";
|
||||
rev = "MeshLab-${version}";
|
||||
sha256 = "sha256-jcc3PfsiIeYyipteZgzd0NwZgFFgR/mMBiaInzhOcDY=";
|
||||
fetchSubmodules = true; # for vcglib
|
||||
sha256 = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -46,38 +52,38 @@ mkDerivation rec {
|
||||
levmar
|
||||
qhull
|
||||
cgal
|
||||
boost179
|
||||
boost
|
||||
mpfr
|
||||
xercesc
|
||||
tbb
|
||||
embree
|
||||
vcg
|
||||
libigl
|
||||
corto
|
||||
openctm
|
||||
structuresynth
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop
|
||||
cmakeDir=$PWD/src
|
||||
mkdir ../build
|
||||
cd ../build
|
||||
substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
|
||||
substituteInPlace src/external/libigl.cmake \
|
||||
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
|
||||
substituteInPlace src/external/nexus.cmake \
|
||||
--replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
|
||||
substituteInPlace src/external/levmar.cmake \
|
||||
--replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
|
||||
--replace-warn "MD5 ''${LEVMAR_MD5}" ""
|
||||
substituteInPlace src/external/ssynth.cmake \
|
||||
--replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
|
||||
--replace-warn "MD5 ''${SSYNTH_MD5}" ""
|
||||
substituteInPlace src/common_gui/CMakeLists.txt \
|
||||
--replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DALLOW_BUNDLED_EIGEN=OFF"
|
||||
"-DALLOW_BUNDLED_GLEW=OFF"
|
||||
"-DALLOW_BUNDLED_LIB3DS=OFF"
|
||||
"-DALLOW_BUNDLED_MUPARSER=OFF"
|
||||
"-DALLOW_BUNDLED_QHULL=OFF"
|
||||
# disable when available in nixpkgs
|
||||
"-DALLOW_BUNDLED_OPENCTM=ON"
|
||||
"-DALLOW_BUNDLED_SSYNTH=ON"
|
||||
"-DALLOW_BUNDLED_BOOST=OFF"
|
||||
# some plugins are disabled unless these are on
|
||||
"-DALLOW_BUNDLED_NEWUOA=ON"
|
||||
"-DALLOW_BUNDLED_LEVMAR=ON"
|
||||
];
|
||||
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'int16_t' has not been declared in 'std'
|
||||
"-include cstdint"
|
||||
"-DVCGDIR=${vcg.src}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
107
pkgs/applications/graphics/pymeshlab/default.nix
Normal file
107
pkgs/applications/graphics/pymeshlab/default.nix
Normal file
@ -0,0 +1,107 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, libGLU
|
||||
, qtbase
|
||||
, qtscript
|
||||
, qtxmlpatterns
|
||||
, lib3ds
|
||||
, bzip2
|
||||
, muparser
|
||||
, eigen
|
||||
, glew
|
||||
, gmp
|
||||
, levmar
|
||||
, qhull
|
||||
, cmake
|
||||
, cgal
|
||||
, boost
|
||||
, mpfr
|
||||
, xercesc
|
||||
, tbb
|
||||
, embree
|
||||
, vcg
|
||||
, libigl
|
||||
, corto
|
||||
, openctm
|
||||
, structuresynth
|
||||
, wrapQtAppsHook
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pymeshlab";
|
||||
version = "2023.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cnr-isti-vclab";
|
||||
repo = "pymeshlab";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IOlRdXoUPOJt67g3HqsLchV5aL+JUEks2y1Sy+wpwsg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libGLU
|
||||
qtbase
|
||||
qtscript
|
||||
qtxmlpatterns
|
||||
lib3ds
|
||||
bzip2
|
||||
muparser
|
||||
eigen
|
||||
glew
|
||||
gmp
|
||||
levmar
|
||||
qhull
|
||||
cgal
|
||||
boost
|
||||
mpfr
|
||||
xercesc
|
||||
tbb
|
||||
embree
|
||||
vcg
|
||||
libigl
|
||||
corto
|
||||
structuresynth
|
||||
openctm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
python3Packages.pybind11
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.numpy
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/meshlab/src/external/libigl.cmake \
|
||||
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
|
||||
substituteInPlace src/meshlab/src/external/nexus.cmake \
|
||||
--replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
|
||||
substituteInPlace src/meshlab/src/external/levmar.cmake \
|
||||
--replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
|
||||
--replace-warn "MD5 ''${LEVMAR_MD5}" ""
|
||||
substituteInPlace src/meshlab/src/external/ssynth.cmake \
|
||||
--replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
|
||||
--replace-warn "MD5 ''${SSYNTH_MD5}" ""
|
||||
export cmakeFlags="cmakeFlags
|
||||
-DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab
|
||||
"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVCGDIR=${vcg.src}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "The open source mesh processing python library";
|
||||
homepage = "https://github.com/cnr-isti-vclab/PyMeshLab";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ nim65s ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
})
|
||||
@ -10,15 +10,15 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brscan5";
|
||||
version = "1.3.0-0";
|
||||
version = "1.3.1-0";
|
||||
src = {
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf104034/${pname}-${version}.i386.deb";
|
||||
sha256 = "sha256-LpbPUo8iD5CcwUoIOa1UYHQXMrZZJ7PjZpcuyXhXjzk=";
|
||||
hash = "sha256-BgS64vwsKESJBDz9H2MDwcGiresROSNFP1b+7+zlE5c=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf104033/${pname}-${version}.amd64.deb";
|
||||
sha256 = "sha256-ntVe/e6/cdz3+LSpGilMFZecxfv74pd7ksh85SzEdKc=";
|
||||
hash = "sha256-0UMbXMBlyiZI90WG5FWEP2mIZEBsxXd11dtgtyuSDnY=";
|
||||
};
|
||||
}."${system}" or (throw "Unsupported system: ${system}");
|
||||
|
||||
@ -33,9 +33,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch =
|
||||
let
|
||||
# Download .deb for both amd64 and i386, then unpack like unpackPhase
|
||||
# to get the offset, run:
|
||||
# strings -n 10 --radix=d opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 | grep "/opt/brother/scanner/brscan5/models"
|
||||
patchOffsetBytes =
|
||||
if system == "x86_64-linux" then 86528
|
||||
else if system == "i686-linux" then 79140
|
||||
if system == "x86_64-linux" then 86592
|
||||
else if system == "i686-linux" then 79236
|
||||
else throw "Unsupported system: ${system}";
|
||||
in
|
||||
''
|
||||
|
||||
@ -99,11 +99,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blender";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.blender.org/source/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-3AAtguPDQMk4VcZoRzDQGAG2aaKbHMa3XuuZC6aecj8=";
|
||||
hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg=";
|
||||
};
|
||||
|
||||
patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonApplication, fetchPypi, requests, yt-dlp, pytestCheckHook }:
|
||||
{ lib, buildPythonApplication, fetchPypi, fetchpatch, requests, yt-dlp, pytestCheckHook }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
@ -11,6 +11,14 @@ buildPythonApplication rec {
|
||||
sha256 = "sha256-PgbfppyJCpgFupBQng8MUPihbDmit4C+xWnSzCJyu5k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# catch general Exceptions. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mikf/gallery-dl/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch";
|
||||
hash = "sha256-rVsd764siP/07XBPVDnpxMm/4kLiH3fp9+NtpHHH23U=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
yt-dlp
|
||||
|
||||
@ -60,8 +60,7 @@ in {
|
||||
makeWrapper ${electron_27}/bin/electron $out/bin/${pname} \
|
||||
--set "LOCAL_GIT_DIRECTORY" ${git} \
|
||||
--add-flags $out/share/${pname}/resources/app \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@ -75,11 +75,11 @@ This would allow someone to upgrade between those NixOS releases in a supported
|
||||
|
||||
## K3s upkeep for nixpkgs maintainers
|
||||
|
||||
* A `nixos-stable` release triggers the need of re-setting K3s versions in `nixos-unstable` branch to a single K3s version. After every `nixos-stable` release, K3s maintainers should remove all K3s versions in `nixos-unstable` branch but the latest. While `nixos-stable` keeps the multiple K3s versions necessary for a smooth upgrade to `nixos-unstable`.
|
||||
* After every nixos release, K3s maintainers should remove from `nixos-unstable` all K3s versions that exist in `nixos-stable` except the latest version (to allow decoupling system upgrade from k3s upgrade).
|
||||
|
||||
* Whenever adding a new major/minor K3s version to nixpkgs:
|
||||
- update `k3s` alias to the latest version.
|
||||
- add a NixOS release note scheduling the removal of all K3s packages but the latest
|
||||
- add a NixOS release note scheduling the removal of deprecated K3s packages
|
||||
- include migration information from both Kubernetes and K3s projects
|
||||
|
||||
* For version patch upgrades, use the K3s update script.
|
||||
@ -111,4 +111,4 @@ This would allow someone to upgrade between those NixOS releases in a supported
|
||||
|
||||
- Read the nix build logs to check for anything unusual. (Obvious but underrated.)
|
||||
|
||||
* Thank you for reading the documentation and your continued contribution.
|
||||
* Thanks for reading the documentation and your continued contribution.
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
, AppKit
|
||||
, CoreServices
|
||||
, desktopToDarwinBundle
|
||||
, libnotify
|
||||
, useKeytar ? true
|
||||
}:
|
||||
|
||||
@ -79,11 +78,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libnotify
|
||||
];
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
@ -111,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
|
||||
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--set LD_LIBRARY_PATH "${libPath}" \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, libXtst
|
||||
, zlib
|
||||
, electron
|
||||
, pipewire
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
@ -72,7 +71,6 @@ buildNpmPackage rec {
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \
|
||||
--add-flags $out/share/jitsi-meet-electron/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pipewire ]} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
|
||||
|
||||
@ -9,9 +9,6 @@
|
||||
, fetchYarnDeps
|
||||
, fixup-yarn-lock
|
||||
, electron
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, pipewire
|
||||
, alsa-utils
|
||||
, which
|
||||
, testers
|
||||
@ -72,11 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
popd
|
||||
|
||||
# Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, 'libpipewire' for screen sharing and 'libnotify' for notifications
|
||||
# Linux needs 'aplay' for notification sounds
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
--prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire libnotify ]} \
|
||||
''} \
|
||||
--add-flags "$out/share/teams-for-linux/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
@ -3,9 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, copyDesktopItems
|
||||
, python3
|
||||
, pipewire
|
||||
, libpulseaudio
|
||||
, libnotify
|
||||
, xdg-utils
|
||||
, electron_29
|
||||
, makeDesktopItem
|
||||
@ -42,11 +39,6 @@ buildNpmPackage rec {
|
||||
# override installPhase so we can copy the only folders that matter
|
||||
installPhase =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libpulseaudio
|
||||
pipewire
|
||||
libnotify
|
||||
];
|
||||
binPath = lib.makeBinPath [ xdg-utils ];
|
||||
in
|
||||
''
|
||||
@ -62,7 +54,6 @@ buildNpmPackage rec {
|
||||
|
||||
# Add xdg-utils to path via suffix, per PR #181171
|
||||
makeWrapper '${lib.getExe electron_29}' $out/bin/webcord \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
|
||||
--suffix PATH : "${binPath}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags $out/lib/node_modules/webcord/
|
||||
|
||||
@ -38,8 +38,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||
--add-flags $out/share/${pname}/resources/app.asar
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
telegram-desktop.overrideAttrs (old: rec {
|
||||
pname = "64gram";
|
||||
version = "1.1.17";
|
||||
version = "1.1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TDesktop-x64";
|
||||
@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec {
|
||||
rev = "v${version}";
|
||||
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-QWHC1NAAKpH9zU7cplCW2rNYckY87bpU7MEZ1ytSi58=";
|
||||
hash = "sha256-sURnKOcg+pwU1Nw6yqtoPaRD1kpg93/VNh7UYi2IIwU=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {};
|
||||
|
||||
@ -3,15 +3,15 @@
|
||||
, buildGoModule
|
||||
}: buildGoModule rec {
|
||||
pname = "betula";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~bouncepaw";
|
||||
repo = "betula";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MH6YeWG94YVBgx5Es3oMJ9A/hAPPBXpAcIdCJV3HX78=";
|
||||
hash = "sha256-oxwOGpf305VDlY3Mwl0dRJRRhe0yolaMMlpNspZdKQk=";
|
||||
};
|
||||
vendorHash = "sha256-wiMIhoSO7nignNWY16OpDYZCguRbcEwwO/HggKSC5jM=";
|
||||
vendorHash = "sha256-DjL2h6YKCJOWgmR/Gb0Eja38yJ4DymqW/SzmPG3+q9w=";
|
||||
|
||||
CGO_ENABLED = 1;
|
||||
# These tests use internet, so are failing in Nix build.
|
||||
|
||||
27
pkgs/by-name/co/corto/package.nix
Normal file
27
pkgs/by-name/co/corto/package.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "corto";
|
||||
version = "0-unstable-2024-04-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cnr-isti-vclab";
|
||||
repo = "corto";
|
||||
rev = "d880519c490c88a39d12c31a914b6a687a7019c3";
|
||||
hash = "sha256-0OUijrf+0ZNv3oYko2r8Kp9zgtg8b9RPL7DXHf15Ryc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mesh compression library, designed for rendering and speed";
|
||||
homepage = "https://github.com/cnr-isti-vclab/corto";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nim65s ];
|
||||
};
|
||||
}
|
||||
48
pkgs/by-name/do/dogedns/package.nix
Normal file
48
pkgs/by-name/do/dogedns/package.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, openssl
|
||||
, pandoc
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dogedns";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dj-Codeman";
|
||||
repo = "doge";
|
||||
rev = "6dd0383f31c096bfe2b6918c36b6e2c48414e753";
|
||||
hash = "sha256-cvqDSTHFf/le2jItGTSkAGURj64WRvOmMRI+vFH0/50=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-v9AuX7FZfy18yu4P9ovHsL5AQIYhPa8NEsMziEeHCJ8=";
|
||||
|
||||
patches = [
|
||||
# remove date info to make the build reproducible
|
||||
# remove commit hash to avoid dependency on git and the need to keep `.git`
|
||||
./remove-date-info.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pandoc ]
|
||||
++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion completions/doge.{bash,fish,zsh}
|
||||
installManPage ./target/man/*.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reviving A command-line DNS client";
|
||||
homepage = "https://github.com/Dj-Codeman/doge";
|
||||
license = licenses.eupl12;
|
||||
mainProgram = "doge";
|
||||
maintainers = with maintainers; [ aktaboot ];
|
||||
};
|
||||
}
|
||||
11
pkgs/by-name/do/dogedns/remove-date-info.patch
Normal file
11
pkgs/by-name/do/dogedns/remove-date-info.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -34,7 +34,7 @@ fn main() -> io::Result<()> {
|
||||
format!("{}\nv{} \\1;31m(beta debug build!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url)
|
||||
}
|
||||
else if is_development_version() {
|
||||
- format!("{}\nv{} [{}] built on {} \\1;31m(beta-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), git_hash(), build_date(), url)
|
||||
+ format!("{}\nv{} [nixpkgs] \\1;31m(beta-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url)
|
||||
}
|
||||
else {
|
||||
format!("{}\nv{}\n\\1;4;34m{}\\0m", tagline, version_string(), url)
|
||||
@ -9,6 +9,7 @@
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, python3
|
||||
, qrencode
|
||||
, qt6
|
||||
, readline
|
||||
@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatus";
|
||||
version = "5.9.0";
|
||||
version = "5.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TwiN";
|
||||
repo = "gatus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-obrdEnNxLdWtbGL57D/nTClaOdzJlLDU3+K9VdR8XI4=";
|
||||
hash = "sha256-gZSK3ebBBJGHRdylCl18AYifGknYbOz7+xaCJjU9ZlY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VICVo7XYeHs/43knHA4CMSgHloyYSjOFe1TUb4u+egE=";
|
||||
vendorHash = "sha256-sZ6IPYitNnnw7+UQVAWFEe9/ObDhAiou1GzDDqnGXb8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -47,6 +47,6 @@ buildGoModule {
|
||||
homepage = "https://github.com/google/gvisor";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ andrew-d gpl ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
31
pkgs/by-name/li/libigl/package.nix
Normal file
31
pkgs/by-name/li/libigl/package.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "libigl";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libigl";
|
||||
repo = "libigl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OpjkQGRiuc7kNlwgCeM4dcotTb5J+6LUn4IOe9bFbW4=";
|
||||
};
|
||||
|
||||
# We could also properly use CMake, but we would have to heavily patch it
|
||||
# to avoid configure-time downloads of many things.
|
||||
installPhase = ''
|
||||
mkdir -p $out/include
|
||||
cp -r include/igl $out/include
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple C++ geometry processing library";
|
||||
homepage = "https://github.com/libigl/libigl";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ nim65s ];
|
||||
};
|
||||
})
|
||||
59
pkgs/by-name/op/openctm/package.nix
Normal file
59
pkgs/by-name/op/openctm/package.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
freeglut,
|
||||
gtk2,
|
||||
libGLU,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openctm";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.sourceforge.net/project/openctm/OpenCTM-${finalAttrs.version}/OpenCTM-${finalAttrs.version}-src.tar.bz2";
|
||||
hash = "sha256-So0mCNlzZPfuxWt8Y3xWuTCK6YKGs+kNu3QTyQ6UPx0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
"dev"
|
||||
"man"
|
||||
"out"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
freeglut
|
||||
gtk2
|
||||
libGLU
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tools/tinyxml/Makefile.linux \
|
||||
--replace-warn "-Wno-format" "-Wno-format -Wno-format-security"
|
||||
substituteInPlace tools/Makefile.linux \
|
||||
--replace-warn "-lglut" "-lglut -lGL -lGLU"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"BINDIR=$(bin)/bin/"
|
||||
"INCDIR=$(dev)/include/"
|
||||
"LIBDIR=$(out)/lib/"
|
||||
"MAN1DIR=$(man)/share/man//man1"
|
||||
];
|
||||
|
||||
makefile = if stdenv.isDarwin then "Makefile.macosx" else "Makefile.linux";
|
||||
|
||||
preInstall = "mkdir -p $bin/bin $dev/include $out/lib $man/share/man/man1";
|
||||
|
||||
meta = with lib; {
|
||||
description = "File format, software library and a tool set for compression of 3D triangle meshes";
|
||||
homepage = "https://sourceforge.net/projects/openctm/";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ nim65s ];
|
||||
};
|
||||
})
|
||||
@ -8,15 +8,11 @@
|
||||
, copyDesktopItems
|
||||
, vencord
|
||||
, electron
|
||||
, pipewire
|
||||
, libpulseaudio
|
||||
, libicns
|
||||
, libnotify
|
||||
, jq
|
||||
, moreutils
|
||||
, cacert
|
||||
, nodePackages
|
||||
, speechd
|
||||
, withTTS ? true
|
||||
# Enables the use of vencord from nixpkgs instead of
|
||||
# letting vesktop manage it's own version
|
||||
@ -116,15 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# this is consistent with other nixpkgs electron packages and upstream, as far as I am aware
|
||||
installPhase =
|
||||
let
|
||||
# this is mainly required for venmic
|
||||
libPath = lib.makeLibraryPath ([
|
||||
libpulseaudio
|
||||
libnotify
|
||||
pipewire
|
||||
stdenv.cc.cc.lib
|
||||
] ++ lib.optional withTTS speechd);
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
@ -139,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/vesktop \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath} \
|
||||
--add-flags $out/opt/Vesktop/resources/app.asar \
|
||||
${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-tNNT8FqMvrjGFuyhizbyd2gAimbd5SLyCMVt6bFcbyQ=",
|
||||
"version": "0.2024.04.02.08.02.stable_01"
|
||||
"hash": "sha256-t8Qobl20YXY71vZVAIq6uJ+vnEeT3wFTmAy2dfthvIY=",
|
||||
"version": "0.2024.04.16.08.02.stable_00"
|
||||
},
|
||||
"linux": {
|
||||
"hash": "sha256-xnXRg23AdfCk2TKBr+PZ3wDYqTN4+8wLSodWpmh3D/Y=",
|
||||
"version": "0.2024.04.02.08.02.stable_01"
|
||||
"hash": "sha256-V1bG4Sx0cWv1+5mPnktQ3pPQm6Qwj0Ec6qDXmxGqB+8=",
|
||||
"version": "0.2024.04.16.08.02.stable_00"
|
||||
}
|
||||
}
|
||||
|
||||
@ -229,6 +229,16 @@ buildFHSEnv {
|
||||
runScript = writeShellScript "wechat-uos-launcher" ''
|
||||
export QT_QPA_PLATFORM=xcb
|
||||
export LD_LIBRARY_PATH=${lib.makeLibraryPath wechat-uos-runtime}
|
||||
|
||||
if [[ ''${XMODIFIERS} =~ fcitx ]]; then
|
||||
export QT_IM_MODULE=fcitx
|
||||
export GTK_IM_MODULE=fcitx
|
||||
elif [[ ''${XMODIFIERS} =~ ibus ]]; then
|
||||
export QT_IM_MODULE=ibus
|
||||
export GTK_IM_MODULE=ibus
|
||||
export IBUS_USE_PORTAL=1
|
||||
fi
|
||||
|
||||
${wechat.outPath}/opt/apps/com.tencent.wechat/files/wechat
|
||||
'';
|
||||
extraInstallCommands = ''
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wireproxy";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pufferffish";
|
||||
repo = "wireproxy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2gio+kyjIvaNjb/+M8M5YvbAPbQX+B9A/Qly2kyFZXw=";
|
||||
hash = "sha256-VPIEgvUg0h80Cd611zXQ5mhamfJTQpaDK9kiUMy2G0A=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -22,7 +22,7 @@ buildGoModule rec {
|
||||
"-X main.version=v${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-u5/ppH+8mcR3AdPnA6vDFL4GwVzbUj679I4zBw80HU0=";
|
||||
vendorHash = "sha256-DNTPzZSxcjkcv7RygTpOIgdYEQ8wBPkuJqfzZGt8ExI=";
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = wireproxy;
|
||||
@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wireguard client that exposes itself as a socks5 proxy";
|
||||
homepage = "https://github.com/octeep/wireproxy";
|
||||
homepage = "https://github.com/pufferffish/wireproxy";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ _3JlOy-PYCCKUi ];
|
||||
mainProgram = "wireproxy";
|
||||
@ -1,32 +1,24 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ispc, tbb, glfw,
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
|
||||
openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "embree";
|
||||
version = "3.13.5";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "embree";
|
||||
repo = "embree";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80=";
|
||||
sha256 = "sha256-gQPlk0bDn04s2pncF22m/OpIbzF3NXKkRCZbmxfXEY4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fixed-compilation-issues-for-arm-aarch64-processor-under-linux.patch";
|
||||
url = "https://github.com/embree/embree/commit/82ca6b5ccb7abe0403a658a0e079926478f04cb1.patch";
|
||||
hash = "sha256-l9S4PBk+yQUypQ22l05daD0ruouZKE4VHkGvzKxkH4o=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix duplicate /nix/store/.../nix/store/.../ paths
|
||||
sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \
|
||||
common/cmake/embree-config.cmake
|
||||
sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake
|
||||
substituteInPlace common/math/math.h --replace 'defined(__MACOSX__) && !defined(__INTEL_COMPILER)' 0
|
||||
substituteInPlace common/math/math.h --replace 'defined(__WIN32__) || defined(__FreeBSD__)' 'defined(__WIN32__) || defined(__FreeBSD__) || defined(__MACOSX__)'
|
||||
substituteInPlace common/math/emath.h --replace 'defined(__MACOSX__) && !defined(__INTEL_COMPILER)' 0
|
||||
substituteInPlace common/math/emath.h --replace 'defined(__WIN32__) || defined(__FreeBSD__)' 'defined(__WIN32__) || defined(__FreeBSD__) || defined(__MACOSX__)'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
61
pkgs/development/libraries/structuresynth/default.nix
Normal file
61
pkgs/development/libraries/structuresynth/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libGL,
|
||||
libGLU,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "structuresynth";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alemuntoni";
|
||||
repo = "structuresynth";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-uFz4WPwA586B/5p+DUJ/W8KzbHLBhLIwP6mySZJ1vPY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This PR in 2 commits allow packaging of this project as standalone.
|
||||
# It was merged upstream, so those 2 patches can be removed on next release.
|
||||
(fetchpatch {
|
||||
name = "shared-lib.patch";
|
||||
url = "https://github.com/alemuntoni/StructureSynth/pull/1/commits/fdb87c55a03c6a0faa4335de5d29f0fb547b6102.patch";
|
||||
hash = "sha256-/66x8HGyNhGwoxsbV+QIRFYQNuFSHYXNYkJzAn4jyJI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "install-project.patch";
|
||||
url = "https://github.com/alemuntoni/StructureSynth/pull/1/commits/f96a90f6a4c60e9e0316edd20ea77674a2b764a7.patch";
|
||||
hash = "sha256-cSZAL1N2/Gd0x+9UkTUQxqVlb2m2MM8AA1Zzlo6S35w=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"dev"
|
||||
"out"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
libGLU
|
||||
qtbase
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate 3D structures by specifying a design grammar";
|
||||
homepage = "https://github.com/alemuntoni/StructureSynth";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ nim65s ];
|
||||
};
|
||||
})
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jedi-language-server";
|
||||
version = "0.41.3";
|
||||
version = "0.41.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,8 +23,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "pappasam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+k4WOoEbVe7mlPyPj0ttBM+kmjq8V739yHi36BDYK2U=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RDLwL9AZ3G8CzVwDtWqFFZNH/ulpHeFBhglbWNv/ZIk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy";
|
||||
version = "10.2.4";
|
||||
version = "10.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -54,7 +54,7 @@ buildPythonPackage rec {
|
||||
owner = "mitmproxy";
|
||||
repo = "mitmproxy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6TPhxprrP6Bgc1yAhN3pBdr98WpvfGnVNvkNtFxROgE=";
|
||||
hash = "sha256-YjvGsnpQQ8GWLyKmnd3lOxesnr+F2xCNXyahZh0JQnc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -122,7 +122,9 @@ buildPythonPackage rec {
|
||||
"test_commands_exist"
|
||||
"test_contentview_flowview"
|
||||
"test_flowview"
|
||||
"test_get_hex_editor"
|
||||
"test_integration"
|
||||
"test_spawn_editor"
|
||||
"test_statusbar"
|
||||
# FileNotFoundError: [Errno 2] No such file or directory
|
||||
# likely wireguard is also not working in the sandbox
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
draco,
|
||||
embree,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
flex,
|
||||
git,
|
||||
graphviz-nox,
|
||||
@ -63,6 +64,14 @@ buildPythonPackage rec {
|
||||
|
||||
format = "other";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "port-to-embree-4.patch";
|
||||
url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/4b6c23d459c602fdac5e0ebc9b7722cbd5475e86.patch";
|
||||
hash = "sha256-yjqdGAVqfEsOX1W/tG6c+GgQLYya5U9xgUe/sNIuDbw=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPXR_BUILD_ALEMBIC_PLUGIN=ON"
|
||||
"-DPXR_BUILD_DRACO_PLUGIN=ON"
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pulsectl
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pulsectl,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pulsectl-asyncio";
|
||||
version = "1.1.1";
|
||||
format = "pyproject";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -18,24 +18,17 @@ buildPythonPackage rec {
|
||||
owner = "mhthies";
|
||||
repo = "pulsectl-asyncio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Uc8iUo9THWNPRRsvJxfw++41cnKrANe/Fk6e8bgLSkc=";
|
||||
hash = "sha256-WqUO4eERJkRg6O+gCmjqfdVbBT/3TVVBUUduoIxcPNQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pulsectl
|
||||
];
|
||||
dependencies = [ pulsectl ];
|
||||
|
||||
# Tests require a running pulseaudio instance
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pulsectl_asyncio"
|
||||
];
|
||||
pythonImportsCheck = [ "pulsectl_asyncio" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings library for PulseAudio";
|
||||
|
||||
@ -1,50 +1,52 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, xorgserver
|
||||
, imagemagick
|
||||
, gobject-introspection
|
||||
, pulseaudio
|
||||
, pytest-asyncio
|
||||
, pytest-lazy-fixture
|
||||
, qtile
|
||||
, keyring
|
||||
, requests
|
||||
, librsvg
|
||||
, gtk3
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
imagemagick,
|
||||
keyring,
|
||||
librsvg,
|
||||
pulseaudio,
|
||||
pytest-asyncio,
|
||||
pytest-lazy-fixture,
|
||||
pytestCheckHook,
|
||||
qtile,
|
||||
requests,
|
||||
setuptools-scm,
|
||||
xorgserver,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qtile-extras";
|
||||
version = "0.25.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elParaguayo";
|
||||
repo = pname;
|
||||
repo = "qtile-extras";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OYzSKOVg4D5gKxaEreclYq3D16dl8ddLipSdifokDNY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [ gtk3 ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
xorgserver
|
||||
imagemagick
|
||||
gobject-introspection
|
||||
];
|
||||
checkInputs = [
|
||||
imagemagick
|
||||
keyring
|
||||
pulseaudio
|
||||
pytest-asyncio
|
||||
pytest-lazy-fixture
|
||||
pytestCheckHook
|
||||
qtile
|
||||
pulseaudio
|
||||
keyring
|
||||
requests
|
||||
xorgserver
|
||||
# stravalib # marked as broken due to https://github.com/stravalib/stravalib/issues/379
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Needs a running DBUS
|
||||
"test_brightness_power_saving"
|
||||
@ -55,12 +57,13 @@ buildPythonPackage rec {
|
||||
"test_wifiicon_internet_check"
|
||||
# Image difference is outside tolerance
|
||||
"test_decoration_output"
|
||||
# Needs github token
|
||||
# Needs Github token
|
||||
"test_githubnotifications_reload_token"
|
||||
# AttributeError: 'NoneType' object has no attribute 'theta'
|
||||
"test_image_size_horizontal"
|
||||
"test_image_size_vertical"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Needs a running DBUS
|
||||
"test/widget/test_iwd.py"
|
||||
@ -68,16 +71,13 @@ buildPythonPackage rec {
|
||||
# Marked as broken due to https://github.com/stravalib/stravalib/issues/379
|
||||
"test/widget/test_strava.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
sed -i 's#/usr/bin/sleep#sleep#' test/widget/test_snapcast.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gtk3
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "qtile_extras" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, channel ? "stable"
|
||||
, fetchurl
|
||||
, installShellFiles
|
||||
, makeBinaryWrapper
|
||||
@ -9,18 +10,33 @@
|
||||
|
||||
let
|
||||
inherit (stdenvNoCC.hostPlatform) system;
|
||||
|
||||
channels = {
|
||||
stable = {
|
||||
version = "2.9.3";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-6VS21x2egWBV6eJqRCBGG7mEGPIDFtY9GN6Ry4ilC70=";
|
||||
x86_64-darwin = "sha256-UBUGjA+jUkT6p9714l8IvDDI/qhWNctVFOvcA2S5kQU=";
|
||||
aarch64-linux = "sha256-2QAahqcM2gi3lT+18q2Nm9GNqVsqzX3RajBsTn+KB1c=";
|
||||
aarch64-darwin = "sha256-uEH7Y7c9BcU/Q/jwx/inFMvUrgm2dUruID+FJL+rA6Y=";
|
||||
};
|
||||
};
|
||||
mainline = {
|
||||
version = "2.10.1";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-jNPL30e5xvyajlIqivtEpSb3cRhfgFhLFlC+CaLY2IM=";
|
||||
x86_64-darwin = "sha256-U1eQaYwnm/mdQoZ8YxK/+s3HboVfMIAtdI7aQnCiDM8=";
|
||||
aarch64-linux = "sha256-YtSyKZYG8vdubZUfo2FjEoVwSF82TXzeLJjPpHqgFDk=";
|
||||
aarch64-darwin = "sha256-aQSiXK7voP5/mPFIscfTnSc4Ae5/f+WW8MR6ZtuC/eY=";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "coder";
|
||||
version = "2.9.1";
|
||||
|
||||
version = channels.${channel}.version;
|
||||
src = fetchurl {
|
||||
hash = {
|
||||
x86_64-linux = "sha256-r4+u/s/dOn2GhyhEROu8i03QY3VA/bIyO/Yj7KSqicY=";
|
||||
x86_64-darwin = "sha256-uShCmMvb5OcinqP0CmrlP9QAJkjfG3g1QuHE4JRDOjE=";
|
||||
aarch64-linux = "sha256-tvpzfJ95YYfCY5V4iayjAmY5PDw+1uHUhY5F3pv/2Uk=";
|
||||
aarch64-darwin = "sha256-sP9HnB2DzAU9IvL3+QPmIFLvRkGkoxSoa68uXGQrNkw=";
|
||||
}.${system};
|
||||
hash = (channels.${channel}.hash).${system};
|
||||
|
||||
url =
|
||||
let
|
||||
|
||||
@ -5,12 +5,13 @@ set -eu -o pipefail
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/coder/coder/releases/latest | jq -r '.tag_name')
|
||||
LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
|
||||
# Fetch the latest stable version
|
||||
LATEST_STABLE_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/coder/coder/releases/latest | jq -r '.tag_name')
|
||||
LATEST_STABLE_VERSION=$(echo ${LATEST_STABLE_TAG} | sed 's/^v//')
|
||||
|
||||
# change version number
|
||||
sed -e "s/version =.*;/version = \"$LATEST_VERSION\";/g" \
|
||||
-i ./default.nix
|
||||
# Fetch the latest mainline version
|
||||
LATEST_MAINLINE_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/coder/coder/releases | jq -r '.[0].tag_name')
|
||||
LATEST_MAINLINE_VERSION=$(echo ${LATEST_MAINLINE_TAG} | sed 's/^v//')
|
||||
|
||||
# Define the platforms
|
||||
declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz"
|
||||
@ -18,15 +19,33 @@ declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz"
|
||||
["x86_64-darwin"]="darwin_amd64.zip"
|
||||
["aarch64-darwin"]="darwin_arm64.zip")
|
||||
|
||||
# Update hashes for each architecture
|
||||
for ARCH in "${!ARCHS[@]}"; do
|
||||
URL="https://github.com/coder/coder/releases/download/v${LATEST_VERSION}/coder_${LATEST_VERSION}_${ARCHS[$ARCH]}"
|
||||
echo "Fetching hash for $ARCH..."
|
||||
update_version_and_hashes() {
|
||||
local version=$1
|
||||
local channel=$2
|
||||
|
||||
# Fetch the new hash using nix-prefetch-url
|
||||
NEW_HASH=$(nix-prefetch-url --type sha256 $URL)
|
||||
SRI_HASH=$(nix hash to-sri --type sha256 $NEW_HASH)
|
||||
# Update version number, using '#' as delimiter
|
||||
sed -i "/${channel} = {/,/};/{
|
||||
s#^\(\s*\)version = .*#\1version = \"$version\";#
|
||||
}" ./default.nix
|
||||
|
||||
# Update the Nix file with the new hash
|
||||
sed -i "s|${ARCH} = \"sha256-.*\";|${ARCH} = \"${SRI_HASH}\";|" ./default.nix
|
||||
done
|
||||
# Update hashes for each architecture
|
||||
for ARCH in "${!ARCHS[@]}"; do
|
||||
local URL="https://github.com/coder/coder/releases/download/v${version}/coder_${version}_${ARCHS[$ARCH]}"
|
||||
echo "Fetching hash for $channel/$ARCH..."
|
||||
|
||||
# Fetch the new hash using nix-prefetch-url
|
||||
local NEW_HASH=$(nix-prefetch-url --type sha256 $URL)
|
||||
local SRI_HASH=$(nix hash to-sri --type sha256 $NEW_HASH)
|
||||
|
||||
# Update the Nix file with the new hash, using '#' as delimiter and preserving indentation
|
||||
sed -i "/${channel} = {/,/};/{
|
||||
s#^\(\s*\)${ARCH} = .*#\1${ARCH} = \"${SRI_HASH}\";#
|
||||
}" ./default.nix
|
||||
done
|
||||
}
|
||||
|
||||
# Update stable channel
|
||||
update_version_and_hashes $LATEST_STABLE_VERSION "stable"
|
||||
|
||||
# Update mainline channel
|
||||
update_version_and_hashes $LATEST_MAINLINE_VERSION "mainline"
|
||||
|
||||
@ -13,7 +13,10 @@
|
||||
, unzip
|
||||
, pkgs
|
||||
, pkgsBuildHost
|
||||
|
||||
, pipewire
|
||||
, libsecret
|
||||
, libpulseaudio
|
||||
, speechd
|
||||
, info
|
||||
}:
|
||||
|
||||
@ -190,6 +193,23 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libnotify
|
||||
pipewire
|
||||
stdenv.cc.cc.lib
|
||||
libsecret
|
||||
libpulseaudio
|
||||
speechd
|
||||
];
|
||||
in
|
||||
base.postFixup + ''
|
||||
patchelf \
|
||||
--add-rpath "${libPath}" \
|
||||
$out/libexec/electron/electron
|
||||
'';
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vsce";
|
||||
version = "2.25.0";
|
||||
version = "2.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vscode-vsce";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HPNKxplSJpo/30vpXu176JMzY3fAzTX/9XPRsYj9x+U=";
|
||||
hash = "sha256-ILu09OerH5XNVN4el3R2GH2LtIzXiQ/ONU+W2pomHRg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-wfgvGWSxV+N9Uh+jEEZCwPEN0yYNmooWXAV9PwWONkM=";
|
||||
npmDepsHash = "sha256-EtzcWeqPy4XVlheBXBpSwxrsHJ678lhTgnYqzIYZn4M=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"'
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "KartoffelToby";
|
||||
domain = "better_thermostat";
|
||||
version = "1.5.0-beta7";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KartoffelToby";
|
||||
repo = "better_thermostat";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bJURpeBgoxXGR7C9MY/gmNY7OFvBxrJKz2cA61b5hNo=";
|
||||
hash = "sha256-noo96Uks+MHtTbwIoU5gnekp/IwMry0U18X4I1qe4LQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -98,6 +98,7 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||
# Hard code bitbridge & runtime dependencies
|
||||
(substituteAll {
|
||||
src = ./hardcode-dependencies.patch;
|
||||
libdbus = dbus.lib;
|
||||
libxcb32 = pkgsi686Linux.xorg.libxcb;
|
||||
inherit wine;
|
||||
})
|
||||
@ -148,10 +149,11 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Hard code wine path in wrapper scripts generated by winegcc
|
||||
postFixup = ''
|
||||
for exe in "$out"/bin/*.exe; do
|
||||
substituteInPlace "$exe" \
|
||||
--replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"'
|
||||
done
|
||||
substituteInPlace "$out/bin/yabridge-host-32.exe" \
|
||||
--replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"'
|
||||
|
||||
substituteInPlace "$out/bin/yabridge-host.exe" \
|
||||
--replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine64"'
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@ -11,6 +11,21 @@ index c602c5ad..a52e20a1 100644
|
||||
endif
|
||||
|
||||
# These are all headers-only libraries, and thus won't require separate 32-bit
|
||||
diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
|
||||
index 66e08527..685c54af 100644
|
||||
--- a/src/common/notifications.cpp
|
||||
+++ b/src/common/notifications.cpp
|
||||
@@ -29,8 +29,8 @@
|
||||
#include "process.h"
|
||||
#include "utils.h"
|
||||
|
||||
-constexpr char libdbus_library_name[] = "libdbus-1.so.3";
|
||||
-constexpr char libdbus_library_fallback_name[] = "libdbus-1.so";
|
||||
+constexpr char libdbus_library_name[] = "@libdbus@/lib/libdbus-1.so.3";
|
||||
+constexpr char libdbus_library_fallback_name[] = "@libdbus@/lib/libdbus-1.so";
|
||||
|
||||
std::atomic<void*> libdbus_handle = nullptr;
|
||||
std::mutex libdbus_mutex;
|
||||
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
||||
index 82db99a5..491f005d 100644
|
||||
--- a/src/plugin/utils.cpp
|
||||
|
||||
@ -6,19 +6,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leanify";
|
||||
version = "unstable-2023-10-19";
|
||||
version = "unstable-2023-12-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JayXon";
|
||||
repo = "Leanify";
|
||||
rev = "5511415b02a7669f5fe9b454e5705e8328ab0359";
|
||||
hash = "sha256-eOp/SOynh0HUz62Ki5ADRk7FjQY0Gh55ydVnO0MCXAA=";
|
||||
rev = "9daa4303cdc03f6b90b72c369e6377c6beb75c39";
|
||||
hash = "sha256-fLazKCQnOT3bN3Kz25Q80RLk54EU5U6HCf6kPLcXn9c=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "-flto" "" \
|
||||
--replace "lib/LZMA/Alloc.o" "lib/LZMA/CpuArch.o lib/LZMA/Alloc.o"
|
||||
--replace-fail "-flto" "" \
|
||||
--replace-fail "lib/LZMA/Alloc.o" "lib/LZMA/CpuArch.o lib/LZMA/Alloc.o" \
|
||||
--replace-quiet "-Werror" ""
|
||||
'';
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
@ -6,23 +6,31 @@
|
||||
, openssl
|
||||
, pkg-config
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, IOKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixci";
|
||||
version = "0.2.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "nixci";
|
||||
hash = "sha256-Q3V/JL64xkIj0X0NSMRTjRAP3PJC9ouj3CmEscVWdns=";
|
||||
hash = "sha256-JC1LUny8UKflANlcx6Hcgx39CRry+ossnp/RQK36oaI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tjk91AaPsMLfXYB2o1HTTxb6Qr3l8BABPStrKEGvbtM=";
|
||||
cargoHash = "sha256-pYPzM7QlQ2EXwrvuXMa1qs0m7cmumh1iPesgJZ0H2kg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libiconv openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
IOKit
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
# The rust program expects an environment (at build time) that points to the
|
||||
# devour-flake flake.
|
||||
@ -37,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Define and build CI for Nix projects anywhere";
|
||||
homepage = "https://github.com/srid/nixci";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ srid ];
|
||||
maintainers = with maintainers; [ srid shivaraj-bh ];
|
||||
mainProgram = "nixci";
|
||||
};
|
||||
}
|
||||
|
||||
@ -14407,8 +14407,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
wireproxy = callPackage ../tools/networking/wireproxy { };
|
||||
|
||||
wiringpi = callPackage ../os-specific/linux/wiringpi { };
|
||||
|
||||
wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { };
|
||||
@ -24708,6 +24706,8 @@ with pkgs;
|
||||
streamlink = callPackage ../applications/video/streamlink { };
|
||||
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { };
|
||||
|
||||
structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
|
||||
|
||||
sub-batch = callPackage ../applications/video/sub-batch { };
|
||||
|
||||
subdl = callPackage ../applications/video/subdl { };
|
||||
@ -39989,7 +39989,7 @@ with pkgs;
|
||||
alejandra = callPackage ../tools/nix/alejandra { };
|
||||
|
||||
nixci = callPackage ../tools/nix/nixci {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration IOKit;
|
||||
};
|
||||
|
||||
nixfmt-classic = haskellPackages.nixfmt.bin;
|
||||
|
||||
@ -9673,6 +9673,8 @@ self: super: with self; {
|
||||
|
||||
pypemicro = callPackage ../development/python-modules/pypemicro { };
|
||||
|
||||
pymeshlab = toPythonModule (pkgs.libsForQt5.callPackage ../applications/graphics/pymeshlab { });
|
||||
|
||||
pyprecice = callPackage ../development/python-modules/pyprecice { };
|
||||
|
||||
pyprobables = callPackage ../development/python-modules/pyprobables { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user