Maintain ./pkgs

home-mods/audio/default.nix

@@ -11,7 +11,7 @@
   };
 
   home.packages = with pkgs; [
-    my.spotube
+    # my.spotube
     spotify
     ncspot
   ];

pkgs/aider-chat.nix

@@ -114,7 +114,7 @@ python3.pkgs.buildPythonApplication {
     homepage = "https://github.com/paul-gauthier/aider";
     changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ taha-yassine ];
+    maintainers = []; # TODO switch back to upstream ?
     mainProgram = "aider";
   };
 }

pkgs/awatcher.nix

@@ -21,6 +21,7 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "awatcher";
+  # TODO Update
   version = "0.2.7";
 
   src = fetchFromGitHub {
@@ -47,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/2e3s/awatcher";
     changelog = "https://github.com/2e3s/awatcher/releases/tag/${version}";
     license = licenses.mpl20;
-    maintainers = with tensorfiles.maintainers; [ tsandrini ];
+    maintainers = [ ]; # TODO add myself ?
     platforms = platforms.linux;
     mainProgram = pname;
   };

pkgs/bisq2.nix

@@ -1,166 +0,0 @@
-{ stdenvNoCC
-, lib
-, makeWrapper
-, runtimeShell
-, fetchurl
-, makeDesktopItem
-, copyDesktopItems
-, imagemagick
-, jdk23
-, dpkg
-, writeShellScript
-, bash
-, tor
-, zip
-, gnupg
-,
-}:
-let
-  version = "2.1.2";
-
-  jdk = jdk23.override { enableJavaFX = true; };
-
-  bisq-launcher = args:
-    writeShellScript "bisq-launcher" ''
-      # 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.
-      # ${lib.getExe' tor "tor"}
-
-      rm -fR $HOME/.local/share/Bisq2/tor
-
-      exec "${lib.getExe jdk}" -Djpackage.app-version=@version@ -classpath @out@/lib/app/desktop-app-launcher.jar:@out@/lib/app/* ${args} bisq.desktop_app_launcher.DesktopAppLauncher "$@"
-    '';
-
-  # A given release will be signed by either Alejandro Garcia or Henrik Jannsen
-  # as indicated in the file
-  # https://github.com/bisq-network/bisq2/releases/download/v${version}/signingkey.asc
-  publicKey =
-    {
-      "E222AA02" = fetchurl {
-        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/E222AA02.asc";
-        sha256 = "sha256-31uBpe/+0QQwFyAsoCt1TUWRm0PHfCFOGOx1M16efoE=";
-      };
-
-      "387C8307" = fetchurl {
-        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/387C8307.asc";
-        sha256 = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
-      };
-    }."387C8307";
-in
-stdenvNoCC.mkDerivation rec {
-  inherit version;
-
-  pname = "bisq2";
-
-  src = fetchurl {
-    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
-    sha256 = "0zgv70xlz3c9mrwmiaa1dgagbc441ppk2vrkgard8zjrvk8rg7va";
-
-    # Verify the upstream Debian package prior to extraction.
-    # See https://bisq.wiki/Bisq_2#Installation
-    # This ensures that a successful build of this Nix package requires the Debian
-    # package to pass verification.
-    nativeBuildInputs = [ gnupg ];
-    downloadToTemp = true;
-
-    postFetch = ''
-      pushd $(mktemp -d)
-      export GNUPGHOME=./gnupg
-      mkdir -m 700 -p $GNUPGHOME
-      ln -s $downloadedFile ./Bisq-${version}.deb
-      ln -s ${signature} ./signature.asc
-      gpg --import ${publicKey}
-      gpg --batch --verify signature.asc Bisq-${version}.deb
-      popd
-      mv $downloadedFile $out
-    '';
-  };
-
-  signature = fetchurl {
-    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
-    sha256 = "sha256-WZhI8RDmb7nQqpCQJM86vrp8qQNg+mvRVdSPcDqgzxE=";
-  };
-
-  nativeBuildInputs = [
-    copyDesktopItems
-    dpkg
-    imagemagick
-    makeWrapper
-    zip
-    gnupg
-    makeWrapper
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "bisq2";
-      exec = "bisq2";
-      icon = "bisq2";
-      desktopName = "Bisq 2";
-      genericName = "Decentralized bitcoin exchange";
-      categories = [
-        "Network"
-        "P2P"
-      ];
-    })
-
-    (makeDesktopItem {
-      name = "bisq2-hidpi";
-      exec = "bisq2-hidpi";
-      icon = "bisq2";
-      desktopName = "Bisq 2 (HiDPI)";
-      genericName = "Decentralized bitcoin exchange";
-      categories = [
-        "Network"
-        "P2P"
-      ];
-    })
-  ];
-
-  unpackPhase = ''
-    dpkg -x $src .
-  '';
-
-  buildPhase = ''
-    # Replace the Tor binary embedded in tor.jar (which is in the zip archive tor.zip)
-    # with the Tor binary from Nixpkgs.
-
-    makeWrapper ${lib.getExe' tor "tor"} ./tor
-    zip tor.zip ./tor
-    zip opt/bisq2/lib/app/tor.jar tor.zip
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib $out/bin
-    cp -r opt/bisq2/lib/app $out/lib
-
-    install -D -m 777 ${bisq-launcher ""} $out/bin/bisq2
-    substituteAllInPlace $out/bin/bisq2
-
-    install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq2-hidpi
-    substituteAllInPlace $out/bin/bisq2-hidpi
-
-    for n in 16 24 32 48 64 96 128 256; do
-      size=$n"x"$n
-      magick convert opt/bisq2/lib/Bisq2.png -resize $size bisq2.png
-      install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq2.png
-    done;
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Decentralized bitcoin exchange network";
-    homepage = "https://bisq.network";
-    mainProgram = "bisq2";
-    sourceProvenance = with sourceTypes; [
-      binaryBytecode
-    ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ emmanuelrosa ];
-    platforms = [ "x86_64-linux" ];
-  };
-}

pkgs/dbeaver.nix

@@ -1,129 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchurl
-, undmg
-, makeWrapper
-, openjdk17
-, gnused
-, autoPatchelfHook
-, wrapGAppsHook3
-, gtk3
-, glib
-, webkitgtk_4_0
-, glib-networking
-, override_xmx ? "1024m"
-,
-}:
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "dbeaver-bin";
-  version = "24.2.5";
-
-  src =
-    let
-      inherit (stdenvNoCC.hostPlatform) system;
-      selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}");
-      suffix = selectSystem {
-        x86_64-linux = "linux.gtk.x86_64-nojdk.tar.gz";
-        aarch64-linux = "linux.gtk.aarch64-nojdk.tar.gz";
-        x86_64-darwin = "macos-x86_64.dmg";
-        aarch64-darwin = "macos-aarch64.dmg";
-      };
-      hash = selectSystem {
-        x86_64-linux = "sha256-LnJq23o60c+Ys0V46esP1bIkcnzj26hQUBu3Ut9bMJM=";
-        aarch64-linux = "";
-        x86_64-darwin = "";
-        aarch64-darwin = "";
-      };
-    in
-    fetchurl {
-      url = "https://github.com/dbeaver/dbeaver/releases/download/${finalAttrs.version}/dbeaver-ce-${finalAttrs.version}-${suffix}";
-      inherit hash;
-    };
-
-  sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "DBeaver.app";
-
-  nativeBuildInputs =
-    [ makeWrapper ]
-    ++ lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [
-      gnused
-      wrapGAppsHook3
-      autoPatchelfHook
-    ]
-    ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg ];
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  prePatch = ''
-    substituteInPlace ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}dbeaver.ini \
-      --replace-fail '-Xmx1024m' '-Xmx${override_xmx}'
-  '';
-
-  installPhase =
-    if !stdenvNoCC.hostPlatform.isDarwin
-    then ''
-      runHook preInstall
-
-      mkdir -p $out/opt/dbeaver $out/bin
-      cp -r * $out/opt/dbeaver
-      makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \
-        --prefix PATH : "${openjdk17}/bin" \
-        --set JAVA_HOME "${openjdk17.home}" \
-        --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
-        --prefix LD_LIBRARY_PATH : "$out/lib:${
-        lib.makeLibraryPath [
-          gtk3
-          glib
-          webkitgtk_4_0
-          glib-networking
-        ]
-      }"
-
-      mkdir -p $out/share/icons/hicolor/256x256/apps
-      ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
-
-      mkdir -p $out/share/applications
-      ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop
-
-      substituteInPlace $out/opt/dbeaver/dbeaver-ce.desktop \
-        --replace-fail "/usr/share/dbeaver-ce/dbeaver.png" "dbeaver" \
-        --replace-fail "/usr/share/dbeaver-ce/dbeaver" "$out/bin/dbeaver"
-
-      sed -i '/^Path=/d' $out/share/applications/dbeaver.desktop
-
-      runHook postInstall
-    ''
-    else ''
-      runHook preInstall
-
-      mkdir -p $out/{Applications/dbeaver.app,bin}
-      cp -R . $out/Applications/dbeaver.app
-      makeWrapper $out/{Applications/dbeaver.app/Contents/MacOS,bin}/dbeaver \
-        --prefix PATH : "${openjdk17}/bin" \
-        --set JAVA_HOME "${openjdk17.home}"
-
-      runHook postInstall
-    '';
-
-  passthru.updateScript = ./update.sh;
-
-  meta = with lib; {
-    homepage = "https://dbeaver.io/";
-    description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
-    longDescription = ''
-      Free multi-platform database tool for developers, SQL programmers, database
-      administrators and analysts. Supports all popular databases: MySQL,
-      PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access,
-      Teradata, Firebird, Derby, etc.
-    '';
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
-      gepbird
-      mkg20001
-      yzx9
-    ];
-    mainProgram = "dbeaver";
-  };
-})

pkgs/spotube.nix

@@ -1,72 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
-, dpkg
-, makeWrapper
-, wrapGAppsHook
-, libappindicator
-, libnotify
-, libsecret
-, mpv-unwrapped
-, xdg-user-dirs
-,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "spotube";
-  version = "3.4.0";
-
-  src = fetchurl {
-    url = "https://github.com/KRTirtho/spotube/releases/download/v${finalAttrs.version}/Spotube-linux-x86_64.deb";
-    hash = "sha256-XBciTNWsmaY1C8ji+SCWWP/M/uIDZHM9fi9wucHJsBY=";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    dpkg
-    makeWrapper
-    wrapGAppsHook
-  ];
-
-  buildInputs = [
-    libappindicator
-    libnotify
-    libsecret
-    mpv-unwrapped
-  ];
-
-  dontWrapGApps = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out
-    mv usr/* $out
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    patchelf $out/share/spotube/lib/libmedia_kit_native_event_loop.so \
-        --replace-needed libmpv.so.1 libmpv.so.2
-  '';
-
-  postFixup = ''
-    makeWrapper $out/share/spotube/spotube $out/bin/spotube \
-        "''${gappsWrapperArgs[@]}" \
-        --prefix LD_LIBRARY_PATH : $out/share/spotube/lib:${lib.makeLibraryPath [mpv-unwrapped]} \
-        --prefix PATH : ${lib.makeBinPath [xdg-user-dirs]}
-  '';
-
-  meta = {
-    changelog = "https://github.com/KRTirtho/spotube/blob/v${finalAttrs.version}/CHANGELOG.md";
-    description = "An open source Spotify client";
-    longDescription = ''
-      Spotube is an open source, cross-platform Spotify client that
-      doesn't require Premium nor uses Electron
-    '';
-    homepage = "https://spotube.netlify.app/";
-    license = lib.licenses.bsdOriginal;
-    maintainers = with lib.maintainers; [ tomasajt ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})

pkgs/xmrig-donate-level.patch

@@ -1,12 +0,0 @@
-diff --git a/src/donate.h b/src/donate.h
---- a/src/donate.h
-+++ b/src/donate.h
-@@ -46,6 +46,6 @@
-  */
--constexpr const int kDefaultDonateLevel = 1;
--constexpr const int kMinimumDonateLevel = 1;
-+constexpr const int kDefaultDonateLevel = @donateLevel@;
-+constexpr const int kMinimumDonateLevel = @donateLevel@;
- 
- 
- #endif /* XMRIG_DONATE_H */

pkgs/zen-browser.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.7.6b",
+  "version": "1.8b",
-  "hash": "sha256-GJuxooMV6h3xoYB9hA9CaF4g7JUIJ2ck5/hiQp89Y5o="
+  "hash": "sha256-pn5dBfu79KyZVHg1ciCZ7H+7bO8tubXTi85xZUUUvGk="
 }