From b6c5b9806f6ae79652336a7cfb51fe0f03d0590a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Tue, 20 Nov 2012 14:06:10 -0800 Subject: [PATCH 1/4] add bash-4.2 patches 25 through 39 --- pkgs/shells/bash/bash-4.2-patches.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 8d2a74e95b0..57f4ef91863 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -25,4 +25,20 @@ patch: [ (patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") (patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") (patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") +(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") +(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") +(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") +(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") +(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") +(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") +(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") +(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") +(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") +(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") +(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") +(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") +(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") +(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq") +(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl") ] + From 949421a4b996aa30370e398e899119754f2f8448 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 28 Nov 2012 14:10:07 -0800 Subject: [PATCH 2/4] Applied to wrong branch. Revert "add bash-4.2 patches 25 through 39" This reverts commit b6c5b9806f6ae79652336a7cfb51fe0f03d0590a. --- pkgs/shells/bash/bash-4.2-patches.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 57f4ef91863..8d2a74e95b0 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -25,20 +25,4 @@ patch: [ (patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") (patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") (patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") -(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") -(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") -(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") -(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") -(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") -(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") -(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") -(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") -(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") -(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") -(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") -(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") -(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") -(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq") -(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl") ] - From 2fd4313f6c13851f73e414a00ac8fb9457ae1674 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 9 Jan 2013 11:49:41 -0800 Subject: [PATCH 3/4] x86info-1.30 --- pkgs/os-specific/linux/x86info/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/x86info/default.nix diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix new file mode 100644 index 00000000000..0cdb7fea1af --- /dev/null +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, pciutils, python}: + +stdenv.mkDerivation rec { + version = "1.30"; + name = "x86info-${version}"; + + src = fetchurl { + url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz"; + sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; + }; + + buildInputs = [ pciutils python ]; + + installPhase = '' + ensureDir $out/bin + cp x86info lsmsr $out/bin + ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [jcumming]; + description = "x86info, a CPU identification utility."; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bf3e136a5..2958c9bb4f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1749,6 +1749,8 @@ let wv2 = callPackage ../tools/misc/wv2 { }; + x86info = callPackage ../os-specific/linux/x86info { }; + x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools { From 0cfd455a67accd8c1617532f8e2377889f8789bc Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 11 Jan 2013 09:25:32 -0800 Subject: [PATCH 4/4] Update x86info description. Add Homepage. --- pkgs/os-specific/linux/x86info/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 0cdb7fea1af..d8840d08460 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -17,8 +17,17 @@ stdenv.mkDerivation rec { ''; meta = { + description = "An identification utility for the x86 series of processors."; + longDescription = + '' + x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages + the cpuid kernel module where possible. it supports parsing model specific + registers (MSRs) via the msr kernel module. it will approximate processor + frequency, and identify the cache sizes and layout. + ''; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + homepage = http://codemonkey.org.uk/projects/x86info/; maintainers = with stdenv.lib.maintainers; [jcumming]; - description = "x86info, a CPU identification utility."; }; }