summaryrefslogtreecommitdiff
path: root/shell.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <silvan.mosberger@tweag.io>2024-10-01 05:59:38 +0200
committerSilvan Mosberger <silvan.mosberger@tweag.io>2024-10-08 22:13:59 +0200
commit1700d0058809db5fa3bf64cdde79c1f417d760ea (patch)
treefe10591f124ea46773da2df7c85f878df9b5fa39 /shell.nix
parentspotube: 3.8.1 -> 3.8.2 (#345551) (diff)
downloadnixpkgs-1700d0058809db5fa3bf64cdde79c1f417d760ea.tar.gz
ci: Add default.nix with exposed pkgs
Allows reusing it in more places
Diffstat (limited to 'shell.nix')
-rw-r--r--shell.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/shell.nix b/shell.nix
index 0722f4efd734..b8a9fe7df19f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -11,23 +11,12 @@
#
# nix-shell --arg nixpkgs ./.
#
-let
- pinnedNixpkgs = builtins.fromJSON (builtins.readFile ci/pinned-nixpkgs.json);
-in
{
system ? builtins.currentSystem,
-
- nixpkgs ? fetchTarball {
- url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgs.rev}.tar.gz";
- sha256 = pinnedNixpkgs.sha256;
- },
+ nixpkgs ? null,
}:
let
- pkgs = import nixpkgs {
- inherit system;
- config = { };
- overlays = [ ];
- };
+ inherit (import ./ci { inherit nixpkgs system; }) pkgs;
in
pkgs.mkShellNoCC {
packages = with pkgs; [