diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 06:01:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-12 06:01:07 +0000 |
commit | eb26e06e9b4f8d9a173099699ef6b8602c22e329 (patch) | |
tree | 78ec4dbbae22af7bf9f21fe22a287f990cd045ae /pkgs/development | |
parent | 597366a4aa9ecdf7d56e452098a43283ba2a67a1 (diff) | |
parent | 6f314053897165a8c629484836a45d1de1a0e965 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/yosys/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/ngtcp2/gnutls.nix | 4 | ||||
-rw-r--r-- | pkgs/development/misc/newlib/default.nix | 25 | ||||
-rw-r--r-- | pkgs/development/python-modules/bash-kernel/bash-path.patch | 22 | ||||
-rw-r--r-- | pkgs/development/python-modules/bash-kernel/default.nix (renamed from pkgs/development/python-modules/bash_kernel/default.nix) | 39 | ||||
-rw-r--r-- | pkgs/development/python-modules/openrazer/daemon.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/pycardano/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/rich-argparse/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/steamship/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/txtai/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/database/sqlcl/default.nix | 38 |
11 files changed, 94 insertions, 72 deletions
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 0ea755f7348b3..6d086d57b017f 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -69,15 +69,15 @@ let } // (yosys-symbiflow); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/${pname}-${version}"; - hash = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g="; + rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ="; }; enableParallelBuilding = true; @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./Makefile \ - --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' + --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in @@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { fi if ! grep -q "YOSYS_VER := $version" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing." + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." exit 1 fi ''; @@ -150,6 +150,6 @@ in stdenv.mkDerivation rec { homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ shell thoughtpolice emily ]; + maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ]; }; -} +}) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 53d8454264bd4..851d687077cd9 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-dnYIRcNGTIzETu2OjTJa0IWB1+xttdGFKRBmMkTwrXk="; + hash = "sha256-Z8rMujmshdes5SLU5GpXu6QzAHl957sFDK+QSdGYCOc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index d162753608bdc..8aed144ff65c2 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -31,13 +31,36 @@ stdenv.mkDerivation (finalAttrs: { # newlib expects CC to build for build platform, not host platform preConfigure = '' export CC=cc + '' + + # newlib tries to disable itself when building for Linux *except* + # when native-compiling. Unfortunately the check for "is cross + # compiling" was written when newlib was part of GCC and newlib + # was built along with GCC (therefore newlib was built to execute + # on the targetPlatform, not the hostPlatform). Unfortunately + # when newlib was extracted from GCC, this "is cross compiling" + # logic was not fixed. So we must disable it. + '' + substituteInPlace configure --replace 'noconfigdirs target-newlib target-libgloss' 'noconfigdirs' ''; + configurePlatforms = [ "build" "target" ]; # flags copied from https://community.arm.com/support-forums/f/compilers-and-libraries-forum/53310/gcc-arm-none-eabi-what-were-the-newlib-compilation-options # sort alphabetically configureFlags = [ - "--host=${stdenv.buildPlatform.config}" + "--with-newlib" + + # The newlib configury uses `host` to refer to the platform + # which is being used to compile newlib. Ugh. It does this + # because of its history: newlib used to be distributed with and + # built as part of gcc. + # + # To prevent nixpkgs from going insane, this package presents the + # "normal" view to the outside world: the binaries in $out will + # execute on `stdenv.hostPlatform`. We then fool newlib's build + # process into doing the right thing. + "--host=${stdenv.targetPlatform.config}" + ] ++ (if !nanoizeNewlib then [ "--disable-newlib-supplied-syscalls" "--disable-nls" diff --git a/pkgs/development/python-modules/bash-kernel/bash-path.patch b/pkgs/development/python-modules/bash-kernel/bash-path.patch new file mode 100644 index 0000000000000..98c3cc511ab74 --- /dev/null +++ b/pkgs/development/python-modules/bash-kernel/bash-path.patch @@ -0,0 +1,22 @@ +diff --git a/bash_kernel/kernel.py b/bash_kernel/kernel.py +index 0496f1e..bd13c4f 100644 +--- a/bash_kernel/kernel.py ++++ b/bash_kernel/kernel.py +@@ -88,7 +88,7 @@ class BashKernel(Kernel): + @property + def banner(self): + if self._banner is None: +- self._banner = check_output(['bash', '--version']).decode('utf-8') ++ self._banner = check_output(['@bash@', '--version']).decode('utf-8') + return self._banner + + language_info = {'name': 'bash', +@@ -116,7 +116,7 @@ class BashKernel(Kernel): + # source code there for comments and context for + # understanding the code here. + bashrc = os.path.join(os.path.dirname(pexpect.__file__), 'bashrc.sh') +- child = pexpect.spawn("bash", ['--rcfile', bashrc], echo=False, ++ child = pexpect.spawn("@bash@", ['--rcfile', bashrc], echo=False, + encoding='utf-8', codec_errors='replace') + # Following comment stolen from upstream's REPLWrap: + # If the user runs 'env', the value of PS1 will be in the output. To avoid diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index 5956d52de861e..1c50b151f01e6 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -4,42 +4,38 @@ , fetchpatch , flit-core , ipykernel -, isPy27 , python , pexpect , bash +, substituteAll }: buildPythonPackage rec { - pname = "bash_kernel"; + pname = "bash-kernel"; version = "0.9.1"; - format = "flit"; - disabled = isPy27; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; + pname = "bash_kernel"; + inherit version; + hash = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; }; patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/takluyver/bash_kernel/pull/69.diff"; - sha256 = "1qd7qjjmcph4dk6j0bl31h2fdmfiyyazvrc9xqqj8y21ki2sl33j"; + (substituteAll { + src = ./bash-path.patch; + bash = lib.getExe bash; }) ]; - postPatch = '' - substituteInPlace bash_kernel/kernel.py \ - --replace "'bash'" "'${bash}/bin/bash'" \ - --replace "\"bash\"" "'${bash}/bin/bash'" - ''; - - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ ipykernel pexpect ]; + nativeBuildInputs = [ + flit-core + ]; - # no tests - doCheck = false; + propagatedBuildInputs = [ + ipykernel + pexpect + ]; preBuild = '' export HOME=$TMPDIR @@ -49,6 +45,9 @@ buildPythonPackage rec { ${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out ''; + # no tests + doCheck = false; + meta = with lib; { description = "Bash Kernel for Jupyter"; homepage = "https://github.com/takluyver/bash_kernel"; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 622917e8a3e70..ea90e089ec345 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -11,6 +11,7 @@ , pyudev , setproctitle , wrapGAppsHook +, notify2 }: let @@ -39,6 +40,7 @@ buildPythonPackage (common // { pygobject3 pyudev setproctitle + notify2 ]; postInstall = '' diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index 8345a3da20655..118e4ed66b5e6 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub # Python deps , blockfrost-python +, cachetools , cbor2 , cose , ecpy @@ -29,7 +30,7 @@ let in buildPythonPackage rec { pname = "pycardano"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; @@ -37,11 +38,12 @@ in buildPythonPackage rec { owner = "Python-Cardano"; repo = "pycardano"; rev = "v${version}"; - hash = "sha256-KRlpGhEzABBh1YWCDcrpW4hyMOhEA1Rla9nh95qdVik="; + hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0="; }; propagatedBuildInputs = [ blockfrost-python + cachetools cbor2 cose_0_9_dev8 ecpy diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 0fde4435543d4..7dc2878d391d0 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; - rev = "v${version}"; - hash = "sha256-WAqFhH9gUwDZuORJ++fKjCmaCurdYpep3WPq68tWJ4U="; + rev = "refs/tags/v${version}"; + hash = "sha256-iQ8x8UM0zmb2qYUpSh6RSEaBMrDpwY0ZHaJ9GJqn4Hs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 5309312bba351..adc6db83dd9bd 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.28"; + version = "2.17.32"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NdWQiHu5YDIEtL4zJj5Vydjmwq1b5aqVcmqIe7zYv3g="; + hash = "sha256-dTpz2/XXu8patDnorg/36652j9VLUjE5uF2fVzbDjfI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index 75b83aaaa090c..45e8980da4236 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -52,7 +52,7 @@ , unittestCheckHook }: let - version = "6.1.0"; + version = "6.2.0"; api = [ aiohttp fastapi uvicorn ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -105,7 +105,7 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-ZUMfDyebroa9r01bOUFYDyVjuNUqlPU88HBocp3YQJ4="; + hash = "sha256-aWuY2z5DIVhZ5bRADhKSadCofIQQdLQAb52HnjPMS/4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index 67d905ae0565c..cc68d8b93bbe8 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -1,37 +1,11 @@ -{ lib, stdenv, makeWrapper, requireFile, unzip, jdk }: +{ lib, stdenv, makeWrapper, fetchurl, unzip, jdk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; version = "23.2.0.178.1027"; - src = requireFile rec { - url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; - name = "sqlcl-${version}.zip"; - message = '' - This Nix expression requires that ${name} already be part of the store. To - obtain it you need to - - - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads - - if it does not, click on the "Previous Version" link below the - download and repeat until the version is correct. This is necessary - because as the time of this writing there exists no permanent link - for the current version yet. - Also consider updating this package yourself (you probably just need - to change the `version` variable and update the sha256 to the one of - the new file) or opening an issue at the nixpkgs repo. - - click "Download" - - sign in or create an oracle account if neccessary - - on the next page, click the "${name}" link - - and then add the file to the Nix store using either: - - nix-store --add-fixed sha256 ${name} - - or - - nix-prefetch-url --type sha256 file:///path/to/${name} - ''; + src = fetchurl { + url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; }; @@ -58,8 +32,8 @@ stdenv.mkDerivation rec { also supporting your previously written SQL*Plus scripts. ''; homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/"; - license = licenses.unfree; + license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ misterio77 ]; }; -} +}) |