Merge master into staging-next
This commit is contained in:
commit
eb26e06e9b
@ -15264,12 +15264,6 @@
|
|||||||
githubId = 496447;
|
githubId = 496447;
|
||||||
name = "Robert Hensing";
|
name = "Robert Hensing";
|
||||||
};
|
};
|
||||||
robert-manchester = {
|
|
||||||
email = "robert.manchester@gmail.com";
|
|
||||||
github = "robert-manchester";
|
|
||||||
githubId = 86313040;
|
|
||||||
name = "Robert Manchester";
|
|
||||||
};
|
|
||||||
robertodr = {
|
robertodr = {
|
||||||
email = "roberto.diremigio@gmail.com";
|
email = "roberto.diremigio@gmail.com";
|
||||||
github = "robertodr";
|
github = "robertodr";
|
||||||
|
@ -33,13 +33,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lorien";
|
pname = "lorien";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mbrlabs";
|
owner = "mbrlabs";
|
||||||
repo = "Lorien";
|
repo = "Lorien";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-x81Obana2BEGrYSoJHDdCkL6UaULfQGQ94tlrH5+kdY=";
|
sha256 = "sha256-mPv/3hyLGF3IUy6cKfGoABidIsyw4UfmhfhS4AD72K8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -15,9 +15,9 @@
|
|||||||
version = "2023-09-12";
|
version = "2023-09-12";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
|
hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA=";
|
||||||
hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
|
hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE=";
|
||||||
version = "119.0.6045.105";
|
version = "119.0.6045.123";
|
||||||
};
|
};
|
||||||
ungoogled-chromium = {
|
ungoogled-chromium = {
|
||||||
deps = {
|
deps = {
|
||||||
@ -28,12 +28,12 @@
|
|||||||
version = "2023-09-12";
|
version = "2023-09-12";
|
||||||
};
|
};
|
||||||
ungoogled-patches = {
|
ungoogled-patches = {
|
||||||
hash = "sha256-+1ln5xD+VwhB+f64rnSXeNOYmhbnm6Kb2xBe5Aanxkc=";
|
hash = "sha256-4EbfM62KuG8nHrYWwp183V5G9ac7FICjpyJahnKbQjE=";
|
||||||
rev = "119.0.6045.105-1";
|
rev = "119.0.6045.123-1";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
|
hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA=";
|
||||||
hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
|
hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE=";
|
||||||
version = "119.0.6045.105";
|
version = "119.0.6045.123";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,32 +1,39 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub
|
{ lib
|
||||||
, readline, cmake
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, readline
|
||||||
|
, cmake
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "abc-verifier";
|
pname = "abc-verifier";
|
||||||
version = "unstable-2023-09-13";
|
version = "unstable-2023-10-13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "yosyshq";
|
owner = "yosyshq";
|
||||||
repo = "abc";
|
repo = "abc";
|
||||||
rev = "daad9ede0137dc58487a0abc126253e671a85b14";
|
rev = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43";
|
||||||
hash = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ=";
|
hash = "sha256-ou+E2lvDEOxXRXNygE/TyVi7quqk+CJHRI+HDI0xljE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ readline ];
|
buildInputs = [ readline ];
|
||||||
|
|
||||||
installPhase = "mkdir -p $out/bin && mv abc $out/bin";
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -Dm755 'abc' "$out/bin/abc"
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
# needed by yosys
|
# needed by yosys
|
||||||
passthru.rev = src.rev;
|
passthru.rev = finalAttrs.src.rev;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A tool for squential logic synthesis and formal verification";
|
description = "A tool for squential logic synthesis and formal verification";
|
||||||
homepage = "https://people.eecs.berkeley.edu/~alanmi/abc";
|
homepage = "https://people.eecs.berkeley.edu/~alanmi/abc";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ thoughtpolice ];
|
maintainers = with maintainers; [ thoughtpolice Luflosi ];
|
||||||
mainProgram = "abc";
|
mainProgram = "abc";
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "git-codereview";
|
pname = "git-codereview";
|
||||||
version = "1.7.0";
|
version = "1.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "golang";
|
owner = "golang";
|
||||||
repo = "review";
|
repo = "review";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-vq/rrDOZUn/apHgk6YPnfG7hmKRSapuw49ZyFVMWNqs=";
|
hash = "sha256-E6KgFSlWa/MKG6R2P+K4T+P/JOqaIfxdWpsSFGHbihg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
|
@ -256,6 +256,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
|||||||
'';
|
'';
|
||||||
changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}";
|
changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
|
mainProgram = "mpv";
|
||||||
maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
|
maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation {
|
|||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace thumbfast.lua \
|
substituteInPlace thumbfast.lua \
|
||||||
--replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getBin mpv-unwrapped}/bin/mpv"'
|
--replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
diff regions to achieve exactly the merge output desired.
|
diff regions to achieve exactly the merge output desired.
|
||||||
'';
|
'';
|
||||||
mainProgram = "tkdiff";
|
mainProgram = "tkdiff";
|
||||||
maintainers = with lib.maintainers; [ robert-manchester ];
|
maintainers = with lib.maintainers; [ mikaelfangel ];
|
||||||
platforms = tk.meta.platforms;
|
platforms = tk.meta.platforms;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
@ -69,15 +69,15 @@ let
|
|||||||
} // (yosys-symbiflow);
|
} // (yosys-symbiflow);
|
||||||
|
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "yosys";
|
pname = "yosys";
|
||||||
version = "0.34";
|
version = "0.35";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "YosysHQ";
|
owner = "YosysHQ";
|
||||||
repo = "yosys";
|
repo = "yosys";
|
||||||
rev = "refs/tags/${pname}-${version}";
|
rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}";
|
||||||
hash = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g=";
|
hash = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace ./Makefile \
|
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
|
chmod +x ./misc/yosys-config.in
|
||||||
patchShebangs tests ./misc/yosys-config.in
|
patchShebangs tests ./misc/yosys-config.in
|
||||||
@ -120,7 +120,7 @@ in stdenv.mkDerivation rec {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if ! grep -q "YOSYS_VER := $version" Makefile; then
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
@ -150,6 +150,6 @@ in stdenv.mkDerivation rec {
|
|||||||
homepage = "https://yosyshq.net/yosys/";
|
homepage = "https://yosyshq.net/yosys/";
|
||||||
license = licenses.isc;
|
license = licenses.isc;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ shell thoughtpolice emily ];
|
maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ];
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ngtcp2";
|
pname = "ngtcp2";
|
||||||
version = "1.0.0";
|
version = "1.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ngtcp2";
|
owner = "ngtcp2";
|
||||||
repo = "ngtcp2";
|
repo = "ngtcp2";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-dnYIRcNGTIzETu2OjTJa0IWB1+xttdGFKRBmMkTwrXk=";
|
hash = "sha256-Z8rMujmshdes5SLU5GpXu6QzAHl957sFDK+QSdGYCOc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
@ -31,13 +31,36 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
# newlib expects CC to build for build platform, not host platform
|
# newlib expects CC to build for build platform, not host platform
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export CC=cc
|
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" ];
|
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
|
# 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
|
# sort alphabetically
|
||||||
configureFlags = [
|
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 [
|
] ++ (if !nanoizeNewlib then [
|
||||||
"--disable-newlib-supplied-syscalls"
|
"--disable-newlib-supplied-syscalls"
|
||||||
"--disable-nls"
|
"--disable-nls"
|
||||||
|
22
pkgs/development/python-modules/bash-kernel/bash-path.patch
Normal file
22
pkgs/development/python-modules/bash-kernel/bash-path.patch
Normal file
@ -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
|
@ -4,42 +4,38 @@
|
|||||||
, fetchpatch
|
, fetchpatch
|
||||||
, flit-core
|
, flit-core
|
||||||
, ipykernel
|
, ipykernel
|
||||||
, isPy27
|
|
||||||
, python
|
, python
|
||||||
, pexpect
|
, pexpect
|
||||||
, bash
|
, bash
|
||||||
|
, substituteAll
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bash_kernel";
|
pname = "bash-kernel";
|
||||||
version = "0.9.1";
|
version = "0.9.1";
|
||||||
format = "flit";
|
pyproject = true;
|
||||||
disabled = isPy27;
|
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
pname = "bash_kernel";
|
||||||
sha256 = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis=";
|
inherit version;
|
||||||
|
hash = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
(fetchpatch {
|
(substituteAll {
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/takluyver/bash_kernel/pull/69.diff";
|
src = ./bash-path.patch;
|
||||||
sha256 = "1qd7qjjmcph4dk6j0bl31h2fdmfiyyazvrc9xqqj8y21ki2sl33j";
|
bash = lib.getExe bash;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
nativeBuildInputs = [
|
||||||
substituteInPlace bash_kernel/kernel.py \
|
flit-core
|
||||||
--replace "'bash'" "'${bash}/bin/bash'" \
|
];
|
||||||
--replace "\"bash\"" "'${bash}/bin/bash'"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ flit-core ];
|
propagatedBuildInputs = [
|
||||||
|
ipykernel
|
||||||
propagatedBuildInputs = [ ipykernel pexpect ];
|
pexpect
|
||||||
|
];
|
||||||
# no tests
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
export HOME=$TMPDIR
|
export HOME=$TMPDIR
|
||||||
@ -49,6 +45,9 @@ buildPythonPackage rec {
|
|||||||
${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out
|
${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# no tests
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Bash Kernel for Jupyter";
|
description = "Bash Kernel for Jupyter";
|
||||||
homepage = "https://github.com/takluyver/bash_kernel";
|
homepage = "https://github.com/takluyver/bash_kernel";
|
@ -11,6 +11,7 @@
|
|||||||
, pyudev
|
, pyudev
|
||||||
, setproctitle
|
, setproctitle
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
|
, notify2
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -39,6 +40,7 @@ buildPythonPackage (common // {
|
|||||||
pygobject3
|
pygobject3
|
||||||
pyudev
|
pyudev
|
||||||
setproctitle
|
setproctitle
|
||||||
|
notify2
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
# Python deps
|
# Python deps
|
||||||
, blockfrost-python
|
, blockfrost-python
|
||||||
|
, cachetools
|
||||||
, cbor2
|
, cbor2
|
||||||
, cose
|
, cose
|
||||||
, ecpy
|
, ecpy
|
||||||
@ -29,7 +30,7 @@ let
|
|||||||
|
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "pycardano";
|
pname = "pycardano";
|
||||||
version = "0.9.0";
|
version = "0.10.0";
|
||||||
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
@ -37,11 +38,12 @@ in buildPythonPackage rec {
|
|||||||
owner = "Python-Cardano";
|
owner = "Python-Cardano";
|
||||||
repo = "pycardano";
|
repo = "pycardano";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-KRlpGhEzABBh1YWCDcrpW4hyMOhEA1Rla9nh95qdVik=";
|
hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
blockfrost-python
|
blockfrost-python
|
||||||
|
cachetools
|
||||||
cbor2
|
cbor2
|
||||||
cose_0_9_dev8
|
cose_0_9_dev8
|
||||||
ecpy
|
ecpy
|
||||||
|
@ -8,14 +8,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "rich-argparse";
|
pname = "rich-argparse";
|
||||||
version = "1.3.0";
|
version = "1.4.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hamdanal";
|
owner = "hamdanal";
|
||||||
repo = "rich-argparse";
|
repo = "rich-argparse";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-WAqFhH9gUwDZuORJ++fKjCmaCurdYpep3WPq68tWJ4U=";
|
hash = "sha256-iQ8x8UM0zmb2qYUpSh6RSEaBMrDpwY0ZHaJ9GJqn4Hs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -16,12 +16,12 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "steamship";
|
pname = "steamship";
|
||||||
version = "2.17.28";
|
version = "2.17.32";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-NdWQiHu5YDIEtL4zJj5Vydjmwq1b5aqVcmqIe7zYv3g=";
|
hash = "sha256-dTpz2/XXu8patDnorg/36652j9VLUjE5uF2fVzbDjfI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
, unittestCheckHook
|
, unittestCheckHook
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "6.1.0";
|
version = "6.2.0";
|
||||||
api = [ aiohttp fastapi uvicorn ];
|
api = [ aiohttp fastapi uvicorn ];
|
||||||
# cloud = [ apache-libcloud ];
|
# cloud = [ apache-libcloud ];
|
||||||
console = [ rich ];
|
console = [ rich ];
|
||||||
@ -105,7 +105,7 @@ buildPythonPackage {
|
|||||||
owner = "neuml";
|
owner = "neuml";
|
||||||
repo = "txtai";
|
repo = "txtai";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-ZUMfDyebroa9r01bOUFYDyVjuNUqlPU88HBocp3YQJ4=";
|
hash = "sha256-aWuY2z5DIVhZ5bRADhKSadCofIQQdLQAb52HnjPMS/4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -1,37 +1,11 @@
|
|||||||
{ lib, stdenv, makeWrapper, requireFile, unzip, jdk }:
|
{ lib, stdenv, makeWrapper, fetchurl, unzip, jdk }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "sqlcl";
|
pname = "sqlcl";
|
||||||
version = "23.2.0.178.1027";
|
version = "23.2.0.178.1027";
|
||||||
|
|
||||||
src = requireFile rec {
|
src = fetchurl {
|
||||||
url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/";
|
url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
|
||||||
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}
|
|
||||||
'';
|
|
||||||
hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y=";
|
hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -58,8 +32,8 @@ stdenv.mkDerivation rec {
|
|||||||
also supporting your previously written SQL*Plus scripts.
|
also supporting your previously written SQL*Plus scripts.
|
||||||
'';
|
'';
|
||||||
homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/";
|
homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/";
|
||||||
license = licenses.unfree;
|
license = licenses.unfreeRedistributable;
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
maintainers = with maintainers; [ misterio77 ];
|
maintainers = with maintainers; [ misterio77 ];
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
@ -10,16 +10,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "goxlr-utility";
|
pname = "goxlr-utility";
|
||||||
version = "0.12.6";
|
version = "1.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "GoXLR-on-Linux";
|
owner = "GoXLR-on-Linux";
|
||||||
repo = "goxlr-utility";
|
repo = "goxlr-utility";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-vvaKCsqncRhag8IrS0AIfNqNHGU2WIvFaYISEVfUB2Y=";
|
hash = "sha256-QKL2iKfn05P20MwT+RAeVzUUyv6FWtxMWuBI+4MgXlQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-Z57H5YeVYqlOaLRLaizVw8xTLstdjyXutnN7OgaUYOE=";
|
cargoHash = "sha256-LVObMspxhZkK81BjolTZZwoeMunzVwdEWWJAt/aOjZA=";
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
|
@ -58,6 +58,7 @@ mapAliases ({
|
|||||||
backports_tempfile = throw "backports_tempfile has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
|
backports_tempfile = throw "backports_tempfile has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
|
||||||
backports_unittest-mock = throw "backports_unittest-mock has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28
|
backports_unittest-mock = throw "backports_unittest-mock has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28
|
||||||
backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
|
backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
|
||||||
|
bash_kernel = bash-kernel; # added 2023-11-10
|
||||||
beancount_docverif = beancount-docverif; # added 2023-10-08
|
beancount_docverif = beancount-docverif; # added 2023-10-08
|
||||||
bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
|
bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
|
||||||
bip_utils = bip-utils; # 2023-10-08
|
bip_utils = bip-utils; # 2023-10-08
|
||||||
|
@ -1321,7 +1321,7 @@ self: super: with self; {
|
|||||||
|
|
||||||
basemap-data = callPackage ../development/python-modules/basemap-data { };
|
basemap-data = callPackage ../development/python-modules/basemap-data { };
|
||||||
|
|
||||||
bash_kernel = callPackage ../development/python-modules/bash_kernel { };
|
bash-kernel = callPackage ../development/python-modules/bash-kernel { };
|
||||||
|
|
||||||
bashlex = callPackage ../development/python-modules/bashlex { };
|
bashlex = callPackage ../development/python-modules/bashlex { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user