From 11f9306b9a90e11b549fb6fa331742e4f729da7e Mon Sep 17 00:00:00 2001 From: sterni Date: Thu, 31 Mar 2022 18:40:08 +0200 Subject: chore(3p/sources): Bump channels & overlays Use nixos-unstable-small which fixes CVE-2018-25032 (out of bounds write while compressing). * //users/grfn/xanthous: - Supporting random-fu 0.3 requires considerable changes and patching random-extras (https://github.com/aristidb/random-extras/pull/5). For now we downgrade random-fu and its dependency rvar to 0.2.*, forcing us to build xanthous with GHC 8.10.7, due to random-fu 0.2.* not supporting that version. Nix expressions for the downgraded packages are checked in to avoid the potential need to compile Haskell at pipeline eval time. - generic-arbitrary exposes a GenericArbitrary newtype now. This means we no longer have to implement it in xanthous downstream and patch generic-arbitrary to expose the GArbitrary type class. - Minor adjustments for lens 5.0: Xanthous.Game.Memo: clear needs to use ASetter' instead of Lens' Xanthous.Data.EntityMap: TraversableWithIndex no longer has an itraversed function. - Xanthous.Orphans: adjust for aeson's KeyMap, use KM.size explicitly instead of relying on MonoTraversable's length * //nix/buildLisp: the CCL issue has resurfaced, disabling the implementation once again. * //3p/arion: remove, as depot uses the nixpkgs package of it anyways. * //users/wpcarro: accomodate GHC 9.0.1's stricter parsing of operators. * //users/tazjin: disable rustfmt as it stopped respecting settings * //3p/overlays: upgrade home-manager until fix for serivce generation has landed upstream * //users/grfn/system: remove rr override, as the pinned commit is part of the 5.5.0 release shipped by nixpkgs. Change-Id: If229e7317ba48498f85170b57ee9053f6997ff8a Reviewed-on: https://cl.tvl.fyi/c/depot/+/5428 Tested-by: BuildkiteCI Autosubmit: sterni Reviewed-by: grfn Reviewed-by: tazjin Reviewed-by: wpcarro --- third_party/arion/OWNERS | 3 -- third_party/arion/default.nix | 10 ------ third_party/overlays/haskell/.skip-subtree | 1 + third_party/overlays/haskell/default.nix | 19 ++++++++-- .../overlays/haskell/extra-pkgs/random-fu-0.2.nix | 41 ++++++++++++++++++++++ .../overlays/haskell/extra-pkgs/rvar-0.2.nix | 25 +++++++++++++ .../generic-arbitrary-export-garbitrary.patch | 12 ------- third_party/overlays/tvl.nix | 26 ++++++-------- third_party/sources/sources.json | 24 ++++++------- 9 files changed, 105 insertions(+), 56 deletions(-) delete mode 100644 third_party/arion/OWNERS delete mode 100644 third_party/arion/default.nix create mode 100644 third_party/overlays/haskell/.skip-subtree create mode 100644 third_party/overlays/haskell/extra-pkgs/random-fu-0.2.nix create mode 100644 third_party/overlays/haskell/extra-pkgs/rvar-0.2.nix delete mode 100644 third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch (limited to 'third_party') diff --git a/third_party/arion/OWNERS b/third_party/arion/OWNERS deleted file mode 100644 index 79a422fcde1c..000000000000 --- a/third_party/arion/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -inherit: true -owners: - - grfn diff --git a/third_party/arion/default.nix b/third_party/arion/default.nix deleted file mode 100644 index 7b0aa4ee334a..000000000000 --- a/third_party/arion/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: - -(import - (pkgs.fetchFromGitHub { - owner = "hercules-ci"; - repo = "arion"; - rev = "db6d4d7490dff363de60cebbece3ae9361e3ce43"; - sha256 = "0d8nqmc7fjshigax2g47ips262v8ml27x0ksq59kmprgb7ckzi5l"; - }) - { inherit pkgs; }).arion diff --git a/third_party/overlays/haskell/.skip-subtree b/third_party/overlays/haskell/.skip-subtree new file mode 100644 index 000000000000..2a528eaa8a3a --- /dev/null +++ b/third_party/overlays/haskell/.skip-subtree @@ -0,0 +1 @@ +extra-pkgs need to be callPackage-ed diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 8ea57f209662..6e18752f5270 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -7,13 +7,26 @@ self: super: # overlay parameters for the nixpkgs overlay let - overrides = hsSelf: hsSuper: with super.haskell.lib; { - generic-arbitrary = appendPatch hsSuper.generic-arbitrary - [ ./patches/generic-arbitrary-export-garbitrary.patch ]; + overrides = hsSelf: hsSuper: with self.haskell.lib.compose; { + # No overrides for the default package set necessary at the moment }; in { haskellPackages = super.haskellPackages.override { inherit overrides; }; + + haskell = lib.recursiveUpdate super.haskell { + packages.ghc8107 = super.haskell.packages.ghc8107.override { + overrides = hsSelf: hsSuper: with self.haskell.lib.compose; { + # TODO(sterni): TODO(grfn): patch xanthous to work with random-fu 0.3.*, + # so we can use GHC 9.0.2 and benefit from upstream binary cache. + random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { }; + rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { }; + + # TODO(sterni): upstream this + universe-base = addBuildDepend hsSelf.OneTuple hsSuper.universe-base; + }; + }; + }; } diff --git a/third_party/overlays/haskell/extra-pkgs/random-fu-0.2.nix b/third_party/overlays/haskell/extra-pkgs/random-fu-0.2.nix new file mode 100644 index 000000000000..1626eca7be4b --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/random-fu-0.2.nix @@ -0,0 +1,41 @@ +{ mkDerivation +, base +, erf +, lib +, math-functions +, monad-loops +, mtl +, random +, random-shuffle +, random-source +, rvar +, syb +, template-haskell +, transformers +, vector +}: +mkDerivation { + pname = "random-fu"; + version = "0.2.7.7"; + sha256 = "8466bcfb5290bdc30a571c91e1eb526c419ea9773bc118996778b516cfc665ca"; + revision = "1"; + editedCabalFile = "16nhymfriygqr2by9v72vdzv93v6vhd9z07pgaji4zvv66jikv82"; + libraryHaskellDepends = [ + base + erf + math-functions + monad-loops + mtl + random + random-shuffle + random-source + rvar + syb + template-haskell + transformers + vector + ]; + homepage = "https://github.com/mokus0/random-fu"; + description = "Random number generation"; + license = lib.licenses.publicDomain; +} diff --git a/third_party/overlays/haskell/extra-pkgs/rvar-0.2.nix b/third_party/overlays/haskell/extra-pkgs/rvar-0.2.nix new file mode 100644 index 000000000000..c00f5a1a8d9b --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/rvar-0.2.nix @@ -0,0 +1,25 @@ +{ mkDerivation +, base +, lib +, MonadPrompt +, mtl +, random-source +, transformers +}: +mkDerivation { + pname = "rvar"; + version = "0.2.0.6"; + sha256 = "01e18875ffde43f9591a8acd9f60c9c51704a026e51c1a6797faecd1c7ae8cd3"; + revision = "1"; + editedCabalFile = "1jn9ivlj3k65n8d9sfsp882m5lvni1ah79mk0cvkz91pgywvkiyq"; + libraryHaskellDepends = [ + base + MonadPrompt + mtl + random-source + transformers + ]; + homepage = "https://github.com/mokus0/random-fu"; + description = "Random Variables"; + license = lib.licenses.publicDomain; +} diff --git a/third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch b/third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch deleted file mode 100644 index f0c936bfca18..000000000000 --- a/third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/Test/QuickCheck/Arbitrary/Generic.hs b/src/Test/QuickCheck/Arbitrary/Generic.hs -index fed6ab3..91f59f1 100644 ---- a/src/Test/QuickCheck/Arbitrary/Generic.hs -+++ b/src/Test/QuickCheck/Arbitrary/Generic.hs -@@ -23,6 +23,7 @@ The generated 'arbitrary' method is equivalent to - - module Test.QuickCheck.Arbitrary.Generic - ( Arbitrary(..) -+ , GArbitrary - , genericArbitrary - , genericShrink - ) where diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index a51035d0c6e2..caf0998a0a19 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -75,21 +75,15 @@ self: super: { }); }); - # Temporary workaround until the following commit is in channels: - # https://github.com/nixos/nixpkgs/commit/5819b99350d7ac6e20f91adce38e7bb22e4d6fc4 - ocamlPackages = super.ocamlPackages.overrideScope' (oself: osuper: { - uutf = - let - expectedUrls = [ - "https://erratique.ch/software/uutf/releases/uutf-${osuper.uutf.version}.tbz" - ]; - in - assert osuper.uutf.src.urls != expectedUrls; - osuper.uutf.overrideAttrs (old: { - src = self.fetchurl { - urls = expectedUrls; - sha256 = old.src.outputHash; - }; - }); + # upgrade home-manager until the service-generation fix has landed upstream + # https://github.com/nix-community/home-manager/issues/2846 + home-manager = super.home-manager.overrideAttrs (old: rec { + version = assert super.home-manager.version == "2021-12-25"; "2022-04-08"; + src = self.fetchFromGitHub { + owner = "nix-community"; + repo = "home-manager"; + rev = "f911ebbec927e8e9b582f2e32e2b35f730074cfc"; + sha256 = "07qa2qkbjczj3d0m03jpw85hfj35cbjm48xhifz3viy4khjw88vl"; + }; }); } diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 29f6f6286efa..e2417d876706 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "26da73dd9129d267f0c8c26b591ab91050c4cdc9", - "sha256": "0sd868br1jqmihgm97ma1jv8r78x1n7s7bqjk5dl4v6s2rhzy3br", + "rev": "e0f4bc33ca1776c1103d15a63f022e29486d9455", + "sha256": "1jci75bs4cz46wbkmhlf07sys75i524bi1jgf49b7glp6z8857cw", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/26da73dd9129d267f0c8c26b591ab91050c4cdc9.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/e0f4bc33ca1776c1103d15a63f022e29486d9455.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510", - "sha256": "19xfad7pxsp6nkrkjhn36w77w92m60ysq7njn711slw74yj6ibxv", + "rev": "fd364d268852561223a5ada15caad669fd72800e", + "sha256": "133i5fsx0gix37q4nxm1vfsl9hqbfzv458xykilqhgxmv45jmfl2", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/fd364d268852561223a5ada15caad669fd72800e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b168e5e62406fa2e55e132f390379a6ba22b402", - "sha256": "16baazcid93afjg75mf8w3hihyc4wilcq0mawxfrilm1xqm52265", + "rev": "715dc137b08213aabbbe0965b78ab938e5d8d3b7", + "sha256": "1q5pxys0s6nb3h1vbmmcr27frf1i5j8pzgc2gm1908yy0himi9ap", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/9b168e5e62406fa2e55e132f390379a6ba22b402.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/715dc137b08213aabbbe0965b78ab938e5d8d3b7.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -41,10 +41,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "1aca83f114ddf1e94b754a475c40b93fd764a867", - "sha256": "1kfrl2qlzg5miwhf83vf63hxizvib9a34h0jlfycfc7zp8sbdy0m", + "rev": "ce150ef8cbed58f21f235c267cd5f501ffa56756", + "sha256": "11fmzfnawg2prjl4s8z1p7xans3pnpb4gy91v0qcq3fskhsldahr", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/1aca83f114ddf1e94b754a475c40b93fd764a867.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/ce150ef8cbed58f21f235c267cd5f501ffa56756.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } -- cgit 1.4.1