diff options
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/nixpkgs/default.nix | 12 | ||||
-rw-r--r-- | third_party/overlays/tvl.nix | 15 |
2 files changed, 11 insertions, 16 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 9dec9a589ae2..f08b46b63c43 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -13,16 +13,16 @@ let # nixos-unstable, and the current stable channel of the latest NixOS # release. - # Tracking nixos-unstable as of 2021-11-16. + # Tracking nixos-unstable as of 2021-11-24. unstableHashes = { - commit = "931ab058daa7e4cd539533963f95e2bb0dbd41e6"; - sha256 = "079925kw711k8agg17kxq36ininpacfjjhgydjy0pqbkhk59v6gm"; + commit = "39cb89ef2ffcbef8d2ac2d52267ac69121a6becb"; + sha256 = "1x9vzpay56ap4hgfq1giz00050crdngv5jkxgkxzx276mzhw93na"; }; - # Tracking nixos-21.05 as of 2021-11-15. + # Tracking nixos-21.05 as of 2021-11-24. stableHashes = { - commit = "46251a79f752ae1d46ef733e8e9760b6d3429da4"; - sha256 = "1xsp0xyrf8arjkf4wi09n96kbg0r8igsmzx8bhc1nj4nr078p0pg"; + commit = "09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de"; + sha256 = "0f06zcc8mh934fya0hwzklmga238yxiyfp183y48vyzkdsg7xgn0"; }; # import the nixos-unstable package set, or optionally use the diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index d1205287762f..0bf301e8e50c 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -9,17 +9,12 @@ self: super: { # Required for apereo-cas # TODO(lukegb): Document why? - gradle_6 = (super.gradleGen.override { - java = self.jdk11; - jdk = self.jdk11; - }).gradleGen rec { - name = "gradle-6.5.1"; + gradle_6 = self.callPackage (super.gradleGen { + version = "6.5.1"; nativeVersion = "0.22-milestone-3"; - - src = builtins.fetchurl { - url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh"; - }; + sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh"; + }) { + java = self.jdk11; }; clang-tools_11 = self.clang-tools.override { |