Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -4,13 +4,13 @@
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amoeba-data";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${version}.orig.tar.gz";
|
||||
sha256 = "1bgclr1v63n14bj9nwzm5zxg48nm0cla9bq1rbd5ylxra18k0jbg";
|
||||
url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${finalAttrs.version}.orig.tar.gz";
|
||||
hash = "sha256-b0kwUVC5U1/aygGvpCgD1SLy+i/1c5vkIsEOs0Om7K0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
|
||||
cp demo.dat $out/share/amoeba/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Fast-paced, polished OpenGL demonstration by Excess (data files)";
|
||||
homepage = "https://packages.qa.debian.org/a/amoeba-data.html";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.dezgeg ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -14,18 +14,18 @@
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amoeba";
|
||||
version = "1.1";
|
||||
debver = "31";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}.orig.tar.gz";
|
||||
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${finalAttrs.version}.orig.tar.gz";
|
||||
hash = "sha256-NT6oMuAlTcVZEnYjMCF+BD+k3/w7LfWEmj6bkQln3sM=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}-${debver}.debian.tar.xz";
|
||||
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${finalAttrs.version}-${finalAttrs.debver}.debian.tar.xz";
|
||||
hash = "sha256-Ga/YeXbPXjkG/6qd9Z201d14Hlj/Je6DxgzeIQOqrWc=";
|
||||
})
|
||||
];
|
||||
@@ -60,11 +60,11 @@ stdenv.mkDerivation rec {
|
||||
installManPage ../debian/amoeba.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Fast-paced, polished OpenGL demonstration by Excess";
|
||||
homepage = "https://packages.qa.debian.org/a/amoeba.html";
|
||||
license = licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
|
||||
maintainers = [ maintainers.dezgeg ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "apko";
|
||||
version = "0.30.13";
|
||||
version = "0.30.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "apko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b90o1MmFYhEc8mwh7ejTm6I59zlaa8Jv46dtuZdC6GQ=";
|
||||
hash = "sha256-eFcj/Yo0qvIgZKiKkm4DNhslOLokFmLoj7QrjeK/iT8=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
|
||||
outputHash =
|
||||
{
|
||||
"aarch64-linux" = "sha256-92UFGgYLmtN13hW0/BV0gJa6ImrVyn+zRpDp5KeRRhs=";
|
||||
"aarch64-linux" = "sha256-fa/WGRb4lWSXMqBmGhCd+N2fZr1YZKsskr3Oowp8gRE=";
|
||||
"x86_64-linux" = "sha256-jVi+pgcz96Dj25T4e/s+SHqsZfonzXs1WZYe0lCI48Q=";
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "lexiforest";
|
||||
repo = "curl-impersonate";
|
||||
rev = "v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tAQdTRGAOD2rpLZvoLQ2YL0wrohXEcmChMZBvYjsMhE=";
|
||||
};
|
||||
|
||||
@@ -193,6 +193,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/lexiforest/curl-impersonate/releases/tag/${src.tag}";
|
||||
description = "Special build of curl that can impersonate Chrome & Firefox";
|
||||
homepage = "https://github.com/lexiforest/curl-impersonate";
|
||||
license = with lib.licenses; [
|
||||
|
||||
@@ -56,24 +56,24 @@
|
||||
|
||||
let
|
||||
pname = "gitkraken";
|
||||
version = "11.4.0";
|
||||
version = "11.5.0";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
|
||||
hash = "sha256-mJ7BAR1cBZS4kE94kQQJc0FBR5lqId/fWTPxu62bUeA=";
|
||||
hash = "sha256-QNFNUVuslQ8ezDakqIPLMx6oSqS3K7VKu+Sm99d2d1E=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
|
||||
hash = "sha256-qMe2vIjKcAI8T53W+lL71G1HS6oy6RaCQmHVLUgCzdI=";
|
||||
hash = "sha256-NEy7hssChI3F62XQwHq3ENbTUrhXdtovCYxQQp4NLEU=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
|
||||
hash = "sha256-HlEsSDq1DZWi6ehO66OHd57rA0jrYXWRA1V7H+DsveM=";
|
||||
hash = "sha256-ANHz+C5XMNEWy4x1btdg4XnhTOvWBVVoS/XpE5beW0w=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
nethack,
|
||||
}:
|
||||
|
||||
nethack.override {
|
||||
qtMode = true;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
nethack,
|
||||
}:
|
||||
|
||||
nethack.override {
|
||||
x11Mode = true;
|
||||
}
|
||||
@@ -5,6 +5,7 @@
|
||||
coreutils,
|
||||
ncurses,
|
||||
gzip,
|
||||
gccStdenv,
|
||||
flex,
|
||||
bison,
|
||||
less,
|
||||
@@ -23,19 +24,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
stdenvUsed = if qtMode then gccStdenv else stdenv;
|
||||
|
||||
platform =
|
||||
if stdenv.hostPlatform.isUnix then
|
||||
if stdenvUsed.hostPlatform.isUnix then
|
||||
"unix"
|
||||
else
|
||||
throw "Unknown platform for NetHack: ${stdenv.hostPlatform.system}";
|
||||
throw "Unknown platform for NetHack: ${stdenvUsed.hostPlatform.system}";
|
||||
unixHint =
|
||||
if x11Mode then
|
||||
"linux-x11"
|
||||
else if qtMode then
|
||||
"linux-qt4"
|
||||
else if stdenv.hostPlatform.isLinux then
|
||||
else if stdenvUsed.hostPlatform.isLinux then
|
||||
"linux"
|
||||
else if stdenv.hostPlatform.isDarwin then
|
||||
else if stdenvUsed.hostPlatform.isDarwin then
|
||||
"macosx10.14"
|
||||
# We probably want something different for Darwin
|
||||
else
|
||||
@@ -47,7 +50,7 @@ let
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvUsed.mkDerivation (finalAttrs: {
|
||||
version = "3.6.7";
|
||||
pname =
|
||||
if x11Mode then
|
||||
@@ -58,10 +61,10 @@ stdenv.mkDerivation rec {
|
||||
"nethack";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nethack.org/download/${version}/nethack-${
|
||||
lib.replaceStrings [ "." ] [ "" ] version
|
||||
url = "https://nethack.org/download/${finalAttrs.version}/nethack-${
|
||||
lib.replaceStrings [ "." ] [ "" ] finalAttrs.version
|
||||
}-src.tgz";
|
||||
sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI=";
|
||||
hash = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -116,7 +119,7 @@ stdenv.mkDerivation rec {
|
||||
-i sys/unix/hints/linux
|
||||
sed \
|
||||
-e 's,^#WANT_WIN_CURSES=1$,WANT_WIN_CURSES=1,' \
|
||||
-e 's,^CC=.*$,CC=${stdenv.cc.targetPrefix}cc,' \
|
||||
-e 's,^CC=.*$,CC=${stdenvUsed.cc.targetPrefix}cc,' \
|
||||
-e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \
|
||||
-e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \
|
||||
-e 's,^CFLAGS=-g,CFLAGS=,' \
|
||||
@@ -132,7 +135,7 @@ stdenv.mkDerivation rec {
|
||||
-e 's,moc-qt4,moc,' \
|
||||
-i sys/unix/hints/linux-qt4
|
||||
''}
|
||||
${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
|
||||
${lib.optionalString (stdenvUsed.buildPlatform != stdenvUsed.hostPlatform)
|
||||
# If we're cross-compiling, replace the paths to the data generation tools
|
||||
# with the ones from the build platform's nethack package, since we can't
|
||||
# run the ones we've built here.
|
||||
@@ -171,7 +174,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mkdir -p $out/bin
|
||||
cat <<EOF >$out/bin/nethack
|
||||
#! ${stdenv.shell} -e
|
||||
#! ${stdenvUsed.shell} -e
|
||||
PATH=${binPath}:\$PATH
|
||||
|
||||
if [ ! -d ${userDir} ]; then
|
||||
@@ -228,12 +231,12 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Rogue-like game";
|
||||
homepage = "http://nethack.org/";
|
||||
license = lib.licenses.ngpl;
|
||||
platforms = if x11Mode then platforms.linux else platforms.unix;
|
||||
maintainers = [ ];
|
||||
platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
mainProgram = "nethack";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "odhcp6c";
|
||||
version = "0-unstable-2025-02-06";
|
||||
version = "0-unstable-2025-10-03";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.openwrt.org/project/odhcp6c.git";
|
||||
rev = "8aa8b706727a6a6a841be42ef35a629ed635db3e";
|
||||
hash = "sha256-cFDiT8EC8/2yuLM6dTWTzwxSbFpc7zuUKx2SHbR4PfQ=";
|
||||
rev = "96d9e0b6e81330c61c954c6bc73a2302276fcda1";
|
||||
hash = "sha256-EhkzSKf1t4MrGCN5oC1h0QJiY9w8VhMsa/jor4lEvD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -11,15 +11,15 @@
|
||||
readline,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scanmem";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scanmem";
|
||||
repo = "scanmem";
|
||||
rev = "v${version}";
|
||||
sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SZ94BNMHcynq0uglP/j/QxTEELmrqJjN+NgjmQHU6J4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -55,11 +55,11 @@ stdenv.mkDerivation rec {
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/scanmem/scanmem";
|
||||
description = "Memory scanner for finding and poking addresses in executing processes";
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,18 +16,18 @@
|
||||
isMobile ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20250926.e00cb46";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-CsMrhYpaTRMz364kt5b/bCY67PCoYwS50Fxw8mi2QCY=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/gentoo/gentoo/720e614d0107e86fc1e520bac17726578186843d/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu";
|
||||
sha256 = "088w0x9g3j8pn725ix8ny8knhdsfgjr3hpswsh9fvfkz5vlg2xkm";
|
||||
hash = "sha256-dXbx6C5/uu0S1FxfOLJ8TjdoJ/IW9VjEsRfJ8VIHHCE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
--set-key Type --set-value Application \
|
||||
--set-key Exec --set-value $i \
|
||||
--set-key Name --set-value $i \
|
||||
--set-key Comment --set-value "${meta.description}" \
|
||||
--set-key Comment --set-value "${finalAttrs.meta.description}" \
|
||||
--set-key Categories --set-value "Game;LogicGame;X-sgt-puzzles;" \
|
||||
--set-key Icon --set-value $out/share/icons/hicolor/96x96/apps/$i-96d24.png \
|
||||
$i.desktop
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
||||
--set-key Icon --set-value $out/share/icons/hicolor/48x48/apps/sgt-puzzles_map \
|
||||
sgt-puzzles.directory
|
||||
|
||||
install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/
|
||||
install -Dm644 ${finalAttrs.sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -88,14 +88,14 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Simon Tatham's portable puzzle collection";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
tomfitzhenry
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
"aarch64-darwin": {
|
||||
"version": "1.12.12",
|
||||
"vscodeVersion": "1.99.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/146732d0c28fe6d8f982f1ebf7ab4101ece88c63/Windsurf-darwin-arm64-1.12.12.zip",
|
||||
"sha256": "dae2809d0d551b1ad4acd03effba65c655d6040b3903e046934b1940e4be063f"
|
||||
"version": "1.12.16",
|
||||
"vscodeVersion": "1.100.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-darwin-arm64-1.12.16.zip",
|
||||
"sha256": "c18f78671472b03bf06f48f966f4674c2a3adf1b55febf4ea6dddd87d455255d"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"version": "1.12.12",
|
||||
"vscodeVersion": "1.99.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/146732d0c28fe6d8f982f1ebf7ab4101ece88c63/Windsurf-darwin-x64-1.12.12.zip",
|
||||
"sha256": "8696e119dbabf962d465ea6d2395f165a849b0d8abdd1f62d0ea1d49528e92e1"
|
||||
"version": "1.12.16",
|
||||
"vscodeVersion": "1.100.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-darwin-x64-1.12.16.zip",
|
||||
"sha256": "c23ef27510bb321cba5cdefdba4a4118f2b3f1904caf521981d514e16fa14667"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"version": "1.12.12",
|
||||
"vscodeVersion": "1.99.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/146732d0c28fe6d8f982f1ebf7ab4101ece88c63/Windsurf-linux-x64-1.12.12.tar.gz",
|
||||
"sha256": "9f832381f3ea79f3662d728817b05ef33756708e845052d40d1253b7e1a055dc"
|
||||
"version": "1.12.16",
|
||||
"vscodeVersion": "1.100.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-linux-x64-1.12.16.tar.gz",
|
||||
"sha256": "e335bfbcdec5a919ea1bf8fdc0acde52df8a8a95ea0019c7c8c56513b119d3e5"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,23 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pathlib-abc";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pathlib_abc";
|
||||
inherit version;
|
||||
hash = "sha256-vsmplUco6iEJL4oRaLWc1vOAoMNQPkZuDCrJx8JiNWQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "barneygale";
|
||||
repo = "pathlib-abc";
|
||||
tag = version;
|
||||
hash = "sha256-Amr5yrdmS0jx1dnakstgE7JFs4QzNK150aG51GUrc2Y=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -26,11 +24,11 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python base classes for rich path objects";
|
||||
homepage = "https://github.com/barneygale/pathlib-abc";
|
||||
changelog = "https://github.com/barneygale/pathlib-abc/blob/${version}/CHANGES.rst";
|
||||
license = licenses.psfl;
|
||||
changelog = "https://github.com/barneygale/pathlib-abc/blob/${src.tag}/CHANGES.rst";
|
||||
license = lib.licenses.psfl;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
oath,
|
||||
pycryptodome,
|
||||
requests,
|
||||
pytest,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -24,20 +24,31 @@ buildPythonPackage rec {
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
# unittest based tests using yield, imcompatible with pytest
|
||||
# test_check_token_detects_valid_hotp_token,
|
||||
# test_check_token_detects_valid_totp_token and
|
||||
# test_check_token_detects_invlaid_token require network
|
||||
checkPhase = ''
|
||||
mv vipaccess vipaccess.hidden
|
||||
pytest tests/ -k 'not test_check_token'
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_utils.py \
|
||||
--replace-fail "test_check_TOTP_token_models" "check_TOTP_token_models" \
|
||||
--replace-fail "test_check_HOTP_token_models" "check_HOTP_token_models"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
rm -rf vipaccess
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# cannot read vipaccess/version.py since we moved it away
|
||||
"test_check_token_detects_invalid_token"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Free software implementation of Symantec's VIP Access application and protocol";
|
||||
mainProgram = "vipaccess";
|
||||
homepage = "https://github.com/dlenski/python-vipaccess";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aw ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ aw ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -29,18 +29,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual";
|
||||
version = "6.2.1";
|
||||
version = "6.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "textual";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2myMafLHxJNw3EWLvlvg0wWznY6m04BOQjhYtRvYTP8=";
|
||||
hash = "sha256-3KxSuyfczyulbpysAO8mF7wvzd+807Lj6l6g0TygBnI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"rich"
|
||||
];
|
||||
dependencies = [
|
||||
markdown-it-py
|
||||
platformdirs
|
||||
|
||||
@@ -13278,9 +13278,6 @@ with pkgs;
|
||||
|
||||
qgo = libsForQt5.callPackage ../games/qgo { };
|
||||
|
||||
amoeba = callPackage ../games/amoeba { };
|
||||
amoeba-data = callPackage ../games/amoeba/data.nix { };
|
||||
|
||||
anki = callPackage ../games/anki {
|
||||
protobuf = protobuf_31;
|
||||
};
|
||||
@@ -13502,15 +13499,6 @@ with pkgs;
|
||||
|
||||
blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
|
||||
|
||||
nethack = callPackage ../games/nethack { };
|
||||
|
||||
nethack-qt = callPackage ../games/nethack {
|
||||
qtMode = true;
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
|
||||
nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
|
||||
|
||||
npush = callPackage ../games/npush { };
|
||||
run-npush = callPackage ../games/npush/run.nix { };
|
||||
|
||||
@@ -13599,9 +13587,7 @@ with pkgs;
|
||||
lure-of-the-temptress
|
||||
;
|
||||
|
||||
sgt-puzzles = callPackage ../games/sgt-puzzles { };
|
||||
|
||||
sgt-puzzles-mobile = callPackage ../games/sgt-puzzles {
|
||||
sgt-puzzles-mobile = callPackage ../by-name/sg/sgt-puzzles/package.nix {
|
||||
isMobile = true;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user