2 files changed, 13 insertions, 50 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 68c6951..083e325 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,13 +1,4 @@
-final: prev: let
-  # The NodeJS packages has to be build in 32bit environment if host platform is
-  # also 32bit because it uses 32bit stubs and links against 32bit OpenSSL. The
-  # only architecture that generally supports execution of 32bit is x86_64 and
-  # thus that is the only one handled here.
-  callPackageNodejs =
-    if prev.stdenv.buildPlatform.isx86_64 && prev.stdenv.is32bit
-    then prev.buildPackages.pkgsi686Linux.callPackage
-    else prev.callPackage;
-in {
+final: prev: {
   luks-hw-password = final.callPackage ./luks-hw-password {};
   dev = final.callPackage ./dev {
     devShells = import ../devShells final;
@@ -22,7 +13,7 @@ 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 {};
@@ -30,17 +21,22 @@ in {
   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 = "bd0cd0c0a0f1793ced1b3f4e41654cb8cfb32d42";
+      hash = "sha256-cQCHWP9kLU6D4op6WMz36ZpzoDKgd+FGbUDuOXoboEQ=";
+    };
+    patches = [];
+    buildInputs = oldAttrs.buildInputs ++ [final.webkitgtk_4_1];
+  });
 
   # nixpkgs patches
   zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs {
     npmInstallFlags = ["--no-optional"]; # Fix cross build
   };
-  nodejs_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {};
-  nodejs-slim_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {enableNpm = false;};
-  nodejs_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {};
-  nodejs-slim_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {enableNpm = false;};
-  nodejs_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {};
-  nodejs-slim_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {enableNpm = false;};
 
   # Older version of packages
   flac1_3 = prev.flac.overrideAttrs {
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;
-  };
-})