From bf632643fd5647bcf366c68c496041fd5e9c8c37 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Fri, 1 May 2026 17:33:52 +0100 Subject: [PATCH] babashka-unwrapped: 1.12.217 -> 1.12.218; migrate to by-name --- .../ba/babashka-unwrapped}/completions/bb.bash | 0 .../ba/babashka-unwrapped}/completions/bb.fish | 0 .../ba/babashka-unwrapped}/completions/bb.zsh | 0 .../ba/babashka-unwrapped/package.nix} | 6 +++--- .../interpreters => by-name/ba}/babashka/clojure-tools.nix | 6 +++--- .../wrapped.nix => by-name/ba/babashka/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 7 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/{development/interpreters/babashka => by-name/ba/babashka-unwrapped}/completions/bb.bash (100%) rename pkgs/{development/interpreters/babashka => by-name/ba/babashka-unwrapped}/completions/bb.fish (100%) rename pkgs/{development/interpreters/babashka => by-name/ba/babashka-unwrapped}/completions/bb.zsh (100%) rename pkgs/{development/interpreters/babashka/default.nix => by-name/ba/babashka-unwrapped/package.nix} (96%) rename pkgs/{development/interpreters => by-name/ba}/babashka/clojure-tools.nix (62%) rename pkgs/{development/interpreters/babashka/wrapped.nix => by-name/ba/babashka/package.nix} (100%) diff --git a/pkgs/development/interpreters/babashka/completions/bb.bash b/pkgs/by-name/ba/babashka-unwrapped/completions/bb.bash similarity index 100% rename from pkgs/development/interpreters/babashka/completions/bb.bash rename to pkgs/by-name/ba/babashka-unwrapped/completions/bb.bash diff --git a/pkgs/development/interpreters/babashka/completions/bb.fish b/pkgs/by-name/ba/babashka-unwrapped/completions/bb.fish similarity index 100% rename from pkgs/development/interpreters/babashka/completions/bb.fish rename to pkgs/by-name/ba/babashka-unwrapped/completions/bb.fish diff --git a/pkgs/development/interpreters/babashka/completions/bb.zsh b/pkgs/by-name/ba/babashka-unwrapped/completions/bb.zsh similarity index 100% rename from pkgs/development/interpreters/babashka/completions/bb.zsh rename to pkgs/by-name/ba/babashka-unwrapped/completions/bb.zsh diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/by-name/ba/babashka-unwrapped/package.nix similarity index 96% rename from pkgs/development/interpreters/babashka/default.nix rename to pkgs/by-name/ba/babashka-unwrapped/package.nix index 0e517c67c139..e762e658beaa 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/by-name/ba/babashka-unwrapped/package.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "babashka-unwrapped"; - version = "1.12.217"; + version = "1.12.218"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar"; - sha256 = "sha256-5Nnzx2chre+h0SnM5spwiR9r4gjlyfc2FbgYa0spM34="; + sha256 = "sha256-CEApb2noPYfRYRDTo1RBLOZELvEuxGO4HW1CB//bky8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -69,7 +69,7 @@ buildGraalvmNativeImage (finalAttrs: { | ${lib.getExe finalAttrs.finalPackage} -I -o -e "(or (some->> *input* (filter #(= '(def version) (take 2 %))) first last last last) (throw (ex-info \"Couldn't find expected '(def version ...)' form in 'borkdude/deps.clj'.\" {})))") update-source-version babashka.clojure-tools "$clojure_tools_version" \ - --file="pkgs/development/interpreters/babashka/clojure-tools.nix" + --file="pkgs/by-name/ba/babashka/clojure-tools.nix" ''; meta = { diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/by-name/ba/babashka/clojure-tools.nix similarity index 62% rename from pkgs/development/interpreters/babashka/clojure-tools.nix rename to pkgs/by-name/ba/babashka/clojure-tools.nix index a8f87bc735b6..a537a00c7389 100644 --- a/pkgs/development/interpreters/babashka/clojure-tools.nix +++ b/pkgs/by-name/ba/babashka/clojure-tools.nix @@ -1,16 +1,16 @@ # This file tracks the Clojure tools version required by babashka. # See https://github.com/borkdude/deps.clj#deps_clj_tools_version for background. -# The `updateScript` provided in default.nix takes care of keeping it in sync, as well. +# The `updateScript` provided in babashka-unwrapped takes care of keeping it in sync, as well. { clojure, fetchurl, }: clojure.overrideAttrs (previousAttrs: { pname = "babashka-clojure-tools"; - version = "1.12.4.1597"; + version = "1.12.4.1618"; src = fetchurl { url = previousAttrs.src.url; - hash = "sha256-DgEvXVExaexDTLoonh/fVS5nHjgekL6BlFYLM9X6wkM="; + hash = "sha256-E3adptY6mN6yAkN4rhpk5O4hGsEDU0DfynppRMQc3iE="; }; }) diff --git a/pkgs/development/interpreters/babashka/wrapped.nix b/pkgs/by-name/ba/babashka/package.nix similarity index 100% rename from pkgs/development/interpreters/babashka/wrapped.nix rename to pkgs/by-name/ba/babashka/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee06ca3ffbb6..312ceec88991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4719,9 +4719,6 @@ with pkgs; acl2 = callPackage ../development/interpreters/acl2 { }; acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; - babashka-unwrapped = callPackage ../development/interpreters/babashka { }; - babashka = callPackage ../development/interpreters/babashka/wrapped.nix { }; - uiua-unstable = callPackage ../by-name/ui/uiua/package.nix { uiua_versionType = "unstable"; }; # BQN interpreters and compilers