diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 09b3183e2f01c..2aec66efa9bee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10079,6 +10079,12 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + nebulka = { + email = "arapun@proton.me"; + github = "nebulka1"; + githubId = 121920704; + name = "Nebulka"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -14339,6 +14345,12 @@ githubId = 1280118; name = "Tomislav Markovski"; }; + tmarkus = { + email = "tobias@markus-regensburg.de"; + github = "hesiod"; + githubId = 3159881; + name = "Tobias Markus"; + }; tmountain = { email = "tinymountain@gmail.com"; github = "tmountain"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index bc74edf5261d8..3d96ebd8deabe 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -79,7 +79,7 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ - --set-default JAVA_HOME "$out/jre" \ + --set-default JAVA_HOME "$out/jbr" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ec1e55e3389de..644f7e734bf79 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -21,11 +21,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.6.2867.58"; + version = "5.6.2867.62"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "sha256-eRHQaKztf66o9FoCNSRyXS5Ht6d51GTilNO5DxItUCw="; + sha256 = "sha256-p5okCdvEBurL1UgqLMBhCd4caPbiOA1WZrI9TC5j6og="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 71f6f2cb7ada6..08846a4ffe89e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -112,13 +112,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-J+x3D7EpV/Kzp98AuhK8pqR26xhItG+JyfkHKc+2IA0=", + "hash": "sha256-jZYeMQW2DTGE/KyUJYGFPHGjFUGgfl11kE1jucZ5sH4=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.51.0", + "rev": "v4.52.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iL03vDNHPQTAbTRoEutRtQllFgD1wn7qFleuZ4n99q8=" + "vendorHash": "sha256-/6RbqOh5/Fpn25woV/AzmkTs1qnIo+sl3fKQxCtVZHQ=" }, "azuread": { "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", @@ -130,11 +130,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-dD2o0b5JQ1bZIBFshe+JkfkO5C0a3OvUwfrO2dgIiO8=", + "hash": "sha256-eDlRnJUo561edblydjBGePJzMFRqtEqKnS+8HOhKGdA=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.40.0", + "rev": "v3.41.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -825,13 +825,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=", + "hash": "sha256-wKs5XRyyCda6pljtuo8ukAQl5ZZxeDSyt0CQWe8eXqY=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.40.0", + "rev": "v3.41.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0=" + "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -1014,13 +1014,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=", + "hash": "sha256-UgZr2ZFN5RvB7BG+DIXK6eSvTyvaVUKoBTIQ6aAfCpY=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.20.0", + "rev": "v6.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ=" + "vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1032,11 +1032,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=", + "hash": "sha256-0nofzwxzf19T9klfzp+h3icyN4S92nPfq/HN+qaHK/E=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.55.1", + "rev": "v0.56.0", "spdx": "MIT", "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 99f5e0e249f63..9fe6221d494dc 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.1.1"; + version = "23.1.2"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-BMisfFMy3kNoZHCYbGqzT9hxzVpKBUN6fSOilPw9O1w="; + sha256 = "sha256-yfsptsatmi0A+qLKHxchaLuu0WkJnUk7sjs1Pb/D6NU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index e117af03b57dd..4c5f3162febdb 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk_8, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }: stdenv.mkDerivation rec { - pname = "ANTs"; + pname = "ANTs"; version = "2.4.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 22950326e8674..84551eeb6311f 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -2,19 +2,30 @@ lib, python3, fetchFromGitHub, + fetchpatch, wrapQtAppsHook, }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-wKKjMcOx7NS2VAIk3OTAj7KWE1+CeAzctdgdidT+HMA="; + rev = "v${version}"; + sha256 = "sha256-CLfgDQt2rOXtWwvEhlXEstPp28nFhuhiAPYL6EjZVu4="; }; + # Fix for https://github.com/NanoVNA-Saver/nanovna-saver/issues/579 + # Try dropping the patch in the next release after v0.5.4 + patches = [ + (fetchpatch { + name = "remote-changelog-from-setup-py.patch"; + url = "https://github.com/NanoVNA-Saver/${pname}/commit/d654ea0441939e4e1c599d1333b587a185394fbe.diff"; + sha256 = "sha256-ifOhiWD0EYyQZRKp2W3G6crmWslca+/21APmhpfP/xE="; + }) + ]; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -47,6 +58,6 @@ python3.pkgs.buildPythonApplication rec { generally display and analyze the resulting data. ''; license = licenses.gpl3Only; - maintainers = with maintainers; [ zaninime ]; + maintainers = with maintainers; [ zaninime tmarkus ]; }; } diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix new file mode 100644 index 0000000000000..54f3cf7700be8 --- /dev/null +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, SDL_compat }: + +stdenv.mkDerivation rec { + pname = "rvvm"; + version = "unstable-2023-01-25"; + + src = fetchFromGitHub { + owner = "LekKit"; + repo = "RVVM"; + rev = "4de27d7083db34bd074b4f056d6eb3871ccf5c10"; + sha256 = "sha256-FjEcXfweL6FzA6iLxl9XnKaD4Fh/wZuRTJzZzHkc/B4="; + }; + + buildInputs = [ SDL_compat ]; + + makeFlags = + [ "BUILDDIR=out" "BINARY=rvvm" "USE_SDL=1" "GIT_COMMIT=${src.rev}" "all" "lib" ] + # work around https://github.com/NixOS/nixpkgs/issues/19098 + ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto"; + + installPhase = '' + runHook preInstall + + install -d $out/{bin,lib,include/devices} + install -m755 out/rvvm -t $out/bin + install -m755 out/librvvm.{a,so} -t $out/lib + install -m644 src/rvvmlib.h -t $out/include + install -m644 src/devices/*.h -t $out/include/devices + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/LekKit/RVVM"; + description = "The RISC-V Virtual Machine"; + license = with licenses; [ gpl3 /* or */ mpl20 ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nebulka ]; + }; +} diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix index 1aa3dace78523..36cfdcfaed33c 100644 --- a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix +++ b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swayest-workstyle"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Lyr-7D1h"; repo = "swayest_workstyle"; rev = version; - sha256 = "sha256-LciTrYbmJV0y0H6QH88vTBXbDdDSx6FQtO4J/CFLjtY="; + sha256 = "sha256-C2Nz6fBwaj+cOxIfoBu+9T+CoJ5Spc1TAJcQWdIF/+I="; }; - cargoSha256 = "sha256-34Ij3Hd1JI6d1vhv1XomFc9SFoB/6pbS39upLk+NeQM="; + cargoHash = "sha256-6pAlJmpyv2a1XCZQLOYilxJAGPbPmkEz1ynTLa0RjE0="; doCheck = false; # No tests diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 2995f85f93e83..22b686684f989 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "andagii"; version = "1.0.2"; -in (fetchzip { - name = "andagii-${version}"; - url = "http://www.i18nguy.com/unicode/andagii.zip"; - curlOpts = "--user-agent 'Mozilla/5.0'"; - sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; + src = fetchzip { + url = "http://www.i18nguy.com/unicode/andagii.zip"; + curlOpts = "--user-agent 'Mozilla/5.0'"; + hash = "sha256-U7wC55G8jIvMMyPcEiJQ700A7nkWdgWK1LM0F/wgDCg="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf + + runHook postInstall + ''; # There are multiple claims that the font is GPL, so I include the # package; but I cannot find the original source, so use it on your @@ -20,10 +29,4 @@ in (fetchzip { license = "unknown"; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf - ''; -}) +} diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index 5f2e6640d2613..e31bc74bac2ae 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "andika"; version = "6.101"; - name = "andika-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; + hash = "sha256-LghkGd/cjuXghzsU9X/YneNIdBeDEnu0ARszipANm8w="; + }; - sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/andika"; - description = "A family designed especially for literacy use taking into account the needs of beginning readers"; - longDescription = '' + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *OFL.txt *OFL-FAQ.txt *README.txt *FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/andika"; + description = "A family designed especially for literacy use taking into account the needs of beginning readers"; + longDescription = '' Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another. A sans serif font is preferred by some literacy personnel for teaching people to read. Its forms are simpler and less cluttered than those of most serif fonts. For years, literacy workers have had to make do with fonts that were not really suitable for beginning readers and writers. In some cases, literacy specialists have had to tediously assemble letters from a variety of fonts in order to get all of the characters they need for their particular language project, resulting in confusing and unattractive publications. Andika addresses those issues. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index afbd80674c660..c363f025bfd2d 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -1,12 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "1.100"; in -(fetchzip { - name = "ankacoder-${version}"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; +stdenvNoCC.mkDerivation rec { + pname = "ankacoder"; + version = "1.100"; - sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85"; + src = fetchzip { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; + stripRoot = false; + hash = "sha256-14ItaSQ/fO/WDq0O4SXGWnZgiM0kayJrWQgsKb7bsyY="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Anka/Coder fonts"; @@ -15,10 +26,4 @@ let version = "1.100"; in maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/data/fonts/annapurna-sil/default.nix index 6eff39cf1ac1d..fd4d33a4aebc9 100644 --- a/pkgs/data/fonts/annapurna-sil/default.nix +++ b/pkgs/data/fonts/annapurna-sil/default.nix @@ -1,31 +1,31 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "annapurna-sil"; version = "1.204"; - name = "annapurna-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; + hash = "sha256-4ya3Iydrz5Pvol9sTDIe9ZW5k3+XQp8GB2LAnRpeiXs="; + }; - sha256 = "sha256-kVeP9ZX8H+Wn6jzmH1UQvUKY6vJjadMTdEusS7LodFM="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/annapurna"; - description = "Unicode-based font family with broad support for writing systems that use the Devanagari script"; - longDescription = '' - Annapurna SIL is a Unicode-based font family with broad support for writing systems that use the Devanagari script. Inspired by traditional calligraphic forms, the design is intended to be highly readable, reasonably compact, and visually attractive. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *OFL.txt *OFL-FAQ.txt *README.txt *FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/annapurna"; + description = "Unicode-based font family with broad support for writing systems that use the Devanagari script"; + longDescription = '' + Annapurna SIL is a Unicode-based font family with broad support for writing systems that use the Devanagari script. Inspired by traditional calligraphic forms, the design is intended to be highly readable, reasonably compact, and visually attractive. ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 7ec429036bceb..9839295653d12 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "babelstone-han"; version = "13.0.3"; -in (fetchzip { - name = "babelstone-han-${version}"; - # upstream download links are unversioned, so hash changes - url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; - sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w"; + src = fetchzip { + # upstream download links are unversioned, so hash changes + url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; + hash = "sha256-LLhNtHu2hh5DY2XVSrLuVzzR6OtMdSSHetyA0k1IFs0="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; @@ -18,9 +27,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ emily ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/barlow/default.nix b/pkgs/data/fonts/barlow/default.nix index aa618140b1b4d..e9bfa4dee3753 100644 --- a/pkgs/data/fonts/barlow/default.nix +++ b/pkgs/data/fonts/barlow/default.nix @@ -1,14 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "barlow"; version = "1.422"; -in -(fetchzip rec { - name = "barlow-${version}"; - url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip"; + src = fetchzip { + url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip"; + stripRoot = false; + hash = "sha256-aHAGPEgBkH41r7HR0D74OGCa7ta7Uo8Mgq4YVtYOwU8="; + }; + + installPhase = '' + runHook preInstall - sha256 = "08ld4c3zq4d1px07lc64i7l8848zsc61ddy3654w2sh0hx5sm5ld"; + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + install -Dm644 fonts/ttf/*.ttf fonts/gx/*.ttf -t $out/share/fonts/truetype + install -Dm644 fonts/eot/*.eot -t $out/share/fonts/eot + install -Dm644 fonts/woff/*.woff -t $out/share/fonts/woff + install -Dm644 fonts/woff2/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; meta = with lib; { description = "A grotesk variable font superfamily"; @@ -17,13 +29,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 - ''; -}) +} diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/data/fonts/borg-sans-mono/default.nix index 0f5de931b8453..8037e5dc645f9 100644 --- a/pkgs/data/fonts/borg-sans-mono/default.nix +++ b/pkgs/data/fonts/borg-sans-mono/default.nix @@ -1,16 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { pname = "borg-sans-mono"; version = "0.2.0"; -in -(fetchzip { - name = "${pname}-${version}"; - # https://github.com/marnen/borg-sans-mono/issues/19 - url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip"; - sha256 = "1gz4ab0smw76ih5cs2l3n92c77nv7ld5zghq42avjsfhxrc2n5ri"; + src = fetchzip { + # https://github.com/marnen/borg-sans-mono/issues/19 + url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip"; + hash = "sha256-nn7TGeVm45t7QI8+eEREBTFg9aShYYKtdEYEwQwO2fQ="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Droid Sans Mono Slashed + Hasklig-style ligatures"; @@ -19,9 +25,4 @@ in platforms = platforms.all; maintainers = with maintainers; [ atila ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index 112f7c8d7d10e..df1af86d5ce04 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "cascadia-code"; version = "2111.01"; -in -(fetchzip { - name = "cascadia-code-${version}"; - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; + src = fetchzip { + url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; + stripRoot = false; + hash = "sha256-v9Vm5X80wEvorMhIlRw3MnyuSOdBpTl9ibBPpmm1vig="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-kUVTQ/oMZztNf22sDbQBpQW0luSc5nr5sxWU5etLDec="; + install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype + install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; @@ -18,10 +27,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 533f40a9a00ad..1df7d794f6523 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "charis-sil"; version = "6.101"; - name = "charis-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; + hash = "sha256-Rf5eKQVZw7zgTv6KkJUdNdd4sSJPdvjy/GDLusvlgzE="; + }; - sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/charis"; - description = "A family of highly readable fonts for broad multilingual use"; - longDescription = '' + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *OFL.txt *OFL-FAQ.txt *README.txt *FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/charis"; + description = "A family of highly readable fonts for broad multilingual use"; + longDescription = '' This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index a5eafeae89cae..c4c7648acd294 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -1,15 +1,27 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "comic-relief"; version = "1.1"; - name = "comic-relief-${version}"; -in (fetchzip rec { - inherit name; - url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; + src = fetchzip { + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; + stripRoot = false; + hash = "sha256-lvkMfaQvLMZ8F0Q5JnpmMsIAkR+XfihoHIoS4z5QEvA="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; + mkdir -p $out/etc/fonts/conf.d + mkdir -p $out/share/doc/${pname}-${version} + mkdir -p $out/share/fonts/truetype + cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf + cp *.ttf -d $out/share/fonts/truetype + cp FONTLOG.txt -d $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://fontlibrary.org/en/font/comic-relief"; @@ -23,20 +35,11 @@ in (fetchzip rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `corefonts` package, then you probably will not # want to install the font alias of this package. priority = 10; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/etc/fonts/conf.d - mkdir -p $out/share/doc/${name} - mkdir -p $out/share/fonts/truetype - cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} - ''; -}) +} diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/data/fonts/courier-prime/default.nix index 59a823727b8f3..1226966d5e6cd 100644 --- a/pkgs/data/fonts/courier-prime/default.nix +++ b/pkgs/data/fonts/courier-prime/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "courier-prime"; version = "unstable-2019-12-05"; - repo = "CourierPrime"; - rev = "7f6d46a766acd9391d899090de467c53fd9c9cb0"; -in (fetchzip rec { - name = "courier-prime-${version}"; - url = "https://github.com/quoteunquoteapps/${repo}/archive/${rev}/${name}.zip"; - sha256 = "1xh4pkksm6zrafhb69q4lq093q6pl245zi9qhqw3x6c1ab718704"; + + src = fetchzip { + url = "https://github.com/quoteunquoteapps/CourierPrime/archive/7f6d46a766acd9391d899090de467c53fd9c9cb0/${pname}-${version}.zip"; + hash = "sha256-pMFZpytNtgoZrBj2Gj8SgJ0Lab8uVY5aQtcO2lFbHj4="; + }; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + + runHook postInstall + ''; meta = with lib; { description = "Monospaced font designed specifically for screenplays"; @@ -17,9 +24,4 @@ in (fetchzip rec { maintainers = [ maintainers.austinbutler ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf - ''; -}) +} diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 6402cf5be5946..03670a1c917d2 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,15 +1,25 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "cozette"; version = "1.13.0"; -in -(fetchzip rec { - name = "Cozette-${version}"; - url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; + src = fetchzip { + url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; + hash = "sha256-bMgjNnm84vk7jT2UvgCeQwmjZ+9X1GzGLXIEukhaWGw="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; + mkdir -p $out/share/fonts + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.otf -t $out/share/fonts/opentype + install -Dm644 *.bdf -t $out/share/fonts/misc + install -Dm644 *.otb -t $out/share/fonts/misc + + runHook postInstall + ''; meta = with lib; { description = "A bitmap programming font optimized for coziness"; @@ -18,12 +28,4 @@ in platforms = platforms.all; maintainers = with maintainers; [ brettlyons marsam ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc - unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc - ''; -}) +} diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix index 0df5dd51df695..9742e5c241fa1 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.3.2"; +stdenvNoCC.mkDerivation rec { pname = "d2codingfont"; + version = "1.3.2"; -in (fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + src = fetchzip { + url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + stripRoot = false; + hash = "sha256-iC6iaUSVg4zt3wVFJUU4HEeswuKDOTFsAxq/0gRiOCA="; + }; - sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj"; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts + install -Dm644 */*-all.ttc -t $out/share/fonts/truetype/ + + runHook postInstall + ''; meta = with lib; { description = "Monospace font with support for Korean and latin characters"; @@ -25,9 +33,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*-all.ttc -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index 83e2a9ac8e713..0d7be48d103b9 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "doulos-sil"; version = "6.101"; - name = "doulos-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip"; + hash = "sha256-CPjk6SLgsDYjachZZ1hanp6Q+cxTxfHOkoeU59Om5b8="; + }; - sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/doulos"; - description = "A font that provides complete support for the International Phonetic Alphabet"; - longDescription = '' + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *OFL.txt *OFL-FAQ.txt *README.txt *FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/doulos"; + description = "A font that provides complete support for the International Phonetic Alphabet"; + longDescription = '' This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular. The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 4240e853f296a..ad78327b8b67c 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "eb-garamond"; version = "0.016"; - name = "eb-garamond-${version}"; -in (fetchzip rec { - inherit name; - url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + src = fetchzip { + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + hash = "sha256-P2VCLcqcMBBoTDJyRLP9vlHI+jE0EqPjPziN2MJbgEg="; + }; + + installPhase = '' + runHook preInstall - sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; + mkdir -p $out/share/{doc,fonts} + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 *Changes *README.markdown *README.xelualatex -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.georgduffner.at/ebgaramond/"; @@ -18,10 +26,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" - ''; -}) +} diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 5a31358b72ae8..256084a320fce 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "emacs-all-the-icons-fonts"; version = "5.0.0"; -in (fetchzip { - name = "emacs-all-the-icons-fonts-${version}"; - url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; + hash = "sha256-70ysVxOey6NLlCwhEYhxpxO6uuarMFDpg3Efh+3bj1M="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii"; + install -Dm644 fonts/*.ttf -t $out/share/fonts/all-the-icons + + runHook postInstall + ''; meta = with lib; { description = "Icon fonts for emacs all-the-icons"; @@ -20,17 +27,12 @@ in (fetchzip { homepage = "https://github.com/domtronn/all-the-icons.el"; /* - The fonts come under a mixture of licenses - the MIT license, - SIL OFL license, and Apache license v2.0. See the GitHub page - for further information. + The fonts come under a mixture of licenses - the MIT license, + SIL OFL license, and Apache license v2.0. See the GitHub page + for further information. */ license = licenses.free; platforms = platforms.all; maintainers = with maintainers; [ rlupton20 ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons - ''; -}) +} diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index a6836afbc871f..e869630057674 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let name = "encode-sans-1.002"; -in (fetchzip rec { - inherit name; +{ lib, stdenvNoCC, fetchzip }: - url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; +stdenvNoCC.mkDerivation rec { + pname = "encode-sans"; + version = "1.002"; - sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; + src = fetchzip { + url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; + hash = "sha256-TPAUc5msAUgJZHibjgYaS2TOuzKFy0rje9ZQTXE6s+w="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *README.md *FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { description = "A versatile sans serif font family"; @@ -23,10 +33,4 @@ in (fetchzip rec { maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; -}) +} diff --git a/pkgs/data/fonts/ezra-sil/default.nix b/pkgs/data/fonts/ezra-sil/default.nix index 2d970fbc38c05..4ebebc4da5532 100644 --- a/pkgs/data/fonts/ezra-sil/default.nix +++ b/pkgs/data/fonts/ezra-sil/default.nix @@ -1,28 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "ezra-sil"; version = "2.51"; - name = "ezra-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/ezra/EzraSIL-${version}.zip"; + hash = "sha256-hGOHjvFVFLwyVkcoUz+7rQekCdn4oEOB+L16XRpthJM="; + }; - sha256 = "sha256-1LGw/RPFeNtEvcBWFWZf8+dABvWye2RfZ/jt8rwQewM="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/ezra"; - description = "Typeface fashioned after the square letter forms of the typography of the Biblia Hebraica Stuttgartensia (BHS)"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - }) + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *OFL-FAQ.txt *README.txt *FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/ezra"; + description = "Typeface fashioned after the square letter forms of the typography of the Biblia Hebraica Stuttgartensia (BHS)"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index f1eb2184266ff..1ba15dadb1122 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,14 +1,24 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "fira-code"; version = "6.2"; -in (fetchzip { - name = "fira-code-${version}"; - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + src = fetchzip { + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + stripRoot = false; + hash = "sha256-UHOwZL9WpCHk6vZaqI/XfkZogKgycs5lWg1p0XdQt0A="; + }; - sha256 = "0l02ivxz3jbk0rhgaq83cqarqxr07xgp7n27l0fh8fbgxwi52djl"; + # only extract the variable font because everything else is a duplicate + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts + cp variable_ttf/*-VF.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/tonsky/FiraCode"; @@ -22,10 +32,4 @@ in (fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - # only extract the variable font because everything else is a duplicate - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index 3d8c5bf3428f8..35d51bb340c97 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "fira-code-symbols-20160811"; +stdenvNoCC.mkDerivation { + pname = "fira-code-symbols"; + version = "20160811"; - url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + src = fetchzip { + url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + hash = "sha256-7y51blEn0Osf8azytK08zJgtfVX/CIWQkiOoRzYKIa4="; + }; + + installPhase = '' + runHook preInstall - sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "FiraCode unicode ligature glyphs in private use area"; @@ -19,9 +28,4 @@ maintainers = [ maintainers.Profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 763f54bb76794..5d059dbf88e08 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "4.202"; -in (fetchzip { - name = "fira-mono-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "fira-mono"; + version = "4.202"; - url = "https://github.com/mozilla/Fira/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/mozilla/Fira/archive/${version}.zip"; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; + install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; @@ -22,9 +30,4 @@ in (fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/data/fonts/fraunces/default.nix index 2d053b1ce7fcb..7e453d05173f1 100644 --- a/pkgs/data/fonts/fraunces/default.nix +++ b/pkgs/data/fonts/fraunces/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "fraunces"; version = "1.000"; -in -(fetchzip { - name = "fraunces-${version}"; - url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + src = fetchzip { + url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + hash = "sha256-hu2G4Fs2I3TMEy/EBFnc88Pv3c8Mpc5rm3OwVvol7gQ="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; + install -Dm644 *Desktop/static/otf/*.otf -t $out/share/fonts/opentype + install -Dm644 *Desktop/static/ttf/*.ttf *Desktop/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; @@ -17,10 +25,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/galatia-sil/default.nix b/pkgs/data/fonts/galatia-sil/default.nix index 965596373c26e..70881399d593e 100644 --- a/pkgs/data/fonts/galatia-sil/default.nix +++ b/pkgs/data/fonts/galatia-sil/default.nix @@ -1,31 +1,31 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "galatia-sil"; version = "2.1"; - name = "galatia-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/galatia/GalatiaSIL-${version}.zip"; + hash = "sha256-7kXnTC5vpUOjcT40oNW6e32zFGejlWJq1J+p+5DiAos="; + }; - sha256 = "sha256-zLL/7LMcJul2LilhEafpvm+tiYlgv1y1jj85VvG+wiI="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/galatia"; - description = "Font designed to support Biblical Polytonic Greek"; - longDescription = '' - Galatia SIL, designed to support Biblical Polytonic Greek, is a Unicode 3.1 font released under the SIL Open Font License. The font supports precomposed characters rather than decomposed characters. Thus, you must use a keyboard that outputs NFC encoding (precomposed). - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + install -Dm644 $downloadedFile *.ttf -t $out/share/fonts/truetype + install -Dm644 $downloadedFile OFL.txt OFL-FAQ.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/galatia"; + description = "Font designed to support Biblical Polytonic Greek"; + longDescription = '' + Galatia SIL, designed to support Biblical Polytonic Greek, is a Unicode 3.1 font released under the SIL Open Font License. The font supports precomposed characters rather than decomposed characters. Thus, you must use a keyboard that outputs NFC encoding (precomposed). ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index be2f71b5346cf..96e9789cd115d 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,17 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - major = "1"; - minor = "102"; - version = "${major}.${minor}"; - name = "gentium-book-basic-${version}"; -in (fetchzip rec { - inherit name; +stdenvNoCC.mkDerivation rec { + pname = "gentium-book-basic"; + version = "1.102"; - url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip"; + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${lib.versions.major version}${lib.versions.minor version}.zip"; + hash = "sha256-oCmpl95MJRfCV25cg/4cf8AwQWnoymXasSss1ziOPoE="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; + mkdir -p $out/share/{doc,fonts} + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt GENTIUM-FAQ.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/gentium/"; @@ -20,10 +26,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} - ''; -}) +} diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 9494f8e62afe4..5c3f7dfab23f1 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "gentium"; version = "6.101"; - name = "gentium-${version}"; -in (fetchzip rec { - inherit name; - url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; + hash = "sha256-iKD1Q7/lsbZCuJQoJqySQHwplrHv8yzmph+QwKpYgMU="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version} + cp -r documentation $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/gentium/"; @@ -34,20 +42,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf \ - -d $out/share/fonts/truetype - unzip -j $downloadedFile \ - \*/FONTLOG.txt \ - \*/README.txt \ - -d $out/share/doc/${name} - unzip -j $downloadedFile \ - \*/documentation/\*.html \ - \*/documentation/\*.txt \ - -x \*/documentation/source/\* \ - -d $out/share/doc/${name}/documentation - ''; -}) +} diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 4b67da84d99ae..6c6bd1918dbf8 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hack-font"; version = "3.003"; -in (fetchzip { - name = "hack-font-${version}"; - url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; + src = fetchzip { + url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; + hash = "sha256-SxF4kYp9aL/9L9EUniquFadzWt/+PcvhUQOIOvCrFRM="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s"; + install -Dm644 *.ttf -t $out/share/fonts/hack + + runHook postInstall + ''; meta = with lib; { description = "A typeface designed for source code"; @@ -22,7 +29,7 @@ in (fetchzip { homepage = "https://sourcefoundry.org/hack/"; /* - "The font binaries are released under a license that permits unlimited + "The font binaries are released under a license that permits unlimited print, desktop, and web use for commercial and non-commercial applications. It may be embedded and distributed in documents and applications. The source is released in the widely supported UFO format @@ -33,9 +40,4 @@ in (fetchzip { maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack - ''; -}) +} diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 8c81bf520424e..a69f8f743cbea 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hasklig"; version = "1.1"; -in (fetchzip { - name = "hasklig-${version}"; - url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; + src = fetchzip { + url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; + stripRoot = false; + hash = "sha256-jsPQtjuegMePt4tB1dZ9mq15LSxXBYwtakbq4od/sko="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; + install -m444 -Dt $out/share/fonts/opentype *.otf + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/i-tu/Hasklig"; @@ -17,9 +25,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ davidrusu Profpatsch ]; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - ''; -}) +} diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 29abcfd607f78..c72e4b9e19a09 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -1,15 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hyperscrypt"; version = "1.1"; - pname = "HyperScrypt"; -in -(fetchzip { - name = "${lib.toLower pname}-font-${version}"; - url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; - sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m"; + src = fetchzip { + url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; + hash = "sha256-ONlAB9C/GYK6KmOaiHCYErkS6OlQ3TUnoumNDHGZnes="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/HyperScrypt_Web/*.ttf -t $out/share/fonts/truetype/ + install -Dm644 fonts/HyperScrypt_Web/*.otf fonts/*.otf -t $out/share/fonts/opentype/ + + runHook postInstall + ''; meta = with lib; { homepage = "https://velvetyne.fr/fonts/hyper-scrypt/"; @@ -28,15 +35,9 @@ in molted metal, Hyper Scrypt is based upon a rigorous grid, allowing some neat alignements between shapes in multi lines layouts. - ''; + ''; license = licenses.ofl; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/{truetype,opentype} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}.ttf - unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf - ''; -}) +} diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index c632338d59e1b..9909f8f5a3e0b 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,15 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "ibm-plex"; version = "6.0.1"; -in (fetchzip { - name = "ibm-plex-${version}"; + src = fetchzip { + url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + hash = "sha256-n13NuKrZUc0JGvDf2PLZkxogefDkEHaOZk4JN42/C74="; + }; + + installPhase = '' + runHook preInstall - url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + install -Dm644 */*.otf IBM-Plex-Sans-JP/unhinted/* -t $out/share/fonts/opentype - sha256 = "sha256-HxO0L5Q6WJQBqtg64cczzuRcSYi4jEqbOzEWxDmqFp8="; + runHook postInstall + ''; meta = with lib; { description = "IBM Plex Typeface"; @@ -19,9 +25,4 @@ in (fetchzip { platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "OpenType/*/*.otf" -x "OpenType/IBM-Plex-Sans-JP/unhinted/*" -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 16adc93a9eec2..46ab699fd3986 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "inter"; version = "3.19"; -in (fetchzip { - name = "inter-${version}"; - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + src = fetchzip { + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + stripRoot = false; + hash = "sha256-6kUQUTFtxiJEU6sYC6HzMwm1H4wvaKIoxoY3F6GJJa8="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype + cp */*.otf $out/share/fonts/opentype - sha256 = "sha256-8p15thg3xyvCA/8dH2jGQoc54nzESFDyv5m47FgWrSI="; + runHook postInstall + ''; meta = with lib; { homepage = "https://rsms.me/inter/"; @@ -17,10 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ demize dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) - +} diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index 9f3268f8d5b76..986eab13a2577 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "ipaexfont-004.01"; +stdenvNoCC.mkDerivation { + pname = "ipaexfont"; + version = "004.01"; - url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; + src = fetchzip { + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; + hash = "sha256-/87qJIb+v4qrtDy+ApfXxh59reOk+6RhGqFN98mc+8Q="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,9 +30,4 @@ license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 5dca9b9faa918..8a1f91da34fb3 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "ipafont-003.03"; +stdenvNoCC.mkDerivation { + pname = "ipafont"; + version = "003.03"; - url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; + src = fetchzip { + url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; + hash = "sha256-EzUNKuDNHr0NIXiqX09w99wtz1r2pZurR/izdgzTcAs="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "Japanese font package with Mincho and Gothic fonts"; @@ -19,9 +28,4 @@ license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index 676ec842c8d24..f5d3a1e48b5a1 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{lib, fetchzip}: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "jost"; version = "3.5"; -in (fetchzip { - name = "jost-${version}"; - url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; - sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; + src = fetchzip { + url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; + hash = "sha256-ne81bMhmTzNZ/GGIzb7nCYh19vNLK+hJ3cP/zDxtiGM="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/indestructible-type/Jost"; @@ -15,9 +23,4 @@ in (fetchzip { license = licenses.ofl; maintainers = [ maintainers.ar1a ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index 2dbe43aa6aec6..1a2f51a6d625f 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,21 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "kawkab-mono-20151015"; +stdenvNoCC.mkDerivation { + pname = "kawkab-mono"; + version = "20151015"; - url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; + src = fetchzip { + url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; + stripRoot = false; + hash = "sha256-arZTzXj7Ba5G4WF3eZVGNaONhOsYVPih9iBgsN/lg14="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = { description = "An arab fixed-width font"; homepage = "https://makkuk.com/kawkab-mono/"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index 7fa894c1cc8d2..ff1cc62bee0e9 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "lato-2.0"; +stdenvNoCC.mkDerivation { + pname = "lato"; + version = "2.0"; - url = "https://www.latofonts.com/download/Lato2OFL.zip"; + src = fetchzip { + url = "https://www.latofonts.com/download/Lato2OFL.zip"; + stripRoot = false; + hash = "sha256-n1TsqigCQIGqyGLGTjLtjHuBf/iCwRlnqh21IHfAuXI="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; + install -Dm644 Lato2OFL/*.ttf -t $out/share/fonts/lato + + runHook postInstall + ''; meta = with lib; { homepage = "https://www.latofonts.com/"; @@ -32,9 +42,4 @@ platforms = platforms.all; maintainers = with maintainers; [ chris-martin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato - ''; -}) +} diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix index ebe4ceb88ca11..3881f0f0f4e76 100644 --- a/pkgs/data/fonts/lmmath/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -1,13 +1,24 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "lmmath"; version = "1.959"; -in (fetchzip rec { - name = "lmmath-${version}"; - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; - sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; + src = fetchzip { + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; + hash = "sha256-et/WMhfZZYgP0S7ZmI6MZK5owv9bSoMBXFX6yGSng5Y="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/latinmodern-math-${version}/ + cp otf/*.otf $out/share/fonts/opentype/ + cp doc/*.txt $out/share/doc/latinmodern-math-${version}/ + + runHook postInstall + ''; meta = with lib; { description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; @@ -19,11 +30,4 @@ in (fetchzip rec { maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/latinmodern-math-${version}/ - unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ - unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ - ''; -}) +} diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index f0ff4c1b2052e..59597120c1003 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -1,22 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "mno16"; version = "1.0"; -in (fetchzip rec { - name = "${pname}-${version}"; - url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${name}.zip"; - sha256 = "1x06nl281fcjk6g1p4cgrgxakmwcci6vvasskaygsqlzxd8ig87w"; + + src = fetchzip { + url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${pname}-${version}.zip"; + stripRoot = false; + hash = "sha256-xJQ9V7GlGUTEeYhqYFl/SemS6iqV0eW85YOn/tLgA+M="; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp fonts/*.ttf $out/share/fonts/truetype/ + ''; meta = with lib; { description = "minimalist monospaced font"; homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index b45d130b1c284..7f7c2876694fc 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "mononoki"; version = "1.3"; -in (fetchzip { - name = "mononoki-${version}"; - url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; + src = fetchzip { + url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; + stripRoot = false; + hash = "sha256-bZYBRdmbQVs4i6UzMIHwJnoLWggX4CW8ZogNFYiX/9w="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-K2uOpJRmQ1NcDZfh6rorCF0MvGHFCsSW8J7Ue9OC/OY="; + mkdir -p $out/share/fonts/mononoki + cp webfont/* $out/share/fonts/mononoki + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/madmalik/mononoki"; @@ -16,9 +25,4 @@ in (fetchzip { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/mononoki - unzip -j $downloadedFile -d $out/share/fonts/mononoki - ''; -}) +} diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index 4a0e3c975f542..3798a33b66c67 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "VER2.5"; - fullName = "NanumGothicCoding-2.5"; +stdenvNoCC.mkDerivation rec { + pname = "nanum-gothic-coding"; + version = "2.5"; -in (fetchzip { - name = "nanum-gothic-coding"; - url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip"; + src = fetchzip { + url = "https://github.com/naver/nanumfont/releases/download/VER${version}/NanumGothicCoding-${version}.zip"; + stripRoot = false; + hash = "sha256-jHbbCMUxn54iQMKdAWI3r8CDxi+5LLJh8ucQzq2Ukdc="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc"; + mkdir -p $out/share/fonts/NanumGothicCoding + cp *.ttf $out/share/fonts/NanumGothicCoding + + runHook postInstall + ''; meta = with lib; { description = "A contemporary monospaced sans-serif typeface with a warm touch"; @@ -18,9 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/NanumGothicCoding - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/NanumGothicCoding - ''; -}) +} diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index cfa36870ed4bc..4970e0d5920fa 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "national-park-typeface"; version = "206464"; -in (fetchzip { - name = "${pname}-${version}"; - url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; - sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d"; + src = fetchzip { + url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; + stripRoot = false; + hash = "sha256-VUboZZVJfKupnoHXo3RxetEEYimrr1DxghVZaaWnnw4="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype/ + + runHook postInstall + ''; meta = with lib; { description = ''Typeface designed to mimic the national park service @@ -17,9 +25,4 @@ in (fetchzip { license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ - ''; -}) +} diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index 5d96ba5527205..f1236d5c05c10 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.2"; +stdenvNoCC.mkDerivation rec { pname = "norwester"; -in (fetchzip { - name = "${pname}-${version}"; + version = "1.2"; - url = "http://jamiewilson.io/norwester/assets/norwester.zip"; + src = fetchzip { + url = "http://jamiewilson.io/norwester/assets/norwester.zip"; + stripRoot = false; + hash = "sha256-Ak/nobrQE/XYGWs/IhlZlTp74ff+s4adUR6Sht5Yf8g="; + }; - sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype + cp ${pname}-v${version}/${pname}.otf $out/share/fonts/opentype/ + + runHook postInstall + ''; meta = with lib; { homepage = "http://jamiewilson.io/norwester"; @@ -18,9 +26,4 @@ in (fetchzip { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ - ''; -}) +} diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index c6b7846a85fe9..33bf37c18baef 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "oldstandard"; version = "2.2"; - name = "oldstandard-${version}"; -in (fetchzip rec { - inherit name; - url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip"; + src = fetchzip { + url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${pname}-${version}.otf.zip"; + stripRoot = false; + hash = "sha256-cDB5KJm87DK+GczZ3Nmn4l5ejqViswVbwrJ9XbhEh8I="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; + install -m444 -Dt $out/share/fonts/opentype *.otf + install -m444 -Dt $out/share/doc/${pname}-${version} FONTLOG.txt + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/akryukov/oldstand"; @@ -18,10 +26,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} FONTLOG.txt - ''; -}) +} diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index f34ff0c17b7a7..8a6b01b1d6d79 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,26 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "open-dyslexic"; version = "2016-06-23"; -in (fetchzip { - name = "open-dyslexic-${version}"; - url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; + src = fetchzip { + url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; + hash = "sha256-f/uavR3n0qHyqumZDw7r8Zy0om2RlJAKyWuGaUXSJ1s="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 README.md -t $out/share/doc/open-dyslexic + + runHook postInstall + ''; meta = with lib; { homepage = "https://opendyslexic.org/"; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic - ''; -}) +} diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 553b4e52efdbb..521c08c85cea1 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "overpass"; version = "3.0.5"; - name = "overpass-${version}"; -in (fetchzip rec { - inherit name; - url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; + src = fetchzip { + url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; + hash = "sha256-8AWT0/DELfNWXtZOejC90DbUSOtyGt9tSkcSuO7HP2o="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha"; + install -Dm644 */*/*.otf -t $out/share/fonts/opentype + install -Dm644 */*/*.ttf -t $out/share/fonts/truetype + install -Dm644 *.md -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://overpassfont.org/"; @@ -18,11 +26,4 @@ in (fetchzip rec { platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts $out/share/doc - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.md -d $out/share/doc/${name} - ''; -}) +} diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 292e9466b96cb..86646ae0ac5de 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "paratype-pt-mono"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-mono"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/631/original/ptmono.zip" - "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/631/original/ptmono.zip" + "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" + ]; + stripRoot = false; + hash = "sha256-mfDAu/KGelC6wZpUCrUrLVZKo+XiKNBqcpMI8tH2tMw="; + }; + + installPhase = '' + runHook preInstall - sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; -}) +} diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 1c976ecb489ed..dffd25c23aa59 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "paratype-pt-sans"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-sans"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/629/original/ptsans.zip" - "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/629/original/ptsans.zip" + "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" + ]; + stripRoot = false; + hash = "sha256-34TqYXtWzkAstaGQBhJy+/hVk5tg6ZvHZ/kvUroWVLs="; + }; + + installPhase = '' + runHook preInstall - sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; -}) +} diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index abe6c3d87f661..f346382d1f738 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "paratype-pt-serif"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-serif"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/634/original/ptserif.zip" - "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/634/original/ptserif.zip" + "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" + ]; + stripRoot = false; + hash = "sha256-4L3t5NEHmj975fn8eBAkRUO1OL0xseNp9g7k7tt/O2c="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; -}) +} diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 460dbfdb38bfc..3b141c501a8c9 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.46.0"; + version = "3.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "S6d36ThUe/zL+azKCWdXTEZkMCLgVMk6AzQZyzzHwew="; + sha256 = "ALpJ92EgiPKzuuynnEXrKjBCPC5Ke+pAFYcr6uJd1sU="; }; patches = [ diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 6b58b171f7d3e..fd58e6b77ad28 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "43"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PW4VMxdIYVdZaqOAL4dnZBTFcHOPRQqUoEH+iDVCCmk="; + sha256 = "sha256-Mq+NvD2afVg1aafw1/GPlYGNXbnuj5LZEjpkexXqyMc="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 157ae89b7ebcb..78f4d56bfac6f 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -1,7 +1,7 @@ { version, rev, sourceSha256 }: { lib, stdenv, fetchFromGitHub, cmake, makeWrapper -, pkg-config, libX11, libuuid, xz, vtk_8, Cocoa }: +, pkg-config, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -53,7 +53,15 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 + # (specifically libGL and libX11 on Linux), + # it's now seemingly necessary for packages that configure ITK to + # also include configuration deps of VTK, even if VTK is not required or available. + # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935, + # so we simply propagate them again from ITK. + # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration. + propagatedBuildInputs = vtk.propagatedBuildInputs; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix new file mode 100644 index 0000000000000..d2cda30b5da7d --- /dev/null +++ b/pkgs/development/libraries/quantlib/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +}: + +stdenv.mkDerivation rec { + pname = "quantlib"; + version = "1.29"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "lballabio"; + repo = "QuantLib"; + rev = "QuantLib-v${version}"; + sha256 = "sha256-TpVn3zPru/GtdNqDH45YdOkm7fkJzv/qay9SY3J6Jiw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + meta = with lib; { + description = "A free/open-source library for quantitative finance"; + homepage = "https://quantlib.org"; + platforms = platforms.unix; + license = licenses.bsd3; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index a12ade51c2ea9..5675e10dbad1f 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -8,19 +8,18 @@ , extlib }: -if lib.versionOlder ocaml.version "4.04" -then throw "javalib is not available for OCaml ${ocaml.version}" -else +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "javalib is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-javalib"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "javalib-team"; repo = "javalib"; - rev = "v${version}"; - sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; + rev = version; + hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s="; }; nativeBuildInputs = [ which ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 78d28270035ab..a5d042fc1907e 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -2,12 +2,11 @@ let pname = "sawja"; - version = "1.5.11"; + version = "1.5.12"; in -if lib.versionOlder ocaml.version "4.07" -then throw "${pname} is not available for OCaml ${ocaml.version}" -else +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "${pname} is not available for OCaml ${ocaml.version}" stdenv.mkDerivation { @@ -19,7 +18,7 @@ stdenv.mkDerivation { owner = "javalib-team"; repo = pname; rev = version; - sha256 = "sha256-1aKkRZDuLJLmDhUC1FXnn4QrgXaTyAbnXfTOAdnKgs8="; + hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw="; }; nativeBuildInputs = [ which ocaml findlib ]; diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 162cda76f4e34..d2e67e4676e79 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.9.0"; + version = "4.10.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ji9GDVQdDmneOcjrmfaG84HJNCz4igHJQmnwk9xiUlM="; + hash = "sha256-8oGZEMKUGaDHKq4qIZy10cbLNMmVclJnQE/dx877pNQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index e3a061b637839..ab0edb676f5b4 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.2.9"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-etmQNUjxrJeRRWy2znkJ0slbODiRrTB/bABGFB1e9xc="; + hash = "sha256-9dvWm5FnqNkcILeY7qkRESk/iLlNEChs24RniRXtsNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index 373a5d090d0ed..9b0efcad461ea 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "prefixed"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s5+/rHJhj6HutbP9ntE0HxDdkN91SZy0w4psPvR83ZQ="; + hash = "sha256-C1TRXmAuuK9Kwxsdsho36pXOWJDgdBuw3Z3tSTzvu+k="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index e993567569eaf..3a595a2d301aa 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.11"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-FVbp7FYTzoNuwROdvKGzSnVN5nAp1hboyzNMhAu6YDY="; + hash = "sha256-m4y65UiuiWRS7EBv6AFnX9Ia2eTy8H1vgfx+fQrcXz4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix index 834a32d65b5bd..bbc7fbde55412 100644 --- a/pkgs/development/tools/inferno/default.nix +++ b/pkgs/development/tools/inferno/default.nix @@ -1,26 +1,23 @@ -{ fetchCrate, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.7"; + version = "0.11.14"; - # github version doesn't have a Cargo.lock - src = fetchCrate { - inherit pname version; - sha256 = "sha256-HZBCLgWC9yEo3lY7If18SILKZV3rwHv7FBVdumiTbJg="; + src = fetchFromGitHub { + owner = "jonhoo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0H+h4BM4x3vlI6EMeXNzcCQpW2S4czJR2GaviZ0nhEM="; + fetchSubmodules = true; }; - cargoSha256 = "sha256-upO+G9569NXFuc2vpxR6E4nxJqCjg+RMlxV7oKb7v1E="; + cargoHash = "sha256-5VQNgZUgakQUczKs7T+c305c3I1DDSaVMO3tFXqIdIc="; - # these tests depend on a patched version of flamegraph which is included in - # the github repository as a submodule, but absent from the crates version + # skip flaky tests checkFlags = [ - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace" - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple" - "--skip=collapse::perf::tests::test_collapse_multi_perf" - "--skip=collapse::perf::tests::test_collapse_multi_perf_simple" - "--skip=collapse::perf::tests::test_multiple_skip_after" - "--skip=collapse::perf::tests::test_one_skip_after" + "--skip=flamegraph_base_symbol" + "--skip=flamegraph_multiple_base_symbol" ]; meta = with lib; { diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 43580d9d22d50..f68c9f34ea9c8 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-oaptZaXG7qFjTPeasM4NjOBfa9jsEzqg+kKTge1mXv4="; + sha256 = "sha256-ZffVc/nLWaiUhg0DcLfDTiGVuK0MCSOpBd2gVG2rT0c="; }; - vendorSha256 = "sha256-Ifn230KHFDQ1RaKAVnd8EBsBZdpJY4Dx/KO+o1cm50k="; + vendorHash = "sha256-FUTyTdGqdzuObpYW1ZSnhj24+MJiYG1NmSU4BZ6SlHM="; doCheck = false; diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index 9571e1160666b..e0a14a82124cb 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2022-12-30"; + version = "unstable-2023-01-27"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "6c2c21dfc871f8cb9c33a77fe7db01419b6ad97d"; - sha256 = "qe8cHGf8X7JjjoiRQ/S3q/WhyvgrMEwsCo7QoQkmg5w="; + rev = "fc55484b5902191e5467e6044bb90c1c74a0c938"; + sha256 = "Ho0yYoe1TIlVxMauz/harP1xSw42wdcklj/O6fA+VEk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index d246eb29b6144..b132125d928b7 100644 --- a/pkgs/tools/misc/yutto/default.nix +++ b/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b16"; + version = "2.0.0b18"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-aGmayZGXmEyVuUKDKrgcYuPKsib/c5ou5CZ+Sag6Evk="; + hash = "sha256-BuubfySQfw4ljWTc1yyW4Zqle0VTimFLQ6enZA3joeQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index c923b5a05824f..db114d6b98f3d 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.12.10"; + version = "2.12.11"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-VKgnnrEG1cx4cx6StWh+XaCe5meSU9LqZRH1ElMQkfk="; + sha256 = "sha256-vhEjzCuMvMZmzkCQK25JG3tT33KnX2fJbqdaTaeuhgo="; }; nativeBuildInputs = [ pkg-config scdoc ] diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix index e0c1ebee90b43..85ae689f32247 100644 --- a/pkgs/tools/system/jsvc/default.nix +++ b/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-Xd6J/TOGCDAtBl3baKJnOYnztJH+C+L2+e9RC0BUqEw="; + sha256 = "sha256-J5Gzd6R8CMqhsgRPrrHhD//LdpcVEQKnBB7i/pLL8ns="; }; buildInputs = [ commonsDaemon ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e284be8669da..c8c6c8a29f5cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22739,6 +22739,8 @@ with pkgs; quark-engine = callPackage ../tools/security/quark-engine { }; + quantlib = callPackage ../development/libraries/quantlib { }; + quesoglc = callPackage ../development/libraries/quesoglc { }; quickder = callPackage ../development/libraries/quickder {}; @@ -26397,6 +26399,8 @@ with pkgs; rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { }; + rvvm = callPackage ../applications/virtualization/rvvm { }; + s3ql = callPackage ../tools/backup/s3ql { }; sasutils = callPackage ../os-specific/linux/sasutils { };