Commit Graph

60 Commits

Author SHA1 Message Date
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
worldofpeace
3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
374e8f4e28 pharo: remove resource files
These should be checked into upstream
2019-04-16 22:33:13 -04:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Jose San Leandro
857853d5f1 pharo: Simple fix for Iceberg (#52466)
* Simple fix for Iceberg
* Avoiding explicit libgit2 version assumption and removed libgit2 from buildInputs
2018-12-19 12:16:06 +01:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
Matthew Bauer
c491a99362 treewide: remove callPackage_i686
This has been replaced with pkgsi686Linux.callPackage
2018-07-05 14:04:52 -04:00
John Ericson
b152dcf852 pharo: Tighten source and simplify meta.platforms 2018-03-12 18:55:41 -04:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Daiderd Jordan
1531fd7351
pharo: disable on darwin 2018-01-02 19:19:37 +01:00
Orivej Desh
33071830e7 pharo: update PharoV50.sources hash 2017-11-13 19:43:30 +00:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Joachim Fasting
8d7da77fb4
pharo: set platforms based on flavor selection 2017-08-26 16:03:31 +02:00
Joachim Fasting
5ddacdc3a8
Merge remote-tracking branch 'lukego/pharo6-for-nixpkgs'
Closes https://github.com/NixOS/nixpkgs/pull/26924
2017-08-26 15:17:33 +02:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Luke Gorrie
2b3dcfab04 pharo: build with gcc48
Building with GCC > 4.9 produces a broken VM for reasons that are not
yet understood, see
http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html

also disable "stackprotector" hardening for compatibility with this
older gcc.
2017-07-10 03:49:29 +00:00
Luke Gorrie
af92427f46 pharo: Compile with -DPharoVM
This is important. The VM was not compiled in "Pharo mode" and this
made certain primitives return different values to the Smalltalk side.

(Practically speaking I am surprised that the VM has been working
basically fine for me for weeks, but this resolves a problem with
adding filetree:// repositories with Monticello that failed in an
obscure way when the file permissions lookup primitive did not behave
as expected.)

See also:
https://pharo.fogbugz.com/f/cases/20217/Image-does-not-detect-incompatible-opensmalltalk-vm
2017-07-05 04:54:50 +00:00
Luke Gorrie
448fe16856 pharo: Add PharoV60.sources to support newer images 2017-07-05 04:53:51 +00:00
Balletie
96600d5770
pharo-vm: Add third-party libraries to LD_LIBRARY_PATH of legacy VM
This commit adds the third party libraries needed by the default Pharo
environment to the LD_LIBRARY_PATH, by using makeWrapper.
2017-06-30 14:07:46 +02:00
Luke Gorrie
d55f8276ae pharo: Update build-vm.nix for latest upstream 2017-06-30 07:50:06 +00:00
Luke Gorrie
4ed1d53cbe pharo: Add missing file: vms.nix 2017-06-30 07:30:02 +00:00
Luke Gorrie
86d3b59a95 pharo: More quoting 2017-06-30 07:24:09 +00:00
Luke Gorrie
8761ef256f pharo: Removed obsolete duplicate ofwrapper.sh 2017-06-29 18:09:16 +00:00
Luke Gorrie
54be67dbd0 pharo6: Minor fixes and cleanups 2017-06-29 18:09:06 +00:00
Luke Gorrie
fdb90f6df7 pharo: 5.0 -> 6.0
Create a new set of VM packages to keep up with changes in the
upstream Pharo project.
2017-06-28 09:26:59 +00:00
Luke Gorrie
c77a54d79f pharo-vm: Disable "pic" hardening
Compiling the Pharo VM with "pic" hardening causes segmentation faults
on startup of pharo-launcher.

Resolves NixOS/nixpkgs#24541.
2017-04-03 13:58:02 +00:00
Damien Cassou
58dc8e3024
Remove myself from maintainers 2017-01-31 11:00:14 +01:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Damien Cassou
fe46fa9d17 pharo-vm5: 2016.05.04 ⇒ 2016.07.16 2016-07-19 16:40:31 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Damien Cassou
4e7e1a8fb6 Merge pull request #15261 from DamienCassou/pharo-vm5-2016.05.04
pharo-vm5: 2016.04.04 -> 2016.05.04
2016-05-06 10:04:36 +02:00
Damien Cassou
7e3f222e7d pharo-vm5: 2016.04.04 -> 2016.05.04 2016-05-06 10:03:02 +02:00
Damien Cassou
8f1fb8de5b pharo-vm: add PharoV50.sources 2016-05-06 09:29:29 +02:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Damien Cassou
21cb5fcf78 pharo-no-spur: 2015.08.06 -> 2016.02.18 2016-04-06 08:53:53 +02:00
Damien Cassou
e1ab998776 pharo-spur: 2016.02.15 -> 2016.04.04 2016-04-06 08:53:10 +02:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
745fa2fbc8 pharo-vm5: disable format hardening 2016-03-03 19:01:21 +00:00
Damien Cassou
ce549c85c8 pharo-vm: stop trying to build on darwin
Building these pharo-vm sources on darwin may be possible but doesn't
make much sense because native darwin sources exist.
2016-02-29 13:08:12 +01:00
Damien Cassou
1bd0d41e0f pharo-vm: 2016.01.14 -> 2016.02.15 2016-02-16 14:04:04 +01:00
Damien Cassou
d422861055 Refactor Pharo to allow co-installation of VMs 2016-01-18 20:14:19 +01:00
Damien Cassou
0b4c7d42a8 pharo-vm: Refactor to introduce new VMs (close #12388)
The Pharo community now has a Spur VM: this VM is the only one to
open Pharo50 images.
2016-01-15 09:29:11 +01:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Damien Cassou
ffa58ba098 Update Pharo VM and Launcher 2015-08-08 08:22:07 +02:00
Damien Cassou
bf91d04c51 Update pharo-vm to 2015.04.30 2015-06-12 22:57:30 +02:00