diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/hackgen/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/hackgen/nerdfont.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/apple-cursor/default.nix | 43 | ||||
-rw-r--r-- | pkgs/data/icons/fluent-icon-theme/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/icons/nordzy-cursor-theme/default.nix | 12 | ||||
-rw-r--r-- | pkgs/data/icons/whitesur-icon-theme/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/clash-geoip/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/dtv-scan-tables/default.nix | 32 | ||||
-rw-r--r-- | pkgs/data/misc/hackage/pin.json | 8 | ||||
-rw-r--r-- | pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/v2ray-geoip/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/themes/adw-gtk3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/adwaita-qt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/fluent-gtk-theme/default.nix | 76 |
14 files changed, 176 insertions, 33 deletions
diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/data/fonts/hackgen/default.nix index 5d87131c1028..b60ccb87fbb7 100644 --- a/pkgs/data/fonts/hackgen/default.nix +++ b/pkgs/data/fonts/hackgen/default.nix @@ -4,10 +4,10 @@ fetchzip rec { pname = "hackgen-font"; - version = "2.7.1"; + version = "2.8.0"; url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; - sha256 = "sha256-UL6U/q2u1UUP31lp0tEnFjzkn6dn8AY6hk5hJhPsOAE="; + sha256 = "sha256-TLqns6ulovHRKoLHxxwKpj6SqfCq5UDVBf7gUASCGK4="; postFetch = '' install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen shopt -s extglob dotglob diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/data/fonts/hackgen/nerdfont.nix index effa2bc45ad4..f563a2eb479b 100644 --- a/pkgs/data/fonts/hackgen/nerdfont.nix +++ b/pkgs/data/fonts/hackgen/nerdfont.nix @@ -4,10 +4,10 @@ fetchzip rec { pname = "hackgen-nf-font"; - version = "2.7.1"; + version = "2.8.0"; url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; - sha256 = "sha256-9sylGr37kKIGWgThZFqL2y6oI3t2z4kbXYk5DBMIb/g="; + sha256 = "sha256-xRFedeavEJY9OZg+gePF5ImpLTYdbSba5Wr9k0ivpkE="; postFetch = '' install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen-nf shopt -s extglob dotglob diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix new file mode 100644 index 000000000000..90898333b45c --- /dev/null +++ b/pkgs/data/icons/apple-cursor/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchzip +, stdenv +}: + +let + _src = variant: suffix: hash: fetchzip ({ + name = variant; + url = "https://github.com/ful1e5/apple_cursor/releases/download/v${version}/${variant}.${suffix}"; + hash = hash; + } // (if suffix == "zip" then { stripRoot = false; } else {})); + + version = "2.0.0"; + srcs = [ + (_src "macOS-BigSur-White" "tar.gz" "sha256-3Ax2hMfkEL4cyJtGQpK3PqC/L5wtmgO0LsY4gkTQ2Bg=") + (_src "macOS-BigSur-White-Windows" "zip" "sha256-V6J2Ddgq46BkgxCWVReZrvE7CsOczzV7slOpilKFG9E=") + (_src "macOS-BigSur" "tar.gz" "sha256-VZWFf1AHum2xDJPMZrBmcyVrrmYGKwCdXOPATw7myOA=") + (_src "macOS-BigSur-Windows" "zip" "sha256-lp28ACsK8BXe6rSDELL4GdXb1QEdOVC8Y6eLofctkR4=") + (_src "macOS-Monterey-White" "tar.gz" "sha256-IfFYUbDW6mBe209iU1sBhFzolZd6YDVdJf+DPe9AQDM=") + (_src "macOS-Monterey-White-Windows" "zip" "sha256-gUuBFOi0nDBoX9TWPg4eQhCAhwYeEhfDEbYpc+XsQNE=") + (_src "macOS-Monterey" "tar.gz" "sha256-MHmaZs56Q1NbjkecvfcG1zAW85BCZDn5kXmxqVzPc7M=") + (_src "macOS-Monterey-Windows" "zip" "sha256-ajxEgq7besaRajLn0gTPpp4euOWVqbzc78u720PWlyE=") + ]; +in stdenv.mkDerivation rec { + pname = "apple_cursor"; + inherit version; + inherit srcs; + + sourceRoot = "."; + + installPhase = '' + install -dm 0755 $out/share/icons + cp -r macOS* $out/share/icons/ + ''; + + meta = with lib; { + description = "Opensource macOS Cursors."; + homepage = "https://github.com/ful1e5/apple_cursor"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/data/icons/fluent-icon-theme/default.nix index 3624f4b1b34a..e7553b4b74d4 100644 --- a/pkgs/data/icons/fluent-icon-theme/default.nix +++ b/pkgs/data/icons/fluent-icon-theme/default.nix @@ -6,12 +6,13 @@ , jdupes , roundedIcons ? false , blackPanelIcons ? false +, allColorVariants ? false , colorVariants ? [ ] , }: let pname = "Fluent-icon-theme"; in -lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "grey" "orange" "pink" "purple" "red" "yellow" "teal" "all" ] colorVariants +lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "grey" "orange" "pink" "purple" "red" "yellow" "teal" ] colorVariants stdenvNoCC.mkDerivation rec { inherit pname; @@ -43,10 +44,11 @@ stdenvNoCC.mkDerivation rec { ./install.sh --dest $out/share/icons \ --name Fluent \ ${builtins.toString colorVariants} \ + ${lib.optionalString allColorVariants "--all"} \ ${lib.optionalString roundedIcons "--round"} \ ${lib.optionalString blackPanelIcons "--black"} - jdupes --link-soft --recurse $out/share + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/data/icons/nordzy-cursor-theme/default.nix index ee18fe287727..394626cec337 100644 --- a/pkgs/data/icons/nordzy-cursor-theme/default.nix +++ b/pkgs/data/icons/nordzy-cursor-theme/default.nix @@ -5,24 +5,18 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-cursor-theme"; - version = "0.1.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-cursors"; rev = "v${version}"; - sha256 = "XabfKFyeII7Xl+ozzpPnc4xFH4B7GzCTLq4M1QPSZPw="; + sha256 = "sha256-q9PEEyxejRQ8UCwbqsfOCL7M70pLCOLyCx8gEFmZkWA="; }; installPhase = '' mkdir -p $out/share/icons - - cp -r nordzy-dark/ $out/share/icons/Nordzy-cursors - mv $out/share/icons/Nordzy-cursors/index.theme $out/share/icons/Nordzy-cursors/cursor.theme - mv $out/share/icons/Nordzy-cursors/Nordzy-cursors $out/share/icons/Nordzy-cursors/cursors - cp -r nordzy-white/ $out/share/icons/Nordzy-white-cursors - mv $out/share/icons/Nordzy-white-cursors/index.theme $out/share/icons/Nordzy-white-cursors/cursor.theme - mv $out/share/icons/Nordzy-white-cursors/Nordzy-white-cursors $out/share/icons/Nordzy-white-cursors/cursors + cp -r Nordzy-cursors{,-white,-lefthand} $out/share/icons ''; meta = with lib; { diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 80f6b5ce24ae..d665c9f2b0d7 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -6,6 +6,7 @@ , jdupes , boldPanelIcons ? false , blackPanelIcons ? false +, alternativeIcons ? false , themeVariants ? [] }: @@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation rec { ./install.sh --dest $out/share/icons \ --name WhiteSur \ --theme ${builtins.toString themeVariants} \ + ${lib.optionalString alternativeIcons "--alternative"} \ ${lib.optionalString boldPanelIcons "--bold"} \ ${lib.optionalString blackPanelIcons "--black"} diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 8c9a288b6c6a..241b209d9e2e 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -19,9 +19,7 @@ stdenvNoCC.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/data/misc/dtv-scan-tables/default.nix b/pkgs/data/misc/dtv-scan-tables/default.nix new file mode 100644 index 000000000000..741823871f4a --- /dev/null +++ b/pkgs/data/misc/dtv-scan-tables/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, v4l-utils +}: + +stdenv.mkDerivation rec { + pname = "dtv-scan-tables"; + version = "20221027"; + + src = fetchFromGitHub { + owner = "tvheadend"; + repo = "dtv-scan-tables"; + rev = "2a3dbfbab129c00d3f131c9c2f06b2be4c06fec6"; + hash = "sha256-bJ+naUs3TDFul4PmpnWYld3j1Se+1X6U9jnECe3sno0="; + }; + + nativeBuildInputs = [ + v4l-utils + ]; + + installFlags = [ + "DATADIR=$(out)" + ]; + + meta = with lib; { + description = "Digital TV scan tables"; + homepage = "https://github.com/tvheadend/dtv-scan-tables"; + license = with licenses; [ gpl2Only lgpl21Only ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 5b654ec8ad0d..4da998f3f3c8 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "e2ccf8a8796c9192280f796ce0f5d98ec783f856", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e2ccf8a8796c9192280f796ce0f5d98ec783f856.tar.gz", - "sha256": "092g4pbxyhkw1isbib967v5aw16iqs3w5iqcicv1irr4rphsr06z", - "msg": "Update from Hackage at 2022-11-11T17:48:48Z" + "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" } diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 9fd794d9d5bb..3d44e34f2b0d 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 = "20221130032508"; + version = "20221223102220"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-1UkP88HGh0KBYaekskeQHkJh02veUYmATKJD/wy4erc="; + sha256 = "sha256-bvTNxJcogF3KxZbC8jW0PMIiJJZnzubWybDcNK7id8s="; }; 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 2842394f7347..4cb78dcf7c99 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 = "202212150047"; + version = "202212220043"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "29c096b1285812a0a9a955b98ff2998c46f9b80a"; - sha256 = "sha256-44kP+4Bc7fwxNViWiKo7jLtUov+7k60v+7NF7CTkbjg="; + rev = "4a54320369805321b90c7c5ca4cdda4f12bdd295"; + sha256 = "sha256-PFbjzzjeCKL9aak45B+R5Y+H3fTBzdXpyEvvEEdInbQ="; }; installPhase = '' diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index c9159d505e36..0685e5d5b6a0 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -30,9 +30,7 @@ stdenvNoCC.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 869c9beb9b7c..79690fa4e6af 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -42,9 +42,7 @@ mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/data/themes/fluent-gtk-theme/default.nix new file mode 100644 index 000000000000..3359e6e1b128 --- /dev/null +++ b/pkgs/data/themes/fluent-gtk-theme/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gnome-themes-extra +, gtk-engine-murrine +, jdupes +, sassc +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, sizeVariants ? [] # default: standard +, tweaks ? [] +}: + +let + pname = "fluent-gtk-theme"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-12-15"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-lGT6MIpc7cdAznZlbSJJ7aBzZPHucyfR8ZNMdJI0LP8="; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Fluent design gtk theme"; + homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} |