summaryrefslogtreecommitdiffstats
path: root/pkgs/data
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/dina/default.nix48
-rw-r--r--pkgs/data/fonts/martian-mono/default.nix4
-rw-r--r--pkgs/data/fonts/sarasa-gothic/default.nix4
-rw-r--r--pkgs/data/fonts/smiley-sans/default.nix8
-rw-r--r--pkgs/data/icons/colloid-icon-theme/default.nix4
-rw-r--r--pkgs/data/icons/numix-icon-theme-circle/default.nix4
-rw-r--r--pkgs/data/icons/numix-icon-theme-square/default.nix4
-rw-r--r--pkgs/data/icons/papirus-icon-theme/default.nix4
-rw-r--r--pkgs/data/icons/whitesur-icon-theme/default.nix4
-rw-r--r--pkgs/data/misc/hackage/pin.json8
-rw-r--r--pkgs/data/misc/osinfo-db/default.nix4
-rw-r--r--pkgs/data/misc/v2ray-domain-list-community/default.nix4
-rw-r--r--pkgs/data/misc/v2ray-geoip/default.nix6
-rw-r--r--pkgs/data/themes/adwaita-qt/default.nix19
-rw-r--r--pkgs/data/themes/marwaita/default.nix4
15 files changed, 75 insertions, 54 deletions
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index 509a37556cec..4a0612efd3e5 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip
+{ lib, stdenv, fetchzip, fontforge
, bdftopcf, xorg
}:
@@ -8,32 +8,41 @@ stdenv.mkDerivation {
outputs = [ "out" "bdf" ];
- src = fetchurl {
- url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
- sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
+ src = fetchzip {
+ url = "https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61";
+ hash = "sha256-JK+vnOyhAbwT825S+WKbQuWgRrfZZHfyhaMQ/6ljO8s=";
+ extension = "zip";
+ stripRoot = false;
};
nativeBuildInputs =
- [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ];
-
- postPatch = ''
- sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
- '';
+ [ fontforge bdftopcf xorg.mkfontscale xorg.fonttosfnt ];
buildPhase = ''
runHook preBuild
newName() {
- test "''${1:5:1}" = i && _it=Italic || _it=
- case ''${1:6:3} in
- 400) test -z $it && _weight=Medium ;;
- 700) _weight=Bold ;;
- esac
- _pt=''${1%.bdf}
- _pt=''${_pt#*-}
- echo "Dina$_weight$_it$_pt"
+ local name=''${1##*/}
+ test "''${name:5:1}" = i && _it=Italic || _it=
+ case ''${name:6:3} in
+ 400) _weight=Medium ;;
+ 700) _weight=Bold ;;
+ esac
+ _pt=''${1%.bdf}
+ _pt=''${_pt#*-}
+ echo "Dina$_weight$_it$_pt"
}
+ # Re-encode the provided BDF files from CP1252 to Unicode as fonttosfnt does
+ # not support the former.
+ # We could generate the PCF and OTB files with fontforge directly, but that
+ # results in incorrect spacing in various places.
+ for f in BDF/*.bdf; do
+ basename=''${f##*/} basename=''${basename%.*}
+ fontforge -lang=ff -c "Open(\"$f\"); Reencode(\"win\", 1); Reencode(\"unicode\"); Generate(\"$basename.bdf\")"
+ mv "$basename"-*.bdf "$basename".bdf # remove the superfluous added size suffix
+ done
+
for f in *.bdf; do
name=$(newName "$f")
bdftopcf -t -o "$name.pcf" "$f"
@@ -62,9 +71,8 @@ stdenv.mkDerivation {
relatively compact to allow a lot of code on screen, while (hopefully)
clear enough to remain readable even at high resolutions.
'';
- homepage = "https://www.donationcoder.com/Software/Jibz/Dina/";
- downloadPage = "https://www.donationcoder.com/Software/Jibz/Dina/";
+ homepage = "https://www.dcmembers.com/jibsen/download/61/";
license = licenses.free;
- maintainers = [ maintainers.prikhi ];
+ maintainers = with maintainers; [ prikhi ncfavier ];
};
}
diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/data/fonts/martian-mono/default.nix
index 98f20082be98..ca15d938d95f 100644
--- a/pkgs/data/fonts/martian-mono/default.nix
+++ b/pkgs/data/fonts/martian-mono/default.nix
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "martian-mono";
- version = "0.9.2";
+ version = "1.0.0";
src = fetchzip {
url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip";
- sha256 = "sha256-whIR7BaEflm/VsF60Xck6ZJDLzTugaTOogHzcEtwCsM=";
+ sha256 = "sha256-hC08IHWqg+x3qoEf4EL98ZbGeqdwjnMpDovEiWrWPpI=";
stripRoot = false;
};
diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index 24ebfe40d58b..9bfe95518dc1 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -1,14 +1,14 @@
{ lib, fetchurl, libarchive }:
let
- version = "0.37.4";
+ version = "0.38.0";
in fetchurl {
name = "sarasa-gothic-${version}";
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
- sha256 = "sha256-fbZN4+SHb2Qelnp122M2I0enbcEl+Qh1oSMiDLAYwSs=";
+ sha256 = "sha256-lGkb3e2EFHkDLm+/KArfOQ50qBFRThlpcID06g0t4aI=";
recursiveHash = true;
downloadToTemp = true;
diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/data/fonts/smiley-sans/default.nix
index 3bef9608b46e..ecc87dbfef00 100644
--- a/pkgs/data/fonts/smiley-sans/default.nix
+++ b/pkgs/data/fonts/smiley-sans/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenvNoCC, fetchzip }:
+{ lib, stdenvNoCC, fetchzip, nix-update-script }:
stdenvNoCC.mkDerivation rec {
pname = "smiley-sans";
- version = "1.0.0";
+ version = "1.1.1";
src = fetchzip {
url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip";
- sha256 = "sha256-LE0CZkWiXjyuiEk316ABCNQL9n5GID8CipjBIu2o6uk=";
+ sha256 = "sha256-/lsAZRHgmx1TMjm2O5Z0IOiHQM8LKJPXcBKZrlXt3RA=";
stripRoot = false;
};
@@ -18,6 +18,8 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
+ passthru.updateScript = nix-update-script { };
+
meta = with lib; {
description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric";
homepage = "https://atelier-anchor.com/typefaces/smiley-sans/";
diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix
index 744db4f3d162..5c0a3817f32f 100644
--- a/pkgs/data/icons/colloid-icon-theme/default.nix
+++ b/pkgs/data/icons/colloid-icon-theme/default.nix
@@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red"
stdenvNoCC.mkDerivation rec {
inherit pname;
- version = "2022-10-26";
+ version = "2023-01-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- hash = "sha256-eHLfWrtY69S37OPvQdLwI/PRvoKCheF2MRsHG5+5BR0=";
+ hash = "sha256-n4kMOIp7AD5Ue4qY4G3ja/VTyYF7cqhdI0uuk9b6o5c=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 35ec3221955b..e7ba756dabb6 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
- version = "22.11.26";
+ version = "23.01.02";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-LdSHzIgXDixRI8xIwBrH7lqzUQbXdJXu5gFd9x8Ytzs=";
+ sha256 = "sha256-Z+gs3CajVBYiWU5SSiL/C7IW8ibglUqD+GhayeS++m8=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index f6b8d85dffb8..8e73cad160db 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
- version = "22.11.26";
+ version = "23.01.02";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-aHDO/Qi3NeF2dFElr6fn34yuuwMJ1fK63AoEjSUt81I=";
+ sha256 = "sha256-8GUcfrnnWbJ+tJmc5zwOFfEFMOfeodYY4KyytAnaZEE=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 90b66c32fc97..d0af110dba24 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "papirus-icon-theme";
- version = "20221201";
+ version = "20230104";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
- sha256 = "sha256-Y+flyo8MJVmAoiJ0mSZNu/xhhLzsYr6t8R0c+TOxbq0=";
+ sha256 = "sha256-BejsAlHnq2oxVQIFA4/ZOTFxz7vZmssrlJNqRZHBGuI=";
};
nativeBuildInputs = [ gtk3 papirus-folders ];
diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix
index d665c9f2b0d7..8733d20e9fab 100644
--- a/pkgs/data/icons/whitesur-icon-theme/default.nix
+++ b/pkgs/data/icons/whitesur-icon-theme/default.nix
@@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
stdenvNoCC.mkDerivation rec {
inherit pname;
- version = "2022-11-17";
+ version = "2023-01-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- hash = "sha256-crZ6JQeXeSjTHGIBptioNiFZas7MksJcjaKGlMP4fo0=";
+ hash = "sha256-xqKGZPlGl8kNZ4AQYZWAywL+6UxwGzYOZ9WvB85JKZk=";
};
nativeBuildInputs = [ gtk3 jdupes ];
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 4da998f3f3c8..9ef7aa2d03d9 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
{
- "commit": "208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6",
- "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6.tar.gz",
- "sha256": "19pgh69fj3p1glqyjikpsvn5j4bax6yw5qxf9qaaap19hksgn85p",
- "msg": "Update from Hackage at 2022-12-28T16:35:05Z"
+ "commit": "9f677e1d2267621375d22e3f6c1a25246678be4c",
+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f677e1d2267621375d22e3f6c1a25246678be4c.tar.gz",
+ "sha256": "0y2mbj8dwfgdz5pzdq682clab10xgnqlrfv1najx53yy5jf63pcv",
+ "msg": "Update from Hackage at 2023-01-06T18:29:38Z"
}
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 0f11459a1702..67c3dc7a3c12 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20220830";
+ version = "20221130";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "sha256-gRFkPZDeq4ONt/IT8VS+8uBXNQqcg0JF7gHdZEM7qvs=";
+ sha256 = "sha256-opVMrXob7yZ5lJmHxjiI8eCBsJ4R+3JQVDcvA37HcX8=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index 3d44e34f2b0d..14299bdc522a 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
- version = "20221223102220";
+ version = "20230106031328";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
- sha256 = "sha256-bvTNxJcogF3KxZbC8jW0PMIiJJZnzubWybDcNK7id8s=";
+ sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU=";
};
vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
meta = with lib; {
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index 4cb78dcf7c99..f00e67dfdcab 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
- version = "202212220043";
+ version = "202301050046";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "4a54320369805321b90c7c5ca4cdda4f12bdd295";
- sha256 = "sha256-PFbjzzjeCKL9aak45B+R5Y+H3fTBzdXpyEvvEEdInbQ=";
+ rev = "6bb07558ac223b3decdff985d5737f4384b34238";
+ sha256 = "sha256-KXLIIs1W+8TC2GtW3m/YA5WQ13Pq5kxC5Zc9jDzW/tU=";
};
installPhase = ''
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
index 79690fa4e6af..2a5d768b1ae3 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -1,16 +1,17 @@
-{ mkDerivation
-, stdenv
+{ stdenv
, lib
, fetchFromGitHub
, nix-update-script
, cmake
, ninja
, qtbase
+, qtwayland
, qt5
, xorg
+, useQt6 ? false
}:
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "adwaita-qt";
version = "1.4.1";
@@ -30,9 +31,19 @@ mkDerivation rec {
buildInputs = [
qtbase
- qt5.qtx11extras
] ++ lib.optionals stdenv.isLinux [
xorg.libxcb
+ ] ++ lib.optionals (!useQt6) [
+ qt5.qtx11extras
+ ] ++ lib.optionals useQt6 [
+ qtwayland
+ ];
+
+ # Qt setup hook complains about missing `wrapQtAppsHook` otherwise.
+ dontWrapQtApps = true;
+
+ cmakeFlags = lib.optionals useQt6 [
+ "-DUSE_QT6=true"
];
postPatch = ''
diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix
index 70d519e73161..42be4e53027e 100644
--- a/pkgs/data/themes/marwaita/default.nix
+++ b/pkgs/data/themes/marwaita/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "marwaita";
- version = "16.1";
+ version = "16.2";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- sha256 = "sha256-NYJ3cVxWd3vVkjr+Ni4kmhQzL9E+paexejrNA8pRfPE=";
+ sha256 = "sha256-jhcmFrTZgWChNvZofLSQzGvOj/U2UqaQ0Cq5sv4UAxE=";
};
buildInputs = [
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-11 03:41:48 +0000