mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
77893d86c2
@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --subst-var out
|
||||
patchShebangs bin/ulauncher-toggle
|
||||
substituteInPlace bin/ulauncher-toggle \
|
||||
--replace wmctrl ${wmctrl}/bin/wmctrl
|
||||
'';
|
||||
|
||||
# https://github.com/Ulauncher/Ulauncher/issues/390
|
||||
@ -99,8 +102,10 @@ python3Packages.buildPythonApplication rec {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
# do not double wrap
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}")
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.8.6";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07p62zifycw7gnwkd3230jsjns80k2q9fbj8drzp84s9cp7ddpa9";
|
||||
sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.1.136";
|
||||
version = "3.1.137";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "v${version}";
|
||||
sha256 = "058sja2miwhr6lx5j8r9d97k4ywh6dsxd05nb5w19z6a0sq1vmyb";
|
||||
sha256 = "15zl97laijn42rhh524rfb3h1rky461hwfnlny2maa3h61889xrv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.041";
|
||||
version = "0.042";
|
||||
|
||||
in
|
||||
fetchzip {
|
||||
name = "JuliaMono-ttf-${version}";
|
||||
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
|
||||
sha256 = "sha256-OjguPR2MFjbY72/PF0R43/g6i95uAPVPbXk+HS0B360=";
|
||||
sha256 = "sha256-oXODkeLDT5GXO4+r1fGaRrRS/SSBhzro5XE0GOwl4mQ=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
@ -25,7 +25,7 @@ fetchzip {
|
||||
'';
|
||||
maintainers = with maintainers; [ suhr ];
|
||||
platforms = with platforms; all;
|
||||
homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/";
|
||||
homepage = "https://juliamono.netlify.app/";
|
||||
license = licenses.ofl;
|
||||
};
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "8.3.9";
|
||||
version = "8.3.29";
|
||||
packInstall = swiplPath: pack:
|
||||
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
|
||||
'';
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation {
|
||||
owner = "SWI-Prolog";
|
||||
repo = "swipl-devel";
|
||||
rev = "V${version}";
|
||||
sha256 = "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz";
|
||||
sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -81,7 +81,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://www.swi-prolog.org";
|
||||
description = "A Prolog compiler and interpreter";
|
||||
license = lib.licenses.bsd2;
|
||||
|
||||
mainProgram = "swipl";
|
||||
platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.meditans ];
|
||||
};
|
||||
|
||||
@ -1,30 +1,39 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, shen-sources
|
||||
, sbcl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shen-sbcl-${version}";
|
||||
pname = "shen-sbcl";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz";
|
||||
sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz";
|
||||
};
|
||||
buildInputs = [
|
||||
sbcl shen-sources
|
||||
];
|
||||
buildPhase = ''
|
||||
|
||||
nativeBuildInputs = [ sbcl ];
|
||||
|
||||
preBuild = ''
|
||||
ln -s ${shen-sources} kernel
|
||||
make sbcl
|
||||
'';
|
||||
|
||||
buildFlags = [ "build-sbcl" ];
|
||||
|
||||
checkTarget = "test-sbcl";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://shenlanguage.org;
|
||||
homepage = "https://shenlanguage.org";
|
||||
description = "Port of Shen running on Steel Bank Common Lisp";
|
||||
changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md";
|
||||
platforms = sbcl.meta.platforms;
|
||||
maintainers = with maintainers; [ bsima ];
|
||||
license = licenses.bsd3;
|
||||
|
||||
@ -1,26 +1,28 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shen-sources-${version}";
|
||||
version = "22.3";
|
||||
pname = "shen-sources";
|
||||
version = "22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz";
|
||||
sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q";
|
||||
sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260";
|
||||
};
|
||||
|
||||
buildInputs = [];
|
||||
buildPhase = "";
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp . $out -R
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://shenlanguage.org;
|
||||
homepage = "https://shenlanguage.org";
|
||||
description = "Source code for the Shen Language";
|
||||
changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ bsima ];
|
||||
license = licenses.bsd3;
|
||||
|
||||
@ -31,9 +31,17 @@ buildDunePackage rec {
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.06";
|
||||
|
||||
buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ];
|
||||
buildInputs =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
[ ]
|
||||
else
|
||||
[ yojson stdlib-shims ocaml-syntax-shims ];
|
||||
|
||||
propagatedBuildInputs = [ ppx_yojson_conv_lib result ];
|
||||
propagatedBuildInputs =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
[ ]
|
||||
else
|
||||
[ ppx_yojson_conv_lib result ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jsonrpc protocol implementation in OCaml";
|
||||
|
||||
@ -9,16 +9,21 @@
|
||||
, octavius
|
||||
, dune-build-info
|
||||
, uutf
|
||||
, re
|
||||
, pp
|
||||
, csexp
|
||||
, cmdliner
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
buildDunePackage rec {
|
||||
pname = "lsp";
|
||||
inherit (jsonrpc) version src;
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimumOCamlVersion =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
"4.12"
|
||||
else
|
||||
"4.06";
|
||||
|
||||
# unvendor some (not all) dependencies.
|
||||
# They are vendored by upstream only because it is then easier to install
|
||||
@ -28,22 +33,24 @@ buildDunePackage {
|
||||
rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
cppo
|
||||
ppx_yojson_conv_lib
|
||||
ocaml-syntax-shims
|
||||
octavius
|
||||
dune-build-info
|
||||
omd
|
||||
cmdliner
|
||||
] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp;
|
||||
buildInputs =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
[ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ]
|
||||
else
|
||||
[ cppo
|
||||
ppx_yojson_conv_lib
|
||||
ocaml-syntax-shims
|
||||
octavius
|
||||
dune-build-info
|
||||
omd
|
||||
cmdliner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
csexp
|
||||
jsonrpc
|
||||
stdlib-shims
|
||||
uutf
|
||||
];
|
||||
] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims;
|
||||
|
||||
meta = jsonrpc.meta // {
|
||||
description = "LSP protocol implementation in OCaml";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certbot";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j+MygstaOt3TMz8rEZE5OBYVZXWtrUyIuSO+qagKrjk=";
|
||||
sha256 = "sha256-tCszN+sy4Z6nOwULj9ra5/TtW4YYi32fkbMKub5i2Xk=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/${pname}";
|
||||
|
||||
@ -623,13 +623,6 @@ in
|
||||
buildInputs = [ taglib ];
|
||||
};
|
||||
|
||||
thrift = attrs: {
|
||||
# See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125
|
||||
# Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd.
|
||||
buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0")
|
||||
"--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\"";
|
||||
};
|
||||
|
||||
timfel-krb5-auth = attrs: {
|
||||
buildInputs = [ libkrb5 ];
|
||||
};
|
||||
|
||||
@ -3106,6 +3106,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/wfxr/minimap.vim/";
|
||||
};
|
||||
|
||||
minsnip-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "minsnip.nvim";
|
||||
version = "2021-09-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "minsnip.nvim";
|
||||
rev = "0bcc73cb716b07d4286ef714f5a07d94204d484c";
|
||||
sha256 = "0k6dmqmw52scvwfr5w8dg7388cy95vdvgfw3f4prwyls60i9x55w";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
|
||||
};
|
||||
|
||||
mkdx = buildVimPluginFrom2Nix {
|
||||
pname = "mkdx";
|
||||
version = "2021-07-05";
|
||||
@ -4114,6 +4126,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/";
|
||||
};
|
||||
|
||||
nvim-spectre = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-spectre";
|
||||
version = "2021-09-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-spectre";
|
||||
rev = "0f10e9fe2553cb8c0a1512924a2639035559e0bd";
|
||||
sha256 = "15bahq0gspjl263bjlpd199brf3ns126j2mrlfxsqzlcnc53y7za";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-spectre/";
|
||||
};
|
||||
|
||||
nvim-terminal-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-terminal.lua";
|
||||
version = "2019-10-17";
|
||||
|
||||
@ -431,6 +431,10 @@ self: super: {
|
||||
dependencies = with self; [ popfix ];
|
||||
});
|
||||
|
||||
nvim-spectre = super.nvim-spectre.overrideAttrs (old: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
});
|
||||
|
||||
# Usage:
|
||||
# pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
|
||||
# or for all grammars:
|
||||
|
||||
@ -283,6 +283,7 @@ joonty/vim-xdebug
|
||||
joosepalviste/nvim-ts-context-commentstring@main
|
||||
josa42/coc-lua
|
||||
josa42/vim-lightline-coc
|
||||
jose-elias-alvarez/minsnip.nvim@main
|
||||
jose-elias-alvarez/null-ls.nvim@main
|
||||
joshdick/onedark.vim@main
|
||||
jpalardy/vim-slime@main
|
||||
@ -858,6 +859,7 @@ wincent/command-t
|
||||
wincent/ferret
|
||||
wincent/terminus
|
||||
windwp/nvim-autopairs
|
||||
windwp/nvim-spectre
|
||||
winston0410/cmd-parser.nvim
|
||||
winston0410/range-highlight.nvim
|
||||
wlangstroth/vim-racket
|
||||
|
||||
@ -6,7 +6,6 @@ gem 'fluent-plugin-s3'
|
||||
gem 'fluent-plugin-kinesis'
|
||||
gem 'fluent-plugin-kafka'
|
||||
gem 'fluent-plugin-elasticsearch'
|
||||
gem 'fluent-plugin-scribe'
|
||||
gem 'fluent-plugin-mongo'
|
||||
gem 'fluent-plugin-webhdfs'
|
||||
gem 'fluent-plugin-rewrite-tag-filter'
|
||||
|
||||
@ -77,9 +77,6 @@ GEM
|
||||
aws-sdk-s3 (~> 1.0)
|
||||
aws-sdk-sqs (~> 1.0)
|
||||
fluentd (>= 0.14.22, < 2)
|
||||
fluent-plugin-scribe (1.0.0)
|
||||
fluentd
|
||||
thrift (~> 0.8.0)
|
||||
fluent-plugin-webhdfs (1.2.4)
|
||||
fluentd (>= 0.14.22)
|
||||
webhdfs (>= 0.6.0)
|
||||
@ -110,7 +107,6 @@ GEM
|
||||
sigdump (~> 0.2.2)
|
||||
sigdump (0.2.4)
|
||||
strptime (0.2.3)
|
||||
thrift (0.8.0)
|
||||
tzinfo (2.0.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
tzinfo-data (1.2019.2)
|
||||
@ -131,7 +127,6 @@ DEPENDENCIES
|
||||
fluent-plugin-record-reformer
|
||||
fluent-plugin-rewrite-tag-filter
|
||||
fluent-plugin-s3
|
||||
fluent-plugin-scribe
|
||||
fluent-plugin-webhdfs
|
||||
fluentd
|
||||
|
||||
|
||||
@ -321,17 +321,6 @@
|
||||
};
|
||||
version = "1.1.11";
|
||||
};
|
||||
fluent-plugin-scribe = {
|
||||
dependencies = ["fluentd" "thrift"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
fluent-plugin-webhdfs = {
|
||||
dependencies = ["fluentd" "webhdfs"];
|
||||
groups = ["default"];
|
||||
@ -487,16 +476,6 @@
|
||||
};
|
||||
version = "0.2.3";
|
||||
};
|
||||
thrift = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.0";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = ["concurrent-ruby"];
|
||||
groups = ["default"];
|
||||
|
||||
@ -628,7 +628,7 @@ with pkgs;
|
||||
mkShell = callPackage ../build-support/mkshell { };
|
||||
mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
|
||||
|
||||
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; };
|
||||
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; };
|
||||
|
||||
nix-gitignore = callPackage ../build-support/nix-gitignore { };
|
||||
|
||||
@ -692,7 +692,7 @@ with pkgs;
|
||||
enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
|
||||
|
||||
makeGCOVReport = makeSetupHook
|
||||
{ deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; }
|
||||
{ deps = [ lcov enableGCOVInstrumentation ]; }
|
||||
../build-support/setup-hooks/make-coverage-analysis-report.sh;
|
||||
|
||||
# intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage'
|
||||
@ -2197,7 +2197,7 @@ with pkgs;
|
||||
|
||||
calamares = libsForQt515.callPackage ../tools/misc/calamares {
|
||||
python = python3;
|
||||
boost = pkgs.boost.override { enablePython = true; python = python3; };
|
||||
boost = boost.override { enablePython = true; python = python3; };
|
||||
};
|
||||
|
||||
calendar-cli = callPackage ../tools/networking/calendar-cli { };
|
||||
@ -3134,7 +3134,7 @@ with pkgs;
|
||||
moonraker = callPackage ../servers/moonraker { };
|
||||
|
||||
mousetweaks = callPackage ../applications/accessibility/mousetweaks {
|
||||
inherit (pkgs.xorg) libX11 libXtst libXfixes;
|
||||
inherit (xorg) libX11 libXtst libXfixes;
|
||||
};
|
||||
|
||||
mp3blaster = callPackage ../applications/audio/mp3blaster { };
|
||||
@ -4697,7 +4697,7 @@ with pkgs;
|
||||
|
||||
entr = callPackage ../tools/misc/entr { };
|
||||
|
||||
envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; };
|
||||
envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; };
|
||||
|
||||
eot_utilities = callPackage ../tools/misc/eot-utilities { };
|
||||
|
||||
@ -5282,7 +5282,7 @@ with pkgs;
|
||||
git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { };
|
||||
|
||||
git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { };
|
||||
@ -5980,7 +5980,7 @@ with pkgs;
|
||||
html-proofer = callPackage ../tools/misc/html-proofer { };
|
||||
|
||||
htmlq = callPackage ../development/tools/htmlq {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
htpdate = callPackage ../tools/networking/htpdate { };
|
||||
@ -6760,11 +6760,11 @@ with pkgs;
|
||||
nodejs-slim_latest = nodejs-slim-16_x;
|
||||
|
||||
nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix {
|
||||
nodejs = pkgs.nodejs_latest;
|
||||
nodejs = nodejs_latest;
|
||||
});
|
||||
|
||||
nodePackages = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix {
|
||||
nodejs = pkgs.nodejs;
|
||||
inherit nodejs;
|
||||
});
|
||||
|
||||
np2kai = callPackage ../misc/emulators/np2kai { };
|
||||
@ -11785,17 +11785,17 @@ with pkgs;
|
||||
|
||||
openspin = callPackage ../development/compilers/openspin { };
|
||||
|
||||
oraclejdk = pkgs.jdkdistro true false;
|
||||
oraclejdk = jdkdistro true false;
|
||||
|
||||
oraclejdk8 = pkgs.oraclejdk8distro true false;
|
||||
oraclejdk8 = oraclejdk8distro true false;
|
||||
|
||||
oraclejre = lowPrio (pkgs.jdkdistro false false);
|
||||
oraclejre = lowPrio (jdkdistro false false);
|
||||
|
||||
oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
|
||||
oraclejre8 = lowPrio (oraclejdk8distro false false);
|
||||
|
||||
jrePlugin = jre8Plugin;
|
||||
|
||||
jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
|
||||
jre8Plugin = lowPrio (oraclejdk8distro false true);
|
||||
|
||||
jdkdistro = oraclejdk8distro;
|
||||
|
||||
@ -12493,7 +12493,7 @@ with pkgs;
|
||||
});
|
||||
|
||||
thrust = callPackage ../development/tools/thrust {
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
gconf = gnome2.GConf;
|
||||
};
|
||||
|
||||
tinycc = callPackage ../development/compilers/tinycc { };
|
||||
@ -13469,7 +13469,7 @@ with pkgs;
|
||||
bison = callPackage ../development/tools/parsing/bison { };
|
||||
|
||||
# Ruby fails to build with current bison
|
||||
bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec {
|
||||
bison_3_5 = bison.overrideAttrs (oldAttrs: rec {
|
||||
version = "3.5.4";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${oldAttrs.pname}/${oldAttrs.pname}-${version}.tar.gz";
|
||||
@ -13643,7 +13643,7 @@ with pkgs;
|
||||
cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };
|
||||
|
||||
cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server {
|
||||
inherit (pkgs) cmake;
|
||||
inherit cmake;
|
||||
};
|
||||
|
||||
# Does not actually depend on Qt 5
|
||||
@ -14277,17 +14277,17 @@ with pkgs;
|
||||
};
|
||||
|
||||
nwjs = callPackage ../development/tools/nwjs {
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
gconf = gnome2.GConf;
|
||||
};
|
||||
|
||||
nwjs-sdk = callPackage ../development/tools/nwjs {
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
gconf = gnome2.GConf;
|
||||
sdk = true;
|
||||
};
|
||||
|
||||
# only kept for nixui, see https://github.com/matejc/nixui/issues/27
|
||||
nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
gconf = gnome2.GConf;
|
||||
};
|
||||
|
||||
# NOTE: Override and set useIcon = false to use Awk instead of Icon.
|
||||
@ -15397,7 +15397,7 @@ with pkgs;
|
||||
faad2 = callPackage ../development/libraries/faad2 { };
|
||||
|
||||
factor-lang = callPackage ../development/compilers/factor-lang {
|
||||
inherit (pkgs.gnome2) gtkglext;
|
||||
inherit (gnome2) gtkglext;
|
||||
};
|
||||
|
||||
far2l = callPackage ../applications/misc/far2l {
|
||||
@ -18403,14 +18403,14 @@ with pkgs;
|
||||
|
||||
qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
|
||||
# GNOME dependencies are not used unless gtkStyle == true
|
||||
inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs;
|
||||
inherit (gnome2) libgnomeui GConf gnome_vfs;
|
||||
cups = if stdenv.isLinux then cups else null;
|
||||
|
||||
# XXX: mariadb doesn't built on fbsd as of nov 2015
|
||||
libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
|
||||
|
||||
inherit (pkgs.darwin) libobjc;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
|
||||
inherit (darwin) libobjc;
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
|
||||
};
|
||||
|
||||
qmake48Hook = makeSetupHook
|
||||
@ -20306,7 +20306,7 @@ with pkgs;
|
||||
|
||||
mariadb = callPackage ../servers/sql/mariadb {
|
||||
inherit (darwin) cctools;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
mongodb = hiPrio mongodb-3_4;
|
||||
@ -21206,7 +21206,7 @@ with pkgs;
|
||||
open-isns = callPackage ../os-specific/linux/open-isns { };
|
||||
|
||||
osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit;
|
||||
};
|
||||
|
||||
macfuse-stubs = callPackage ../os-specific/darwin/macfuse {
|
||||
@ -23199,7 +23199,7 @@ with pkgs;
|
||||
libxkbcommon = libxkbcommon_7;
|
||||
};
|
||||
bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
|
||||
inherit (pkgs) bitwig-studio1;
|
||||
inherit bitwig-studio1;
|
||||
};
|
||||
bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
|
||||
bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { };
|
||||
@ -23570,7 +23570,7 @@ with pkgs;
|
||||
dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { };
|
||||
|
||||
dia = callPackage ../applications/graphics/dia {
|
||||
inherit (pkgs.gnome2) libart_lgpl libgnomeui;
|
||||
inherit (gnome2) libart_lgpl libgnomeui;
|
||||
};
|
||||
|
||||
direwolf = callPackage ../applications/radio/direwolf {
|
||||
@ -25123,7 +25123,7 @@ with pkgs;
|
||||
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
|
||||
|
||||
k3d = callPackage ../applications/graphics/k3d {
|
||||
inherit (pkgs.gnome2) gtkglext;
|
||||
inherit (gnome2) gtkglext;
|
||||
stdenv = gcc6Stdenv;
|
||||
boost = boost155.override {
|
||||
enablePython = true;
|
||||
@ -25608,7 +25608,7 @@ with pkgs;
|
||||
|
||||
# Needs qtwebkit which is broken on qt5.15
|
||||
mendeley = libsForQt514.callPackage ../applications/office/mendeley {
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
gconf = gnome2.GConf;
|
||||
};
|
||||
|
||||
menumaker = callPackage ../applications/misc/menumaker { };
|
||||
@ -26288,7 +26288,7 @@ with pkgs;
|
||||
opera = callPackage ../applications/networking/browsers/opera {};
|
||||
|
||||
orca = python3Packages.callPackage ../applications/misc/orca {
|
||||
inherit (pkgs) pkg-config;
|
||||
inherit pkg-config;
|
||||
};
|
||||
|
||||
orca-c = callPackage ../applications/audio/orca-c {};
|
||||
@ -30774,7 +30774,7 @@ with pkgs;
|
||||
|
||||
celestia = callPackage ../applications/science/astronomy/celestia {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
inherit (pkgs.gnome2) gtkglext;
|
||||
inherit (gnome2) gtkglext;
|
||||
};
|
||||
|
||||
convertall = qt5.callPackage ../applications/science/misc/convertall { };
|
||||
@ -31030,7 +31030,7 @@ with pkgs;
|
||||
|
||||
depotdownloader = callPackage ../tools/misc/depotdownloader { };
|
||||
|
||||
desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; };
|
||||
desmume = callPackage ../misc/emulators/desmume { inherit (gnome2) gtkglext libglade; };
|
||||
|
||||
dbacl = callPackage ../tools/misc/dbacl { };
|
||||
|
||||
@ -31685,7 +31685,7 @@ with pkgs;
|
||||
rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { };
|
||||
|
||||
pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker {
|
||||
inherit (pkgs) glib gtk3 gobject-introspection wrapGAppsHook;
|
||||
inherit glib gtk3 gobject-introspection wrapGAppsHook;
|
||||
};
|
||||
|
||||
rpl = callPackage ../tools/text/rpl {
|
||||
@ -32188,11 +32188,11 @@ with pkgs;
|
||||
|
||||
yuzu-mainline = import ../misc/emulators/yuzu {
|
||||
branch = "mainline";
|
||||
inherit (pkgs) libsForQt5 fetchFromGitHub;
|
||||
inherit libsForQt5 fetchFromGitHub;
|
||||
};
|
||||
yuzu-ea = import ../misc/emulators/yuzu {
|
||||
branch = "early-access";
|
||||
inherit (pkgs) libsForQt5 fetchFromGitHub;
|
||||
inherit libsForQt5 fetchFromGitHub;
|
||||
};
|
||||
|
||||
zap = callPackage ../tools/networking/zap { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user