From b8267b19884c8a130970afe6261c4082ea15d6cf Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 29 Mar 2020 22:18:25 +0200 Subject: [PATCH] update 1.31 Use the `fetch.py` script to update to dhall 1.31 and add some instructions on how to do it. --- README.md | 11 ++++++++ dhall-bash-simple.nix | 12 ++++++--- dhall-json-simple.nix | 14 ++++++---- dhall-lsp-simple.nix | 12 ++++++--- dhall-nix-simple.nix | 12 ++++++--- dhall-simple.nix | 12 ++++++--- dhall-yaml-simple.nix | 12 ++++++--- release.json | 62 +++++++++++++++++++++++++++++++++++++++++++ release.nix | 1 + 9 files changed, 123 insertions(+), 25 deletions(-) create mode 100644 release.json create mode 100644 release.nix diff --git a/README.md b/README.md index ce71e9a..1656544 100644 --- a/README.md +++ b/README.md @@ -32,3 +32,14 @@ nix-repl> drvs.dhall-simple ## NixOS: Contributors needed The derivations here have been tested by others to work on NixOS. If you have problems, open an issue. + +## Update this repository + +To update, run + +``` +./fetch.py +``` + +from the root of this repository. +It will prefetch the binaries from the latest dhall release on Github. diff --git a/dhall-bash-simple.nix b/dhall-bash-simple.nix index b444df3..128bf6e 100644 --- a/dhall-bash-simple.nix +++ b/dhall-bash-simple.nix @@ -1,16 +1,20 @@ { pkgs ? import {} }: +let + release = import ./release.nix; +in + pkgs.stdenv.mkDerivation rec { name = "dhall-bash-simple"; src = if pkgs.stdenv.isDarwin then pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-bash-1.0.28-x86_64-macos.tar.bz2"; - sha256 = "1flzfjb9qxphpgzpp9acpgxdylkn97zbrw6f3lbz6rnb2k7sc8b5"; + url = release.dhall-bash-darwin.url; + sha256 = release.dhall-bash-darwin.hash; } else pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-bash-1.0.28-x86_64-linux.tar.bz2"; - sha256 = "0v377zbna1m7mphgzmibbs35k3bshx22iwvnyciwryl9x2hglbsg"; + url = release.dhall-bash-linux.url; + sha256 = release.dhall-bash-linux.hash; }; installPhase = '' diff --git a/dhall-json-simple.nix b/dhall-json-simple.nix index f1cc659..0606859 100644 --- a/dhall-json-simple.nix +++ b/dhall-json-simple.nix @@ -1,16 +1,20 @@ { pkgs ? import {} }: +let + release = import ./release.nix; +in + pkgs.stdenv.mkDerivation rec { name = "dhall-json-simple"; src = if pkgs.stdenv.isDarwin then pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-json-1.6.2-x86_64-macos.tar.bz2"; - sha256 = "02j0lg285a1a7w4rxcmvvn3fxyn5mnxrrgzdn8j4yjdbizkq13lx"; - } + url = release.dhall-json-darwin.url; + sha256 = release.dhall-json-darwin.hash; + } else pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-json-1.6.2-x86_64-linux.tar.bz2"; - sha256 = "1wzlxcfvw1nf6g5rhnsd7g079f25n569s2gg7prrly0r9ry64dza"; + url = release.dhall-json-linux.url; + sha256 = release.dhall-json-linux.hash; }; installPhase = '' diff --git a/dhall-lsp-simple.nix b/dhall-lsp-simple.nix index 7a24e49..af18b90 100644 --- a/dhall-lsp-simple.nix +++ b/dhall-lsp-simple.nix @@ -1,16 +1,20 @@ { pkgs ? import {} }: +let + release = import ./release.nix; +in + pkgs.stdenv.mkDerivation rec { name = "dhall-lsp-simple"; src = if pkgs.stdenv.isDarwin then pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-lsp-server-1.0.5-x86_64-macos.tar.bz2"; - sha256 = "1ng7f6mrxz1yjwskdf0knlbrb1r8d95yb9sqzbfymnynvpakjn1g"; + url = release.dhall-lsp-server-darwin.url; + sha256 = release.dhall-lsp-server-darwin.hash; } else pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-lsp-server-1.0.5-x86_64-linux.tar.bz2"; - sha256 = "0bgidy98s6nn2ysfbyl13s36rc8mn1rr5lw2wdpad6achz0mr397"; + url = release.dhall-lsp-server-linux.url; + sha256 = release.dhall-lsp-server-linux.hash; }; installPhase = '' diff --git a/dhall-nix-simple.nix b/dhall-nix-simple.nix index 6b1003e..55e60e2 100644 --- a/dhall-nix-simple.nix +++ b/dhall-nix-simple.nix @@ -1,16 +1,20 @@ { pkgs ? import {} }: +let + release = import ./release.nix; +in + pkgs.stdenv.mkDerivation rec { name = "dhall-nix-simple"; src = if pkgs.stdenv.isDarwin then pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-nix-1.1.12-x86_64-macos.tar.bz2"; - sha256 = "19fyhwldla827im6xajhdwgfcim66r9ajc6rwyhl18qlhfbddqhm"; + url = release.dhall-nix-darwin.url; + sha256 = release.dhall-nix-darwin.hash; } else pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-nix-1.1.12-x86_64-linux.tar.bz2"; - sha256 = "0wskg94n64khx3advc019bxmfa67pzvjkd1q2fjpz8cnn9953gmf"; + url = release.dhall-nix-linux.url; + sha256 = release.dhall-nix-linux.hash; }; installPhase = '' diff --git a/dhall-simple.nix b/dhall-simple.nix index a90860f..aff8646 100644 --- a/dhall-simple.nix +++ b/dhall-simple.nix @@ -1,16 +1,20 @@ { pkgs ? import {} }: +let + release = import ./release.nix; +in + pkgs.stdenv.mkDerivation rec { name = "dhall-simple"; src = if pkgs.stdenv.isDarwin then pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-1.30.0-x86_64-macos.tar.bz2"; - sha256 = "03s4fj7i3jvnjk3faiqd77g46xxyj85i10jxrv2nvgy14kmx11cr"; + url = release.dhall-darwin.url; + sha256 = release.dhall-darwin.hash; } else pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-1.30.0-x86_64-linux.tar.bz2"; - sha256 = "00llrslfvlihfzryfvh8z2dz93nz1327h4ha2ks41k63x4fl4ib8"; + url = release.dhall-linux.url; + sha256 = release.dhall-linux.hash; }; installPhase = '' diff --git a/dhall-yaml-simple.nix b/dhall-yaml-simple.nix index 6844756..6f10172 100644 --- a/dhall-yaml-simple.nix +++ b/dhall-yaml-simple.nix @@ -1,16 +1,20 @@ { pkgs ? import {} }: +let + release = import ./release.nix; +in + pkgs.stdenv.mkDerivation rec { name = "dhall-yaml-simple"; src = if pkgs.stdenv.isDarwin then pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-yaml-1.0.2-x86_64-macos.tar.bz2"; - sha256 = "05hj7h682bwk721r86qjq4s24q1vy302kacak9gn7l6k05awx166"; + url = release.dhall-yaml-darwin.url; + sha256 = release.dhall-yaml-darwin.hash; } else pkgs.fetchurl { - url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.30.0/dhall-yaml-1.0.2-x86_64-linux.tar.bz2"; - sha256 = "0n8015gc7pkqppqabxw66yvdv0kzd747z3hr477bzv1aawpc8i9f"; + url = release.dhall-yaml-linux.url; + sha256 = release.dhall-yaml-linux.hash; }; installPhase = '' diff --git a/release.json b/release.json new file mode 100644 index 0000000..dbb85b8 --- /dev/null +++ b/release.json @@ -0,0 +1,62 @@ +{ + "dhall-linux": { + "name": "dhall-1.31.0-x86_64-linux.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-1.31.0-x86_64-linux.tar.bz2", + "hash": "0h8hnxgh7jpql79fgr9iv0qy0122fph64vwqld02p6cb3v7s59yd" + }, + "dhall-darwin": { + "name": "dhall-1.31.0-x86_64-macos.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-1.31.0-x86_64-macos.tar.bz2", + "hash": "063gidfq64fnbb8ixfdx9y5lraxwh1gc1hbq8x201d84c0rvldrk" + }, + "dhall-bash-linux": { + "name": "dhall-bash-1.0.29-x86_64-linux.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-bash-1.0.29-x86_64-linux.tar.bz2", + "hash": "1907b5c377gzbyghlf5gfghasm14szqj7x5bmkibxspymxwxza3h" + }, + "dhall-bash-darwin": { + "name": "dhall-bash-1.0.29-x86_64-macos.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-bash-1.0.29-x86_64-macos.tar.bz2", + "hash": "0ad0k73rvljxmrygx9vz0aiksrm4hs876k7q0vc261vmw95p5rqq" + }, + "dhall-json-linux": { + "name": "dhall-json-1.6.3-x86_64-linux.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-json-1.6.3-x86_64-linux.tar.bz2", + "hash": "0x4q39g02swkcj47r9cr53dljn06dwjrfiypp17is7csb62lhs6h" + }, + "dhall-json-darwin": { + "name": "dhall-json-1.6.3-x86_64-macos.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-json-1.6.3-x86_64-macos.tar.bz2", + "hash": "158mw49rayivb9xp6ch8cai1p6i94pa6ivpfbpjlb8j9r603jkvn" + }, + "dhall-lsp-server-linux": { + "name": "dhall-lsp-server-1.0.6-x86_64-linux.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-lsp-server-1.0.6-x86_64-linux.tar.bz2", + "hash": "1fmd5snaa7c441g994szl1chzcq0wyzjr7fkshf8jg5mw1gs1z5i" + }, + "dhall-lsp-server-darwin": { + "name": "dhall-lsp-server-1.0.6-x86_64-macos.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-lsp-server-1.0.6-x86_64-macos.tar.bz2", + "hash": "1h0rr7n0fw41fnivdaywxba5rbh007x9y627d10azd1whm7f1r3s" + }, + "dhall-nix-linux": { + "name": "dhall-nix-1.1.13-x86_64-linux.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-nix-1.1.13-x86_64-linux.tar.bz2", + "hash": "0vhrlbnky58hm975ikq47z1pc1578r5mzv8l1ppysxwi30v0riv9" + }, + "dhall-nix-darwin": { + "name": "dhall-nix-1.1.13-x86_64-macos.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-nix-1.1.13-x86_64-macos.tar.bz2", + "hash": "15i8cpwlzjsf19n8lqzfj75qspv8zkcf43nxdd1cjb6b8by1pqg6" + }, + "dhall-yaml-linux": { + "name": "dhall-yaml-1.0.3-x86_64-linux.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-yaml-1.0.3-x86_64-linux.tar.bz2", + "hash": "0bx3273s5b9rj3k4d69qazsqlfjq8yb7idfddk86kqgjxas5wkr3" + }, + "dhall-yaml-darwin": { + "name": "dhall-yaml-1.0.3-x86_64-macos.tar.bz2", + "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.31.0/dhall-yaml-1.0.3-x86_64-macos.tar.bz2", + "hash": "0crb9kara9jfskljb5v3m5whl72spamml3h6afjz8clym925ka2y" + } +} \ No newline at end of file diff --git a/release.nix b/release.nix new file mode 100644 index 0000000..435d001 --- /dev/null +++ b/release.nix @@ -0,0 +1 @@ +builtins.fromJSON (builtins.readFile ./release.json)