Skip to content

nixpkgs: draw from release-21.11 branch #2954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 16 commits into from
Dec 3, 2021
Merged

nixpkgs: draw from release-21.11 branch #2954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0540343
bump to `release-21.11` branch
ggreif Dec 2, 2021
d7b4f7a
this patch is already in the release
ggreif Dec 2, 2021
609bbcb
bump ocamlformat version
ggreif Dec 2, 2021
92a498f
ocamlformat
ggreif Dec 2, 2021
97333f9
try this
ggreif Dec 2, 2021
a7bf41f
bump to llvm_12
ggreif Dec 2, 2021
646f1ff
add menhirLib
ggreif Dec 2, 2021
6acb703
tweak
ggreif Dec 2, 2021
254578a
fresh all-cabal-hashes
ggreif Dec 3, 2021
782988f
use fetchFromGitHub
ggreif Dec 3, 2021
2f2287f
revendor
ggreif Dec 3, 2021
1113fd1
these now have newer versions in 21.11
ggreif Dec 3, 2021
96ec4b0
Revert "use fetchFromGitHub"
ggreif Dec 3, 2021
69d49ee
cleanups and hints
ggreif Dec 3, 2021
bde3a44
try to figure out whether the menhir bug is fixed
ggreif Dec 3, 2021
37a40aa
Merge branch 'master' into gabor/nixpkgs-21.11
mergify[bot] Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ let commonBuildInputs = pkgs:
pkgs.ocamlPackages.checkseum
pkgs.ocamlPackages.findlib
pkgs.ocamlPackages.menhir
pkgs.ocamlPackages.menhirLib
pkgs.ocamlPackages.cow
pkgs.ocamlPackages.num
pkgs.ocamlPackages.stdint
Expand Down Expand Up @@ -165,7 +166,7 @@ rec {
vendorRustStdDeps = "${cargoVendorTools}/bin/vendor-rust-std-deps";

# SHA256 of Rust std deps
rustStdDepsHash = "0wxx8prh66i19vd5078iky6x5bzs6ppz7c1vbcyx9h4fg0f7pfj6";
rustStdDepsHash = "sha256-jCe1HXSexW6p8QINrMtcBDO1TDWkg2glZwnf1EqLuB0";

# Vendor directory for Rust std deps
rustStdDeps = nixpkgs.stdenvNoCC.mkDerivation {
Expand Down
12 changes: 6 additions & 6 deletions nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ let
nixpkgs-patched = bootstrap-pkgs.applyPatches {
Copy link
Copy Markdown
Contributor Author

@ggreif ggreif Dec 3, 2021

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
Copy Markdown
Contributor

@nomeata nomeata Dec 3, 2021

Choose a reason for hiding this comment

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

You could copy what I did at https://github.com/dfinity/ic-hs/blob/master/nix/default.nix#L9, but it's not important

name = "nixpkgs-patched";
src = nixpkgs_src;
patches = [
./patches/124498.patch
];
# patches = [
# ];
};

pkgs =
Expand Down Expand Up @@ -46,7 +45,7 @@ let
# Rust nightly
(self: super: let
moz_overlay = import self.sources.nixpkgs-mozilla self super;
rust-channel = moz_overlay.rustChannelOf { date = "2021-10-25"; channel = "nightly"; };
rust-channel = moz_overlay.rustChannelOf { date = "2021-12-02"; channel = "nightly"; };
Comment thread
ggreif marked this conversation as resolved.
in rec {
rustc-nightly = rust-channel.rust.override {
targets = [
Expand All @@ -71,10 +70,11 @@ let
(self: super: import ./drun.nix self)

# to allow picking up more recent Haskell packages from Hackage
# don't use `fetchFromGitHub` here as we really need an intact tarball
(self: super: {
all-cabal-hashes = self.fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/66a799608f2c6e0e6c530383bc0e2bcb42ae11f2.tar.gz";
sha256 = "0ds95gacrzsqg5f0f6j533ghxzcqqn7wn1d391pcpj5g9frp01q2";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d859530d8342c52d09a73d1d125c144725b5945d.tar.gz";
sha256 = "0gjahsqqq99dc4bjcx9p3z8adpwy51w3mzrf57nib856jlvlfmv5";
};
})

Expand Down
8 changes: 4 additions & 4 deletions nix/drun.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ pkgs:

buildInputs = with pkgs; [
openssl
llvm_10
llvmPackages_10.libclang
llvm_12
Copy link
Copy Markdown
Contributor Author

@ggreif ggreif Dec 3, 2021

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

llvmPackages_12.libclang
lmdb
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
pkgs.darwin.apple_sdk.frameworks.Security
];

# needed for bindgen
LIBCLANG_PATH = "${pkgs.llvmPackages_10.libclang.lib}/lib";
CLANG_PATH = "${pkgs.llvmPackages_10.clang}/bin/clang";
LIBCLANG_PATH = "${pkgs.llvmPackages_12.libclang.lib}/lib";
CLANG_PATH = "${pkgs.llvmPackages_12.clang}/bin/clang";

# needed for ic-protobuf
PROTOC="${pkgs.protobuf}/bin/protoc";
Expand Down
4 changes: 1 addition & 3 deletions nix/generate.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ let
random = localHaskellSrc2nixWithDoc "qc-motoko" "test/random" "";
lsp-int = localHaskellSrc2nixWithDoc "lsp-int" "test/lsp-int" "";
# Packages on hackage that are newer than what's in nixpkgs
lsp-test = pkgs.haskellPackages.hackage2nix "lsp-test" "0.11.0.6";
haskell-lsp = pkgs.haskellPackages.hackage2nix "haskell-lsp" "0.23.0.0";
haskell-lsp-types = pkgs.haskellPackages.hackage2nix "haskell-lsp-types" "0.23.0.0";
# See #2954 for what to do when a custom package should become necessary.
};

allGenerated = pkgs.runCommandNoCC "generated" {
Expand Down
39 changes: 0 additions & 39 deletions nix/generated/haskell-lsp-types.nix
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions nix/generated/haskell-lsp.nix
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions nix/generated/lsp-int.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
, data-default
, directory
, filepath
, haskell-lsp-types
, hspec
, HUnit
, lens
, lib
, lsp-test
, lsp-types
, text
}:
mkDerivation {
Expand All @@ -26,11 +26,11 @@ mkDerivation {
data-default
directory
filepath
haskell-lsp-types
hspec
HUnit
lens
lsp-test
lsp-types
text
];
description = "Integration tests for the language server";
Expand Down
76 changes: 0 additions & 76 deletions nix/generated/lsp-test.nix
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions nix/haskell-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ nix: subpath:
lsp-int = super.callPackage generated/lsp-int.nix {};

# tests: dist-newstyle: getDirectoryContents:openDirStream: does not exist (No such file or directory)
lsp-test = nix.haskell.lib.dontCheck (super.callPackage generated/lsp-test.nix {});
haskell-lsp = nix.haskell.lib.dontCheck (super.callPackage generated/haskell-lsp.nix {});
haskell-lsp-types = nix.haskell.lib.dontCheck (super.callPackage generated/haskell-lsp-types.nix {});
# See #2954 for what to do when a custom package should become necessary.
}
52 changes: 0 additions & 52 deletions nix/patches/124498.patch
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,16 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "release-21.05",
"branch": "release-21.11",
"builtin": true,
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b720376c7c4da1663e155b0b2142348c8caddae9",
"sha256": "1jvrdgrz31dxmhzkdrvxk4hzhajc0404is9s0w35fcmmay9rk9yc",
"rev": "dc6b93f729ddd8cc1222279162ef05ec7eee80e7",
"sha256": "0fvdwgpsfghmdc1wx1wvqpapy7n9655jj6z1zcxfn97s93xqsxb9",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/b720376c7c4da1663e155b0b2142348c8caddae9.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/dc6b93f729ddd8cc1222279162ef05ec7eee80e7.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-mozilla": {
Expand Down
Loading