From 5a881cc7b5a96be946b6d360bb1a19c7ef07c524 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 9 Jan 2022 12:06:17 -0500 Subject: [PATCH] flake: update nixpkgs --- distros/distro-overlay.nix | 12 ++++-------- flake.lock | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index 9b9b2ed8bb..d12c9014cf 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -28,14 +28,10 @@ let python3 = pythonOverridesFor self.python3; python3Packages = rosSelf.python3.pkgs; - boost = - # Trigger an error when nixpkgs default has changed so that this is no - # longer needed - assert self.lib.versionOlder self.boost.version "1.73.0"; - self.boost173.override { - python = rosSelf.python; - enablePython = true; - }; + boost = self.boost.override { + python = rosSelf.python; + enablePython = true; + }; }; overrides = rosSelf: rosSuper: with rosSelf.lib; { diff --git a/flake.lock b/flake.lock index 400563386d..a42311f750 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1639699734, - "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=", + "lastModified": 1641528457, + "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", "owner": "lopsided98", "repo": "nixpkgs", - "rev": "03ec468b14067729a285c2c7cfa7b9434a04816c", + "rev": "ff377a78794d412a35245e05428c8f95fef3951f", "type": "github" }, "original": {