3 files changed, 68 insertions, 47 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0a09f9f..82bd1a8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,4 @@
-final: prev: let
-  inherit (final.lib) optional;
-  is_cross = final.buildPlatform != final.targetPlatform;
-in {
+final: prev: {
   luks-hw-password = final.callPackage ./luks-hw-password {};
   dev = final.callPackage ./dev {
     devShells = import ../devShells final;
@@ -16,18 +13,43 @@ in {
   stardict-en-cz = final.callPackage ./stardict/en-cz.nix {};
   stardict-de-cz = final.callPackage ./stardict/de-cz.nix {};
   stardict-cz = final.callPackage ./stardict/cz.nix {};
-  sdcv-unwrapped = final.callPackage ./sdcv {};
+  sdcv-unwrapped = prev.sdcv;
   sdcv = final.callPackage ./stardict/wrapper.nix {stardict = final.sdcv-unwrapped;};
 
   lorem-text = final.callPackage ./lorem-text {};
 
   bigclown-leds = final.callPackage ./bigclown-leds {};
 
+  dodo = final.callPackage ./dodo {};
+  astroid = prev.astroid.overrideAttrs (oldAttrs: {
+    version = "240629";
+    src = final.fetchFromGitHub {
+      owner = "astroidmail";
+      repo = "astroid";
+      rev = "65acc24048a57039753cf2326dbfca6b608b91d1";
+      hash = "sha256-PXFVOaCgBHNUg0aCJD1TL/ulzjz9v70/jW5ManUPcHw=";
+    };
+    patches = [];
+    buildInputs = oldAttrs.buildInputs ++ [final.webkitgtk_4_1];
+    meta = oldAttrs.meta // {broken = false;};
+  });
+
   # nixpkgs patches
-  #zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: {
-  #  npmInstallFlags = ["--no-optional"]; # Fix cross build
-  #});
-  flac1_3 = prev.flac.overrideAttrs {
+  zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs {
+    npmInstallFlags = ["--no-optional"]; # Fix cross build
+  };
+  ubootRaspberryPi3_btrfs = prev.buildUBoot {
+    defconfig = "rpi_3_defconfig";
+    extraConfig = ''
+      CONFIG_FS_BTRFS=y
+      CONFIG_CMD_BTRFS=y
+    '';
+    extraMeta.platforms = ["aarch64-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
+  # Older version of packages
+  flac134 = prev.flac.overrideAttrs {
     version = "1.3.4";
     src = final.fetchurl {
       url = "http://downloads.xiph.org/releases/flac/flac-1.3.4.tar.xz";
@@ -35,9 +57,4 @@ in {
     };
     outputs = ["out"];
   };
-  gnupg = prev.gnupg.overrideAttrs (oldAttrs: {
-    nativeBuildInputs =
-      oldAttrs.nativeBuildInputs
-      ++ (optional is_cross prev.libgpg-error);
-  });
 }
diff --git a/pkgs/dodo/default.nix b/pkgs/dodo/default.nix
new file mode 100644
index 0000000..2984de3
--- /dev/null
+++ b/pkgs/dodo/default.nix
@@ -0,0 +1,37 @@
+{
+  python3Packages,
+  fetchFromGitHub,
+  qt6,
+  copyDesktopItems,
+}:
+python3Packages.buildPythonApplication {
+  pname = "dodo";
+  version = "250313";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "akissinger";
+    repo = "dodo";
+    rev = "c108dd93aa637ef757fa8d86cf210d37093f03ec";
+    hash = "sha256-tRLaPOh2y87zcBKTtZazfsNzJnLUXRaAEMEMND7XnNY=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    qt6.qtwayland
+    bleach
+    pyqt6
+    pyqt6-webengine
+    python-gnupg
+    copyDesktopItems
+  ];
+
+  nativeBuildInputs = [qt6.wrapQtAppsHook];
+  dontWrapQtApps = true;
+  preFixup = ''
+    wrapQtApp "$out/bin/dodo" --prefix PATH : $out/bin/dodo
+  '';
+}
diff --git a/pkgs/sdcv/default.nix b/pkgs/sdcv/default.nix
deleted file mode 100644
index 8817270..0000000
--- a/pkgs/sdcv/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  gettext,
-  zlib,
-  glib,
-  pcre,
-  readline,
-}:
-stdenv.mkDerivation (attrs: {
-  pname = "sdcv";
-  version = "0.5.5";
-
-  src = fetchFromGitHub {
-    owner = "Dushistov";
-    repo = attrs.pname;
-    rev = "v${attrs.version}";
-    hash = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4=";
-  };
-
-  nativeBuildInputs = [cmake pkg-config gettext];
-  buildInputs = [zlib glib pcre readline];
-  makeFlags = "sdcv lang";
-
-  meta = with lib; {
-    description = "Console version of Stardict program";
-    homepage = "https://dushistov.github.io/sdcv/";
-    license = licenses.gpl2;
-  };
-})