From ffa38b7712d0dbb3c39fd13500de66c2bbb90498 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Thu, 21 Apr 2022 20:15:05 -0500 Subject: [PATCH] pixie: remove --- .../interpreters/pixie/default.nix | 94 -------------- pkgs/development/interpreters/pixie/dust.nix | 46 ------- .../interpreters/pixie/load_paths.patch | 25 ---- .../pixie/make-paths-configurable.patch | 119 ------------------ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 3 - 6 files changed, 2 insertions(+), 287 deletions(-) delete mode 100644 pkgs/development/interpreters/pixie/default.nix delete mode 100644 pkgs/development/interpreters/pixie/dust.nix delete mode 100644 pkgs/development/interpreters/pixie/load_paths.patch delete mode 100644 pkgs/development/interpreters/pixie/make-paths-configurable.patch diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix deleted file mode 100644 index 5b93357b2665..000000000000 --- a/pkgs/development/interpreters/pixie/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc, - pypy, libffi, libedit, libuv, boost, zlib, - variant ? "jit", buildWithPypy ? false }: - -let - commit-count = "1364"; - common-flags = "--thread --gcrootfinder=shadowstack --continuation"; - variants = { - jit = { flags = "--opt=jit"; target = "target.py"; }; - jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; }; - no-jit = { flags = ""; target = "target.py"; }; - no-jit-preload = { flags = ""; target = "target_preload.py"; }; - }; - pixie-src = fetchFromGitHub { - owner = "pixie-lang"; - repo = "pixie"; - rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62"; - sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10="; - }; - pypy-tag = "91db1a9"; - pypy-src = fetchurl { - name = "pypy-src-${pypy-tag}"; - url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2"; - sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq"; - }; - libs = [ libffi libedit libuv boost.dev boost.out zlib ]; - include-path = lib.concatStringsSep ":" - (map (p: "${p}/include") libs); - library-path = lib.concatStringsSep ":" - (map (p: "${p}/lib") libs); - bin-path = lib.concatStringsSep ":" - (map (p: "${p}/bin") [ gcc ]); - build = {flags, target}: stdenv.mkDerivation rec { - pname = "pixie"; - version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = libs; - PYTHON = if buildWithPypy - then "${pypy}/pypy-c/pypy-c" - else python2.interpreter; - unpackPhase = '' - cp -R ${pixie-src} pixie-src - mkdir pypy-src - (cd pypy-src - tar --strip-components=1 -xjf ${pypy-src}) - chmod -R +w pypy-src pixie-src - ''; - patchPhase = '' - (cd pixie-src - patch -p1 < ${./load_paths.patch} - libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]' - export libraryPaths - substituteAllInPlace ./pixie/ffi-infer.pxi) - ''; - buildPhase = ''( - PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH"; - RPYTHON="`pwd`/pypy-src/rpython/bin/rpython"; - cd pixie-src - $PYTHON $RPYTHON ${common-flags} ${target} - find pixie -name "*.pxi" -exec ./pixie-vm -c {} \; - )''; - LD_LIBRARY_PATH = library-path; - C_INCLUDE_PATH = include-path; - LIBRARY_PATH = library-path; - PATH = bin-path; - installPhase = '' - mkdir -p $out/share $out/bin - cp pixie-src/pixie-vm $out/share/pixie-vm - cp -R pixie-src/pixie $out/share/pixie - makeWrapper $out/share/pixie-vm $out/bin/pixie \ - --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \ - --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \ - --prefix LIBRARY_PATH : ${LIBRARY_PATH} \ - --prefix PATH : ${PATH} - ''; - doCheck = true; - checkPhase = '' - RES=$(./pixie-src/pixie-vm -e "(print :ok)") - if [ "$RES" != ":ok" ]; then - echo "ERROR Unexpected output: '$RES'" - return 1 - else - echo "$RES" - fi - ''; - meta = { - description = "A clojure-like lisp, built with the pypy vm toolkit"; - homepage = "https://github.com/pixie-lang/pixie"; - license = lib.licenses.lgpl3; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; - maintainers = with lib.maintainers; [ bendlas ]; - }; - }; -in build (builtins.getAttr variant variants) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix deleted file mode 100644 index 9c39b5c5ce63..000000000000 --- a/pkgs/development/interpreters/pixie/dust.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, pixie, rlwrap -}: - -stdenv.mkDerivation rec { - pname = "dust"; - version = "0-91"; - - src = fetchFromGitHub { - owner = "pixie-lang"; - repo = "dust"; - rev = "efe469661e749a71e86858fd006f61464810575a"; - sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc"; - }; - - buildInputs = [ pixie ]; - - patches = [ ./make-paths-configurable.patch ]; - - configurePhase = '' - pixiePath="${pixie}/bin/pixie" \ - basePath="$out/share/dust" \ - rlwrapPath="${rlwrap}/bin/rlwrap" \ - substituteAll dust.in dust - chmod +x dust - ''; - - # FIXME: AOT for dust - # buildPhase = '' - # find . -name "*.pxi" -exec pixie-vm -c {} \; - # ''; - - installPhase = '' - mkdir -p $out/bin $out/share/dust - cp -a src/ run.pxi $out/share/dust - mv dust $out/bin/dust - ''; - - meta = with lib; { - description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; - homepage = src.meta.homepage; - maintainers = with maintainers; [ ]; - license = licenses.lgpl3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/pixie/load_paths.patch b/pkgs/development/interpreters/pixie/load_paths.patch deleted file mode 100644 index a36d280c5867..000000000000 --- a/pkgs/development/interpreters/pixie/load_paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi -index 9f13ac7..74301c2 100644 ---- a/pixie/ffi-infer.pxi -+++ b/pixie/ffi-infer.pxi -@@ -1,15 +1,12 @@ - (ns pixie.ffi-infer - (:require [pixie.io-blocking :as io])) - -+(defn -add-library-path [p] -+ (swap! load-paths conj (str p "/include")) -+ (swap! load-paths conj (str p "/lib"))) - --(defn -add-rel-path [rel] -- (swap! load-paths conj (str (first @load-paths) "/" rel))) -- --(-add-rel-path "lib") --(-add-rel-path "include") --(-add-rel-path "../lib") --(-add-rel-path "../include") -- -+(doseq [lp @libraryPaths@] -+ (-add-library-path lp)) - - (def *config* nil) - (set-dynamic! (var *config*)) diff --git a/pkgs/development/interpreters/pixie/make-paths-configurable.patch b/pkgs/development/interpreters/pixie/make-paths-configurable.patch deleted file mode 100644 index e22e83d2ee74..000000000000 --- a/pkgs/development/interpreters/pixie/make-paths-configurable.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001 -From: Herwig Hochleitner -Date: Sun, 28 Feb 2016 16:34:14 +0100 -Subject: [PATCH] make paths configurable - ---- - dust | 52 ---------------------------------------------------- - dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 43 insertions(+), 52 deletions(-) - delete mode 100755 dust - create mode 100755 dust.in - -diff --git a/dust b/dust -deleted file mode 100755 -index ffced9b..0000000 ---- a/dust -+++ /dev/null -@@ -1,52 +0,0 @@ --#!/usr/bin/env bash -- --base_path=$0 --if [ -L "$base_path" ]; then -- base_path=`readlink $base_path` --fi --base_path=`dirname $base_path` -- --pixie_path=`which pixie-vm` --if [ -z "$pixie_path" ]; then -- echo "Error: 'pixie-vm' must be on your PATH" -- exit 1 --fi -- --function set_load_path() { -- load_path="" -- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then -- load_path="`cat .load-path`" -- fi --} -- --if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then -- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'." -- echo "To start you can run the following command:" -- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'" -- echo --fi -- --set_load_path --run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi" -- --case $1 in -- ""|"repl") -- rlwrap_cmd="" -- if [ -n "`which rlwrap`" ]; then -- rlwrap_cmd="rlwrap -aignored -n" -- fi -- $rlwrap_cmd $pixie_path $load_path -- ;; -- "run") -- shift -- file=$1 -- shift -- $pixie_path $load_path $file $@ -- ;; -- -h|--help) -- $run_dust help -- ;; -- *) -- $run_dust $@ -- ;; --esac -diff --git a/dust.in b/dust.in -new file mode 100755 -index 0000000..44a7fbd ---- /dev/null -+++ b/dust.in -@@ -0,0 +1,40 @@ -+#!/usr/bin/env bash -+ -+base_path=@basePath@ -+pixie_path=@pixiePath@ -+rlwrap_cmd=@rlwrapPath@ -+ -+function set_load_path() { -+ load_path="" -+ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then -+ load_path="`cat .load-path`" -+ fi -+} -+ -+if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then -+ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'." -+ echo "To start you can run the following command:" -+ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'" -+ echo -+fi -+ -+set_load_path -+run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi" -+ -+case $1 in -+ ""|"repl") -+ $rlwrap_cmd -aignored -n $pixie_path $load_path -+ ;; -+ "run") -+ shift -+ file=$1 -+ shift -+ $pixie_path $load_path $file $@ -+ ;; -+ -h|--help) -+ $run_dust help -+ ;; -+ *) -+ $run_dust $@ -+ ;; -+esac --- -2.7.1 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a150e2c7829..3387d0b3683e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -324,6 +324,7 @@ mapAliases ({ double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10; draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 + dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07 @@ -1002,6 +1003,7 @@ mapAliases ({ pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19 ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 + pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d08ec3d0737..0d30f0a6e415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14497,9 +14497,6 @@ with pkgs; inherit (ocamlPackages) reason; - pixie = callPackage ../development/interpreters/pixie { }; - dust = callPackage ../development/interpreters/pixie/dust.nix { }; - buildRubyGem = callPackage ../development/ruby-modules/gem { }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { inherit (darwin) DarwinTools cctools;