JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39907 from matthewbauer/work

Browse Source 
Miscellaneous cleanups
This commit is contained in:
Matthew Justin Bauer 2018-05-03 13:33:42 -05:00 committed by GitHub
commit b45ef79b74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 55 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/spotify/default.nix
View File

@ -2,8 +2,6 @@
, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }:
assert stdenv.system == "x86_64-linux";
let
# Please update the stable branch!
# Latest version number can be found at:

2
pkgs/applications/editors/jetbrains/default.nix
View File

@ -3,8 +3,6 @@
, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses
}:
assert stdenv.isLinux;
with stdenv.lib;
let

4
pkgs/applications/editors/sublime/2/default.nix
View File

@ -2,11 +2,10 @@
let
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo];
in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "sublimetext-2.0.2";
src =
src =
if stdenv.system == "i686-linux" then
fetchurl {
name = "sublimetext-2.0.2.tar.bz2";
@ -55,5 +54,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Sophisticated text editor for code, markup and prose";
license = stdenv.lib.licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

3
pkgs/applications/editors/sublime/3/common.nix
View File

@ -4,7 +4,6 @@
pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
gksuSupport ? false, gksu, unzip, zip, bash}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
assert gksuSupport -> gksu != null;
let
@ -114,6 +113,6 @@ in stdenv.mkDerivation (rec {
homepage = https://www.sublimetext.com/;
maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ];
license = licenses.unfree;
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
};
})

4
pkgs/applications/graphics/draftsight/default.nix
View File

@ -4,8 +4,6 @@
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
libXrender, libXcomposite }:
assert stdenv.system == "x86_64-linux";
let version = "2017-SP2"; in
stdenv.mkDerivation {
name = "draftsight-${version}";
@ -71,6 +69,6 @@ stdenv.mkDerivation {
homepage = https://www.3ds.com/products-services/draftsight-cad-software/;
license = stdenv.lib.licenses.unfree;
maintainers = with maintainers; [ hodapp ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/applications/misc/ipmiview/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "IPMIView-${version}";
version = "2.13.0";

11
pkgs/applications/misc/minergate/default.nix
View File

@ -1,12 +1,10 @@
{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }:
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
version = "8.1";
name = "minergate-${version}";
src = fetchurl {
url = "https://minergate.com/download/ubuntu";
url = "https://minergate.com/download/ubuntu";
sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13";
};
@ -15,12 +13,12 @@ stdenv.mkDerivation rec {
phases = [ "installPhase" ];
installPhase = ''
dpkg-deb -x $src $out
dpkg-deb -x $src $out
pgm=$out/opt/minergate/minergate
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
patchelf --set-interpreter "$interpreter" $pgm
wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
rm $out/usr/bin/minergate
@ -35,5 +33,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ bfortz ];
platforms = [ "x86_64-linux" ];
};
}
}

2
pkgs/applications/misc/playonlinux/default.nix
View File

@ -21,8 +21,6 @@
, curl
}:
assert stdenv.isLinux;
let
version = "4.2.12";

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -48,8 +48,6 @@
, gnupg
}:
assert stdenv.isLinux;
let
inherit (generated) version sources;

7
pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, dpkg, zlib }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "TREZOR-bridge-1.0.5";
@ -42,6 +40,7 @@ stdenv.mkDerivation {
# Download URL, .deb content & hash (yikes) changed, not version.
# New archive doesn't contain any Mozilla plugin at all.
broken = true;
};
platforms = platforms.linux;
};
}
}

2
pkgs/applications/networking/ike/default.nix
View File

@ -1,8 +1,6 @@
{ stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper
, gcc, nettools, iproute, linuxHeaders }:
assert stdenv.isLinux;
# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
# launch with "iked -f /etc/iked.conf"

2
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -3,8 +3,6 @@
, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg
}:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "jitsi-${version}";
version = "2.10.5550";

4
pkgs/applications/networking/instant-messengers/viber/default.nix
View File

@ -3,8 +3,6 @@
libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}:
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "viber-${version}";
version = "7.0.0.1035";
@ -99,7 +97,7 @@ stdenv.mkDerivation rec {
homepage = http://www.viber.com;
description = "An instant messaging and Voice over IP (VoIP) app";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ jagajaga ];
};

2
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -24,8 +24,6 @@ let
buildCore = monolithic || daemon;
in
assert stdenv.isLinux;
assert monolithic -> !client && !daemon;
assert client || daemon -> !monolithic;
assert !buildClient -> !withKDE; # KDE is used by the client only

