git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #169664 from armeenm/remove-pixie

pixie: remove

commite006a2a2b9ef181bb42cfe2a9c64a165400cc878 authorRick van Schijndel <Mindavi@users.noreply.github.com> dateWed 4 May 2022, 22:42 (5 years ago) parent080d6f6ffa38b7
6 files changed+2−287
pkgs/development/interpreters/pixie/default.nix−94 pkgs/development/interpreters/pixie/dust.nix−46 pkgs/development/interpreters/pixie/load_paths.patch−25 pkgs/development/interpreters/pixie/make-paths-configurable.patch−119 pkgs/top-level/aliases.nix+2 pkgs/top-level/all-packages.nix−3
pkgs/development/interpreters/pixie/default.nixdeleted−94
@@ -1,94 +0,0 @@
1−{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,
2− pypy, libffi, libedit, libuv, boost, zlib,
3− variant ? "jit", buildWithPypy ? false }:
4−
5−let
6− commit-count = "1364";
7− common-flags = "--thread --gcrootfinder=shadowstack --continuation";
8− variants = {
9− jit = { flags = "--opt=jit"; target = "target.py"; };
10− jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };
11− no-jit = { flags = ""; target = "target.py"; };
12− no-jit-preload = { flags = ""; target = "target_preload.py"; };
13− };
14− pixie-src = fetchFromGitHub {
15− owner = "pixie-lang";
16− repo = "pixie";
17− rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";
18− sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";
19− };
20− pypy-tag = "91db1a9";
21− pypy-src = fetchurl {
22− name = "pypy-src-${pypy-tag}";
23− url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";
24− sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";
25− };
26− libs = [ libffi libedit libuv boost.dev boost.out zlib ];
27− include-path = lib.concatStringsSep ":"
28− (map (p: "${p}/include") libs);
29− library-path = lib.concatStringsSep ":"
30− (map (p: "${p}/lib") libs);
31− bin-path = lib.concatStringsSep ":"
32− (map (p: "${p}/bin") [ gcc ]);
33− build = {flags, target}: stdenv.mkDerivation rec {
34− pname = "pixie";
35− version = "0-r${commit-count}-${variant}";
36− nativeBuildInputs = [ makeWrapper pkg-config ];
37− buildInputs = libs;
38− PYTHON = if buildWithPypy
39− then "${pypy}/pypy-c/pypy-c"
40− else python2.interpreter;
41− unpackPhase = ''
42− cp -R ${pixie-src} pixie-src
43− mkdir pypy-src
44− (cd pypy-src
45− tar --strip-components=1 -xjf ${pypy-src})
46− chmod -R +w pypy-src pixie-src
47− '';
48− patchPhase = ''
49− (cd pixie-src
50− patch -p1 < ${./load_paths.patch}
51− libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'
52− export libraryPaths
53− substituteAllInPlace ./pixie/ffi-infer.pxi)
54− '';
55− buildPhase = ''(
56− PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";
57− RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";
58− cd pixie-src
59− $PYTHON $RPYTHON ${common-flags} ${target}
60− find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;
61− )'';
62− LD_LIBRARY_PATH = library-path;
63− C_INCLUDE_PATH = include-path;
64− LIBRARY_PATH = library-path;
65− PATH = bin-path;
66− installPhase = ''
67− mkdir -p $out/share $out/bin
68− cp pixie-src/pixie-vm $out/share/pixie-vm
69− cp -R pixie-src/pixie $out/share/pixie
70− makeWrapper $out/share/pixie-vm $out/bin/pixie \
71− --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \
72− --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \
73− --prefix LIBRARY_PATH : ${LIBRARY_PATH} \
74− --prefix PATH : ${PATH}
75− '';
76− doCheck = true;
77− checkPhase = ''
78− RES=$(./pixie-src/pixie-vm -e "(print :ok)")
79− if [ "$RES" != ":ok" ]; then
80− echo "ERROR Unexpected output: '$RES'"
81− return 1
82− else
83− echo "$RES"
84− fi
85− '';
86− meta = {
87− description = "A clojure-like lisp, built with the pypy vm toolkit";
88− homepage = "https://github.com/pixie-lang/pixie";
89− license = lib.licenses.lgpl3;
90− platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
91− maintainers = with lib.maintainers; [ bendlas ];
92− };
93− };
94−in build (builtins.getAttr variant variants)
pkgs/development/interpreters/pixie/dust.nixdeleted−46
@@ -1,46 +0,0 @@
1−{ lib, stdenv, fetchFromGitHub
2−, pixie, rlwrap
3−}:
4−
5−stdenv.mkDerivation rec {
6− pname = "dust";
7− version = "0-91";
8−
9− src = fetchFromGitHub {
10− owner = "pixie-lang";
11− repo = "dust";
12− rev = "efe469661e749a71e86858fd006f61464810575a";
13− sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc";
14− };
15−
16− buildInputs = [ pixie ];
17−
18− patches = [ ./make-paths-configurable.patch ];
19−
20− configurePhase = ''
21− pixiePath="${pixie}/bin/pixie" \
22− basePath="$out/share/dust" \
23− rlwrapPath="${rlwrap}/bin/rlwrap" \
24− substituteAll dust.in dust
25− chmod +x dust
26− '';
27−
28− # FIXME: AOT for dust
29− # buildPhase = ''
30− # find . -name "*.pxi" -exec pixie-vm -c {} \;
31− # '';
32−
33− installPhase = ''
34− mkdir -p $out/bin $out/share/dust
35− cp -a src/ run.pxi $out/share/dust
36− mv dust $out/bin/dust
37− '';
38−
39− meta = with lib; {
40− description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
41− homepage = src.meta.homepage;
42− maintainers = with maintainers; [ ];
43− license = licenses.lgpl3;
44− platforms = platforms.unix;
45− };
46−}
pkgs/development/interpreters/pixie/load_paths.patchdeleted−25
@@ -1,25 +0,0 @@
1−diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi
2−index 9f13ac7..74301c2 100644
3−--- a/pixie/ffi-infer.pxi
4−+++ b/pixie/ffi-infer.pxi
5−@@ -1,15 +1,12 @@
6− (ns pixie.ffi-infer
7− (:require [pixie.io-blocking :as io]))
8−
9−+(defn -add-library-path [p]
10−+ (swap! load-paths conj (str p "/include"))
11−+ (swap! load-paths conj (str p "/lib")))
12−
13−-(defn -add-rel-path [rel]
14−- (swap! load-paths conj (str (first @load-paths) "/" rel)))
15−-
16−-(-add-rel-path "lib")
17−-(-add-rel-path "include")
18−-(-add-rel-path "../lib")
19−-(-add-rel-path "../include")
20−-
21−+(doseq [lp @libraryPaths@]
22−+ (-add-library-path lp))
23−
24− (def *config* nil)
25− (set-dynamic! (var *config*))
pkgs/development/interpreters/pixie/make-paths-configurable.patchdeleted−119
@@ -1,119 +0,0 @@
1−From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001
2−From: Herwig Hochleitner <herwig@bendlas.net>
3−Date: Sun, 28 Feb 2016 16:34:14 +0100
4−Subject: [PATCH] make paths configurable
5−
6−---
7− dust | 52 ----------------------------------------------------
8− dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++
9− 2 files changed, 43 insertions(+), 52 deletions(-)
10− delete mode 100755 dust
11− create mode 100755 dust.in
12−
13−diff --git a/dust b/dust
14−deleted file mode 100755
15−index ffced9b..0000000
16−--- a/dust
17−+++ /dev/null
18−@@ -1,52 +0,0 @@
19−-#!/usr/bin/env bash
20−-
21−-base_path=$0
22−-if [ -L "$base_path" ]; then
23−- base_path=`readlink $base_path`
24−-fi
25−-base_path=`dirname $base_path`
26−-
27−-pixie_path=`which pixie-vm`
28−-if [ -z "$pixie_path" ]; then
29−- echo "Error: 'pixie-vm' must be on your PATH"
30−- exit 1
31−-fi
32−-
33−-function set_load_path() {
34−- load_path=""
35−- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
36−- load_path="`cat .load-path`"
37−- fi
38−-}
39−-
40−-if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
41−- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
42−- echo "To start you can run the following command:"
43−- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
44−- echo
45−-fi
46−-
47−-set_load_path
48−-run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
49−-
50−-case $1 in
51−- ""|"repl")
52−- rlwrap_cmd=""
53−- if [ -n "`which rlwrap`" ]; then
54−- rlwrap_cmd="rlwrap -aignored -n"
55−- fi
56−- $rlwrap_cmd $pixie_path $load_path
57−- ;;
58−- "run")
59−- shift
60−- file=$1
61−- shift
62−- $pixie_path $load_path $file $@
63−- ;;
64−- -h|--help)
65−- $run_dust help
66−- ;;
67−- *)
68−- $run_dust $@
69−- ;;
70−-esac
71−diff --git a/dust.in b/dust.in
72−new file mode 100755
73−index 0000000..44a7fbd
74−--- /dev/null
75−+++ b/dust.in
76−@@ -0,0 +1,40 @@
77−+#!/usr/bin/env bash
78−+
79−+base_path=@basePath@
80−+pixie_path=@pixiePath@
81−+rlwrap_cmd=@rlwrapPath@
82−+
83−+function set_load_path() {
84−+ load_path=""
85−+ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
86−+ load_path="`cat .load-path`"
87−+ fi
88−+}
89−+
90−+if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
91−+ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
92−+ echo "To start you can run the following command:"
93−+ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
94−+ echo
95−+fi
96−+
97−+set_load_path
98−+run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
99−+
100−+case $1 in
101−+ ""|"repl")
102−+ $rlwrap_cmd -aignored -n $pixie_path $load_path
103−+ ;;
104−+ "run")
105−+ shift
106−+ file=$1
107−+ shift
108−+ $pixie_path $load_path $file $@
109−+ ;;
110−+ -h|--help)
111−+ $run_dust help
112−+ ;;
113−+ *)
114−+ $run_dust $@
115−+ ;;
116−+esac
117−--
118−2.7.1
119−
pkgs/top-level/aliases.nix+2
@@ -324,6 +324,7 @@ mapAliases ({
324324 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
325325 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;
326326 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
327+ dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21
327328 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03
328329 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22
329330 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 ({
10021003 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19
10031004 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
10041005 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22
1006+ pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21
10051007 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18
10061008 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22
10071009 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02
pkgs/top-level/all-packages.nix−3
@@ -14497,9 +14497,6 @@ with pkgs;
1449714497
1449814498 inherit (ocamlPackages) reason;
1449914499
14500− pixie = callPackage ../development/interpreters/pixie { };
14501− dust = callPackage ../development/interpreters/pixie/dust.nix { };
14502−
1450314500 buildRubyGem = callPackage ../development/ruby-modules/gem { };
1450414501 defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
1450514502 inherit (darwin) DarwinTools cctools;