diff options
Diffstat (limited to 'nixpkgs/pkgs/development/misc')
| -rwxr-xr-x | nixpkgs/pkgs/development/misc/haskell/hasura/update.sh | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/misc/resholve/oildev.nix | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/update.sh b/nixpkgs/pkgs/development/misc/haskell/hasura/update.sh index f4286ea6b831..825f57fa4e58 100755 --- a/nixpkgs/pkgs/development/misc/haskell/hasura/update.sh +++ b/nixpkgs/pkgs/development/misc/haskell/hasura/update.sh @@ -88,7 +88,7 @@ new_kritilang_version=$(curl --silent "https://api.github.com/repos/hasura/kriti cabal2nix --revision "$new_kritilang_version" --maintainer lassulus "https://github.com/hasura/kriti-lang.git" >> "$kritilang_derivation_file" echo "###################" -echo "please update pkgs/servers/hasura/cli.nix vendorSha256" +echo "please update pkgs/servers/hasura/cli.nix vendorHash" echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version" echo "###################" diff --git a/nixpkgs/pkgs/development/misc/resholve/oildev.nix b/nixpkgs/pkgs/development/misc/resholve/oildev.nix index de3ac08ec99d..3e7dbc8e0108 100644 --- a/nixpkgs/pkgs/development/misc/resholve/oildev.nix +++ b/nixpkgs/pkgs/development/misc/resholve/oildev.nix @@ -9,8 +9,7 @@ , # py-yajl deps git , # oil deps - cmark -, file + file , glibcLocales , six , typing @@ -80,8 +79,8 @@ rec { patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.14.0.0"; - hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8="; + rev = "v0.14.0.1"; + hash = "sha256-47+986+SohdtoNzTYAgF2vPPWgakyg0VCmR+MgxMzTk="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -93,6 +92,7 @@ rec { "${patchSrc}/0010-disable-line-input.patch" "${patchSrc}/0011-disable-fanos.patch" "${patchSrc}/0012-disable-doc-cmark.patch" + "${patchSrc}/0013-fix-pyverify.patch" ]; configureFlags = [ @@ -118,14 +118,6 @@ rec { substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' ''; - /* - We did convince oil to upstream an env for specifying - this to support a shell.nix. Would need a patch if they - later drop this support. See: - https://github.com/oilshell/oil/blob/46900310c7e4a07a6223eb6c08e4f26460aad285/doctools/cmark.py#L30-L34 - */ - _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; - # See earlier note on glibcLocales TODO: verify needed? LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; |