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
Dmitry Kozlyuk
8b89e0494c
mingw-w64: 5.0.4 -> 6.0.0
...
Version 6.0.0 brings better Win32 API coverage and bugfixes.
It's been used in various distros long enough to be considered stable.
Latest version 7.0.0 hasn't received extensive testing yet.
Announce mail:
https://sourceforge.net/p/mingw-w64/mailman/message/36416777/
2020-08-16 10:16:51 +00:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists
2019-12-30 12:58:11 +01:00
John Ericson
16f0fe7fe3
Merge remote-tracking branch 'upstream/master' into mingw-mcfthreads
2019-11-11 20:48:14 -05:00
John Ericson
04cb05d20c
gcc: Build MinGW stage two with threading library
...
Currently this is set up to be mcfgthreads, but it could be something
else instead.
2019-11-11 11:02:38 -05:00
John Ericson
999ef20129
mingw-w64 libc: Multiple outputs and parallel builds
...
Also deduplicate more of the GCC derivations.
2019-11-11 00:25:24 -05:00
John Ericson
06c5e811e6
mcfgthreads: Init from git
2019-11-11 00:25:24 -05:00
John Ericson
0a63190c31
windows top-level: Clean up with makeScope
2019-11-11 00:25:24 -05:00
Matthew Bauer
3b96c76bef
wxMSW: mark broken
...
This hasn’t worked for a while:
https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.windows.wxMSW.x86_64-linux
2019-09-18 12:51:00 -04: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
Frederik Rietdijk
fe9a3e3e63
Merge staging-next into staging
2019-08-17 09:39:23 +02: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
Yegor Timoshenko
31d5005cd6
pthreads-w32: 1.10.0 -> 2.9.1
2019-08-15 08:44:54 +00:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Florian Klink
ddfc4797fb
windows.mingwrt: fix src url
2019-06-15 13:33:32 +02:00
Matthew Bauer
febda2b127
Revert "mingw: use current package set for headers"
...
This reverts commit 0307203693
.
2019-01-28 10:42:04 -05:00
Matthew Bauer
0307203693
mingw: use current package set for headers
...
gccCrossStageStatic should not need targetPackages.
Fixes #53587 .
2019-01-07 16:15:27 -06:00
John Ericson
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
...
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Matthew Bauer
e575275de7
windows: Cleanups
2018-08-10 12:05:04 -04:00
Matthew Bauer
f32e9a34c8
windows: add more meta
...
‘platforms.windows’ includes all windows platforms. Should prefer this
to using assertions.
2018-08-10 11:51:18 -04:00
Matthew Bauer
744665e3c4
mingw: add osvi.patch
...
This is apparently a typo that has not been fixed.
Also remove unused configureFlags.
2018-08-07 14:17:01 -04:00
Matthew Bauer
9cee386f38
windows: refactor
2018-08-07 14:16:55 -04:00
John Ericson
db965063b3
treewide: Make configureFlags lists
2018-08-03 17:06:03 -04:00
John Ericson
1f9838ea34
jom: Remove crossAttrs
...
Untested, but I don't think this has ever built.
2018-07-24 17:54:31 -04:00
Matthew Bauer
916f096911
Merge pull request #43890 from matthewbauer/mingw-fixes
...
Mingw fixes
2018-07-21 17:04:20 -04:00
Matthew Bauer
53cb8dc09e
windows.libgnurx: init
2018-07-21 17:00:05 -04:00
volth
52f53c69ce
pkgs/*: remove unreferenced function arguments
2018-07-21 02:48:04 +00:00
John Ericson
232bc24b56
Merge pull request #40530 from obsidiansystems/mingw-cleanup
...
MinGW, Hurd: Clean ups and crossConfig removal
2018-05-14 21:05:44 -04:00
John Ericson
9be118223b
misc mingw: Get rid of crossConfig and clean up
...
Style of dual implementation and headers derivations is take from
bb7067f882
.
2018-05-14 20:32:42 -04:00
Matthew Justin Bauer
e203a9a553
pthread-w32: add missing args
...
Fixes #40207
2018-05-09 02:51:59 -05:00
Moritz Angermann
1d3db8139e
mingw-w64: 4.0.6 -> 5.0.3
...
This came up with GHC, as GHC requires `_(un)lock_file`, which are only present in mingw-w64 >= 5.
2018-03-20 13:09:53 -04:00
Remy Goldschmidt
aec57cfabe
mingw-w64: Add enable-idl / enable-secure-api flags
2018-03-20 13:09:53 -04:00
Bojan Nikolic
db475df127
mingw-w64-pthreads: The C compiler is needed
...
It was a copy and paste error from the headers derivation. Also test in
release-cross.
2018-01-02 19:01:18 -05:00
John Ericson
bc3a6e260a
Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix
2017-12-29 15:28:56 -05:00
John Ericson
169227bfd2
Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix
2017-12-29 14:24:10 -05:00
Bojan Nikolic
2e0ebc0532
mingw-w64: Disable stack hardening of the runtime
...
Do this because it is built with the static stage
2017-12-29 14:23:30 -05:00
John Ericson
e755a8a27d
treewide: Use targetPrefix
instead of prefix
for platform name prefixes
...
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
John Ericson
b0ada07f36
wxMSW: Fix syntax --- travis eval did not catch
2017-06-28 22:31:24 -04:00
hsloan
2f37cad1b9
wxMSW-2.8: Don't use stdenv ? cross
2017-06-28 21:29:07 -04:00
hsloan
c4ab3ef580
jom: Don't use stdenc.cross
2017-06-28 21:29:07 -04:00
John Ericson
fc42ec0a5c
mingw-w64: Depend on own headers derivation
...
Without this, a `#include <float.h>` resolves incorrectly. Either the
headers weren't on the include path at all, or they only were for
local, not system, imports.
What's weird is this used to not be a problem. Not sure what other
change in e.g. cc-wrapper would affect this.
2017-06-22 17:53:51 -04:00
John Ericson
bb7067f882
mingw-w64: Clean up, especially clarifying staging
2017-06-22 17:53:51 -04:00
John Ericson
295315cc87
binutilsCross: Remove and use binutils
instead always
...
See previous commit for what was done to `binutils` to make this
possible.
There were some uses of `forcedNativePackages` added. The
combination of overrides with that attribute is highly spooky: it's
often important that if an overridden package comes from it, the
replaced arguments for that package come from it. Long term this
package set and all the spookiness should be gone and irrelevant:
"Move along, nothing to see here!"
No hashes should be changed with this commit
2017-04-25 21:36:19 -04:00
Vladimír Čunát
13df963c7e
mingw: update 3.1.0 -> 4.0.6
2016-04-21 13:38:20 +02:00
Nikolay Amiantov
c48dd664ff
jom: move to qmake4Hook
2016-04-20 18:55:55 +03:00
William A. Kennington III
a71f78acf7
libgcrypt: Massive cleanup and make 1.6 the default
2015-05-01 17:41:42 -07:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
...
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.
This also closes #1876 .
Conflicts:
pkgs/development/interpreters/lua-5/5.2.nix
pkgs/development/libraries/SDL/default.nix
pkgs/development/libraries/glew/default.nix
pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig
c6cb3276dd
windows/cygwin-setup: Drop meta.platforms attr.
...
This prevents cross-builds, so let's drop it for now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-04 00:52:39 +01:00
aszlig
1771e07e20
os-specific/windows: Add new package cygwinSetup.
...
This is primarily going to be used for vmTools.runInWindowsVM, but in
theory, it could also work with Nix on CygWin which I haven't tested.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 23:18:33 +01:00
aszlig
e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
...
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
aszlig
44cfba7950
mingw-w64-pthreads: Create based on mingw-w64.
...
The winpthreads library is part of the same source package, so let's
just override the name and the source directory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:24 +01:00
aszlig
4fde72c7d6
mingw-w64: Fix typo in preConfigure hook.
...
D'oh, no wonder the headers are of almost the same size as the main
package.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:23 +01:00
aszlig
a78c6490d7
mingw-w64: Update to new upstream version 3.1.0.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:22 +01:00
Ludovic Courtès
ea304762fe
pthread-win32: don't propagate `mingw_headers'
2013-03-29 21:46:38 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell
0332f87a0b
Adding windows jom; it does not build for me still, but it's close to it.
...
I think it's better to share it though. I wrote a comment about the expression
not building.
svn path=/nixpkgs/trunk/; revision=34365
2012-06-05 21:24:27 +00:00
Lluís Batlle i Rossell
383b76df79
Fixing mingw-w64 builds. I can build simple C++ programs with gccCrossStageFinal.
...
I also add tests for hydra; let's see if it builds far.
svn path=/nixpkgs/trunk/; revision=34232
2012-05-24 22:07:23 +00:00
Lluís Batlle i Rossell
3729f9ce5e
Trying to add a few bits of mingw-w64. To be tested.
...
svn path=/nixpkgs/trunk/; revision=34228
2012-05-24 21:23:23 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Ludovic Courtès
010edf825c
Add pthreads-w32.
...
svn path=/nixpkgs/trunk/; revision=31927
2012-01-30 09:53:45 +00:00
Ludovic Courtès
67a45c1d25
MinGW 3.20, and w32api 3.17-2.
...
svn path=/nixpkgs/trunk/; revision=31926
2012-01-30 09:53:39 +00:00
Eelco Dolstra
c556a6ea46
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
...
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Lluís Batlle i Rossell
2c8783a48b
Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added
...
to test the crossbuilding with wxGTK.
I added a new windows-specific package: wxMSW.
svn path=/nixpkgs/trunk/; revision=21634
2010-05-06 19:19:22 +00:00
Lluís Batlle i Rossell
c548c084bb
Making gcc-4.5 cross-build to mingw32 too (set by the proper config and libc = "msvcrt"
...
in the crossSystem)
svn path=/nixpkgs/trunk/; revision=21630
2010-05-06 18:22:51 +00:00