Upgrade nixpkgs #8190

cocreature · 2020-12-08T07:38:30Z

changelog_begin
changelog_end

Pull Request Checklist

Read and understand the contribution guidelines
Include appropriate tests
Set a descriptive title and thorough description
Add a reference to the issue this PR will solve, if appropriate
Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

garyverhaegen-da · 2020-12-27T13:29:13Z

/azp run

azure-pipelines · 2020-12-27T13:29:29Z

Azure Pipelines successfully started running 1 pipeline(s).

garyverhaegen-da · 2021-01-01T19:01:32Z

/azp run

azure-pipelines · 2021-01-01T19:01:49Z

Azure Pipelines successfully started running 1 pipeline(s).

cocreature · 2021-01-09T10:40:23Z

/azp run

azure-pipelines · 2021-01-09T10:40:29Z

Pull request contains merge conflicts.

cocreature · 2021-02-05T05:57:17Z

/azp run

azure-pipelines · 2021-02-05T05:57:37Z

Azure Pipelines successfully started running 1 pipeline(s).

changelog_begin changelog_end

cocreature · 2021-02-05T08:57:07Z

ci/patch_bazel_windows/patch-bazel

@@ -1,9 +1,28 @@
+From 167bee5cd95f679dc4c4e1ff732a4e251ef12633 Mon Sep 17 00:00:00 2001


I’ve removed our own debugging printf. The issue hasn’t reappeared so seems a bit pointless to keep it here.

cocreature · 2021-02-05T08:57:45Z

compatibility/WORKSPACE

@@ -62,12 +62,6 @@ common_nix_file_deps = [
    "@daml//nix:nixpkgs/default.src.json",
 ]

