Skip to content

Commit

Permalink
Merge pull request #298 from linz/build/bump-nixpkgs
Browse files Browse the repository at this point in the history
build: Bump nixpkgs
  • Loading branch information
l0b0 authored Sep 13, 2023
2 parents 59f5426 + 84e00f4 commit 660b5fc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"nixpkgs": {
"branch": "release-22.11",
"branch": "nixos-23.05",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96e18717904dfedcd884541e5a92bf9ff632cf39",
"sha256": "0zw1851mia86xqxdf8jgy1c6fm5lqw4rncv7v2lwxar3vhpn6c78",
"rev": "53657afe29748b3e462f1f892287b7e254c26d77",
"sha256": "1l9pwclmx7kw7kd5p3dxf67w3arh413pbasfgs1ckmjm9zdajsmv",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/96e18717904dfedcd884541e5a92bf9ff632cf39.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/53657afe29748b3e462f1f892287b7e254c26d77.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
11 changes: 9 additions & 2 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ let
path = ./.;
name = "oidc-provider";
};
preferWheels = true;
overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
aws-cdk-asset-node-proxy-agent-v6 = super.aws-cdk-asset-node-proxy-agent-v6.overridePythonAttrs (
# Upstream fix: https://github.com/nix-community/poetry2nix/pull/1306
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
}
);
});
};
in
poetryEnv.env.overrideAttrs (
Expand All @@ -20,7 +27,7 @@ poetryEnv.env.overrideAttrs (
pkgs.gitFull
pkgs.nodejs
(pkgs.poetry.override {
inherit python;
python3 = python;
})
pkgs.which
];
Expand Down

0 comments on commit 660b5fc

Please sign in to comment.