[Nix-dev] Re: [Nix-commits] SVN commit: nix - 21781 - urkud - nixpkgs/trunk/pkgs/os-specific/linux/udev

[Nicolas Pierron]

On Sat, May 15, 2010 at 11:54, Yury G Kudryashov <urkud at mccme.ru> wrote:
> Author: urkud
> Date: 2010-05-15 09:54:35 +0000 (Sat, 15 May 2010)
> New Revision: 21781
>
> You can view the changes in this commit at:
>   https://svn.nixos.org/viewvc/nix?rev=21781&view=rev
>
> Modified:
>   nixpkgs/trunk/pkgs/os-specific/linux/udev/default.nix
>
> Log:
> Upgrade to udev-153. Use /etc/firmware:/root/test-firmware path
>
> Changes:
>
> Modified: nixpkgs/trunk/pkgs/os-specific/linux/udev/default.nix
> ===================================================================
> --- nixpkgs/trunk/pkgs/os-specific/linux/udev/default.nix       2010-05-15 09:49:07 UTC (rev 21780)
> +++ nixpkgs/trunk/pkgs/os-specific/linux/udev/default.nix       2010-05-15 09:54:35 UTC (rev 21781)
> @@ -4,29 +4,23 @@
>  assert stdenv ? glibc;
>
>  stdenv.mkDerivation rec {
> -  name = "udev-145";
> +  name = "udev-153";
>
>   src = fetchurl {
>     url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
> -    sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
> +    sha256 = "0i3ns4qhfbnci284k8zri0rfxw88ccajdynb5djh6k182a6nn3la";
>   };
>
>   buildInputs = [gperf pkgconfig glib acl libusb usbutils];
>
> -  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
> +  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids
> +    --disable-introspection
> +    --with-firmware-path=/etc/firmware:/root/test-firmware";
>
> -  preConfigure =
> -    ''
> -      substituteInPlace extras/keymap/Makefile.in \
> -        --replace /usr/include ${stdenv.glibc}/include
> -    '';
> -
>   postInstall =
>     ''
>       # Install some rules that really should be installed by default.
> -      for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
> -        cp rules/packages/$i $out/libexec/rules.d/
> -      done
> +      cp rules/packages/40-pilot-links.rules $out/libexec/rules.d/

NixOS need these files and I am trying to fix your issue by fixing a
bug in NixOS.  This bug fix rely on 64-md-raid.rules, in addition I
need the device mapper for ciphered partitions.

>       # The path to rule_generator.functions in write_cd_rules and
>       # write_net_rules is broken.  Also, don't store the mutable
> @@ -39,13 +33,8 @@
>       done
>
>       # Don't set PATH to /bin:/sbin; won't work in NixOS.
> -      substituteInPlace $out/libexec/rule_generator.functions \
> -        --replace 'PATH=' '#PATH='
> +      sed -e '/PATH=/d' -i $out/libexec/rule_generator.functions
>
> -      # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
> -      # environment of the caller.
> -      sed '3,4d' -i $out/libexec/firmware.sh
> -
>       ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit
>     '';
>
>
> _______________________________________________
> nix-commits mailing list
> nix-commits at cs.uu.nl
> http://mail.cs.uu.nl/mailman/listinfo/nix-commits
>



-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/