diff --git a/nix/sources.json b/nix/sources.json index 68b98d5d85..47db2b8060 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,22 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fb3ce0b6b84d3b4e7b49e142da9c5764b563058", - "sha256": "0wwnjdjckhibw3662kb3v8r0xbj7f3qjf7q9gacc45n6y4mfr1hk", + "rev": "e381a1288138aceda0ac63db32c7be545b446921", + "sha256": "0nlrd3cp4mim7h8159sc7yng251w2kg5h8i9q3fy8xzwmgjz0z9w", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/3fb3ce0b6b84d3b4e7b49e142da9c5764b563058.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/e381a1288138aceda0ac63db32c7be545b446921.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nixpkgs-rg": { + "branch": "738fe494da28777ddeb2612c70a5dc909958df4b", + "description": "Nix Packages collection & NixOS", + "homepage": "", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "738fe494da28777ddeb2612c70a5dc909958df4b", + "sha256": "1im58ql0ilvk79pn349f1yzr4z6mycag40vlym78q1p9xlag2fkn", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/738fe494da28777ddeb2612c70a5dc909958df4b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs16": { diff --git a/shell.nix b/shell.nix index 30534b48b5..902a66d964 100644 --- a/shell.nix +++ b/shell.nix @@ -1,18 +1,15 @@ # shell.nix let sources = import ./nix/sources.nix; - pkgs16 = import sources.nixpkgs16 {}; + pkgsrg = import sources.nixpkgs-rg {}; pkgs = import sources.nixpkgs {}; - yarn16 = pkgs16.yarn.overrideAttrs (finalAttrs: previousAttrs: { - buildInputs = [ pkgs16.nodejs-16_x ]; - }); in pkgs.mkShell { buildInputs = [ - pkgs16.nodejs-16_x - yarn16 + pkgs.nodejs + pkgs.yarn pkgs.git - pkgs.ripgrep + pkgsrg.ripgrep ]; }