diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-20 12:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 12:02:05 +0000 |
| commit | 3202dd166c491b8389c130d80dde3a377f650741 (patch) | |
| tree | f01981a4772ae7a89265dcf9f32ab04e45866053 /pkgs/data | |
| parent | b53692cdc6c06881578f206239291326ed42a78c (diff) | |
| parent | 578dd8d634f0a4666f7481f6ea9e578114da74f8 (diff) | |
| download | nixpkgs-3202dd166c491b8389c130d80dde3a377f650741.tar nixpkgs-3202dd166c491b8389c130d80dde3a377f650741.tar.gz nixpkgs-3202dd166c491b8389c130d80dde3a377f650741.tar.bz2 nixpkgs-3202dd166c491b8389c130d80dde3a377f650741.tar.lz nixpkgs-3202dd166c491b8389c130d80dde3a377f650741.tar.xz nixpkgs-3202dd166c491b8389c130d80dde3a377f650741.tar.zst nixpkgs-3202dd166c491b8389c130d80dde3a377f650741.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/themes/flat-remix-gnome/default.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index ec0fa407d73..17a63debdc6 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; - phases = [ "installPhase" ]; - installPhase = '' osinfo-db-import --dir "$out/share/osinfo" "${src}" ''; diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index cff5f911584..f9eed54534c 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20210623"; + version = "20210715"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-FKsbAvjhXb2ipe3XqACM6OwGYwbBbzvDjsUQYCIQ8NM="; + hash = "sha256-e7sXzmhfBfcp+KqIc9yuqqXLfYzVlQVn9TNYoa2lZcA="; }; nativeBuildInputs = [ glib ]; |