diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/commit-mono/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/material-design-icons/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/sarasa-gothic/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/fonts/sudo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/catppuccin-cursors/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/dbip-country-lite/default.nix | 4 | ||||
-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/themes/alacritty-theme/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/themes/catppuccin-gtk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/colloid-kde/default.nix | 24 | ||||
-rw-r--r-- | pkgs/data/themes/graphite-gtk-theme/default.nix | 6 |
12 files changed, 39 insertions, 35 deletions
diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index 16fd6b7dd1a1f..ea358bba2b556 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.142"; + version = "1.143"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; - hash = "sha256-ZOEo+uD1Vug+F38/eXD6xG1netEIAYn25bPBZ1H7aEE="; + hash = "sha256-JTyPgWfbWq+lXQU/rgnyvPG6+V3f+FB5QUkd+I1oFKE="; stripRoot = false; }; diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 1a6537a0096fe..872c3af264900 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -34,6 +34,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://materialdesignicons.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ vlaci PlayerNameHere ]; + maintainers = with maintainers; [ vlaci dixslyf ]; }; } diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index b7895b94be4c5..b18b79950bfd3 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.42.6"; + version = "1.0.2"; src = fetchurl { # 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"; - hash = "sha256-G6REQA3Eq5fqVQCQN967Yv1xaLQSG06meJ0KeD0I/TM="; + url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/Sarasa-TTC-${version}.7z"; + hash = "sha256-h34M5waO2uaqsZDYEEI72LIYv7B1Qjwms2v6qGTaNKg="; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 68b8eae40e2a0..874aeb4c4b55d 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "0.77"; + version = "0.80"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-xnIDCuCUP8ErUsWTJedWpy4lo77Ji+FO2vO9BRDAmV0="; + hash = "sha256-PUqWwWvi9k7Aj6L7NjlrBMFeRHKDUF5yX4efvi0nywI="; }; installPhase = '' diff --git a/pkgs/data/icons/catppuccin-cursors/default.nix b/pkgs/data/icons/catppuccin-cursors/default.nix index 450484b463272..20e4718515e61 100644 --- a/pkgs/data/icons/catppuccin-cursors/default.nix +++ b/pkgs/data/icons/catppuccin-cursors/default.nix @@ -61,6 +61,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/catppuccin/cursors"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ PlayerNameHere ]; + maintainers = with maintainers; [ dixslyf ]; }; } diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index 4e3ec3b550497..8685c1b35cd78 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2023-12"; + version = "2024-01"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-02ujUkrMaINTwPUQbC/RKfAgGMySgalQnpALxdZQW/A="; + hash = "sha256-aFelcJPwkHRp/McStNABdJKTifz+WK3ODUk8bdiTtEk="; }; dontUnpack = true; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 7ed0f4abfd4a8..a45f47bee6858 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "def4ad933fb86415a9802d7833369d12520e7744", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/def4ad933fb86415a9802d7833369d12520e7744.tar.gz", - "sha256": "0nfqz1mwzgvkkk22igq5jxfwfcc0l8i1ihlgxaixf2ip1qqlqzs6", - "msg": "Update from Hackage at 2023-11-20T05:37:18Z" + "commit": "6a46f981138e6d012bfcced5f1d2b309b5452766", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6a46f981138e6d012bfcced5f1d2b309b5452766.tar.gz", + "sha256": "1v297xyfv9nv1bji08gq8s6wrgmxjnhklvf6p0mvslyrj36w7mlj", + "msg": "Update from Hackage at 2023-12-04T17:35:08Z" } diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 7b2a05e97349b..01042d5c6b68c 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 = "20231219144426"; + version = "20240101162810"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-xiHQL4fyGcb0yY++aqwaaZ8spPINQwbhI/VIer2LOe0="; + hash = "sha256-aL5QH+bvQt3l40GuM0lbvamjl1I7MpkSNceiaccyttg="; }; vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY="; meta = with lib; { diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index e8dd692eb6e47..ea5a426f624a1 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { name = "alacritty-theme"; - version = "unstable-2023-11-07"; + version = "unstable-2023-12-28"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "808b81b2e88884e8eca5d951b89f54983fa6c237"; - hash = "sha256-g5tM6VBPLXin5s7X0PpzWOOGTEwHpVUurWOPqM/O13A="; + rev = "b7a59c92fd54a005893b99479fb0aa466a37a4b7"; + hash = "sha256-UBWH4Q9MliqcolFq1tZrfRdzCkUO1pRn84qvZEVw8Gg="; }; dontConfigure = true; diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix index dd3ee6bb303a9..49df77b2adb96 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/data/themes/catppuccin-gtk/default.nix @@ -16,7 +16,7 @@ let validAccents = [ "blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow" ]; validSizes = [ "standard" "compact" ]; - validTweaks = [ "black" "rimless" "normal" ]; + validTweaks = [ "black" "rimless" "normal" "float" ]; validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; pname = "catppuccin-gtk"; @@ -82,6 +82,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/catppuccin/gtk"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fufexan PlayerNameHere ]; + maintainers = with maintainers; [ fufexan dixslyf ]; }; } diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix index 24cde3f38989d..5393c54f7c335 100644 --- a/pkgs/data/themes/colloid-kde/default.nix +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -18,13 +18,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-AYH9fW20/p+mq6lxR1lcCV1BQ/kgcsjHncpMvYWXnWA="; }; - # Propagate sddm theme dependencies to user env otherwise sddm does - # not find them. Putting them in buildInputs is not enough. - propagatedUserEnvPkgs = [ - kdeclarative.bin - plasma-framework - plasma-workspace - ]; + outputs = [ "out" "sddm" ]; postPatch = '' patchShebangs install.sh @@ -34,12 +28,12 @@ stdenvNoCC.mkDerivation rec { --replace '$HOME/.config' $out/share substituteInPlace sddm/install.sh \ - --replace /usr $out \ + --replace /usr $sddm \ --replace '$(cd $(dirname $0) && pwd)' . \ --replace '"$UID" -eq "$ROOT_UID"' true substituteInPlace sddm/Colloid/Main.qml \ - --replace /usr $out + --replace /usr $sddm ''; installPhase = '' @@ -50,13 +44,23 @@ stdenvNoCC.mkDerivation rec { name= HOME="$TMPDIR" \ ./install.sh --dest $out/share/themes - mkdir -p $out/share/sddm/themes + mkdir -p $sddm/share/sddm/themes cd sddm source install.sh runHook postInstall ''; + postFixup = '' + # Propagate sddm theme dependencies to user env otherwise sddm + # does not find them. Putting them in buildInputs is not enough. + + mkdir -p $sddm/nix-support + + printWords ${kdeclarative.bin} ${plasma-framework} ${plasma-workspace} \ + >> $sddm/nix-support/propagated-user-env-packages + ''; + passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 46cceaa23ba47..ef453e7cbbda9 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { inherit pname; - version = "unstable-2023-11-22"; + version = "2023-12-31"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "429645480653e2e3b3d003d9afcebf075769db2b"; - sha256 = "sha256-2MPAyod4kPlj/eJiYRsS3FJL0pUR+o9W4CSbI6M3350="; + rev = version; + hash = "sha256-tAby1nLRBdkVQy448BXloBw8oeYqN2aFEs0jahNI3jg="; }; nativeBuildInputs = [ |