diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
| commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
| tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/data/misc/nixos-artwork | |
| parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
| parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
| download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/data/misc/nixos-artwork')
| -rw-r--r-- | nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix index af8a157d491c..75c7075bae9f 100644 --- a/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix +++ b/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix @@ -1,25 +1,39 @@ { stdenv +, lib , fetchFromGitHub , imagemagick }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "nixos-icons"; - version = "2021-02-24"; + version = "0-unstable-2024-04-10"; src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-artwork"; - rev = "488c22aad523c709c44169d3e88d34b4691c20dc"; - sha256 = "ZoanCzn4pqGB1fyMzMyGQVT0eIhNdL7ZHJSn1VZWVRs="; + rev = "f84c13adae08e860a7c3f76ab3a9bef916d276cc"; + hash = "sha256-lO/2dLGK2f9pzLHudRIs4PUcGUliy7kfyt9r4CbhbVg="; }; + sourceRoot = "${finalAttrs.src.name}/icons"; + + strictDeps = true; + nativeBuildInputs = [ imagemagick ]; makeFlags = [ - "DESTDIR=${placeholder "out"}" - "prefix=" + "prefix=${placeholder "out"}" ]; -} + + enableParallelBuilding = true; + + meta = with lib; { + description = "Icons of the Nix logo, in Freedesktop Icon Directory Layout"; + homepage = "https://github.com/NixOS/nixos-artwork"; + license = licenses.cc-by-40; + maintainers = with maintainers; []; + platforms = platforms.all; + }; +}) |