Commit Graph

5280 Commits

Author SHA1 Message Date
Artturi
6396adbdfa
Merge pull request #164420 from corngood/build-fhs-fix 2022-03-22 19:57:02 +02:00
Alyssa Ross
da450f6b1d treewide: clean up obsolete version checks
These checks are all redundant with the check for Nix ≥2.2 in
default.nix.
2022-03-22 10:54:11 +00:00
David McFarland
d5bf6bac5c buildFHSUserEnv{Chroot,Bubblewrap}: fix handling of glib schema
An error would occur if share/glib-2.0/schema was a symlink.
2022-03-20 20:38:53 -03:00
sohalt
3619ffaeb6 rust: fix importCargoLock for repositories without toplevel Cargo.toml
Some crates do not have a Cargo.toml at the top-level, but only in
nested directories. Before this change importCargoLock used to fail with:

error: manifest path `/nix/store/some-store-path/Cargo.toml` does not exist
2022-03-17 00:15:56 -04:00
Martin Weinelt
8d18f29b60
Merge pull request #161366 from NixOS/staging-next
Staging next 2022-02-22
2022-03-15 22:31:01 +01:00
Robert Hensing
80672b6b87 fetchpatch: Fix typos 2022-03-15 19:11:10 +01:00
Vladimír Čunát
f48c1fda6b
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments.  The fetched patch is already in src.
I checked that libvirt builds.
2022-03-15 09:52:04 +01:00
Artturi
d41730c72d
Merge pull request #164133 from IvarWithoutBones/fix/nuget-to-nix
nuget-to-nix: add missing comma
2022-03-15 03:46:39 +02:00
Artturi
b54e7571e2
Merge pull request #161739 from Artturin/gsettingsfhsenv 2022-03-15 00:03:56 +02:00
Ivar Scholten
a42c074db0 nuget-to-nix: add missing comma
This fixes a regression introduced in bbcb7d3d34
2022-03-14 18:59:53 +01:00
github-actions[bot]
0ed928e4ab
Merge master into staging-next 2022-03-14 12:01:26 +00:00
Anderson Torres
8590804259
Merge pull request #164046 from AndersonTorres/metalab-mirrors
Change metalab mirrors to ibiblioPubLinux ones
2022-03-14 08:26:42 -03:00
AndersonTorres
b988e9a1f9 pkgs/build-support/fetchurl/mirrors.nix: remove metalab 2022-03-13 21:20:49 -03:00
github-actions[bot]
ea64a128d1
Merge master into staging-next 2022-03-14 00:02:12 +00:00
AndersonTorres
667902897a pkgs/build-support/fetchurl/mirrors.nix: add IBiblioPubLinux
It corresponds to old Metalab/Sunsite.
2022-03-13 18:46:11 -03:00
Vincent Laporte
b5359c444e buildDunePackage: use dune_2 by default 2022-03-13 21:19:09 +01:00
AndersonTorres
2d88a59de1 pkgs/build-support/fetchurl/mirrors.nix: add TCSH mirrors 2022-03-13 15:44:46 -03:00
AndersonTorres
953de20946 pkgs/build-support/fetchurl/mirrors.nix: reoder 2022-03-13 15:44:38 -03:00
github-actions[bot]
7573d7fe79
Merge master into staging-next 2022-03-11 18:01:20 +00:00
Sandro
5416f2ecd5
Merge pull request #162771 from IvarWithoutBones/dotnet-setuphook 2022-03-11 16:25:34 +01:00
github-actions[bot]
cac809141e
Merge master into staging-next 2022-03-10 12:01:13 +00:00
Åsmund Østvold
d8012c5458
nuget-to-nix: deterministic sorting of output list (#162187)
It is the package list output that should be sorted. The current
output sequence is not logical because '.' is sorted in front of '/'
with input sorting and is not deterministic for different language
environments.

To get a deterministic and logical sorting in environments with
different language configured, env "LC_ALL=C" is set and the produced
strings is that is sorted. To get alphabetic sorting and not a pure
ASCII value sort "--ignore-case" is added.
2022-03-10 09:11:04 +01:00
github-actions[bot]
d30e2aa8f5
Merge master into staging-next 2022-03-09 18:01:14 +00:00
Jörg Thalheim
9a5b1d3ca2 makeDesktopItem: improve error messages 2022-03-09 14:53:04 +00:00
github-actions[bot]
d47f26379a
Merge master into staging-next 2022-03-08 18:01:16 +00:00
Nick Cao
1454380313 makeDesktopItem: use desktop-file-utils from buildPackages in checkPhase 2022-03-08 12:44:36 +00:00
github-actions[bot]
c8add09e8f
Merge master into staging-next 2022-03-06 12:01:22 +00:00
Artturi
00178a6874
Merge pull request #160189 from evils/appimage-gmp
appimageTools: add gmp to the environment
2022-03-06 10:01:54 +02:00
github-actions[bot]
9dd2a8b600
Merge master into staging-next 2022-03-06 00:02:10 +00:00
Atemu
b4e2df2e10
remove networkmanager098 (#162904) 2022-03-05 22:19:36 +02:00
Ivar Scholten
d786405336 treewide: don't unnecessary set dotnet-related env vars
These have been moved to a setup hook in dotnet-{sdk,runtime,aspnetcore}
2022-03-04 14:41:18 +01:00
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
Artturin
4330797dfb appimage: add gsettings-desktop-schemas, hicolor-icon-theme to the fhs 2022-03-03 01:23:11 +02:00
Artturin
3e7e6ab84a buildFHSUserEnv{Chroot,Bubblewrap}: link gsettings-schemas to the FHS location
We shouldn't need to use wrapGAppsHook in expressions
that use this builder.
2022-03-03 01:22:09 +02: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