summary refs log tree commit diff
path: root/pkgs/os-specific/linux/mmc-utils/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-28 13:44:21 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-28 17:46:39 +0000
commitcab13e087c80c4e7476bb7df432e2b7deb56563d (patch)
treef8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/mmc-utils/default.nix
parentd9c82ed3044c72cecf01c6ea042489d30914577c (diff)
parent8ecc61c91a596df7d3293603a9c2384190c1b89a (diff)
downloadnixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts:
	pkgs/applications/graphics/hello-wayland/default.nix
	pkgs/applications/virtualization/cloud-hypervisor/default.nix
	pkgs/applications/window-managers/tinywl/default.nix
	pkgs/applications/window-managers/wayfire/applications.nix
	pkgs/applications/window-managers/wayfire/default.nix
	pkgs/applications/window-managers/wayfire/wcm.nix
	pkgs/applications/window-managers/wayfire/wf-config.nix
	pkgs/applications/window-managers/wayfire/wf-shell.nix
	pkgs/development/libraries/wlroots/default.nix
	pkgs/os-specific/linux/chromium-os/crosvm/default.nix
	pkgs/os-specific/linux/kernel/common-config.nix
	pkgs/os-specific/linux/kernel/patches.nix
	pkgs/os-specific/linux/mdevd/default.nix
	pkgs/os-specific/linux/s6-linux-init/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/mmc-utils/default.nix')
-rw-r--r--pkgs/os-specific/linux/mmc-utils/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix
index 61ad327c394..7430182e5d2 100644
--- a/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/pkgs/os-specific/linux/mmc-utils/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   pname = "mmc-utils";
-  version = "2018-12-14";
+  version = "2021-05-11";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git";
-    rev = "aef913e31b659462fe6b9320d241676cba97f67b";
-    sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7";
+    rev = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc";
+    sha256 = "0l06ahmprqshh75pkdpagb8fgnp2bwn8q8hwp1yl3laww2ghm8i5";
   };
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp man/mmc.1 $out/share/man/man1/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Configure MMC storage devices from userspace";
     homepage = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/";
     license = licenses.gpl2;