2
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -43,8 +43,6 @@
, gnupg
}:
assert stdenv.isLinux;
# imports `version` and `sources`
with (import ./release_sources.nix);

4
pkgs/applications/office/mendeley/default.nix
View File

@ -34,8 +34,6 @@
, writeScript
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
arch32 = "i686-linux";
arch64 = "x86_64-linux";
@ -140,7 +138,7 @@ stdenv.mkDerivation {
homepage = http://www.mendeley.com;
description = "A reference manager and academic social network";
license = licenses.unfree;
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ dtzWill ];
};

1
pkgs/applications/science/logic/verifast/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype
, fontconfig, libxml2, gnome2 }:
assert stdenv.isLinux;
let
libPath = stdenv.lib.makeLibraryPath

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -82,7 +82,7 @@ rec {
git-radar = callPackage ./git-radar { };
git-recent = callPackage ./git-recent {
utillinux = if stdenv.isLinux then utillinuxMinimal else null;
utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
};
git-remote-hg = callPackage ./git-remote-hg { };

12
pkgs/applications/version-management/git-and-tools/git-recent/default.nix
View File

@ -1,15 +1,9 @@
{stdenv, git, less, fetchFromGitHub, makeWrapper
# utillinuxMinimal is included because we need the column command
, utillinux ? null
, utillinux
}:
assert stdenv.isLinux -> utillinux != null;
let
binpath = stdenv.lib.makeBinPath
([ git less ]
++ stdenv.lib.optional (utillinux != null) utillinux);
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "git-recent-${version}";
version = "1.0.4";
@ -28,7 +22,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin
cp git-recent $out/bin
wrapProgram $out/bin/git-recent \
--prefix PATH : "${binpath}"
--prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}"
'';
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-2/desktop/libgweather/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "libgweather-2.30.3";
src = fetchurl {

1
pkgs/development/compilers/oraclejdk/jdk10-linux.nix
View File

@ -25,7 +25,6 @@
, setJavaClassPath
}:
assert stdenv.system == "x86_64-linux";
assert swingSupport -> xorg != null;
let

1
pkgs/development/libraries/glib/default.nix
View File

@ -9,7 +9,6 @@
with stdenv.lib;
assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU || hostPlatform.isCygwin;
assert stdenv.isLinux -> utillinuxMinimal != null;
# TODO:

2
pkgs/development/mobile/androidenv/androidndk.nix
View File

@ -3,8 +3,6 @@
, platformTools
}:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "android-ndk-r10e";

2
pkgs/development/mobile/androidenv/androidndk_r8e.nix
View File

@ -3,8 +3,6 @@
, platformTools
}:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "android-ndk-r8e";

4
pkgs/development/mobile/flashtool/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }:
assert stdenv.system == "i686-linux";
# TODO:
#
# The FlashTool and FlashToolConsole scripts are messy and should probably we
@ -57,7 +55,7 @@ stdenv.mkDerivation rec {
homepage = http://www.flashtool.net/;
description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
license = stdenv.lib.licenses.unfreeRedistributableFirmware;
platforms = stdenv.lib.platforms.linux;
platforms = [ "i686-linux" ];
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
};

1
pkgs/development/tools/iaca/2.1.nix
View File

@ -1,5 +1,4 @@
{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }:
assert stdenv.system == "x86_64-linux";
with stdenv.lib;
# v2.1: last version with NHM/WSM arch support

1
pkgs/development/tools/iaca/3.0.nix
View File

@ -1,5 +1,4 @@
{ stdenv, requireFile, patchelf, unzip }:
assert stdenv.system == "x86_64-linux";
with stdenv.lib;
stdenv.mkDerivation {

4
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@ -21,8 +21,6 @@ let
in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
pname = "saleae-logic";
version = "1.2.10";
@ -93,7 +91,7 @@ stdenv.mkDerivation rec {
description = "Software for Saleae logic analyzers";
homepage = http://www.saleae.com/;
license = licenses.unfree;
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.bjornfor ];
};
}

1
pkgs/development/tools/phantomjs/default.nix
View File

@ -3,7 +3,6 @@
let
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
in
assert lib.elem stdenv.system platforms;
stdenv.mkDerivation rec {
name = "phantomjs-1.9.8";

3
pkgs/games/adom/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio
, xorg }:
assert stdenv.system == "x86_64-linux";
let
inherit (xorg) libXext libX11;
@ -58,5 +57,3 @@ stdenv.mkDerivation rec {
platforms = ["x86_64-linux"];
};
}

