Commit graph

26 commits

Author SHA1 Message Date
Weijia Wang
9627659c22 Merge branch 'master' into staging-next 2023-11-04 17:27:09 +01:00
R. Ryantm
c0a5910229 gnustep.make: 2.9.0 -> 2.9.1 2023-11-04 09:16:30 -07:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Felix Buehler
6672dde558 treewide: use optionalAttrs instead of 'else {}' 2023-06-25 11:01:34 -03:00
Weijia Wang
4c7c8a68a0 gnustep.make: allow overriding preConfigure in gsmakeDerivation 2023-03-24 13:55:26 +02:00
Sergei Trofimovich
092d57c076 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
    pkgs/development/tools/language-servers/ansible-language-server/default.nix
2022-12-28 09:35:37 +00:00
Artturin
d78711a3e1 gnustep.base: use multiple outputs and support multiple outputs in hook
had to move the installFlagsArray in preInstallPhases so that ${!outputX} work because they're set by the multiple-output hook

unar before:
closure size 1.4G

unar after:
closure size 138.9M
2022-12-25 21:10:43 +02:00
Artturin
c01f509e44 treewide: source .attrs in builders
if theres a source $stdenv then this is needed

for structuredAttrs
2022-12-08 21:09:02 +02:00
Artturin
7db9cda1b5 gnustep.make: fix cross 2022-07-14 22:08:56 +03:00
Artturin
6a249036fb gnustep.gsmakeDerivation: fix cross eval
error: attribute 'runtimeShell' missing
2022-07-14 22:08:56 +03:00
Victor Engmark
57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
R. RyanTM
99509cff29 gnustep.make: 2.8.0 -> 2.9.0
https://github.com/gnustep/tools-make/releases/tag/make-2_9_0
2021-07-05 18:52:25 +02:00
R. RyanTM
dd60bd3422 gnustep.make: 2.8.0 -> 2.9.0 2021-05-17 14:01:02 -07:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
R. RyanTM
f5fae8fa43 gnustep.make: 2.7.0 -> 2.8.0 2020-05-22 19:57:06 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Frederik Rietdijk
01ea5635fc gnustep: fix build 2019-11-25 20:01:10 +01:00
Chuck
a45b3ad89f
makeWrapper: Remove unused extraFlagsArray feature
There is a bug in this feature: It allows extra arguments to leak in
from the environment. For example:

  $ export extraFlagsArray=date
  $ man ls

Note that you get the man page for date rather than for ls. This happens
because 'man' happens to use a wrapper (to add groff to its PATH).

An attempt to fix this was made in 5ae18574fc in PR  for
issue , but 1. That change didn't actually fix the problem because
it addressed makeWrapper's environment during the build process, not the
constructed wrapper script's environment after installation, and 2. That
change was apparently accidentally lost when merged with 7ff6eec5fd.

Rather than trying to fix the bug again, we remove the extraFlagsArray
feature, since it has never been used in the public repo in the ten
years it has been available.

wrapAclocal continues to use its own, separate flavor of extraFlagsArray
in a more limited context. The analogous bug there was fixed in
4d7d10da6b in 2011.
2019-09-25 09:23:09 -07:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
c0bw3b
9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Ryan Mulligan
633acbf5c0 gnustep-make: 2.6.8 -> 2.7.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests -h` got 0 exit code
- ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests --help` got 0 exit code
- ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests -h` and found version 2.7.0
- ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests --help` and found version 2.7.0
- ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/openapp --help` got 0 exit code
- ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/opentool --help` got 0 exit code
- ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-config --help` got 0 exit code
- found 2.7.0 with grep in /nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0
- directory tree listing: https://gist.github.com/30c82119c95760404469e4a1fcfa0d8d
2018-03-16 12:33:58 -07:00
John Ericson
046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Matthew Bauer
49bb0aa25a gnustep: attempt to fix osx building
Set with-layout=fhs. This should prevent OS X from having compat issues.
2016-08-16 21:53:45 +00:00
Matthew Bauer
2e5edbfd99 gnustep: move to pkgs/desktops/gnustep 2016-08-16 21:53:45 +00:00