cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #114528 from abathur/update/resholve

Browse source 
resholve: 0.4.2 -> 0.5.0
This commit is contained in:
Sandro 2021-02-28 20:44:51 +01:00 committed by GitHub
commit fc8ec91602
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/misc/resholve/deps.nix generated
View file

@ -60,13 +60,13 @@ rec {
# resholve's primary dependency is this developer build of the oil shell.
oildev = python27Packages.buildPythonPackage rec {
pname = "oildev-unstable";
version = "2020-03-31";
version = "2021-02-26";
src = fetchFromGitHub {
owner = "oilshell";
repo = "oil";
rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a";
sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2";
rev = "11c6bd3ca0e126862c7a1f938c8510779837affa";
hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY=";
/*
It's not critical to drop most of these; the primary target is

7
pkgs/development/misc/resholve/resholve.nix
View file

@ -11,12 +11,12 @@
, doCheck ? true
}:
let
version = "0.4.2";
version = "0.5.0";
rSrc = fetchFromGitHub {
owner = "abathur";
repo = "resholve";
rev = "v${version}";
hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0=";
hash = "sha256-dscmT0ss1buP56QzQtfs2HANr9oWWMxCS+fwBIKBxv4=";
};
deps = callPackage ./deps.nix {
/*
@ -29,6 +29,9 @@ let
"${rSrc}/0002-add_MANIFEST_in.patch"
"${rSrc}/0003-fix_codegen_shebang.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