Commit graph

5246 commits

Author SHA1 Message Date
github-actions[bot] fc22d0d5e2
Merge master into staging-next 2022-03-04 12:01:33 +00:00
Justin Bedő d0c44f5955
Merge pull request #162673 from cfhammill/cfh/singularity-fix
singularity: enable setting vm mem in buildImage
2022-03-04 21:44:50 +11:00
Chris Hammill 976d703d23 singularity: enable setting vm mem in buildImage 2022-03-03 17:09:48 -05:00
github-actions[bot] 2a58d6a788
Merge master into staging-next 2022-03-03 00:06:54 +00:00
Lassulus 1d8b13942b
Merge pull request #161504 from moinessim/writefsharp
writers: Add writeFSharp and makeFSharpWriter functions to writers
2022-03-02 20:05:18 +01:00
github-actions[bot] a97d52b348
Merge master into staging-next 2022-03-02 18:05:41 +00:00
Jörg Thalheim b750049336
Revert "buildDotnetModule: enable RestoreUseStaticGraphEvaluation"
This reverts commit 0b1856bfe3.

This broke one of our clients projects where a local libary could no
longer be found. Since there is no easy way to disable it's better
if this flag is set per project using `dotnetRestoreFlags`.
2022-03-02 11:14:26 +01:00
github-actions[bot] cd1f27794e
Merge master into staging-next 2022-03-02 06:11:13 +00:00
Uri Baghin 5c9e0c9459
Merge pull request #161003 from reckenrode/squircle-fix
desktopToDarwinBundle: fix squircle icons
2022-03-02 14:34:28 +11:00
Randy Eckenrode 8a2fdda938
desktopToDarwinBundle: use Bash arithmetic
Co-authored-by: Uri Baghin <uri@canva.com>
2022-03-01 22:00:13 -05:00
Randy Eckenrode d2748e84f8
desktopToDarwinBundle: support 48x48 icons 2022-03-01 21:59:22 -05:00
github-actions[bot] 9e44972094
Merge master into staging-next 2022-03-01 00:06:40 +00:00
Moises Nessim 81998d0a1d Add writeFSharp and makeFSharpWriter functions to writers
Uses fsharp interactive (fsi) to run fsx script

Expose mkNugetSource and mkNugetDeps functions

Use them in writers.writeFSharp and buildDotnetModule

Add tests
2022-02-28 17:40:43 -05:00
K900 1e2662c5fd treewide: fix some desktop file names
pkgs.writeTextFile doesn't like spaces in filenames.
This is fixed in #162246, but other tools will probably dislike
spaces in .desktop file names as well, and that PR will take forever,
so let's fix this anyway.
2022-02-28 20:15:33 +03:00
github-actions[bot] 6787116890
Merge master into staging-next 2022-02-28 00:02:07 +00:00
Daniel Fullmer 0a8007498f bash: use default PATH in FHS environments
If bash is executed within an environment where PATH is not set, it uses
the DEFAULT_PATH_VALUE compiled into bash to set PATH. In nixpkgs we set
this to /no-such-path by default. This makes sense in a nixpkgs/NixOS
environment since paths like /bin or /usr/bin should not be used.
However, when bash is used inside an FHS environment, this produces
results that differ from distributions which follow the FHS standard.

Before this change:
$ steam-run env -i /bin/bash -c 'echo $PATH'
/no-such-path

After this change:
$ steam-run env -i /bin/bash -c 'echo $PATH'
/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:.
2022-02-27 15:59:39 -08:00
Guillaume Girol b9ecdae495
Merge pull request #161344 from ulrikstrid/ulrikstrid/tree-wide-native-inputs
ocamlPackages tree-wide: Move buildInputs that should be nativeBuildInputs
2022-02-27 19:49:07 +00:00
github-actions[bot] 6fab7a16fa
Merge master into staging-next 2022-02-27 12:01:09 +00:00
Jörg Thalheim 9cbcf56032
Merge pull request #155257 from IvarWithoutBones/dotnetModule-setuphook
buildDotnetModule: use setup hooks
2022-02-27 06:46:21 +00:00
AndersonTorres ed2b1b4b90 Merge branch 'master' into staging-next 2022-02-26 21:04:25 -03:00
Jonathan Ringer 24cbda98f3 fetchzip: remove need for overrideAttrs 2022-02-26 08:58:08 -08:00
Vincent Laporte 68e4b639a3
Merge pull request #161111 from ulrikstrid/ulrikstrid/coq-move-dune-to-native
coq: Move dune, ocaml and findlib to nativeBuildInputs
2022-02-26 08:54:53 +01:00
K900 0c713dbed4 build-support/makeDesktopItem: make fully declarative, add all missing options
This updates makeDesktopItem to explicitly support all the fields in the spec,
converts list-like fields to native Nix lists instead of semicolon-separated strings,
and allows automatically generating [Desktop Action] sections from Nix code
instead of hardcoding them as extraConfig strings.
2022-02-25 13:40:38 -08:00
Ulrik Strid 7e20e9039e coqPackages: tree-wide move packages to nativeBuildInputs and add strictDeps = true
Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
2022-02-25 07:54:17 +01:00
Ulrik Strid a13cdfe520 ocamlPackages tree-wide: Move buildInputs that should be nativeBuildInputs
To keep this for the future we also strictDeps where possible, including for janePackages, topkg, oasis and ocamlbuild.
This makes some closures significantly smaller and makes cross compilation easier
2022-02-24 14:39:27 +01:00
Randy Eckenrode 30a09ae9ac
desktopToDarwinBundle: fix squircle icons
- Convert icons to a single .icns file; and
- Provide an opt-out via X-macOS-Squircle in the desktop item to
  override the squircle behavior when the source icons look bad when
  converted automatically.
