From d6604d0c8a808dbaf984ea7064037f52c1f5daf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jul 2023 06:14:34 +0000 Subject: [PATCH 1/2] twitterBootstrap: 5.3.0 -> 5.3.1 --- pkgs/development/web/twitter-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 7284bc95e54e..4536f36afffd 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-RUN0HbrDlUt7fMDjSHaIoTyOchSmfsMQZyATZmz2zY0="; + sha256 = "sha256-SfxkgJujf07f2vq0ViDhjGgRDCeg32L0RKDHHTWBp6Q="; }; nativeBuildInputs = [ unzip ]; From 6b377933957214303480f482bcd0c54db4d19fe1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 30 Jul 2023 22:03:51 +0200 Subject: [PATCH 2/2] twitterBootstrap: use `finalAttrs` pattern --- .../web/twitter-bootstrap/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 4536f36afffd..aad89980645d 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,20 +1,28 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib +, stdenv +, fetchurl +, unzip +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bootstrap"; version = "5.3.1"; src = fetchurl { - url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-SfxkgJujf07f2vq0ViDhjGgRDCeg32L0RKDHHTWBp6Q="; + url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip"; + hash = "sha256-SfxkgJujf07f2vq0ViDhjGgRDCeg32L0RKDHHTWBp6Q="; }; nativeBuildInputs = [ unzip ]; dontBuild = true; installPhase = '' + runHook preInstall + mkdir $out cp -r * $out/ + + runHook postInstall ''; meta = { @@ -22,5 +30,4 @@ stdenv.mkDerivation rec { homepage = "https://getbootstrap.com/"; license = lib.licenses.mit; }; - -} +})