-
-
Notifications
You must be signed in to change notification settings - Fork 104
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 2314fb1bbfda
head repository: NixOS/nixpkgs-channels
compare: f7bc9886f9d5
Commits on Nov 25, 2019
-
stdenv: Introduce hasCC attribute
Before, we'd always use `cc = null`, and check for that. The problem is this breaks for cross compilation to platforms that don't support a C compiler. It's a very subtle issue. One might think there is no problem because we have `stdenvNoCC`, and presumably one would only build derivations that use that. The problem is that one still wants to use tools at build-time that are themselves built with a C compiler, and those are gotten via "splicing". The runtime version of those deps will explode, but the build time / `buildPackages` versions of those deps will be fine, and splicing attempts to work this by using `builtins.tryEval` to filter out any broken "higher priority" packages (runtime is the default and highest priority) so that both `foo` and `foo.nativeDrv` works. However, `tryEval` only catches certain evaluation failures (e.g. exceptions), and not arbitrary failures (such as `cc.attr` when `cc` is null). This means `tryEval` fails to let us use our build time deps, and everything comes apart. The right solution is, as usually, to get rid of splicing. Or, baring that, to make it so `foo` never works and one has to explicitly do `foo.*`. But that is a much larger change, and certaily one unsuitable to be backported to stable. Given that, we instead make an exception-throwing `cc` attribute, and create a `hasCC` attribute for those derivations which wish to condtionally use a C compiler: instead of doing `stdenv.cc or null == null` or something similar, one does `stdenv.hasCC`. This allows quering without "tripping" the exception, while also allowing `tryEval` to work. No platform without a C compiler is yet wired up by default. That will be done in a following commit.
Configuration menu - View commit details
-
Copy full SHA for 63bd851 - Browse repository at this point
Copy the full SHA 63bd851View commit details -
Add support for cross compiling to
js-ghcjs
This platform doesn't have a C compiler, and so relies and the changes in the previous commit to work.
Configuration menu - View commit details
-
Copy full SHA for c739c42 - Browse repository at this point
Copy the full SHA c739c42View commit details -
haskell genenric-builder: Make the C compiler optional
This is GHCJS, and perhaps other obscure targets.
Configuration menu - View commit details
-
Copy full SHA for ea9a2c5 - Browse repository at this point
Copy the full SHA ea9a2c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 765d260 - Browse repository at this point
Copy the full SHA 765d260View commit details
Commits on Nov 26, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 8737963 - Browse repository at this point
Copy the full SHA 8737963View commit details
Commits on Dec 24, 2019
-
Configuration menu - View commit details
-
Copy full SHA for d3ecd5b - Browse repository at this point
Copy the full SHA d3ecd5bView commit details -
Merge commit '2ed8568d837ac7aaa5c802fa87f4aa9b8c7a4ea6' into ghcjs-cr…
…oss-without-cc-19.09
Configuration menu - View commit details
-
Copy full SHA for 2411aa5 - Browse repository at this point
Copy the full SHA 2411aa5View commit details -
Use `buildPackages.stdenv.mkDerivation` because we are making a shell script to start hoogle on the build platform.
Configuration menu - View commit details
-
Copy full SHA for ad93663 - Browse repository at this point
Copy the full SHA ad93663View commit details -
Configuration menu - View commit details
-
Copy full SHA for 46feec0 - Browse repository at this point
Copy the full SHA 46feec0View commit details
Commits on Dec 25, 2019
-
ghcjs: get socket.io from pkgsHostHost
This is a bit dubvious, but the alternative of making nodejs a nativeBuildInput for node packages is worse. In general the cross story for interpreted languages is murky, and this fits that pattern.
Configuration menu - View commit details
-
Copy full SHA for c3c245d - Browse repository at this point
Copy the full SHA c3c245dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4528f07 - Browse repository at this point
Copy the full SHA 4528f07View commit details -
treewide: Check
stdenv.isi686
before checkingstdenv.cc.isGNU
This makes us a bit more robust to various splicing nastiness. May splicing someday go so we don't have to resort to such hacks.
John Cotton Ericson committedDec 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 95464f6 - Browse repository at this point
Copy the full SHA 95464f6View commit details -
Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without…
…-cc-19.09
John Cotton Ericson committedDec 25, 2019 Configuration menu - View commit details
-
Copy full SHA for c432f34 - Browse repository at this point
Copy the full SHA c432f34View commit details -
arrow-cpp: Check stdenv.isi686 before stdenv.cc.isGNU
John Cotton Ericson committedDec 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 37290dd - Browse repository at this point
Copy the full SHA 37290ddView commit details -
(cherry picked from commit 59dbb00)
Configuration menu - View commit details
-
Copy full SHA for ed6c877 - Browse repository at this point
Copy the full SHA ed6c877View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6253af9 - Browse repository at this point
Copy the full SHA 6253af9View commit details -
haskell generic-builder: Fix
--with-ghc
flag for GHCJS as crossOtherwise it passes `--with-ghc=ghc`, and we do the wrong thing.
Configuration menu - View commit details
-
Copy full SHA for 6a23c9d - Browse repository at this point
Copy the full SHA 6a23c9dView commit details -
Configuration menu - View commit details
-
Copy full SHA for bb76903 - Browse repository at this point
Copy the full SHA bb76903View commit details -
Configuration menu - View commit details
-
Copy full SHA for d8dd301 - Browse repository at this point
Copy the full SHA d8dd301View commit details -
Configuration menu - View commit details
-
Copy full SHA for 49550f2 - Browse repository at this point
Copy the full SHA 49550f2View commit details
Commits on Dec 30, 2019
-
steam.chroot: add at-spi2-core
Needed by CrossCode (cherry picked from commit 21958c0)
Configuration menu - View commit details
-
Copy full SHA for 5bbcc17 - Browse repository at this point
Copy the full SHA 5bbcc17View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6078f09 - Browse repository at this point
Copy the full SHA 6078f09View commit details -
Merge remote-tracking branch 'obsidian/ghcjs-cross-without-cc-common'…
… into ghcjs-cross-without-cc-19.09
Configuration menu - View commit details
-
Copy full SHA for d0c2696 - Browse repository at this point
Copy the full SHA d0c2696View commit details
Commits on Dec 31, 2019
-
Merge pull request #76545 from obsidiansystems/ghcjs-cross-without-cc…
…-19.09 stdenv, haskell: bonafied GHCJS cross compilation without stdenv.cc for 19.09
Configuration menu - View commit details
-
Copy full SHA for e3e26c9 - Browse repository at this point
Copy the full SHA e3e26c9View commit details -
opensc: 0.19.0 -> 0.20.0 (#76666)
(cherry picked from commit a436604)
Configuration menu - View commit details
-
Copy full SHA for 2f3bbb5 - Browse repository at this point
Copy the full SHA 2f3bbb5View commit details -
(cherry picked from commit 3ab3614)
Configuration menu - View commit details
-
Copy full SHA for 2ce54ed - Browse repository at this point
Copy the full SHA 2ce54edView commit details -
Merge pull request #76736 from zimbatm/release-19.09-nix-2.3.1
nix: 2.3 -> 2.3.1
Configuration menu - View commit details
-
Copy full SHA for cf17d0e - Browse repository at this point
Copy the full SHA cf17d0eView commit details -
Configuration menu - View commit details
-
Copy full SHA for d29f193 - Browse repository at this point
Copy the full SHA d29f193View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7fabfc2 - Browse repository at this point
Copy the full SHA 7fabfc2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 02fa0e0 - Browse repository at this point
Copy the full SHA 02fa0e0View commit details
Commits on Jan 1, 2020
-
Bugfixes; master has 2.9.x already. https://gitlab.labs.nic.cz/knot/knot-dns/tags/v2.8.5
Configuration menu - View commit details
-
Copy full SHA for a7191d0 - Browse repository at this point
Copy the full SHA a7191d0View commit details -
Configuration menu - View commit details
-
Copy full SHA for dce9dfa - Browse repository at this point
Copy the full SHA dce9dfaView commit details -
(cherry picked from commit 3ab3614)
Configuration menu - View commit details
-
Copy full SHA for 88ed1af - Browse repository at this point
Copy the full SHA 88ed1afView commit details -
Don't create /nix/var/nix/{gcroots,per-user}/per-user with 1777 permi…
…ssion In fact, don't create them at all because Nix does that automatically. Also remove modules/programs/shell.nix because everything it did is now done automatically by Nix. (cherry picked from commit 4e0d6a5)
Configuration menu - View commit details
-
Copy full SHA for 487288f - Browse repository at this point
Copy the full SHA 487288fView commit details -
nix-daemon.nix: Use 'nix ping-store' to initialize directories
(cherry picked from commit 27d2857)
Configuration menu - View commit details
-
Copy full SHA for 13b4d10 - Browse repository at this point
Copy the full SHA 13b4d10View commit details -
nix-daemon.nix: Shut up warning
(cherry picked from commit 9d0de0d)
Configuration menu - View commit details
-
Copy full SHA for e4ce888 - Browse repository at this point
Copy the full SHA e4ce888View commit details -
Merge pull request #76785 from flokli/nix-2.3.1
[19.09] nix: 2.3 -> 2.3.1
Configuration menu - View commit details
-
Copy full SHA for cc52180 - Browse repository at this point
Copy the full SHA cc52180View commit details
Commits on Jan 2, 2020
-
pythonPackages.pyjwt: fix tests
Rationale for this backport: not entirely sure why this starts to fail now, but this change fixes the build on 19.09: https://hydra.nixos.org/build/109120376 (cherry picked from commit 5cc8fdb)
Configuration menu - View commit details
-
Copy full SHA for ad1e1af - Browse repository at this point
Copy the full SHA ad1e1afView commit details -
matrix-synapse: 1.7.2 -> 1.7.3
https://github.com/matrix-org/synapse/releases/tag/v1.7.3 (cherry picked from commit a5689a2)
Configuration menu - View commit details
-
Copy full SHA for 0b5c626 - Browse repository at this point
Copy the full SHA 0b5c626View commit details -
nginx: Clear Last-Modified if ETag is from store
This is what I've suspected a while ago[1]: > Heads-up everyone: After testing this in a few production instances, > it seems that some browsers still get cache hits for new store paths > (and changed contents) for some reason. I highly suspect that it might > be due to the last-modified header (as mentioned in [2]). > > Going to test this with last-modified disabled for a little while and > if this is the case I think we should improve that patch by disabling > last-modified if serving from a store path. Much earlier[2] when I reviewed the patch, I wrote this: > Other than that, it looks good to me. > > However, I'm not sure what we should do with Last-Modified header. > From RFC 2616, section 13.3.4: > > - If both an entity tag and a Last-Modified value have been > provided by the origin server, SHOULD use both validators in > cache-conditional requests. This allows both HTTP/1.0 and > HTTP/1.1 caches to respond appropriately. > > I'm a bit nervous about the SHOULD here, as user agents in the wild > could possibly just use Last-Modified and use the cached content > instead. Unfortunately, I didn't pursue this any further back then because @pbogdan noted[3] the following: > Hmm, could they (assuming they are conforming): > > * If an entity tag has been provided by the origin server, MUST > use that entity tag in any cache-conditional request (using If- > Match or If-None-Match). Since running with this patch in some deployments, I found that both Firefox and Chrome/Chromium do NOT re-validate against the ETag if the Last-Modified header is still the same. So I wrote a small NixOS VM test with Geckodriver to have a test case which is closer to the real world and I indeed was able to reproduce this. Whether this is actually a bug in Chrome or Firefox is an entirely different issue and even IF it is the fault of the browsers and it is fixed at some point, we'd still need to handle this for older browser versions. Apart from clearing the header, I also recreated the patch by using a plain "git diff" with a small description on top. This should make it easier for future authors to work on that patch. [1]: NixOS/nixpkgs#48337 (comment) [2]: NixOS/nixpkgs#48337 (comment) [3]: NixOS/nixpkgs#48337 (comment) Signed-off-by: aszlig <aszlig@nix.build> (cherry picked from commit ccf55be) Reason: The issue breaks setups that serve static content via Nix store paths. I've also backported the NixOS VM test from Python to Perl.
Configuration menu - View commit details
-
Copy full SHA for f7bc988 - Browse repository at this point
Copy the full SHA f7bc988View commit details
There are no files selected for viewing
This file was deleted.