Commit 35b623b8 authored by sternenseemann's avatar sternenseemann
Browse files

gnatcoll-{lzma,gmp,iconv,omp,python3,readline,syslog,zlib}: 22.0.0 -> 23.0.0

parent 30908712
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -33,19 +33,15 @@ in

stdenv.mkDerivation rec {
  pname = "gnatcoll-${component}";
  version = "22.0.0";
  version = "23.0.0";

  src = fetchFromGitHub {
    owner = "AdaCore";
    repo = "gnatcoll-bindings";
    rev = "v${version}";
    sha256 = "0wbwnd6jccwfd4jdxbnzhc0jhm8ad4phz6y9b1gk8adykkk6jcz4";
    sha256 = "1jnnfsvll4jh6ip0fww4mh2cm61h7dzpxz3zaa2psrc1w54x34nn";
  };

  patches = [
    ./omp-setup-text-mode.patch
  ];

  nativeBuildInputs = [
    gprbuild
    gnat
+0 −23
Original line number Diff line number Diff line
commit 37c815ee660d1bf37256638d23b0346ad7cc19e7
Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date:   Wed Jul 21 00:18:30 2021 +0200

    omp/setup.py: open version_information in text mode
    
    Otherwise saving the config in setup_support.py will fail as a bytes
    object is not encodeable as JSON. Luckily, version_information is text
    anyways.

diff --git a/omp/setup.py b/omp/setup.py
index 942ab1f5..5281398e 100755
--- a/omp/setup.py
+++ b/omp/setup.py
@@ -25,7 +25,7 @@ class GNATCollOMP(SetupApp):
 
         # Set library version
         with open(os.path.join(config.source_dir, '..',
-                               'version_information'), 'rb') as fd:
+                               'version_information'), 'r') as fd:
             version = fd.read().strip()
         config.set_data('GNATCOLL_VERSION', version, sub='gprbuild')