diff options
Diffstat (limited to 'pkgs/applications')
20 files changed, 4 insertions, 94 deletions
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index c38e613fdd4..cb8d01467a2 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -26,7 +26,7 @@ let }; mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation { - inherit name version; + inherit name version meta; src = { i686-linux = fetchurl { @@ -56,7 +56,7 @@ let }); in buildFHSUserEnv { - inherit name; + inherit name meta; targetPkgs = pkgs: with pkgs; [ mist diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 6379975e951..b8044972576 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -4,7 +4,6 @@ , qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: let - withSpotify = config.clementine.spotify or false; withIpod = config.clementine.ipod or false; withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; @@ -12,8 +11,6 @@ let version = "1.3.1"; - exeName = "clementine"; - src = fetchurl { url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz; sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq"; diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index b8543841a7f..8df45ffb61e 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -23,12 +23,6 @@ self: super = imported; - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; - overrides = { }; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 4f1a29278be..818183b9852 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -56,7 +56,6 @@ let gtdialog_zip = "gtdialog_1.3.zip"; cdk_tgz = "cdk-5.0-20150928.tgz"; termkey_tgz = "libtermkey-0.17.tar.gz"; - bombay_zip = "bombay.zip"; scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip; diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index a9d32d4b252..3245a56e9de 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -6,7 +6,6 @@ let version = "0.96.1"; - sitePackages = pythonPackages.python.sitePackages; inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted; in buildPythonApplication { diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 959ed6b11ba..25067e3bba5 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -3,8 +3,7 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; -let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "llpp-${version}"; version = "2018-03-02"; diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix index b41f5c9a0a7..f001cbcaab9 100644 --- a/pkgs/applications/misc/tqsl/default.nix +++ b/pkgs/applications/misc/tqsl/default.nix @@ -1,12 +1,5 @@ { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: -let - lib_suffix = - if stdenv.system == "x86_64-linux" then - "64" - else - ""; -in stdenv.mkDerivation rec { name = "tqsl-${version}"; version = "2.3.1"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 021c048669f..196e2eb79bd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -43,10 +43,6 @@ let # source tree. extraAttrs = buildFun base; - gentooPatch = name: sha256: fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; - inherit sha256; - }; githubPatch = commit: sha256: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; inherit sha256; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index dbf0bbbd4d5..8420dbdaaa8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -47,12 +47,6 @@ , debug ? false }: -let - arch = - if stdenv.system == "x86_64-linux" then - "x86_64" - else throw "Flash Player is not supported on this platform"; -in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; version = "30.0.0.134"; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index cf40392c6dd..693fa63661b 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -36,7 +36,6 @@ let arch32 = "i686-linux"; - arch64 = "x86_64-linux"; arch = if stdenv.system == arch32 then "i386" diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index e1db7131a65..ba2d5221cc5 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -60,10 +60,6 @@ let ${(wrapBinary libs) attrs.toolName} ''; }); - fhs = target: buildFHSUserEnv { - inherit (pkg) name; - runScript = target; - }; in buildFHSUserEnv { name = "${attrs.toolName}-${attrs.version}"; runScript = "${pkg.outPath}/bin/${attrs.toolName}"; diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix index c10e9de851a..dc333f3d3b7 100644 --- a/pkgs/applications/science/electronics/bitscope/packages.nix +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -6,10 +6,6 @@ }: let - wrapBinary = libPaths: binaryName: '' - wrapProgram "$out/bin/${binaryName}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" - ''; mkBitscope = callPackage (import ./common.nix) { }; in { chart = let diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 97781a69ce6..d2a518e9db0 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -24,12 +24,6 @@ }: let - platform = - if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then - "Linux" - else - throw "Mathematica requires i686-linux or x86_64 linux"; - l10n = with stdenv.lib; with callPackage ./l10ns.nix {}; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 5b210fa4bf6..f423adbe786 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -2,15 +2,7 @@ , wxGTK, perl, python2, zlib, libGLU_combined, libX11 , automake, autoconf }: -let - s = # Generated upstream information - rec { - baseName="golly"; - version="2.8"; - name="${baseName}-${version}"; - hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; - }; -in + stdenv.mkDerivation rec { name = "golly-${version}"; version = "2.8.99.2.20161122"; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index dab90a1ed78..5e21f7ee608 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -22,11 +22,6 @@ with stdenv.lib; # and try applying all the ones we don't have yet. let - xsaPatch = { name , sha256 }: (fetchpatch { - url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; - inherit sha256; - }); - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; qemuMemfdBuildFix = fetchpatch { diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 79be1be1190..f99cdb69d2a 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -22,11 +22,6 @@ with stdenv.lib; # and try applying all the ones we don't have yet. let - xsaPatch = { name , sha256 }: (fetchpatch { - url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; - inherit sha256; - }); - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; xenlockprofpatch = (fetchpatch { diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix index 9ba6db36772..8a740b15500 100644 --- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix +++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix index d1c0993982a..c63123db7cc 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix index 253281b6a9a..947a9653e56 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix index 80775112abc..008df5479ce 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: |