diff --git a/modules/nix.nix b/modules/nix.nix index 789c9de..d34927e 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -9,7 +9,6 @@ nixpkgs = { overlays = [ (self: super: { - bun-baseline = (super.callPackage ../overlays/bun-baseline.nix { }); mfcl3750cdwlpr = (super.callPackage ../overlays/mfcl3750cdw.nix { }).driver; mfcl3750cdwcupswrapper = (super.callPackage ../overlays/mfcl3750cdw.nix { }).cupswrapper; pppdf = (super.python3Packages.callPackage ../overlays/pppdf { }); diff --git a/modules/packages.nix b/modules/packages.nix index e47179a..6275fae 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -27,10 +27,10 @@ # languages gcc13 clang - universal-ctags + universal-ctags # a maintained ctags implementation rustc - cargo - go + cargo # downloads your rust project's dependencies and builds your project + go # go programming language python312 python312Packages.ptpython python312Packages.ipython @@ -39,7 +39,6 @@ openjdk17 javaPackages.openjfx17 gradle_7 - bun-baseline nodejs_20 nodenv nodePackages.yarn diff --git a/overlays/bun-baseline.nix b/overlays/bun-baseline.nix deleted file mode 100644 index add110f..0000000 --- a/overlays/bun-baseline.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenvNoCC -, callPackage -, fetchurl -, autoPatchelfHook -, unzip -, openssl -, writeShellScript -, curl -, jq -, common-updater-scripts -}: - -stdenvNoCC.mkDerivation rec { - version = "1.0.24"; - pname = "bun"; - - src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - - strictDeps = true; - nativeBuildInputs = [ unzip ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; - buildInputs = [ openssl ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -Dm 755 ./bun $out/bin/bun - runHook postInstall - ''; - passthru = { - sources = { - "x86_64-linux" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64-baseline.zip"; - sha256 = "be6240720eaf37d761ee80264a5ce2dbfb81c7cea3fea7a4e522fe89cdf8c659"; - }; - }; - updateScript = writeShellScript "update-bun" '' - set -o errexit - export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}" - NEW_VERSION=$(curl --silent https://api.github.com/repos/oven-sh/bun/releases/latest | jq '.tag_name | ltrimstr("bun-v")' --raw-output) - if [[ "${version}" = "$NEW_VERSION" ]]; then - echo "The new version same as the old version." - exit 0 - fi - for platform in ${lib.escapeShellArgs meta.platforms}; do - update-source-version "bun" "0" "${lib.fakeSha256}" --source-key="sources.$platform" - update-source-version "bun" "$NEW_VERSION" --source-key="sources.$platform" - done - ''; - }; - meta = with lib; { - homepage = "https://bun.sh"; - changelog = "https://github.com/Jarred-Sumner/bun/releases/tag/bun-v${version}"; - description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - longDescription = '' - All in one fast & easy-to-use tool. Instead of 1,000 node_modules for development, you only need bun. - ''; - license = with licenses; [ - mit # bun core - lgpl21Only # javascriptcore and webkit - ]; - maintainers = [ maintainers.bchmnn ]; - platforms = builtins.attrNames passthru.sources; - }; -} diff --git a/users/gandalf/modules/packages.nix b/users/gandalf/modules/packages.nix index f937c14..58de193 100644 --- a/users/gandalf/modules/packages.nix +++ b/users/gandalf/modules/packages.nix @@ -16,6 +16,7 @@ ghostscript # postscript interpreter (mainline version) ventoy-full # bootable usb solution isisdl # downloader for isis of tu-berlin + sage # open source mathematics software, free alternative to magma, maple, mathematica, and matlab ]; }