2022-02-23 20:29:52 -05:00
github-actions[bot] 37f89e2837
Merge master into staging-next 2022-02-23 18:01:10 +00:00
Maciej Krüger 0bd82b7767
flutter.mkFlutterApp: fix installing .desktop
Previously this was pulling from $built, which got moved to $out/app,
so the glob didn't do anything. Now uses find on $out/app
2022-02-23 15:10:59 +01:00
Maciej Krüger 1495ce56ba
flutter.mkFlutterApp: allow extra fetch commands
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-02-23 15:10:57 +01:00
Maciej Krüger 847b557ef3
flutter.mkFlutterApp: disable fetch buildPhase
Otherwise it tries to run some other commands, this prevents that

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-02-23 15:02:43 +01:00
github-actions[bot] 4175f9cdcb
Merge master into staging-next 2022-02-23 00:01:51 +00:00
Guillaume Girol bedabfbcef rustPlatform.bindgenHook: init 2022-02-22 19:37:07 +01:00
Bernardo Meurer 86be4335af
Merge pull request #158047 from trofi/fix-cc-wrapper-lookup-paths
cc-wrapper: pass always -B and -L together to avoid mixing parts of libc
2022-02-20 10:49:00 -08:00
Sergei Trofimovich 649ebfbed6 cc-wrapper: change cflags order from cc/crt1/libc to crt1/libc/cc
In https://github.com/NixOS/nixpkgs/issues/158042 I noticed order
mismatch as a bootstrap build failure when building x86_64-linux
against glibc-2.35 in nixpkgs (bootstrap libs has glibc-2.27):

    expand-response-params> ld: /nix/store/p4s4jf7aq6v6z9iazll1aiqwb34aqxq9-bootstrap-tools/lib/crt1.o: in function `_start':
    expand-response-params> /build/glibc-2.27/csu/../sysdeps/x86_64/start.S:101: undefined reference to `__libc_csu_fini'
    expand-response-params> ld: /build/glibc-2.27/csu/../sysdeps/x86_64/start.S:102: undefined reference to `__libc_csu_init'
    expand-response-params> collect2: error: ld returned 1 exit status

Here crt1.o from glibc-2.27 links against libc.so.6 from glibc-2.35.

This happens because ordering of `-L` (influences `libc.so` lookup) and
`-B` (influences `crt1.o` lookup) flags differs:

    expand-response-params>   -B/...-bootstrap-tools/lib
    expand-response-params>   -B/...-glibc-2.35/lib/
    ...
    expand-response-params>   -L/...-glibc-2.35/lib
    expand-response-params>   -L/...-bootstrap-tools/lib

The change makes consistent ordering of `-L`/`-B` and allows getting to
stage4 for `glibc-2.35` target.
2022-02-20 10:45:45 +00:00
github-actions[bot] 4f8c8f9497
Merge staging-next into staging 2022-02-19 18:02:01 +00:00
Maciej Krüger fd41185d86
flutter.mkFlutterApp: init
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-02-19 15:07:41 +01:00
Maciej Krüger ba83787f0d
fetchgit: split off deterministic-git functions 2022-02-19 14:33:20 +01:00
markuskowa a2b668d7c0
Merge pull request #158484 from markuskowa/fix-blaslapack
blas/lapack: increase flexibility of wrappers
2022-02-16 09:58:58 +01:00
github-actions[bot] afc666deed
Merge staging-next into staging 2022-02-15 12:01:39 +00:00
Cyril Cohen 876cd6bcc2 coq: misc
Removing a dangling `let` that went undetected for a while
2022-02-15 10:06:07 +01:00
talyz 183147a037
makeWrapper: Don't glob in prefix/suffix
Disable file globbing in --prefix/--suffix, since bash will otherwise
try to find filenames matching the the value to be prefixed/suffixed
if it contains characters considered wildcards, such as `?` and
`*`. We want the value as is, except we also want to split it on on
the separator; hence we can't quote it.
2022-02-12 11:03:32 +01:00
IvarWithoutBones 0b1856bfe3 buildDotnetModule: enable RestoreUseStaticGraphEvaluation
This should speed up restore times a fair bit, especially for bigger
projects. Roslyn also has it enabled by default already, so I don't
expect any breakages from it.
2022-02-12 02:15:13 +01:00
IvarWithoutBones 992b656c9e buildDotnetModule: use setup hooks
This is a much more flexible way of doing things, as we can adopt and
reuse these hooks for various tasks. Syntax highlighting now also works
way better for me, which is a nice bonus :)
2022-02-12 02:15:13 +01:00
github-actions[bot] dafecf1c6d
Merge staging-next into staging 2022-02-11 18:01:48 +00:00
Markus Kowalewski 39210e89c2
lapack,blas: allow for more flexible use of ILP64 interface 2022-02-11 17:51:35 +01:00
Ivar Scholten a204ca0902 dotnetenv: move to pkgs/build-support/dotnet 2022-02-11 16:43:20 +01:00
Ivar Scholten b2b54c980a dotnetbuildhelpers: move to pkgs/build-support/dotnet 2022-02-11 16:42:07 +01:00
Ivar Scholten 1878b7b1b2 nuget-to-nix: move to pkgs/build-support/dotnet 2022-02-11 16:38:12 +01:00
Ivar Scholten b2b29319de fetchNuGet: move to pkgs/build-support/dotnet 2022-02-11 16:37:26 +01:00
Ivar Scholten 8910db35ea buildDotnetPackage: move to pkgs/build-support/dotnet 2022-02-11 16:36:41 +01:00