cleanup and updates

flake.lock

@@ -891,11 +891,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1750146866,
-        "narHash": "sha256-Eu3/uTRnenjCJUY76T3zDWiUtIGG+RMQoDu1QdIU8AI=",
+        "lastModified": 1750217223,
+        "narHash": "sha256-F4IZxpZBQMubMzt/Ye6aNh4yY537qrKEI51G4SApmTA=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "e2401ec11b2ed71337931aa1123faf469c4df327",
+        "rev": "e05506ee00f7db56db951bde1c5dbc3a8a6208b6",
         "type": "github"
       },
       "original": {
@@ -1128,11 +1128,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1750005367,
-        "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
+        "lastModified": 1750133334,
+        "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
+        "rev": "36ab78dab7da2e4e27911007033713bab534187b",
         "type": "github"
       },
       "original": {
@@ -1776,11 +1776,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1750155883,
-        "narHash": "sha256-Oc/T1zs8f8QN7lXEsRGG/hbdNye5oG0Fv2eZWf5BKUk=",
+        "lastModified": 1750214791,
+        "narHash": "sha256-A9oPoZaS9aaN9yGiqtoT8k1NOz9TU1j1PZ2GUa0LWsY=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "ec90f26ac3835301e06cfe93c80eff82aba20248",
+        "rev": "002b742cd9c4abe51e12112382c2837ca20339b2",
         "type": "github"
       },
       "original": {

modules/home/desktop.nix

@@ -106,7 +106,6 @@
     })
 
     turbocase
-    # nix-config.packages.x86_64-linux.openscad-git
     openscad-unstable
     openscad-lsp
 

packages/openscad-git.nix

@@ -1,158 +0,0 @@
-{
-  fetchgit,
-  lib,
-  stdenv,
-  cmake,
-  bison,
-  flex,
-  eigen,
-  boost,
-  libGLU,
-  libGL,
-  glew,
-  opencsg,
-  cgal,
-  mpfr,
-  gmp,
-  glib,
-  pkg-config,
-  harfbuzz,
-  gettext,
-  freetype,
-  fontconfig,
-  double-conversion,
-  lib3mf,
-  libzip,
-  spacenavSupport ? stdenv.hostPlatform.isLinux,
-  libspnav,
-  wayland,
-  wayland-protocols,
-  wrapGAppsHook3,
-  cairo,
-  openscad,
-  runCommand,
-  python3,
-  ghostscript,
-  tbb,
-  qt6,
-  qt6Packages,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "openscad";
-  version = "0-latest";
-
-  src = fetchgit {
-    url = "https://github.com/openscad/openscad.git";
-    rev = "edbbd86b2a44092fd876ec71e162934d03fdb25c";
-    sha256 = "sha256-SuRByBKOiAvEXGjlztvDrJIeh/EdESH727/MJWSHoVA=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    bison
-    flex
-    pkg-config
-    gettext
-    cmake
-    wrapGAppsHook3
-    python3
-    ghostscript
-    qt6.qttools
-    qt6.wrapQtAppsHook
-    qt6.qt5compat
-    qt6.qtmultimedia
-    qt6.qtbase
-    qt6Packages.qscintilla
-  ];
-
-  buildInputs =
-    [
-      eigen
-      boost
-      glew
-      opencsg
-      cgal
-      mpfr
-      gmp
-      glib
-      harfbuzz
-      lib3mf
-      libzip
-      double-conversion
-      freetype
-      fontconfig
-      cairo
-      tbb
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGLU
-      libGL
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optional spacenavSupport libspnav;
-
-  cmakeFlags =
-    [
-      "-DUSE_QT6=ON"
-      "-DVERSION=${version}"
-      "-DLIB3MF_INCLUDE_DIR=${lib3mf.dev}/include/lib3mf/Bindings/Cpp"
-      "-DLIB3MF_LIBRARY=${lib3mf}/lib/lib3mf.so"
-    ]
-    ++ lib.optionals spacenavSupport [
-      "-DENABLE_SPNAV=ON"
-      "-DSPNAV_INCLUDE_DIR=${libspnav}/include"
-      "-DSPNAV_LIBRARY=${libspnav}/lib/libspnav.so"
-      "-DCMAKE_CXX_STANDARD=17"
-    ];
-
-  enableParallelBuilding = true;
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir $out/Applications
-    mv $out/bin/*.app $out/Applications
-    rmdir $out/bin || true
-
-    mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \
-      $out/share/openscad/{examples,color-schemes,locale,libraries,fonts,templates}
-
-    rmdir $out/share/openscad
-  '';
-
-  meta = {
-    description = "3D parametric model compiler";
-    longDescription = ''
-      OpenSCAD is a software for creating solid 3D CAD objects. It is free
-      software and available for Linux/UNIX, MS Windows and macOS.
-
-      Unlike most free software for creating 3D models (such as the famous
-      application Blender) it does not focus on the artistic aspects of 3D
-      modelling but instead on the CAD aspects. Thus it might be the
-      application you are looking for when you are planning to create 3D models of
-      machine parts but pretty sure is not what you are looking for when you are more
-      interested in creating computer-animated movies.
-    '';
-    homepage = "https://openscad.org/";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      bjornfor
-      raskin
-    ];
-    mainProgram = "openscad";
-  };
-
-  passthru.tests = {
-    lib3mf_support =
-      runCommand "${pname}-lib3mf-support-test"
-        {
-          nativeBuildInputs = [ openscad ];
-        }
-        ''
-          echo "cube([1, 1, 1]);" | openscad -o cube.3mf -
-          echo "import(\"cube.3mf\");" | openscad -o cube-import.3mf -
-          mv cube-import.3mf $out
-        '';
-  };
-}