diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 106 |
1 files changed, 79 insertions, 27 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae7e30d0ff89..3e0e4ba200de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,12 +185,14 @@ with pkgs; fetchFromGitHub = { owner, repo, rev, name ? "${repo}-${rev}-src", - fetchSubmodules ? false, + fetchSubmodules ? false, private ? false, + githubBase ? "github.com", varPrefix ? null, ... # For hash agility - }@args: + }@args: assert private -> !fetchSubmodules; let - baseUrl = "https://github.com/${owner}/${repo}"; - passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ]; + baseUrl = "https://${githubBase}/${owner}/${repo}"; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; + varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; in if fetchSubmodules then fetchgit ({ inherit name rev fetchSubmodules; @@ -203,6 +205,19 @@ with pkgs; inherit name; url = "${baseUrl}/archive/${rev}.tar.gz"; meta.homepage = "${baseUrl}/"; + } // lib.optionalAttrs private { + netrcPhase = '' + if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then + echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + exit 1 + fi + cat > netrc <<EOF + machine ${githubBase} + login ''$${varBase}USERNAME + password ''$${varBase}PASSWORD + EOF + ''; + netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { @@ -257,6 +272,8 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; + madonctl = callPackage ../applications/misc/madonctl { }; + makeDesktopItem = callPackage ../build-support/make-desktopitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { }; @@ -518,6 +535,8 @@ with pkgs; autorevision = callPackage ../tools/misc/autorevision { }; + bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -1080,6 +1099,10 @@ with pkgs; mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mozlz4a = callPackage ../tools/compression/mozlz4a { + pylz4 = python3Packages.lz4; + }; + msr-tools = callPackage ../os-specific/linux/msr-tools { }; mstflint = callPackage ../tools/misc/mstflint { }; @@ -1512,8 +1535,6 @@ with pkgs; desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; - despotify = callPackage ../development/libraries/despotify { }; - dfc = callPackage ../tools/system/dfc { }; dev86 = callPackage ../development/compilers/dev86 { }; @@ -2006,6 +2027,8 @@ with pkgs; git-lfs = callPackage ../applications/version-management/git-lfs { }; + git-series = callPackage ../development/tools/git-series { }; + git-up = callPackage ../applications/version-management/git-up { }; gitfs = callPackage ../tools/filesystems/gitfs { }; @@ -2102,6 +2125,8 @@ with pkgs; # rename to upower-notify? go-upower-notify = callPackage ../tools/misc/upower-notify { }; + google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { }; + google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; @@ -2620,6 +2645,8 @@ with pkgs; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; + lldpd = callPackage ../tools/networking/lldpd { }; + lnav = callPackage ../tools/misc/lnav { }; loc = callPackage ../development/misc/loc { }; @@ -3003,12 +3030,16 @@ with pkgs; metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; + metar = callPackage ../applications/misc/metar { }; + mfcuk = callPackage ../tools/security/mfcuk { }; mfoc = callPackage ../tools/security/mfoc { }; mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; + mimeo = callPackage ../tools/misc/mimeo { }; mimetic = callPackage ../development/libraries/mimetic { }; @@ -3192,6 +3223,8 @@ with pkgs; networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; @@ -4101,6 +4134,8 @@ with pkgs; squashfsTools = callPackage ../tools/filesystems/squashfs { }; + srcml = callPackage ../applications/version-management/srcml { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshuttle = callPackage ../tools/security/sshuttle { }; @@ -4210,6 +4245,8 @@ with pkgs; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; + tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; + tboot = callPackage ../tools/security/tboot { }; tcpdump = callPackage ../tools/networking/tcpdump { }; @@ -4218,6 +4255,8 @@ with pkgs; tcpkali = callPackage ../applications/networking/tcpkali { }; + tcpreplay = callPackage ../tools/networking/tcpreplay { }; + teamviewer = callPackage ../applications/networking/remote/teamviewer { stdenv = stdenv_32bit; }; @@ -4245,6 +4284,8 @@ with pkgs; timemachine = callPackage ../applications/audio/timemachine { }; + timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; + timetrap = callPackage ../applications/office/timetrap { }; tinc = callPackage ../tools/networking/tinc { }; @@ -5978,6 +6019,10 @@ with pkgs; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; + lxpanel = callPackage ../desktops/lxde/core/lxpanel { + gtk2 = gtk2-x11; + }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -7722,7 +7767,6 @@ with pkgs; glibc = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; - gccCross = null; }; glibc_memusage = callPackage ../development/libraries/glibc { @@ -7730,13 +7774,23 @@ with pkgs; withGd = true; }; - glibcCross = forcedNativePackages.glibc.override { - gccCross = gccCrossStageStatic; - inherit (forcedNativePackages) linuxHeaders; + # Being redundant to avoid cycles on boot. TODO: find a better way + glibcCross = callPackage ../development/libraries/glibc { + installLocales = config.glibc.locales or false; + # Can't just overrideCC, because then the stdenv-cross mkDerivation will be + # thrown away. TODO: find a better solution for this. + stdenv = buildPackages.makeStdenvCross + buildPackages.buildPackages.stdenv + buildPackages.targetPlatform + buildPackages.binutils + buildPackages.gccCrossStageStatic; }; # We can choose: - libcCrossChooser = name: if name == "glibc" then glibcCross + libcCrossChooser = name: + # libc is hackily often used from the previous stage. This `or` + # hack fixes the hack, *sigh*. + /**/ if name == "glibc" then __targetPackages.glibcCross or glibcCross else if name == "uclibc" then uclibcCross else if name == "msvcrt" then windows.mingw_w64 else if name == "libSystem" then darwin.xcode @@ -11808,20 +11862,6 @@ with pkgs; ]; }; - linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.10" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_11 = callPackage ../os-specific/linux/kernel/linux-4.11.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12015,7 +12055,6 @@ with pkgs; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); linuxPackages_4_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_11); # Don't forget to update linuxPackages_latest! @@ -13308,6 +13347,8 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; + cloud-print-connector = callPackage ../servers/cloud-print-connector { }; + cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { @@ -14325,6 +14366,8 @@ with pkgs; i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled/default.nix { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; @@ -15050,6 +15093,8 @@ with pkgs; inherit (gnome3) defaultIconTheme; }; + typora = callPackage ../applications/editors/typora { }; + librep = callPackage ../development/libraries/librep { }; rep-gtk = callPackage ../development/libraries/rep-gtk { }; @@ -15682,6 +15727,7 @@ with pkgs; st = callPackage ../applications/misc/st { conf = config.st.conf or null; patches = config.st.patches or null; + extraLibs = config.st.extraLibs or []; }; st-wayland = callPackage ../applications/misc/st/wayland.nix { @@ -17978,7 +18024,7 @@ with pkgs; megam = callPackage ../applications/science/misc/megam { }; root = callPackage ../applications/science/misc/root { - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; simgrid = callPackage ../applications/science/misc/simgrid { }; @@ -18263,6 +18309,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + inherit (callPackages ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; @@ -18472,6 +18520,8 @@ with pkgs; terraform_0_9 = terraform_0_9_4; terraform = terraform_0_9; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { @@ -18774,4 +18824,6 @@ with pkgs; xib2nib = callPackage ../development/tools/xib2nib {}; linode-cli = callPackage ../tools/virtualization/linode-cli { }; + + hss = callPackage ../tools/networking/hss {}; } |