Commit Graph

56 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
K900
cb2cfba6f7 treewide: switch all desktop file generators to new API
Notably:
- remove explicit arguments that match the defaults
- convert everything to the right Nix types
2022-02-25 13:40:38 -08:00
Zack A
c2e95d0cbf
sublime4: 4121 -> 4126, sublime4-dev: 4112 -> 4125 2021-12-22 12:33:04 +09:00
Tim Zook
d7b6075cdc sublime4: add libcurl to application library path
See https://github.com/NixOS/nixpkgs/issues/146635
2021-12-13 15:33:19 -06:00
Felix Bühler
fbdf78236a
pkgs/applications: rename name to pname&version part 1 (#144949)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-07 21:29:51 +01:00
Amanda Cameron
eb7d94e6e3 sublime{4,-merge}: Update packages. 2021-10-31 16:09:08 -04:00
Zack A
63e74d6988
sublime4-dev: 4106 -> 4112 2021-07-15 14:24:53 -07:00
Zack A
6682e539e1
sublime4: 4107 -> 4113 2021-07-15 14:24:04 -07:00
Felix Bühler
91932cbdfa
sublime3/4: deprecate phases (#130169) 2021-07-14 15:16:07 +02:00
Jan Tojnar
6a3d82e433
sublime4: init at 4107
https://www.sublimetext.com/download

* works with my 7 year old license so far
* i686 is no longer supported
* aarch64 support has been added
* adds harware accelerated (needs libGL.so.1)
* adds python 3.8 plugin host (needs libssl.so and libcrypto.so)
2021-05-22 20:53:21 +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
Sandro Jäckel
435fe3dab2 sublime: url => urls
Fixes eval after 9bbfb26854
2021-04-07 02:41:26 +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
Guillaume Massé
297db487c2 sublimetext: 3207 -> 3211 2019-10-03 11:24:37 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00: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
Sebastian Sellmeier
96c66ee609 sublime3: 3200 -> 3207 2019-05-17 17:59:22 +02:00
Jan Tojnar
9f4ae182c1
sublime3-dev: 3203 → 3208
Build 3208
21 April 2019

    Mac: Added a workaround for a macOS OpenGL driver bug in 10.14.4

Build 3206
5 April 2019

    Performance improvements

Build 3205
3 April 2019

    Improved scrolling logic in some scenarios
    Linux: Fixed compatibility with old Linux distributions

Build 3204
2 April 2019

    Mac: Added a workaround for a MacOS issue with DisplayLink adapters
    Linux: Tweaked the way text scaling is handled
    Improved file indexing behavior in some scenarios
    Fixed block carets changing the way text selection works
2019-05-03 04:36:12 +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
zimbatm
b9038204d6
sublime3: Fix python api locale (#58491) 2019-03-29 14:38:03 +01:00
Jan Tojnar
460d5bc0f7
sublime3-dev: 3184 → 3203 2019-03-28 23:42:52 +01:00
Graham Christensen
8b261be37f
Revert "sublime3-dev: 3184 → 3203"
This reverts commit 85b69524bf as its
hash is invalid.
2019-03-28 18:30:24 -04:00
Jan Tojnar
85b69524bf
sublime3-dev: 3184 → 3203 2019-03-28 23:09:33 +01:00
d10n
37f416a9cd sublime3: Fix python api locale 2019-03-28 11:41:58 -04:00
Aaron Janse
b98e20811b sublimetext3: 3176 -> 3200 (#57600) 2019-03-13 23:35:32 +01: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
Ivan Kozik
ed7a86d175 sublime3-dev: 3183 -> 3184 2019-01-01 05:08:40 +00:00
Patrick Hilhorst
dcb5c0cd82
sublime: add new download url
The old one gave a 404. I left it there for if it ever comes back
2018-12-13 17:19:26 +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
Guillaume Massé
1de744647f sublime3: 3170 -> 3176 (#40494) 2018-05-14 17:11:44 +02:00
Guillaume Massé
8be7bb656f sublime3: 3162(dev), 3143(stable) -> 3170(stable, dev) 2018-05-07 17:10:19 +02:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Jan Tojnar
bd4ad008dd
sublime3-dev: 3161 → 3162 2018-04-16 13:06:38 +02: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
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Chris Martin
79a50c0473 sublime: add a desktop item and icons 2016-05-25 19:26:37 -04:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03: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
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Wojciech Danilo
c50314dc38 Added SublimeText3 support. SublimeText2 and SublimeText3 can be installed side by side.
They provide 'sublime', 'sublime2' and 'sublime3' commands. SublimeText3 has lower precedense than SublimeText2
because its in beta mode (for over a year now)
2014-01-27 20:50:08 +01:00