From de988db9c97e37cfec8418f18d872ce6d53cd1f4 Mon Sep 17 00:00:00 2001 From: t-spr Date: Mon, 29 May 2023 10:02:06 -0400 Subject: [PATCH 1/4] init at 11.0.2 --- .../development/libraries/libcs50/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/libcs50/default.nix diff --git a/pkgs/development/libraries/libcs50/default.nix b/pkgs/development/libraries/libcs50/default.nix new file mode 100644 index 000000000000..a1c466c0a826 --- /dev/null +++ b/pkgs/development/libraries/libcs50/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libcs50"; + version = "11.0.2"; + + src = fetchFromGitHub { + owner = "cs50"; + repo = "libcs50"; + rev = "v${version}"; + hash = "sha256-A4CEU5wfwykVTDIsKZnQ8co+6RwBGYGZEZxRFzQTKBI="; + }; + + installPhase = '' + mkdir $out + cp -R build/lib $out/lib + cp -R build/include $out/include + ln -sf $out/lib/libcs50.so.11.0.2 $out/lib/libcs50.so.11 + ''; + + meta = with lib; { + homepage = "https://github.com/cs50/libcs50"; + description = "CS50 Library for C"; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0590d9d12b6..4729671a4ab3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40710,4 +40710,6 @@ with pkgs; isolate = callPackage ../tools/security/isolate { }; reindeer = callPackage ../development/tools/reindeer { }; + + libcs50 = callPackage ../development/libraries/libcs50 { }; } From dc9aa0c84c812581dd6c5944f232880ed1d69be8 Mon Sep 17 00:00:00 2001 From: t-spr Date: Mon, 29 May 2023 13:33:44 -0400 Subject: [PATCH 2/4] libcs50: init at 11.0.2 --- pkgs/development/libraries/libcs50/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libcs50/default.nix b/pkgs/development/libraries/libcs50/default.nix index a1c466c0a826..a5c37ce281e0 100644 --- a/pkgs/development/libraries/libcs50/default.nix +++ b/pkgs/development/libraries/libcs50/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcs50"; version = "11.0.2"; src = fetchFromGitHub { owner = "cs50"; repo = "libcs50"; - rev = "v${version}"; + rev = finalAttrs.version; hash = "sha256-A4CEU5wfwykVTDIsKZnQ8co+6RwBGYGZEZxRFzQTKBI="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { description = "CS50 Library for C"; license = licenses.gpl3Only; }; -} +}) From 4c3e82df39cf68b803123eb664f19c2b088478dd Mon Sep 17 00:00:00 2001 From: t-spr Date: Thu, 1 Jun 2023 11:40:03 -0400 Subject: [PATCH 3/4] libcs50: init at 11.0.2 --- pkgs/development/libraries/libcs50/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libcs50/default.nix b/pkgs/development/libraries/libcs50/default.nix index a5c37ce281e0..59cc4feacd71 100644 --- a/pkgs/development/libraries/libcs50/default.nix +++ b/pkgs/development/libraries/libcs50/default.nix @@ -7,15 +7,17 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cs50"; repo = "libcs50"; - rev = finalAttrs.version; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-A4CEU5wfwykVTDIsKZnQ8co+6RwBGYGZEZxRFzQTKBI="; }; installPhase = '' + runHook preInstall mkdir $out cp -R build/lib $out/lib cp -R build/include $out/include ln -sf $out/lib/libcs50.so.11.0.2 $out/lib/libcs50.so.11 + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4729671a4ab3..a5204b83d5f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21614,6 +21614,8 @@ with pkgs; libcrossguid = callPackage ../development/libraries/libcrossguid { }; + libcs50 = callPackage ../development/libraries/libcs50 { }; + libuchardet = callPackage ../development/libraries/libuchardet { }; libchop = callPackage ../development/libraries/libchop { }; @@ -40710,6 +40712,4 @@ with pkgs; isolate = callPackage ../tools/security/isolate { }; reindeer = callPackage ../development/tools/reindeer { }; - - libcs50 = callPackage ../development/libraries/libcs50 { }; } From 3c389546e505d316adc82e1fb5d5172a74a01f1c Mon Sep 17 00:00:00 2001 From: t-spr Date: Thu, 1 Jun 2023 11:51:48 -0400 Subject: [PATCH 4/4] libcs50: init at 11.0.2 --- pkgs/development/libraries/libcs50/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcs50/default.nix b/pkgs/development/libraries/libcs50/default.nix index 59cc4feacd71..14c8190ccbf2 100644 --- a/pkgs/development/libraries/libcs50/default.nix +++ b/pkgs/development/libraries/libcs50/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cs50"; repo = "libcs50"; - rev = "refs/tags/v${finalAttrs.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-A4CEU5wfwykVTDIsKZnQ8co+6RwBGYGZEZxRFzQTKBI="; };