From 5e2cea4213541535aefd147a133a092cd43442ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Jul 2023 11:28:27 +0200 Subject: [PATCH] unison: match version with tag, cleanup --- pkgs/development/compilers/unison/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 809b36ce35b..f34992c8a36 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -1,22 +1,26 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook -, ncurses6, zlib, gmp -, makeWrapper +{ lib +, autoPatchelfHook +, fetchurl +, gmp , less +, makeWrapper +, ncurses6 +, stdenv +, zlib }: stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - milestone_id = "M5b"; - version = "1.0.${finalAttrs.milestone_id}-alpha"; + version = "M5b"; - src = if (stdenv.isDarwin) then + src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-macos.tar.gz"; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; hash = "sha256-Uknt1NrywmGs8YovlnN8TU8iaYgT1jeYP4SQCuK1u+I="; } else fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-linux.tar.gz"; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; hash = "sha256-CZLGA4fFFysxHkwedC8RBLmHWwr3BM8xqps7hN3TC/g="; }; @@ -25,7 +29,8 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; dontConfigure = true; - nativeBuildInputs = [ makeWrapper ] ++ (lib.optional (!stdenv.isDarwin) autoPatchelfHook); + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses6 zlib gmp ]; installPhase = ''