ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Revert "coq2html: New expression"

Browse Source 
This reverts commit 31437ccf7a.
This commit is contained in:
Franz Pletz 2017-07-20 19:36:50 +02:00
parent 3e8a565a04
commit e69dfc252a
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 81 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/science/logic/coq2html/default.nix
View File

@ -1,38 +0,0 @@
{ stdenv, lib, make, fetchgit, ocaml }:
let
version = "20170720";
in
stdenv.mkDerivation {
name = "coq2html-${version}";
src = fetchgit {
url = "https://github.com/xavierleroy/coq2html";
rev = "e2b94093c6b9a877717f181765e30577de22439e";
sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
};
buildInputs = [ make ocaml ];
installPhase = ''
mkdir -p $out/bin
cp coq2html $out/bin
'';
meta = with stdenv.lib; {
description = "coq2html is an HTML documentation generator for Coq source files";
longDescription = ''
coq2html is an HTML documentation generator for Coq source files. It is
an alternative to the standard coqdoc documentation generator
distributed along with Coq. The major feature of coq2html is its ability
to fold proof scripts: in the generated HTML, proof scripts are
initially hidden, but can be revealed one by one by clicking on the
"Proof" keyword.
'';
homepage = https://github.com/xavierleroy/coq2html;
license = licenses.gpl2;
maintainers = with maintainers; [ jwiegley ];
platforms = platforms.unix;
};
}

101
pkgs/top-level/all-packages.nix
View File