4
pkgs/games/sdlmame/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
version = "0.151.u0-1";
name = "sdlmame-${version}";
@ -39,6 +37,6 @@ stdenv.mkDerivation rec {
description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support";
license = "MAME";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

3
pkgs/games/terraria-server/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, lib, file, fetchurl, unzip }:
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "terraria-server-${version}";
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = http://terraria.org;
description = "Dedicated server for Terraria, a 2D action-adventure sandbox";
platforms = platforms.linux;
platforms = ["x86_64-linux"];
license = licenses.unfree;
};
}

1
pkgs/games/tibia/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }:
with stdenv.lib;
assert stdenv.isi686;
stdenv.mkDerivation {
name = "tibia-10.90";

6
pkgs/games/ue4demos/default.nix
View File

@ -1,8 +1,5 @@
{ stdenv, fetchurl, unzip, patchelf, xorg, openal }:
assert stdenv.isLinux;
assert stdenv.isx86_64;
let
buildDemo = { name, src }:
stdenv.mkDerivation rec {
@ -47,7 +44,7 @@ let
meta = {
description = "Unreal Engine 4 Linux demos";
homepage = https://wiki.unrealengine.com/Linux_Demos;
platforms = stdenv.lib.platforms.linux;
platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.unfree;
};
};
@ -189,4 +186,3 @@ in {
};
};
}

8
pkgs/misc/drivers/gutenprint/bin.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, rpm, cpio, zlib }:
assert stdenv.system == "x86_64-linux";
/* usage: (sorry, its still impure but works!)
impure directory:
@ -23,7 +21,7 @@ sed -n 's/^ServerBin //p' $(sed -n 's/respawn.*-c \(.*''\) -F.*''/\1/p' /etc/eve
then. I've tried that.
TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc
*/
stdenv.mkDerivation {
@ -56,13 +54,13 @@ stdenv.mkDerivation {
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $libPath $p
done
mkdir $out/lib
ln -s $out/cups/lib $out/lib/cups
'';
meta = {
description = "Some additional CUPS drivers including Canon drivers";
platforms = stdenv.lib.platforms.linux;
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/misc/emulators/pcsx2/default.nix
View File

@ -2,8 +2,6 @@
, makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv
, wxGTK30, zlib }:
assert stdenv.isi686;
stdenv.mkDerivation rec {
name = "pcsx2-${version}";
version = "1.4.0";

5
pkgs/misc/emulators/wine/base.nix
View File

@ -6,7 +6,6 @@
buildScript ? null, configureFlags ? ""
}:
assert stdenv.isLinux;
assert stdenv.cc.cc.isGNU or false;
with import ./util.nix { inherit lib; };
@ -83,7 +82,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
# Add capability to ignore known failing tests
# and enable doCheck
doCheck = false;
postInstall = let
links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";
in ''
@ -100,7 +99,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
fi
done
'';
enableParallelBuilding = true;
# https://bugs.winehq.org/show_bug.cgi?id=43530

5
pkgs/misc/foldingathome/default.nix
View File

@ -1,7 +1,5 @@
{stdenv, fetchurl}:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "folding-at-home-6.02";
@ -22,7 +20,7 @@ stdenv.mkDerivation {
# be considered a gcroot.
installPhase = ''
BINFILES="fah6 mpiexec";
for a in $BINFILES; do
for a in $BINFILES; do
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a
done
mkdir -p $out/bin
@ -33,5 +31,6 @@ stdenv.mkDerivation {
homepage = http://folding.stanford.edu/;
description = "Folding@home distributed computing client";
license = stdenv.lib.licenses.unfree;
platforms = [ "i686-linux" ];
};
}

2
pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, writeScript }:
assert stdenv.isDarwin;
stdenv.mkDerivation rec {
name = "darwin-native-x11-and-opengl";

1
pkgs/os-specific/linux/blcr/default.nix
View File

@ -2,7 +2,6 @@
# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
assert stdenv.isLinux;
assert builtins.compareVersions "3.18" kernel.version == 1;
stdenv.mkDerivation {

2
pkgs/os-specific/linux/bluez/default.nix
View File

@ -2,8 +2,6 @@
pythonPackages, readline, udev, libical,
systemd, enableWiimote ? false, enableMidi ? false }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "bluez-5.49";

2
pkgs/os-specific/linux/cpufrequtils/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, libtool, gettext }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "cpufrequtils-008";

2
pkgs/os-specific/linux/drbd/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, flex, systemd, perl }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "drbd-8.4.4";

