mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 23:20:55 +00:00
resholve: 0.4.2 -> 0.5.0
This commit is contained in:
parent
caa23be256
commit
7823d6a449
6
pkgs/development/misc/resholve/deps.nix
generated
6
pkgs/development/misc/resholve/deps.nix
generated
|
@ -60,13 +60,13 @@ rec {
|
||||||
# resholve's primary dependency is this developer build of the oil shell.
|
# resholve's primary dependency is this developer build of the oil shell.
|
||||||
oildev = python27Packages.buildPythonPackage rec {
|
oildev = python27Packages.buildPythonPackage rec {
|
||||||
pname = "oildev-unstable";
|
pname = "oildev-unstable";
|
||||||
version = "2020-03-31";
|
version = "2021-02-26";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "oilshell";
|
owner = "oilshell";
|
||||||
repo = "oil";
|
repo = "oil";
|
||||||
rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a";
|
rev = "11c6bd3ca0e126862c7a1f938c8510779837affa";
|
||||||
sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2";
|
hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY=";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
It's not critical to drop most of these; the primary target is
|
It's not critical to drop most of these; the primary target is
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
, doCheck ? true
|
, doCheck ? true
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "0.4.2";
|
version = "0.5.0";
|
||||||
rSrc = fetchFromGitHub {
|
rSrc = fetchFromGitHub {
|
||||||
owner = "abathur";
|
owner = "abathur";
|
||||||
repo = "resholve";
|
repo = "resholve";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0=";
|
hash = "sha256-dscmT0ss1buP56QzQtfs2HANr9oWWMxCS+fwBIKBxv4=";
|
||||||
};
|
};
|
||||||
deps = callPackage ./deps.nix {
|
deps = callPackage ./deps.nix {
|
||||||
/*
|
/*
|
||||||
|
@ -29,6 +29,9 @@ let
|
||||||
"${rSrc}/0002-add_MANIFEST_in.patch"
|
"${rSrc}/0002-add_MANIFEST_in.patch"
|
||||||
"${rSrc}/0003-fix_codegen_shebang.patch"
|
"${rSrc}/0003-fix_codegen_shebang.patch"
|
||||||
"${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch"
|
"${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch"
|
||||||
|
"${rSrc}/0005_revert_libc_locale.patch"
|
||||||
|
"${rSrc}/0006_disable_failing_libc_tests.patch"
|
||||||
|
"${rSrc}/0007_restore_root_init_py.patch"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in a new issue