mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-09-11 14:35:30 +03:00
update flake input nixpkgsV1
This commit is contained in:
parent
0572dda8bd
commit
3f47ac7490
@ -207,16 +207,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgsV1": {
|
"nixpkgsV1": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1678500271,
|
"lastModified": 1686501370,
|
||||||
"narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
|
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
|
"rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-22.11",
|
"ref": "nixos-unstable",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
nixpkgsV1.url = "nixpkgs/nixos-22.11";
|
nixpkgsV1.url = "nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||||
|
@ -15,13 +15,15 @@
|
|||||||
.old;
|
.old;
|
||||||
|
|
||||||
extractPythonAttrs = pythonPackage: let
|
extractPythonAttrs = pythonPackage: let
|
||||||
pythonAttrs = extractOverrideAttrs pythonPackage.overridePythonAttrs;
|
pythonAttrs =
|
||||||
|
extractOverrideAttrs
|
||||||
|
(pythonPackage.overridePythonAttrs or pythonPackage.overrideAttrs);
|
||||||
in
|
in
|
||||||
l.filterAttrs (name: _: ! exclude ? ${name}) pythonAttrs;
|
l.filterAttrs (name: _: ! exclude ? ${name}) pythonAttrs;
|
||||||
|
|
||||||
extracted =
|
extracted =
|
||||||
if config.deps.python.pkgs ? ${config.name}
|
if cfg.from != null
|
||||||
then extractPythonAttrs config.deps.python.pkgs.${config.name}
|
then extractPythonAttrs cfg.from
|
||||||
else {};
|
else {};
|
||||||
|
|
||||||
extractedMkDerivation =
|
extractedMkDerivation =
|
||||||
|
@ -14,6 +14,12 @@ in {
|
|||||||
description = "Attributes we do not want to copy from nixpkgs";
|
description = "Attributes we do not want to copy from nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
from = l.mkOption {
|
||||||
|
type = t.nullOr t.package;
|
||||||
|
description = "package from which to extract the attributes";
|
||||||
|
default = config.deps.python.pkgs.${config.name} or null;
|
||||||
|
};
|
||||||
|
|
||||||
lib.extractOverrideAttrs = l.mkOption {
|
lib.extractOverrideAttrs = l.mkOption {
|
||||||
type = t.functionTo t.attrs;
|
type = t.functionTo t.attrs;
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -19,6 +19,15 @@
|
|||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
npm_8 = nodejs:
|
||||||
|
nodejs.pkgs.npm.override (old: rec {
|
||||||
|
version = "8.19.4";
|
||||||
|
src = builtins.fetchTarball {
|
||||||
|
url = "https://registry.npmjs.org/npm/-/npm-${version}.tgz";
|
||||||
|
sha256 = "0xmvjkxgfavlbm8cj3jx66mlmc20f9kqzigjqripgj71j6b2m9by";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
npmArgs = l.concatStringsSep " " (map (arg: "'${arg}'") cfg.npmArgs);
|
npmArgs = l.concatStringsSep " " (map (arg: "'${arg}'") cfg.npmArgs);
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
@ -38,7 +47,7 @@ in {
|
|||||||
writeScript
|
writeScript
|
||||||
writeScriptBin
|
writeScriptBin
|
||||||
;
|
;
|
||||||
inherit (nixpkgs.nodePackages) npm;
|
npm = npm_8 nixpkgs.nodejs;
|
||||||
};
|
};
|
||||||
|
|
||||||
lock.fields.package-lock.script =
|
lock.fields.package-lock.script =
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
l = lib // builtins;
|
l = lib // builtins;
|
||||||
python = config.deps.python;
|
python = config.deps.python;
|
||||||
extractPythonAttrs = config.nixpkgs-overrides.lib.extractPythonAttrs;
|
extractPythonAttrs = config.nixpkgs-overrides.lib.extractPythonAttrs;
|
||||||
nixpkgsAttrs = extractPythonAttrs python.pkgs.apache-airflow;
|
nixpkgsAttrs = extractPythonAttrs config.deps.apache-airflow;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../../drv-parts/pip
|
../../drv-parts/pip
|
||||||
@ -20,6 +20,7 @@ in {
|
|||||||
}: {
|
}: {
|
||||||
inherit
|
inherit
|
||||||
(nixpkgs)
|
(nixpkgs)
|
||||||
|
apache-airflow
|
||||||
git
|
git
|
||||||
fetchFromGitHub
|
fetchFromGitHub
|
||||||
;
|
;
|
||||||
@ -47,7 +48,6 @@ in {
|
|||||||
inherit
|
inherit
|
||||||
(nixpkgsAttrs)
|
(nixpkgsAttrs)
|
||||||
buildInputs
|
buildInputs
|
||||||
checkInputs
|
|
||||||
postPatch
|
postPatch
|
||||||
postInstall
|
postInstall
|
||||||
preCheck
|
preCheck
|
||||||
@ -96,4 +96,7 @@ in {
|
|||||||
pytestFlagsArray
|
pytestFlagsArray
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixpkgs-overrides.from =
|
||||||
|
config.deps.apache-airflow.pythonPackages.apache-airflow;
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
l = lib // builtins;
|
l = lib // builtins;
|
||||||
|
system = config.deps.stdenv.system;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../../drv-parts/nodejs-package-json
|
../../drv-parts/nodejs-package-json
|
||||||
@ -29,4 +30,7 @@ in {
|
|||||||
|
|
||||||
name = l.mkForce "prettier";
|
name = l.mkForce "prettier";
|
||||||
version = l.mkForce "2.8.7";
|
version = l.mkForce "2.8.7";
|
||||||
|
|
||||||
|
lock.lockFileRel =
|
||||||
|
l.mkForce "/v1/nix/modules/drvs/prettier-no-lock/lock-${system}.json";
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user