8
pkgs/os-specific/linux/libcap/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, buildPackages, fetchurl, attr, perl, pam ? null }:
assert pam != null -> stdenv.isLinux;
{ stdenv, buildPackages, fetchurl, attr, perl, pam }:
stdenv.mkDerivation rec {
name = "libcap-${version}";
@ -10,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39";
};
outputs = [ "out" "dev" "lib" "man" "doc" ]
++ stdenv.lib.optional (pam != null) "pam";
outputs = [ "out" "dev" "lib" "man" "doc" "pam" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
@ -22,7 +20,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"lib=lib"
(stdenv.lib.optional (pam != null) "PAM_CAP=yes")
"PAM_CAP=yes"
"BUILD_CC=$(CC_FOR_BUILD)"
"CC:=$(CC)"
];

2
pkgs/os-specific/linux/lsscsi/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl }:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "lsscsi-0.28";

2
pkgs/os-specific/linux/mdadm/default.nix
View File

@ -3,8 +3,6 @@
, buildPlatform, hostPlatform
}:
assert stdenv.isLinux;
let
sendmail-script = writeScript "sendmail-script" ''
#!/bin/sh

3
pkgs/os-specific/linux/mwprocapture/default.nix
View File

@ -5,9 +5,6 @@ with stdenv.lib;
# The Magewell Pro Capture drivers are not supported for kernels older than 3.2
assert versionAtLeast kernel.version "3.2.0";
# this package currently only supports x86 and x86_64, as I have no ARM device to test on
assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
let
bits =
if stdenv.is64bit then "64"

1
pkgs/os-specific/linux/phc-intel/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, kernel, which }:
assert stdenv.isLinux;
# Don't bother with older versions, though some might even work:
assert stdenv.lib.versionAtLeast kernel.version "4.10";

2
pkgs/os-specific/linux/psmisc/default.nix
View File

@ -1,7 +1,5 @@
{stdenv, fetchurl, ncurses}:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "psmisc-23.1";

2
pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
View File

@ -1,7 +1,5 @@
{ stdenv, systemd, cryptsetup }:
assert stdenv.isLinux;
stdenv.lib.overrideDerivation systemd (p: {
version = p.version;
name = "systemd-cryptsetup-generator";

2
pkgs/os-specific/linux/systemd/default.nix
View File

@ -13,8 +13,6 @@
, withSelinux ? false, libselinux
}:
assert stdenv.isLinux;
let
pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);

1
pkgs/os-specific/linux/uclibc/default.nix
View File

@ -1,7 +1,6 @@
{stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
extraConfig ? ""}:
assert stdenv.isLinux;
assert cross != null -> gccCross != null;
let

2
pkgs/os-specific/linux/upower/default.nix
View File

@ -3,8 +3,6 @@
, useSystemd ? true, systemd, gobjectIntrospection
}:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "upower-0.99.7";

2
pkgs/os-specific/linux/xf86-input-multitouch/default.nix
View File

@ -11,8 +11,6 @@
, libpciaccess
}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "xf86-input-multitouch-20110312";

3
pkgs/servers/sql/oracle-xe/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }:
assert stdenv.system == "x86_64-linux";
with stdenv.lib;
stdenv.mkDerivation rec {
@ -79,5 +77,6 @@ stdenv.mkDerivation rec {
description = "Oracle Database Express Edition";
homepage = http://www.oracle.com/technetwork/products/express-edition/;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/tools/audio/aucdtect/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, lib, rpmextract }:
assert stdenv.isLinux;
with lib;
stdenv.mkDerivation rec {

5
pkgs/tools/filesystems/yandex-disk/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }:
assert stdenv.isLinux;
let
p = if stdenv.is64bit then {
arch = "x86_64";
@ -13,7 +11,7 @@ let
gcclib = "${stdenv.cc.cc.lib}/lib";
sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx";
};
in
in
stdenv.mkDerivation rec {
name = "yandex-disk-${version}";
@ -64,4 +62,3 @@ stdenv.mkDerivation rec {
'';
};
}

3
pkgs/tools/misc/megacli/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, rpmextract, ncurses5, patchelf, makeWrapper, requireFile, unzip }:
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "megacli-8.07.07";
@ -31,5 +29,6 @@ stdenv.mkDerivation rec {
meta = {
description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards";
license = stdenv.lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/tools/misc/pk2cmd/default.nix
View File

@ -1,7 +1,5 @@
{stdenv, fetchurl, libusb, makeWrapper}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "pk2cmd-1.20";
src = fetchurl {

23
pkgs/tools/misc/trash-cli/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, coreutils
, python3, python3Packages, substituteAll }:
assert stdenv.isLinux;
{ stdenv, fetchFromGitHub, fetchpatch, python3, python3Packages
, lib, makeWrapper, coreutils }:
python3Packages.buildPythonApplication rec {
name = "trash-cli-${version}";
@ -16,12 +14,6 @@ python3Packages.buildPythonApplication rec {
};
patches = [
(substituteAll {
src = ./nix-paths.patch;
df = "${coreutils}/bin/df";
libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
})
# Fix build on Python 3.6.
(fetchpatch {
url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";
@ -30,10 +22,19 @@ python3Packages.buildPythonApplication rec {
];
buildInputs = with python3Packages; [ nose mock ];
nativeBuildInputs = [ makeWrapper ];
preFixup = ''
for bin in $out/bin/*; do
wrapProgram $bin \
--prefix PATH : ${lib.makeBinPath [ coreutils ]} \
--prefix DYLD_LIBRARY_PATH : ${lib.makeSearchPath "lib" (lib.optional (stdenv.hostPlatform.libc == "glibc") (lib.getDev stdenv.cc.libc))}
done
'';
checkPhase = "nosetests";
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://github.com/andreafrancia/trash-cli;
description = "Command line tool for the desktop trash can";
maintainers = [ maintainers.rycee ];

26
pkgs/tools/misc/trash-cli/nix-paths.patch
View File

@ -1,26 +0,0 @@
--- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100
+++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100
@@ -12,7 +12,7 @@ def mount_points_from_getmnt():
def mount_points_from_df():
import subprocess
- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout
+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout
return list(_mount_points_from_df_output(df_output))
def _mount_points_from_df_output(df_output):
@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() :
("mnt_freq", c_int), # Dump frequency (in days).
("mnt_passno", c_int)] # Pass number for `fsck'.
- if sys.platform == "cygwin":
- libc_name = "cygwin1.dll"
- else:
- libc_name = find_library("c")
-
- if libc_name == None :
- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0
+ libc_name = "@libc@"
libc = cdll.LoadLibrary(libc_name)
libc.getmntent.restype = POINTER(mntent_struct)

2
pkgs/tools/networking/filegive/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, fetchgit, go }:
assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
let
# Code with BSD license

2
pkgs/tools/networking/logmein-hamachi/default.nix
View File

@ -2,8 +2,6 @@
with stdenv.lib;
assert stdenv.isLinux;
let
arch =
if stdenv.system == "x86_64-linux" then "x64"

2
pkgs/tools/networking/miniupnpd/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, iptables, libuuid, pkgconfig }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "miniupnpd-2.0.20180422";

4
pkgs/tools/networking/ssmtp/default.nix
View File

@ -4,7 +4,7 @@ assert tlsSupport -> openssl != null;
stdenv.mkDerivation {
name = "ssmtp-2.64";
src = fetchurl {
url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2;
sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2";
@ -28,7 +28,7 @@ stdenv.mkDerivation {
installFlags = "etcdir=$(out)/etc";
installTargets = [ "install" "install-sendmail" ];
buildInputs = stdenv.lib.optional tlsSupport openssl;
meta = with stdenv.lib; {

12
pkgs/tools/security/enpass/default.nix
View File

@ -3,15 +3,15 @@
, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
, makeWrapper , makeDesktopItem, python, pythonPackages, lib
, libredirect, lsof}:
assert system == "i686-linux" || system == "x86_64-linux";
let
all_data = (with builtins; fromJSON (readFile ./data.json));
all_data = builtins.fromJSON (builtins.readFile ./data.json);
system_map = {
i686-linux = "i386";
x86_64-linux = "amd64";
};
data = (with builtins; getAttr (getAttr system system_map) all_data);
data = all_data.${system_map.${system} or (throw "Unsupported platform")};
baseUrl = http://repo.sinew.in;
@ -54,7 +54,7 @@ let
description = "a well known password manager";
homepage = https://www.enpass.io/;
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
platforms = [ "x86_64-linux" "i686-linux"];
};
buildInputs = [makeWrapper dpkg];
@ -70,8 +70,8 @@ let
cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered}
sed \
-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
$out/share/applications/enpass.desktop
-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
$out/share/applications/enpass.desktop
for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i

2
pkgs/tools/system/storebrowse/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, fetchhg, go, sqlite}:
assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
stdenv.mkDerivation rec {
name = "storebrowse-20130318212204";