@ -412,6 +412,10 @@ with pkgs;
albert = libsForQt5.callPackage ../applications/misc/albert {};
alacritty = callPackage ../applications/misc/alacritty {
inherit (xorg) libXcursor libXxf86vm libXi;
};
amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
ammonite = callPackage ../development/tools/ammonite {};
@ -531,6 +535,8 @@ with pkgs;
bonnie = callPackage ../tools/filesystems/bonnie { };
container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
djmount = callPackage ../tools/filesystems/djmount { };
dgsh = callPackage ../shells/dgsh { };
@ -985,6 +991,10 @@ with pkgs;
fastJson = callPackage ../development/libraries/fastjson { };
fast-cli = nodePackages.fast-cli.overrideDerivation (old: {
buildInputs = old.buildInputs ++ [phantomjs2];
});
filebench = callPackage ../tools/misc/filebench { };
fsmon = callPackage ../tools/misc/fsmon { };
@ -1035,8 +1045,12 @@ with pkgs;
heatseeker = callPackage ../tools/misc/heatseeker { };
hebcal = callPackage ../tools/misc/hebcal {};
hexio = callPackage ../development/tools/hexio { };
hid-listen = callPackage ../tools/misc/hid-listen { };
hostsblock = callPackage ../tools/misc/hostsblock { };
hr = callPackage ../applications/misc/hr { };
@ -1089,6 +1103,8 @@ with pkgs;
syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };
rsyslog = callPackage ../tools/system/rsyslog {
hadoop = null; # Currently Broken
czmq = czmq3;
@ -2183,6 +2199,8 @@ with pkgs;
google-fonts = callPackage ../data/fonts/google-fonts { };
google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
gource = callPackage ../applications/version-management/gource { };
gpart = callPackage ../tools/filesystems/gpart { };
@ -3387,6 +3405,8 @@ with pkgs;
graphicalSupport = true;
};
nnn = callPackage ../applications/misc/nnn { };
notify-osd = callPackage ../applications/misc/notify-osd { };
nox = callPackage ../tools/package-management/nox {
@ -4360,6 +4380,8 @@ with pkgs;
tarsnap = callPackage ../tools/backup/tarsnap { };
tarsnapper = callPackage ../tools/backup/tarsnapper { };
tcpcrypt = callPackage ../tools/security/tcpcrypt { };
tcptraceroute = callPackage ../tools/networking/tcptraceroute { };
@ -5610,8 +5632,8 @@ with pkgs;
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(openjdk7.jre // { outputs = [ "jre" ]; }));
jdk8 = openjdk8 // { outputs = [ "out" ]; };
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(openjdk8.jre // { outputs = [ "jre" ]; }));
jre8_headless =
@ -5644,7 +5666,8 @@ with pkgs;
supportsJDK =
system == "i686-linux" ||
system == "x86_64-linux";
system == "x86_64-linux" ||
system == "armv7l-linux";
jdkdistro = oraclejdk8distro;
@ -5878,6 +5901,14 @@ with pkgs;
buildRustPackage = callPackage ../build-support/rust {
inherit rust;
};
rustcSrc = stdenv.mkDerivation {
name = "rust-src";
src = rust.rustc.src;
phases = ["unpackPhase" "installPhase"];
installPhase = "mv src $out";
};
});
rainicorn = callPackage ../development/tools/rust/rainicorn { };
@ -6055,7 +6086,7 @@ with pkgs;
inherit (beam.interpreters)
erlang erlang_odbc erlang_javac erlang_odbc_javac
elixir elixir_1_5_rc elixir_1_4 elixir_1_3
lfe
lfe lfe_1_2
erlangR16 erlangR16_odbc
erlang_basho_R16B02 erlang_basho_R16B02_odbc
erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
@ -7055,7 +7086,7 @@ with pkgs;
pahole = callPackage ../development/tools/misc/pahole {};
inherit (callPackages ../development/tools/build-managers/pants {}) pants pants13-pre;
pants = callPackage ../development/tools/build-managers/pants {};
parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
@ -7381,6 +7412,8 @@ with pkgs;
aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { };
attica = callPackage ../development/libraries/attica { };
attr = callPackage ../development/libraries/attr { };
@ -7645,6 +7678,8 @@ with pkgs;
vmmlib = callPackage ../development/libraries/vmmlib {};
elastix = callPackage ../development/libraries/science/biology/elastix { };
enchant = callPackage ../development/libraries/enchant { };
enet = callPackage ../development/libraries/enet { };
@ -11488,8 +11523,10 @@ with pkgs;
storm = callPackage ../servers/computing/storm { };
slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
slurm-llnl = slurm; # renamed July 2017
slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
slurm-llnl-full = slurm-full; # renamed July 2017
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
@ -12073,6 +12110,20 @@ with pkgs;
];
};
linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
];
};
linux_samus_latest = linux_samus_4_12;
linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
kernelPatches.chromiumos_no_link_restrictions
@ -12277,6 +12328,10 @@ with pkgs;
linux_grsec_server_xen = linux_grsec_nixos;
# Samus kernels
linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest);
# ChromiumOS kernels
linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);
@ -13253,11 +13308,9 @@ with pkgs;
amsn = callPackage ../applications/networking/instant-messengers/amsn { };
android-studio = callPackage ../applications/editors/android-studio {
fontsConf = makeFontsConf {
fontDirectories = [];
};
};
androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {};
android-studio = androidStudioPackages.stable;
android-studio-preview = androidStudioPackages.preview;
antfs-cli = callPackage ../applications/misc/antfs-cli {};
@ -13325,6 +13378,8 @@ with pkgs;
ethabi = self.altcoins.ethabi;
ethrun = self.altcoins.ethrun;
seth = self.altcoins.seth;
dapp = self.altcoins.dapp;
hsevm = self.altcoins.hsevm;
stellar-core = self.altcoins.stellar-core;
@ -13382,6 +13437,8 @@ with pkgs;
libgpod = pkgs.libgpod.override { monoSupport = true; };
};
bashSnippets = callPackage ../applications/misc/bashSnippets { };
batik = callPackage ../applications/graphics/batik { };
batti = callPackage ../applications/misc/batti { };
@ -14549,6 +14606,8 @@ with pkgs;
ht = callPackage ../applications/editors/ht { };
hue-cli = callPackage ../tools/networking/hue-cli { };
hugin = callPackage ../applications/graphics/hugin { };
hugo = callPackage ../applications/misc/hugo { };
@ -17941,6 +18000,10 @@ with pkgs;
cmake = cmakeCurses;
});
### SCIENCE/MEDICINE
aliza = callPackage ../applications/science/medicine/aliza { };
### PHYSICS
sacrifice = callPackage ../applications/science/physics/sacrifice {};
@ -18066,10 +18129,6 @@ with pkgs;
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
coq = coqPackages.coq;
coq2html = callPackage ../applications/science/logic/coq2html {
make = pkgs.gnumake3;
};
cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
cubicle = callPackage ../applications/science/logic/cubicle { };
@ -18184,11 +18243,7 @@ with pkgs;
z3 = callPackage ../applications/science/logic/z3 {};
z3_opt = callPackage ../applications/science/logic/z3_opt {};
boolector = boolector15;
boolector15 = callPackage ../applications/science/logic/boolector {};
boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
useV16 = true;
});
boolector = callPackage ../applications/science/logic/boolector {};
### SCIENCE / ELECTRONICS
@ -18445,6 +18500,9 @@ with pkgs;
cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
# this driver ships with pre-compiled 32-bit binary libraries
cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { };
cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
libusb = libusb1;
};
@ -18640,6 +18698,7 @@ with pkgs;
nix-serve = callPackage ../tools/package-management/nix-serve { };
nixos-artwork = callPackage ../data/misc/nixos-artwork { };
nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
nixos-container = callPackage ../tools/virtualization/nixos-container { };
@ -19092,7 +19151,9 @@ with pkgs;
tomb = callPackage ../os-specific/linux/tomb {};
tomboy = callPackage ../applications/misc/tomboy {};
tomboy = callPackage ../applications/misc/tomboy {
mono = mono46;
};
imatix_gsl = callPackage ../development/tools/imatix_gsl {};