diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/qmmp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/dfilemanager/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/kubectl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/eagle/eagle.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/nix-prefetch-github/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/nextpnr/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/icestorm/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/unifi/default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyIRCt/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyMAILt/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/shab/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
15 files changed, 22 insertions, 40 deletions
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 03f6bb1b7936..ef52c65b1051 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, xlibsWrapper +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -28,7 +28,7 @@ # Qmmp installs working .desktop file(s) all by itself, so we don't need to # handle that. -stdenv.mkDerivation rec { +mkDerivation rec { name = "qmmp-1.3.3"; src = fetchurl { diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 403075f91352..3f99e22a4cbd 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -78,8 +78,6 @@ stdenv.mkDerivation { buildInputs = [ squashfsTools makeWrapper ]; - doConfigure = false; - doBuild = false; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 5df7c0b06727..1bfb6bbfeaf3 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }: let version = "git-2016-01-10"; in -stdenv.mkDerivation { +mkDerivation { pname = "dfilemanager"; inherit version; src = fetchgit { @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ cmake qtbase qttools file solid ]; - cmakeFlags = "-DQT5BUILD=true"; + cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { homepage = http://dfilemanager.sourceforge.net/; diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix index 40d42408679e..fed40523a9b7 100644 --- a/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; - doBuild = false; - installPhase = '' mkdir -p \ "$out/bin" \ diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 3168fc19d055..2b28f2c06db5 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -36,9 +36,6 @@ let qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; - doConfigure = false; - doBuild = false; - installPhase = '' # Extract eagle tarball mkdir "$out" diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5ff8a1650bab..c092f1be006d 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -56,8 +56,6 @@ stdenv.mkDerivation { } ''; - doConfigure = false; - buildPhase = '' # Build kernel modules. cd src diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix index 3c5cbe2b4928..10a6daaf53f7 100644 --- a/pkgs/build-support/nix-prefetch-github/default.nix +++ b/pkgs/build-support/nix-prefetch-github/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-prefetch-github"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "0b2hgfyxhlqq6lyi5cr98dz6if5kl6b3kq67f2lzfkalydywl1dh"; + sha256 = "13wvq13iiva97a16kahfpxar5ppb015nnbn7d4v9s9jyxdickc2c"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 894ef8c45fa0..357f26cf3141 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -6,6 +6,7 @@ , enableGui ? true , wrapQtAppsHook , qtbase +, OpenGL ? null }: let @@ -41,7 +42,10 @@ with stdenv; mkDerivation rec { "-DSERIALIZE_CHIPDB=OFF" # use PyPy for icestorm if enabled "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" - ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF"); + ] + ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF") + ++ (lib.optional (enableGui && stdenv.isDarwin) + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); # Fix the version number. This is a bit stupid (and fragile) in practice # but works ok. We should probably make this overrideable upstream. @@ -61,7 +65,7 @@ with stdenv; mkDerivation rec { description = "Place and route tool for FPGAs"; homepage = https://github.com/yosyshq/nextpnr; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice emily ]; }; } diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 2bac15403038..b3ce4f8f6a71 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, libftdi +, pkgconfig, libftdi1 , python3, pypy3 # PyPy yields large improvements in build time and runtime performance, @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2019.08.15"; + version = "2019.08.31"; pythonPkg = if usePyPy then pypy3 else python3; pythonInterp = pythonPkg.interpreter; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "95949315364f8d9b0c693386aefadf44b28e2cf6"; - sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2"; + rev = "04f1eb78ed8fd50516aee50102675041a8fd40cd"; + sha256 = "10jdiw4mw0afcjq7xl3xs8z733mlrx927x620vs2yz91p757jxbd"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pythonPkg libftdi ]; + buildInputs = [ pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index eb7a072799dc..908b7b1adc9f 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -19,8 +19,6 @@ let runHook postUnpack ''; - doConfigure = false; - installPhase = '' runHook preInstall @@ -54,11 +52,4 @@ in rec { version = "5.11.39"; sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj"; }; - - # TODO: update as it is outdated - unifiTesting = generic { - version = "5.11.18"; - suffix = "-996baf2ca5"; - sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc"; - }; } diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index f5bdfd9fe853..7db8ec3b6049 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { xmpppy pythonIRClib ]; - /* doConfigure should be removed if not needed */ # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; installPhase = '' diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 719acfd3a66e..0c85f322f487 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { pythonPath = [ xmpppy ]; buildInputs = [ pythonPackages.wrapPython ]; - /* doConfigure should be removed if not needed */ installPhase = '' cd mail-transport mkdir -p $out/bin $out/share/${pname}-${version} diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b35fe709f95a..7c81e861ddbc 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { buildInputs = [ python makeWrapper ]; - doBuild = false; - patches = [ ./gcloud-path.patch ]; diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix index 73323c784fd7..02d2d545122a 100644 --- a/pkgs/tools/text/shab/default.nix +++ b/pkgs/tools/text/shab/default.nix @@ -19,7 +19,6 @@ let done ''; - doBuild = false; doCheck = true; doInstallCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b574576b135..28a8f402201d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8265,7 +8265,9 @@ in neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { }; + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; nasm = callPackage ../development/compilers/nasm { }; @@ -15275,8 +15277,7 @@ in inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable - unifiTesting; + unifiStable; unifi = unifiStable; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; |