Skip to content

Comments

nixpkgs: draw from release-21.11 branch#2954

Merged
mergify[bot] merged 16 commits intomasterfrom
gabor/nixpkgs-21.11
Dec 3, 2021
Merged

nixpkgs: draw from release-21.11 branch#2954
mergify[bot] merged 16 commits intomasterfrom
gabor/nixpkgs-21.11

Conversation

@ggreif
Copy link
Contributor

@ggreif ggreif commented Dec 2, 2021

Porcupine

https://discourse.nixos.org/t/21-11-has-been-released/16353


Mostly benign changes, but we can now eliminate a bunch of custom pulls from Hackage, which is a bonus. (Actually this was possible with 21.05 too, but nobody noticed.)

TODO (for follow-ups)

  • eliminate/improve nixpkgs-patched (see comment below)
  • transition to llvm-13

@ggreif ggreif force-pushed the gabor/nixpkgs-21.11 branch from b4b4b4e to 254578a Compare December 3, 2021 00:35
@ggreif ggreif force-pushed the gabor/nixpkgs-21.11 branch 2 times, most recently from fbcadfe to 782988f Compare December 3, 2021 02:26
@ggreif ggreif force-pushed the gabor/nixpkgs-21.11 branch 4 times, most recently from c4a99f3 to c28f986 Compare December 3, 2021 11:45
@ggreif ggreif force-pushed the gabor/nixpkgs-21.11 branch from c28f986 to 1113fd1 Compare December 3, 2021 11:48
@ggreif ggreif requested a review from nomeata December 3, 2021 11:58
openssl
llvm_10
llvmPackages_10.libclang
llvm_12
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a follow-on PR I'll transition to llvm_13

-> Session ()
definitionsTestCase project doc pos expected = do
response <- getDefinitions doc pos
LSP.InL response <- getDefinitions doc pos
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could fail, but we'll see when it happens!

@@ -13,9 +13,8 @@ let
nixpkgs-patched = bootstrap-pkgs.applyPatches {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nomeata I tried to short-cut the nixpkgs-patched by eliminating, but it didn't work out. I didn't invest too much time, though...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 3, 2021

Comparing from 24a9a4a to 37a40aa:
In terms of gas, 2 tests regressed and the mean change is +0.0%.
In terms of size, 3 tests improved and the mean change is -0.2%.

Copy link
Contributor

@nomeata nomeata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job!

@ggreif ggreif added the automerge-squash When ready, merge (using squash) label Dec 3, 2021
@ggreif ggreif changed the title Nixpkgs: draw from release-21.11 branch nixpkgs: draw from release-21.11 branch Dec 3, 2021
@caffeinelabs caffeinelabs deleted a comment from mergify bot Dec 3, 2021
@mergify mergify bot merged commit 2986868 into master Dec 3, 2021
@mergify mergify bot deleted the gabor/nixpkgs-21.11 branch December 3, 2021 16:13
@mergify mergify bot removed the automerge-squash When ready, merge (using squash) label Dec 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants