diff options
author | Vincent Ambo <mail@tazj.in> | 2021-04-10T16·05+0200 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2021-04-10T21·18+0000 |
commit | 473604f5675c455a65b91e287b125a9e042ae39f (patch) | |
tree | 9d1255ea0a01396136ced032ba3f1fc5a46967cb /third_party/nixpkgs-exposed | |
parent | a83abc902456cbdfcf31497c9c788fd9daf66109 (diff) |
refactor: Move nixpkgs attribute to `third_party.nixpkgs` r/2470
Please read b/108 to make sense of this. This gets rid of the explicit list of exposed packages from nixpkgs, and instead makes the entire package set available at `third_party.nixpkgs`. To accommodate this, a LOT of things have to be very slightly shuffled around. Some of this was done in already submitted CLs, but this change is unfortunately still quite noisy. Pay extra attention to: * overlay-like functionality that was partially moved to actual overlays (partially as in, the minimum required to get a green build) * modified uses of the package set path, esp. in NixOS systems Special notes: * xanthous has been disabled in CI because of issues with the Haskell overlay * //third_party/nix has been disabled because of other unclear dependency issues Both of these will be tackled in a followup CL. Change-Id: I2f9c60a4d275fdb5209264be0addfd7e06c53118 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2910 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/nixpkgs-exposed')
-rw-r--r-- | third_party/nixpkgs-exposed/.skip-subtree | 1 | ||||
-rw-r--r-- | third_party/nixpkgs-exposed/OWNERS | 8 | ||||
-rw-r--r-- | third_party/nixpkgs-exposed/exposed/default.nix | 210 |
3 files changed, 0 insertions, 219 deletions
diff --git a/third_party/nixpkgs-exposed/.skip-subtree b/third_party/nixpkgs-exposed/.skip-subtree deleted file mode 100644 index aff471145e46..000000000000 --- a/third_party/nixpkgs-exposed/.skip-subtree +++ /dev/null @@ -1 +0,0 @@ -This subtree is responsible for setting up the read tree arguments in the first place. diff --git a/third_party/nixpkgs-exposed/OWNERS b/third_party/nixpkgs-exposed/OWNERS deleted file mode 100644 index 72c0ac47fb47..000000000000 --- a/third_party/nixpkgs-exposed/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# The nixpkgs whitelist needs to be changed every time we reference -# a new attribute, so every commiter should be able to change it, -# otherwise we create undue blockers on superowners. -inherited: true -owners: - - Profpatsch - - sterni - - glittershark diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix deleted file mode 100644 index 478b55cb2965..000000000000 --- a/third_party/nixpkgs-exposed/exposed/default.nix +++ /dev/null @@ -1,210 +0,0 @@ -# This file has to be in yet another subdir -# because of how readTree interprets .skip-subtree -# see https://b.tvl.fyi/issues/89 -{ nixpkgs, stableNixpkgs }: -{ - # Inherit the packages from nixos-unstable that should be available inside - # of the repo. They become available under `pkgs.third_party.<name>` - inherit (nixpkgs) - age - atk - autoconf - autoreconfHook - avrdude - avrlibc - bashInteractive - bat - bc - bind - buildBazelPackage - buildFHSUserEnv - buildGoModule - buildGoPackage - buildPackages - buildRustCrate - buildkite-agent - busybox - bzip2 - c-ares - cacert - cachix - cairo - cargo - cgit - clang_11 - cmake - coreutils - cudatoolkit - darwin - dbus-glib - dbus_libs - dfu-programmer - dfu-util - diffutils - docker-compose - dockerTools - emacs27 - emacs27-nox - emacsPackages - emacsPackagesGen - execline - fd - fdtools - fetchFromGitHub - fetchFromGitLab - fetchgit - fetchurl - fetchzip - ffmpeg-full - findutils - fira - fira-code - fira-mono - flamegraph - fontconfig - freetype - gdk-pixbuf - gettext - glibc - glib - gtk3 - gmock - gnused - gnutar - go - google-cloud-sdk - graphviz - gzip - haskell - iana-etc - imagemagickBig - installShellFiles - jdk - jdk11 - jdk11_headless - jetbrains-mono - jq - kontemplate - lib - libappindicator-gtk3 - libredirect - libffi - linuxPackages - linuxPackages_5_11 - lr - luajit - lutris - makeFontsConf - makeWrapper - mandoc - mdbook - meson - mime-types - minify - mkShell - moreutils - nano - ncurses - nginx - ninja - nix - ocamlPackages - openssh - openssl - overrideCC - pandoc - pango - parallel - path - pkgconfig - pkgsCross - plantuml - postgresql - pounce - pulseaudio - python3 - python3Packages - quassel - remarshal - rink - ripgrep - rsync - runCommand - runCommandLocal - runCommandNoCC - rustPlatform - rustc - s6-portable-utils - sbcl - shellcheck - sqlite - stdenvNoCC - stern - substituteAll - symlinkJoin - systemd - tdlib - teensy-loader-cli - terraform_0_12 - texlive - thttpd - tree - tree-sitter - unzip - which - writers - writeShellScript - writeShellScriptBin - writeText - xorg - xz - zlib - zstd; - - # Inherit packages from the stable channel for things that are - # broken on unstable - inherit (stableNixpkgs) - awscli # TODO(grfn): Move back to unstable once it is fixed - ; - - # Required by //third_party/nix - inherit (nixpkgs) - aws-sdk-cpp - bison - boehmgc - boost # urgh - brotli - busybox-sandbox-shell - curl - docbook5 - docbook_xsl_ns - editline - flex - libseccomp - libsodium - libxml2 - libxslt - mercurial - perl - perlPackages - ; - - haskellPackages = (nixpkgs.haskellPackages.override { - overrides = (import ../../overlays/haskell - { /* empty readTree arg */ } - { pkgs = nixpkgs; }); - }); - - gradle_6 = (nixpkgs.gradleGen.override { - java = nixpkgs.jdk11; - jdk = nixpkgs.jdk11; - }).gradleGen rec { - name = "gradle-6.5.1"; - nativeVersion = "0.22-milestone-3"; - - src = builtins.fetchurl { - url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh"; - }; - }; -} |