diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/overlays/haskell/default.nix | 50 | ||||
| -rw-r--r-- | third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix | 70 | ||||
| -rw-r--r-- | third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix | 33 | ||||
| -rw-r--r-- | third_party/sources/sources.json | 36 |
4 files changed, 162 insertions, 27 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 54d278a786cf..6116c5c33926 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -7,15 +7,19 @@ self: super: # overlay parameters for the nixpkgs overlay let - dhall-source = subdir: pkg: super.haskell.lib.overrideSrc pkg { - src = "${super.fetchFromGitHub { - owner = "Profpatsch"; - repo = "dhall-haskell"; - # https://github.com/dhall-lang/dhall-haskell/pull/2426 - rev = "82123817316192d39f9a3e68b8ce9c9cff0a48ed"; - sha256 = "sha256-gbHoUKIdLPIttqeV471jsT8OJz6uiI6LpHOwtLbBGHY="; - }}/${subdir}"; - }; + haskellLib = self.haskell.lib.compose; + dhall-source = subdir: pkg: + haskellLib.overrideSrc + { + src = "${super.fetchFromGitHub { + owner = "Profpatsch"; + repo = "dhall-haskell"; + # https://github.com/dhall-lang/dhall-haskell/pull/2426 + rev = "5e3a407d8ac826597d935d8398825a0ca73fc4e9"; + sha256 = "005plj6kgxlkm9npaq07kmsgmiqk50dpwb9li9w1ly4aj1zgfjnd"; + }}/${subdir}"; + } + (haskellLib.overrideCabal { patches = [ ]; } pkg); in @@ -25,6 +29,24 @@ in # TODO: this is to fix a bug in dhall-nix dhall = dhall-source "dhall" hsSuper.dhall; dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix; + + # TODO(Profpatsch): move cas-serve off superrecord + # https://github.com/agrafix/superrecord/pull/35 + # https://github.com/agrafix/superrecord/pull/37 + superrecord = haskellLib.overrideSrc + { + src = self.fetchFromGitHub { + owner = "possehl-analytics"; + repo = "superrecord"; + rev = "05c8fdd724af5189a9a8be2f30dfa55a67f8b656"; + sha256 = "0p6a280kils12ycdlp6dd7392940yzzy6xi8pjar975j38fm3x5a"; + }; + } + hsSuper.superrecord; + + # Use recently-released version that has 9.2 support + graphmod = assert hsSuper.graphmod != "1.4.5.1"; + hsSelf.callPackage ./extra-pkgs/graphmod-1.4.5.1.nix { }; }; }; @@ -35,6 +57,16 @@ in # 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(grfn): port to brick 1.4 + # Breaking changes since 0.68: + # - handleEditorEvent takes a BrickEvent (0.72) + # - EventM gains an additional type argument (1.0) + brick = hsSelf.callPackage ./extra-pkgs/brick-0.71.1.nix { }; + + # TODO(sterni): upstream into nixpkgs + binary-orphans = + haskellLib.addBuildDepends [ hsSelf.OneTuple ] hsSuper.binary-orphans; }; }; }; diff --git a/third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix b/third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix new file mode 100644 index 000000000000..e49be075c65b --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix @@ -0,0 +1,70 @@ +{ mkDerivation +, base +, bytestring +, config-ini +, containers +, contravariant +, data-clist +, deepseq +, directory +, dlist +, exceptions +, filepath +, lib +, microlens +, microlens-mtl +, microlens-th +, QuickCheck +, stm +, template-haskell +, text +, text-zipper +, transformers +, unix +, vector +, vty +, word-wrap +}: +mkDerivation { + pname = "brick"; + version = "0.71.1"; + sha256 = "49701466384534b131650bec0a2b3c4811b410a3e55a392edef8d5fa6322d254"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + config-ini + containers + contravariant + data-clist + deepseq + directory + dlist + exceptions + filepath + microlens + microlens-mtl + microlens-th + stm + template-haskell + text + text-zipper + transformers + unix + vector + vty + word-wrap + ]; + testHaskellDepends = [ + base + containers + microlens + QuickCheck + vector + vty + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; +} diff --git a/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix b/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix new file mode 100644 index 000000000000..d11e739cdd4b --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix @@ -0,0 +1,33 @@ +{ mkDerivation +, base +, Cabal +, containers +, directory +, dotgen +, filepath +, haskell-lexer +, lib +, pretty +}: +mkDerivation { + pname = "graphmod"; + version = "1.4.5.1"; + sha256 = "d72b70dd47ba85756e963681307d8dcf341e9d1f0c3b50bd34c33a4e429436cc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + Cabal + containers + directory + dotgen + filepath + haskell-lexer + pretty + ]; + executableHaskellDepends = [ base ]; + homepage = "http://github.com/yav/graphmod/wiki"; + description = "Present the module dependencies of a program as a \"dot\" graph"; + license = lib.licenses.bsd3; + mainProgram = "graphmod"; +} diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 79d1cb3fad83..138811044ac9 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1cb4409944f776fbf9ca79bbd25cd8f4c3b70069", - "sha256": "0v2bfjy00zcbn7897wxfhgpwmpgdsy1clgryrw7rzrj4mb42q7bg", + "rev": "ebbb22510930b5153de22357518ebd8ce7ed93b3", + "sha256": "1vmsk0znvjc6qlmiqgpzx07644rhfg0kgxx5l9ig9lrga1wwh8bs", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/1cb4409944f776fbf9ca79bbd25cd8f4c3b70069.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/ebbb22510930b5153de22357518ebd8ce7ed93b3.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "home-manager": { @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "d7eee202e597bc7789498a8664082cf0ffedaa8f", - "sha256": "0hfys6nblswfblm5m4ii3mnwhnihqpsvxjnd6fwa55k788x500xl", + "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea", + "sha256": "01wd61lp6sbhbvjjn0sb1waw5bbklbq4ci8k8i0chbg655yy1cld", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/d7eee202e597bc7789498a8664082cf0ffedaa8f.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/c55fa26ce05fee8e063db22918d05a73d430b2ea.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "impermanence": { @@ -65,10 +65,10 @@ "homepage": "", "owner": "nix-community", "repo": "napalm", - "rev": "61f33f63fbab96e42d4537776091945939ea1a85", - "sha256": "14s6niz5z1gqkmkgyqbml63i70w1x67sg3zwnh1f8nqa8vmdyb1i", + "rev": "7c25a05cef52dc405f4688422ce0046ca94aadcf", + "sha256": "0aff7rikmyy4c2h6981vcv2n05xvllh2dqkhqxgz80z2nfapm7wb", "type": "tarball", - "url": "https://github.com/nix-community/napalm/archive/61f33f63fbab96e42d4537776091945939ea1a85.tar.gz", + "url": "https://github.com/nix-community/napalm/archive/7c25a05cef52dc405f4688422ce0046ca94aadcf.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", - "sha256": "19vq1n9m73xfd8d521sxvxgv3fmpdk6lgwvij2cy6h88x58ijdx2", + "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", + "sha256": "0jzy84zgjgblp2ph3kb2kj5z2k05vagn6ms5m80pjr2g27m6hr37", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/652e92b8064949a11bc193b90b74cb727f2a1405.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/fad51abd42ca17a60fc1d4cb9382e2d79ae31836.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs-stable": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "631e692192eeeea85cdfb2a9dccbbfce543478b1", - "sha256": "1k75xk6b3l7xsygrwjmhxr886bznc4rvwiwavn73kkb08v245qra", + "rev": "f4827ef0518463f31a52ab2e5c500c80558fdd78", + "sha256": "119fmjgqpnyqdaxk2r0zvah75x2n10lq7vl0bl99rs1qr7xhz2cv", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/631e692192eeeea85cdfb2a9dccbbfce543478b1.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/f4827ef0518463f31a52ab2e5c500c80558fdd78.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "rustsec-advisory-db": { @@ -113,10 +113,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "487a60b7a5d4337f3ac33c504f1e03ede505bcdb", - "sha256": "102jp2ajbm2gnvh9v4mfg7xkl9a91k0iq3133ml1d9nqz1grk3h4", + "rev": "6d5b76eb3be175fd2101b83140df15673531bb7b", + "sha256": "07xj50g978j8y4z39zrb1nm071pnw13wnlbhznrbzkm6v6abmsn7", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/487a60b7a5d4337f3ac33c504f1e03ede505bcdb.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/6d5b76eb3be175fd2101b83140df15673531bb7b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } |