3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

19 commits

Author SHA1 Message Date
Alyssa Ross fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
Felix Bühler 91932cbdfa
sublime3/4: deprecate phases (#130169) 2021-07-14 15:16:07 +02:00
Jan Tojnar 2d95945420
sublime3: remove updateScript
Sublime 3 is EOL and the latest version file now points to sublime text 4 releases so let’s remove the update script.
2021-05-22 20:25:24 +02:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar 794a08ca8e
sublime3{,-dev}: fix updateScript
The HTML page changed and the update script was no longer finding the latest version.
I changed it to query for the latest version using dedicated URL:

https://forum.sublimetext.com/t/fixed-download-url-for-latest-version/23763/7

Also terminated the update sooner if we detect no update available.
update-source-version handles that normally but we are cleaning the version
so that we can update both platforms at the same time.
2020-05-14 12:08:08 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar b75a43f9e0
sublime{3,-merge}: simplify code 2019-06-18 23:43:37 +02:00
Jan Tojnar e8cdece9ce
sublime3: add maintainer 2019-06-18 22:47:11 +02:00
Jan Tojnar 48d92c9461
sublime3: remove GTK 2 support
No version in the repo uses it anymore
2019-06-18 22:47:11 +02:00
Tim Zook 148119b9a6 sublime-{merge,text}: make common.nix files have a similar structure
In the future it's desired to unify Sublime packages expressions.
So them having a shared structure will make this more achievable.
2019-04-24 09:14:50 -04:00
d10n 37f416a9cd sublime3: Fix python api locale 2019-03-28 11:41:58 -04:00
Jan Tojnar a5cdac3d7c
sublime3: Add updateScript 2019-03-02 23:03:04 +01: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
Jan Tojnar 23de7958bf
sublime3-dev: 3176 → 3183
Sublime finally switched to GTK 3!
2018-12-03 23:13:24 +01:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Matthew Bauer 143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Guillaume Massé 15a2dca15c Sublime dev (#38383)
* Package sublime-dev build.

* sublime3-dev: Init at 3160

* Sublime3: Refactor to share derivation between sublime-text 3 dev and stable

* Sublime3: Refactor as a fuction to avoid duplicating parameters

* Sublime3: Remove unnecessary rec

https://github.com/NixOS/nixpkgs/pull/38383#discussion_r178898901

* sublime3-dev: 3160 -> 3161
2018-04-06 17:31:10 +01:00
Renamed from pkgs/applications/editors/sublime3/default.nix (Browse further)