-nix_ghc_deps = common_nix_file_deps + [


we now use upstream GHC. The only patch we still had was the dwarf stuff and that hasn’t been used for months so I don’t think it’s worth keeping the custom GHC around.

cocreature · 2021-02-05T08:58:07Z

ci/cron/src/Main.hs

@@ -150,8 +150,7 @@ update_s3 opts temp vs = do
        -- Not going through Aeson because it represents JSON objects as
        -- unordered maps, and here order matters.
        versions_json vs = vs
-                           & map show
-                           & map (\s -> "\"" <> s <> "\": \"" <> s <> "\"")
+                           & map ((\s -> "\"" <> s <> "\": \"" <> s <> "\"") . show)


all the haskell changes are forced by the hlint upgrade.

cocreature · 2021-02-05T08:59:30Z

nix/tools/license-checker/node-env.nix

@@ -1,6 +1,6 @@
 # This file originates from node2nix

-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:


pgs.stdenv.lib is deprecated in favor of pkgs.lib.

cocreature · 2021-02-05T09:06:50Z

nix/nixpkgs/default.src.json

-  "branch": "nixpkgs-unstable",
-  "rev": "1d8018068278a717771e9ec4054dff1ebd3252b0",
-  "sha256": "1vi3wbvlvpd4200swd3594vps1fsnd7775mgzm3nnfs1imzkg00i"
+  "repo": "nixpkgs",


nixpkgs-channels is dead.

cocreature · 2021-02-05T11:25:05Z

nix/bazel.nix

@@ -29,7 +29,20 @@ let shared = rec {
    zip
    ;

-  scala = pkgs.scala_2_12;
+    scala = (pkgs.scala_2_12.override { }).overrideAttrs (attrs: {
+      # Something appears to be broken in nixpkgs' fixpoint which results in the


If someone has any idea for fixing that I’m all ears. I tried to overwrite nixosTests.scala.scala_2_12 as well but I couldn’t get it to work 🤷

Is there an issue on nixpkgs about it?

not yet, I was planning to look into it a bit more but haven’t found the time.

cocreature · 2021-02-05T11:26:03Z

nix/default.nix

-    # Note: we need to pin Terraform to 0.11 until nixpkgs includes a version
-    # of the secret provider that is compatiblz with Terraform 0.12 (1.1.0+)
-    terraform = pkgs.terraform_0_11.withPlugins (p: with p; [
+    terraform = pkgs.terraform_0_12.withPlugins (p: with p; [


@garyverhaegen-da how do I test that the security plugin works with terraform 0.12? Nix killed terraform 0.11 completely so I would hope that it works but 🤷

ci/build.yml

cocreature · 2021-02-05T17:05:40Z

/azp run

azure-pipelines · 2021-02-05T17:06:00Z

Azure Pipelines successfully started running 1 pipeline(s).

aherrmann-da

Thank you! LGTM

aherrmann-da · 2021-02-08T09:59:02Z

.bazelrc

-# Required for node_modules trees generated by yarn_install.
-common --experimental_allow_incremental_repository_updates


Flag was removed in 3.5.0. (To answer to myself why this was removed)

aherrmann-da · 2021-02-08T10:02:54Z

nix/bazel.nix

@@ -29,7 +29,20 @@ let shared = rec {
    zip
    ;

-  scala = pkgs.scala_2_12;
+    scala = (pkgs.scala_2_12.override { }).overrideAttrs (attrs: {
+      # Something appears to be broken in nixpkgs' fixpoint which results in the


Is there an issue on nixpkgs about it?

aherrmann-da · 2021-02-08T10:04:30Z

nix/nixpkgs.nix

+     packages = pkgs.haskell.packages // {
+       integer-simple = pkgs.haskell.packages.integer-simple // {
+        ghc8103 = pkgs.haskell.packages.integer-simple.ghc8103.override {
+          ghc = pkgs.haskell.compiler.integer-simple.ghc8103.overrideAttrs (old: {


Why is this needed?

Otherwise GHC fails to find otool. Added a comment (I already had, just forgot to push it 🤦)

changelog_begin changelog_end

Two changes have happened recently that have invalidated the current Terraform files: 1. The Terraform version has gone through a major, incompatible upgrade (#8190); the required updates for this are reflected in the first commit of this PR. 2. The certificate used to serve [Hoogle](https://hoogle.daml.com) was about to expire, so Edward created a new one and updated the config directly. The second commit in this PR updates the Terraform config to match that new, already-in-prod setting. Note: This PR applies cleanly, as there are no resulting changes in Terraform's perception of the target state from 1, and the change from 2 has already been applied through other channels. CHANGELOG_BEGIN CHANGELOG_END

* fixup terraform config Two changes have happened recently that have invalidated the current Terraform files: 1. The Terraform version has gone through a major, incompatible upgrade (#8190); the required updates for this are reflected in the first commit of this PR. 2. The certificate used to serve [Hoogle](https://hoogle.daml.com) was about to expire, so Edward created a new one and updated the config directly. The second commit in this PR updates the Terraform config to match that new, already-in-prod setting. Note: This PR applies cleanly, as there are no resulting changes in Terraform's perception of the target state from 1, and the change from 2 has already been applied through other channels. CHANGELOG_BEGIN CHANGELOG_END * update hoogle cert

cocreature force-pushed the upgrade-nixpkgs branch 2 times, most recently from 58f3cab to ed89b91 Compare December 8, 2020 14:10

garyverhaegen-da changed the base branch from master to main December 27, 2020 12:16

cocreature force-pushed the upgrade-nixpkgs branch 4 times, most recently from bfb008f to a542051 Compare February 4, 2021 21:43

Upgrade nixpkgs

bf0d4bf

changelog_begin changelog_end

cocreature force-pushed the upgrade-nixpkgs branch from 051fd8c to bf0d4bf Compare February 5, 2021 10:04

cocreature added 4 commits February 5, 2021 11:23

.

a4a0989

changelog_begin changelog_end

.

183c61a

changelog_begin changelog_end

No ibazel

11ced70

changelog_begin changelog_end

.

d6a5bea

changelog_begin changelog_end

cocreature force-pushed the upgrade-nixpkgs branch from 4a4be90 to bf74246 Compare February 5, 2021 14:59

Switch agent pool

25dea27

changelog_begin changelog_end

cocreature force-pushed the upgrade-nixpkgs branch from bf74246 to 25dea27 Compare February 5, 2021 16:30

cocreature marked this pull request as ready for review February 5, 2021 16:46

cocreature requested review from aherrmann-da, garyverhaegen-da, hurryabit and sofiafaro-da as code owners February 5, 2021 16:46

cocreature commented Feb 5, 2021

View reviewed changes

.

4371eee

aherrmann-da approved these changes Feb 8, 2021

View reviewed changes

.

f78a41d

changelog_begin changelog_end

cocreature added the automerge label Feb 8, 2021

mergify bot merged commit 773ddad into main Feb 8, 2021

mergify bot deleted the upgrade-nixpkgs branch February 8, 2021 11:12

garyverhaegen-da mentioned this pull request Feb 8, 2021

update Terraform files to match reality #8780

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade nixpkgs #8190

Upgrade nixpkgs #8190

cocreature commented Dec 8, 2020

garyverhaegen-da commented Dec 27, 2020

azure-pipelines bot commented Dec 27, 2020

garyverhaegen-da commented Jan 1, 2021

azure-pipelines bot commented Jan 1, 2021

cocreature commented Jan 9, 2021

azure-pipelines bot commented Jan 9, 2021

cocreature commented Feb 5, 2021

azure-pipelines bot commented Feb 5, 2021

cocreature Feb 5, 2021

cocreature Feb 5, 2021

cocreature Feb 5, 2021

cocreature Feb 5, 2021

cocreature Feb 5, 2021

cocreature Feb 5, 2021

aherrmann-da Feb 8, 2021

cocreature Feb 8, 2021

cocreature Feb 5, 2021

cocreature commented Feb 5, 2021

azure-pipelines bot commented Feb 5, 2021

aherrmann-da left a comment

aherrmann-da Feb 8, 2021 •

edited

Loading

aherrmann-da Feb 8, 2021

aherrmann-da Feb 8, 2021

cocreature Feb 8, 2021

		@@ -1,9 +1,28 @@
		From 167bee5cd95f679dc4c4e1ff732a4e251ef12633 Mon Sep 17 00:00:00 2001

		# Required for node_modules trees generated by yarn_install.
		common --experimental_allow_incremental_repository_updates

Upgrade nixpkgs #8190

Upgrade nixpkgs #8190

Conversation

cocreature commented Dec 8, 2020

Pull Request Checklist

garyverhaegen-da commented Dec 27, 2020

azure-pipelines bot commented Dec 27, 2020

garyverhaegen-da commented Jan 1, 2021

azure-pipelines bot commented Jan 1, 2021

cocreature commented Jan 9, 2021

azure-pipelines bot commented Jan 9, 2021

cocreature commented Feb 5, 2021

azure-pipelines bot commented Feb 5, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cocreature commented Feb 5, 2021

azure-pipelines bot commented Feb 5, 2021

aherrmann-da left a comment

Choose a reason for hiding this comment

aherrmann-da Feb 8, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aherrmann-da Feb 8, 2021 •

edited

Loading