diff --git a/homes/desktop.nix b/homes/desktop.nix index 980d220..6bd2945 100644 --- a/homes/desktop.nix +++ b/homes/desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, custom-pkgs, ... }: { +{ pkgs, ... }: { imports = [ ./../programs/firefox.nix @@ -30,7 +30,6 @@ tex-fmt woodpecker-cli (texlive.combine { inherit (texlive) scheme-basic latex-bin latexmk; }) - custom-pkgs.ark ]; shellAliases = { code = "codium"; }; }; diff --git a/pkgs/ark.nix b/pkgs/ark.nix deleted file mode 100644 index 5c8d456..0000000 --- a/pkgs/ark.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ pkgs, lib, ... }: - -let - version = "0.1.174"; - sha256 = { - x86_64-linux = "sha256-fZnVR5V9VaCmj4tkCrYRv3ouKr0gFukyLdEqvcb1c/8="; - aarch64-linux = "sha256-yj7UHUqnnlTz9ZYsH0UHgnhDY7bBZzff09KbYwOINj8="; - darwin = "sha256-cI1Xrico/0SHbuPwYLQNS6crJbY5gaVuAR02u5O+NPc="; - }; - -in with pkgs; -stdenv.mkDerivation { - name = "ark"; - inherit version; - src = { - x86_64-linux = fetchurl { - url = - "https://github.com/posit-dev/ark/releases/download/${version}/ark-${version}-linux-x64.zip"; - sha256 = sha256.x86_64-linux; - }; - aarch64-linux = fetchurl { - url = - "https://github.com/posit-dev/ark/releases/download/${version}/ark-${version}-linux-arm64.zip"; - sha256 = sha256.aarch64-linux; - }; - x86_64-darwin = fetchurl { - url = - "https://github.com/posit-dev/ark/releases/download/${version}/ark-${version}-darwin-universal.zip"; - sha256 = sha256.darwin; - }; - aarch64-darwin = fetchurl { - url = - "https://github.com/posit-dev/ark/releases/download/${version}/ark-${version}-darwin-universal.zip"; - sha256 = sha256.darwin; - }; - }.${stdenv.hostPlatform.system} or (throw - "Unsupported system: ${stdenv.hostPlatform.system}"); - - # Nix reports "unpacker appears to have produced no directories" without this - # line. Not sure why sc4pac doesn't need it when it is also a zip archive, but - # I found this article that pointed me to this line: - # https://sekun.net/blog/packaging-prebuilt-binaries-with-nix/ - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/bin - unzip $src -d $out/bin - chmod +x $out/bin/ark - ''; - - meta = with lib; { - description = "Ark is an R kernel for Jupyter notebooks"; - homepage = "https://github.com/posit-dev/ark"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 2e0c11e..ce6c178 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,5 @@ { pkgs, ... }: { - ark = pkgs.callPackage ./ark.nix { }; sc4pac = pkgs.callPackage ./sc4pac.nix { }; } diff --git a/playbooks/packages.yaml b/playbooks/packages.yaml index 4fd609d..7d31ca4 100644 --- a/playbooks/packages.yaml +++ b/playbooks/packages.yaml @@ -53,9 +53,6 @@ name: - chromium - firefoxpwa - - fontconfig-devel - - freetype-devel - - fribidi-devel - ghostty - inkscape - jq @@ -63,10 +60,6 @@ - kdenlive - kdiff3 - krita - - libjpeg-devel - - libpng-devel - - libtiff-devel - - libwebp-devel - musescore - nextcloud-client - nextcloud-client-dolphin