colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-06-09 12:02:17 +00:00 committed by GitHub
commit 67ddd1eb40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 381 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -64,6 +64,12 @@
githubId = 64707304;
name = "Dmitry Kulikov";
};
_0x120581f = {
email = "nixpkgs@0x120581f.dev";
name = "0x120581f";
github = "0x120581f";
githubId = 130835755;
};
_0x4A6F = {
email = "mail-maintainer@0x4A6F.dev";
matrix = "@0x4a6f:matrix.org";

16
pkgs/applications/editors/ldtk/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip
, appimage-run, nix-update-script }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ldtk";
version = "1.3.2";
version = "1.3.3";
src = fetchurl {
url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
hash = "sha256-8GiMm1Nb2jRLFWtGNsSfrW1jIi9yKCcyuUKwMEqoUZI=";
url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip";
hash = "sha256-egvAe4nAzPDBeTaAzrqhlDsG60bGNnKXB5Vt16vIZrQ";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
runHook preUnpack
unzip $src
appimage-run -x src 'LDtk ${version} installer.AppImage'
appimage-run -x src 'LDtk ${finalAttrs.version} installer.AppImage'
runHook postUnpack
'';
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -Dm644 'LDtk ${version} installer.AppImage' $out/share/ldtk.AppImage
install -Dm644 'LDtk ${finalAttrs.version} installer.AppImage' $out/share/ldtk.AppImage
makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \
--add-flags $out/share/ldtk.AppImage
install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png
@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Modern, lightweight and efficient 2D level editor";
homepage = "https://ldtk.io/";
changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}";
changelog = "https://github.com/deepnight/ldtk/releases/tag/v${finalAttrs.version}";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ felschr ];
sourceProvenance = with sourceTypes; [ binaryBytecode ];
};
}
})

12
pkgs/applications/editors/vscode/vscode.nix
View File

@ -19,17 +19,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0kir1grd150gb7im6yx2l16hi43wwsi8q3dlpgah4m7na064xgyd";
x86_64-darwin = "1fw73483ja4zav8xd0j03ygib5zbviy3kd02jzmgbbbsac5li96m";
aarch64-linux = "1w0dxpvrj06m1d15q45xi4sl4g3fk0nf04vh2ar956lg67dqj7i6";
aarch64-darwin = "0i5vj3km6wkdc2mrks2rjbqbn1isg4l4ss6zs7qfra3zcj62bkc2";
armv7l-linux = "1jx8cz43ac35as414mxsj9abpkr4a7v10fg1msjy2ykcrzv9v3dr";
x86_64-linux = "13yd42jqlzjxg5afs05ph2z4xwsfkbcddqvc4fvz1qqwr698mkjj";
x86_64-darwin = "1slmqrxhrwm04v0lisc200mx6jv86vf5p62as4brzz9irnv707ry";
aarch64-linux = "1q99y9jx3c8z0l3pda0b79c50yff8as4z9c4dxwf7b67argi5ls6";
aarch64-darwin = "0ykb0ifkswv3rcp3x6rkm8r88flsfmwhlrlc4f55mbgj7jbfn5k3";
armv7l-linux = "0gshhing3drsrmf17jykafks7z587ixk63xinrdv62xl4x4qxca8";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.78.2";
version = "1.79.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

38
pkgs/applications/misc/genesys/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib, stdenv, fetchurl, jre, graphviz, makeWrapper }:
stdenv.mkDerivation (finalAttrs: {
pname = "genesys";
version = "1.0.7";
src = fetchurl {
url = "https://github.com/mrlem/genesys/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-I1lEVvwRiGf1f4zUtqKhSb+it/nC8WAmw5S6edquOj8=";
};
nativeBuildInputs = [ makeWrapper ];
# The package is distributed as a prebuilt JAVA binary
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out
mv bin lib $out
wrapProgram $out/bin/${finalAttrs.pname} \
--set JAVA_HOME "${jre.home}" \
--prefix PATH : "${graphviz}/bin"
runHook postInstall
'';
meta = {
description = "A simple family tree generator that scales";
homepage = "https://github.com/mrlem/genesys";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ rogarb ];
platforms = lib.platforms.all;
};
})

34
pkgs/applications/misc/nwg-dock-hyprland/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, wrapGAppsHook
, gtk-layer-shell
}:
buildGoModule rec {
pname = "nwg-dock-hyprland";
version = "0.1.2";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7vdfxE3X2J7bDLzose0dKmjxNQhS5+/ROky9wkK1gc0=";
};
vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q=";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ gtk-layer-shell ];
meta = with lib; {
description = "GTK3-based dock for Hyprland";
homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ aleksana ];
};
}

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -49,7 +49,7 @@
assert withQt -> qt6 != null;
let
version = "4.0.5";
version = "4.0.6";
variant = if withQt then "qt" else "cli";
in
stdenv.mkDerivation {
@ -61,7 +61,7 @@ stdenv.mkDerivation {
repo = "wireshark";
owner = "wireshark";
rev = "v${version}";
hash = "sha256-9U0V2oLVyzq+3HxvOuD8Uzj1tjoMtYBws43fn5RfGhQ=";
hash = "sha256-hQpnD1BWOdb1YuG2BaQI+q1EkkTF1Du/HezrYr/Fl7w=";
};
cmakeFlags = [

5
pkgs/applications/version-management/gitea/default.nix
View File

@ -5,6 +5,7 @@
, makeWrapper
, git
, bash
, coreutils
, gitea
, gzip
, openssh
@ -34,7 +35,7 @@ buildGoModule rec {
];
postPatch = ''
substituteInPlace modules/setting/setting.go --subst-var data
substituteInPlace modules/setting/server.go --subst-var data
'';
subPackages = [ "." ];
@ -62,7 +63,7 @@ buildGoModule rec {
cp -R ./options/locale $out/locale
wrapProgram $out/bin/gitea \
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
--prefix PATH : ${lib.makeBinPath [ bash coreutils git gzip openssh ]}
'';
passthru = {

10
pkgs/applications/video/filebot/default.nix
View File

@ -8,13 +8,13 @@ let
url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar";
hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ=";
};
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
pname = "filebot";
version = "5.0.2";
version = "5.0.3";
src = fetchurl {
url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
hash = "sha256-XnzBXZy/gNA8qf7XairoviRmdQiXHbW19BgbHL52SP0=";
url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz";
hash = "sha256-8FTmR+ztR2ugPcgHvfwyh9yfxPiUJdeAVvjjl5cQCy0=";
};
unpackPhase = "tar xvf $src";
@ -68,4 +68,4 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ gleber felschr ];
platforms = platforms.linux;
};
}
})

8
pkgs/data/fonts/unscii/default.nix
View File

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unscii";
version = "1.1";
version = "2.1";
src = fetchurl {
url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
url = "http://viznut.fi/${pname}/${pname}-${version}-src.tar.gz";
sha256 = "0msvqrq7x36p76a2n5bzkadh95z954ayqa08wxd017g4jpa1a4jd";
};
nativeBuildInputs =
@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
# version. The reduced version is public domain.
license = "http://unifoundry.com/LICENSE.txt";
maintainers = [ lib.maintainers.raskin ];
homepage = "http://pelulamu.net/unscii/";
homepage = "http://viznut.fi/unscii/";
};
}

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.28";
hash = "sha256-nV50k1yQDjuce2vHQFlrcZM2MOufY3F8DEkj2MeIxi4=";
version = "8.0.29";
hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI=";
});
in

6
pkgs/development/interpreters/php/8.1.nix
View File

@ -1,9 +1,9 @@
{ callPackage, lib, stdenv, ... }@_args:
{ callPackage, ... }@_args:
let
base = callPackage ./generic.nix (_args // {
version = "8.1.19";
hash = "sha256-ZCByB/2jC+kmou8fZv8ma/H9x+AzObyZ+7oKEkXkJ5s=";
version = "8.1.20";
hash = "sha256-VVeFh1FKJwdQD4UxnlfA1N+biAPNsmVmWVrEv0WdxN0=";
});
in

6
pkgs/development/interpreters/php/8.2.nix
View File

@ -1,9 +1,9 @@
{ callPackage, lib, stdenv, fetchurl, ... }@_args:
{ callPackage, ... }@_args:
let
base = callPackage ./generic.nix (_args // {
version = "8.2.6";
hash = "sha256-RKcMUvU3ZiwQ2R7tv1H9dlyZYb5rolCO1jv3omzdMQA=";
version = "8.2.7";
hash = "sha256-W/sqNcZ5Ib3K3VyQyykK11N9JNoROl6LwtZGsC3nSI8=";
});
in

4
pkgs/development/python-modules/dvc-data/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "0.54.3";
version = "0.55.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-xkLqZmAzYfmfv9l1+PR8j5S7O5gKVh63+Jb9aZiLS8s=";
hash = "sha256-eE1cVzhwyClVYmaotw37sG46g5W1ToUE/f3pZ2CCcE0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dvclive/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvclive";
version = "2.11.0";
version = "2.11.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-dV6ob+TXzQOuHU9bybAO8sVmrJ7yP8vwp0pXXFVNb34=";
hash = "sha256-zr8fLRwan1/G8RMHa6lf4Qa5fTh5DzVLO53PMW0fm4c=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/elkm1-lib/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "elkm1-lib";
version = "2.2.2";
version = "2.2.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gwww";
repo = "elkm1";
rev = "refs/tags/${version}";
hash = "sha256-z/ltpypCGJ3ORHOlLjicKlqIoxqGzVt588OHmNO65bg=";
hash = "sha256-d676gLABChQn67E4q4koxwBRmurBWuFxSo/u+W5F8CI=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/emoji/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "emoji";
version = "2.4.0";
version = "2.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "carpedm20";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-tbNatosXt+KV1K3bvdz8lY73Yx/ClJcxUWHiPetp5wM=";
hash = "sha256-S2gU16kO8QVdhgjsfIeuv0ypcYSjWOFaVFGJdQsdijg=";
};
nativeCheckInputs = [

35
pkgs/development/python-modules/fontmath/default.nix
View File

@ -1,28 +1,43 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, fonttools, setuptools-scm
, pytest, pytest-runner
{ lib
, buildPythonPackage
, fetchPypi
, fonttools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "fontMath";
pname = "fontmath";
version = "0.9.3";
disabled = isPy27;
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
pname = "fontMath";
inherit version;
hash = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw=";
extension = "zip";
};
nativeBuildInputs = [ setuptools-scm ];
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [ fonttools ];
nativeCheckInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [
fonttools
];
nativeCheckInputs = [
pytestCheckHook
];
meta = with lib; {
description = "A collection of objects that implement fast font, glyph, etc. math";
homepage = "https://github.com/robotools/fontMath/";
changelog = "https://github.com/robotools/fontMath/releases/tag/${version}";
license = licenses.mit;
maintainers = [ maintainers.sternenseemann ];
maintainers = with maintainers; [ sternenseemann ];
};
}

18
pkgs/development/python-modules/mwparserfromhell/default.nix
View File

@ -2,26 +2,38 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pytest-runner
, pythonOlder
}:
buildPythonPackage rec {
pname = "mwparserfromhell";
version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w=";
};
postPatch = ''
substituteInPlace setup.py \
--replace '"pytest-runner"' ""
'';
nativeCheckInputs = [
pytestCheckHook
pytest-runner
];
pythonImportsCheck = [
"mwparserfromhell"
];
meta = with lib; {
description = "MWParserFromHell is a parser for MediaWiki wikicode";
homepage = "https://mwparserfromhell.readthedocs.io/en/latest/";
homepage = "https://mwparserfromhell.readthedocs.io/";
changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ melling ];
};

34
pkgs/development/python-modules/ndjson/default.nix
View File

@ -1,21 +1,43 @@
{ lib, buildPythonPackage, fetchPypi, watchdog, flake8
, pytest, pytest-runner, coverage, sphinx, twine }:
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, six
, watchdog
}:
buildPythonPackage rec {
pname = "ndjson";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
hash = "sha256-v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
};
nativeCheckInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner', " ""
'';
nativeCheckInputs = [
pytestCheckHook
six
watchdog
];
pythonImportsCheck = [
"ndjson"
];
meta = with lib; {
description = "Module supports ndjson";
homepage = "https://github.com/rhgrant10/ndjson";
description = "JsonDecoder";
platforms = platforms.unix;
changelog = "https://github.com/rhgrant10/ndjson/blob/v${version}/HISTORY.rst";
license = licenses.gpl3Only;
maintainers = with maintainers; [ freezeboy ];
};

39
pkgs/development/python-modules/py-multibase/default.nix
View File

@ -1,45 +1,50 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, lib
, morphys
, pytest
, pytest-runner
, pytestCheckHook
, python-baseconv
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "py-multibase";
version = "1.0.3";
disabled = isPy27;
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version ;
sha256 = "d28a20efcbb61eec28f55827a0bf329c7cea80fffd933aecaea6ae8431267fe4";
inherit pname version;
hash = "sha256-0oog78u2Huwo9VgnoL8ynHzqgP/9kzrsrqauhDEmf+Q=";
};
postPatch = ''
substituteInPlace setup.cfg --replace "[pytest]" ""
substituteInPlace setup.cfg --replace "python_classes = *TestCase" ""
substituteInPlace setup.cfg \
--replace "[pytest]" "" \
--replace "python_classes = *TestCase" ""
substituteInPlace setup.py \
--replace "'pytest-runner'," ""
'';
nativeBuildInputs = [
pytest-runner
];
propagatedBuildInputs = [
morphys
six
python-baseconv
six
];
nativeCheckInputs = [
pytest
pytestCheckHook
];
pythonImportsCheck = [
"multibase"
];
meta = with lib; {
description = "Multibase is a protocol for distinguishing base encodings and other simple string encodings";
description = "Module for distinguishing base encodings and other simple string encodings";
homepage = "https://github.com/multiformats/py-multibase";
changelog = "https://github.com/multiformats/py-multibase/blob/v${version}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ rakesh4g ];
};

26
pkgs/development/python-modules/py-multicodec/default.nix
View File

@ -1,10 +1,9 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest-runner
, morphys
, pytestCheckHook
, pythonOlder
, morphys
, six
, varint
}:
@ -12,36 +11,39 @@
buildPythonPackage rec {
pname = "py-multicodec";
version = "0.2.1";
disabled = pythonOlder "3.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "multiformats";
repo = pname;
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4=";
};
# Error when not substituting:
# Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
postPatch = ''
substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
substituteInPlace setup.cfg \
--replace "[pytest]" "[tool:pytest]"
substituteInPlace setup.py \
--replace "'pytest-runner'," ""
'';
nativeBuildInputs = [
pytest-runner
];
propagatedBuildInputs = [
varint
six
morphys
six
varint
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "multicodec" ];
pythonImportsCheck = [
"multicodec"
];
meta = with lib; {
description = "Compact self-describing codecs";

4
pkgs/development/python-modules/pyschlage/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyschlage";
version = "2023.5.0";
version = "2023.6.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "dknowles2";
repo = "pyschlage";
rev = "refs/tags/${version}";
hash = "sha256-l9Xi1VffvobSjluParvQjCTsCMWvhSV975j1OVclBWw=";
hash = "sha256-ogYVk0Kvv595IlIa/qdV1lqlnW45IG29PX5EEaMaphw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/reolink-aio/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.5.16";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
hash = "sha256-FyrTZqp4h4GOCxld+y3wDEfLOl6a6dCgs/LJetjmr8I=";
hash = "sha256-fDtZEcHv13f9WtNZKoT8/I+Hz145n7SmQz0t9CVqE3g=";
};
postPatch = ''

4
pkgs/development/python-modules/torch/bin.nix
View File

@ -38,10 +38,8 @@ in buildPythonPackage {
src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
nativeBuildInputs = [
nativeBuildInputs = lib.optionals stdenv.isLinux [
addOpenGLRunpath
patchelf
] ++ lib.optionals stdenv.isLinux [
autoPatchelfHook
cudaPackages.autoAddOpenGLRunpathHook
];

18
pkgs/development/python-modules/waterfurnace/default.nix
View File

@ -3,26 +3,33 @@
, click
, fetchFromGitHub
, mock
, pytest-runner
, pytestCheckHook
, requests
, pythonOlder
, websocket-client
}:
buildPythonPackage rec {
pname = "waterfurnace";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sdague";
repo = pname;
rev = "v${version}";
rev = "refs/tags/v${version}";
sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf";
};
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'," ""
'';
propagatedBuildInputs = [
click
pytest-runner
requests
websocket-client
];
@ -32,11 +39,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "waterfurnace" ];
pythonImportsCheck = [
"waterfurnace"
];
meta = with lib; {
description = "Python interface to waterfurnace geothermal systems";
homepage = "https://github.com/sdague/waterfurnace";
changelog = "https://github.com/sdague/waterfurnace/blob/v${version}/HISTORY.rst";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

25
pkgs/development/tools/hobbes/default.nix
View File

@ -1,14 +1,24 @@
{ lib, stdenv, fetchFromGitHub, cmake, llvm_12, ncurses, readline, zlib, libxml2 }:
stdenv.mkDerivation {
{ lib
, stdenv
, llvmPackages_10
, fetchFromGitHub
, cmake
, llvm_12
, ncurses
, readline
, zlib
, libxml2
, python3
}:
llvmPackages_10.stdenv.mkDerivation {
pname = "hobbes";
version = "unstable-2021-04-28";
version = "unstable-2023-06-03";
src = fetchFromGitHub {
owner = "morgan-stanley";
owner = "morganstanley";
repo = "hobbes";
rev = "737c7ca63516f6b3dca0e659c3de75d4325472d6";
sha256 = "0fjsmz1sbrp6464mrb9ha7p615w2l2pdldsc2ayvcrvxfyi1r4gj";
rev = "88a712b85bc896a4c87e60c12321445f1cdcfd00";
hash = "sha256-2v0yk35/cLKTjX0Qbc8cjc7Y6bamRSa9GpPvGoxL2Cw=";
};
# TODO: re-enable Python tests once they work on Python 3
@ -27,6 +37,7 @@ stdenv.mkDerivation {
readline
zlib
libxml2
python3
];
doCheck = true;

40
pkgs/development/tools/xcodes/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation (finalAttrs: {
pname = "xcodes";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/XcodesOrg/xcodes/releases/download/${finalAttrs.version}/xcodes.zip";
hash = "sha256:0cqb0gfb80xrnm4fipr46kbzqz2kicc13afhdxkbifzm4k83any5";
};
nativeBuildInputs = [ unzip ];
unpackPhase = ''
runHook preUnpack
unzip -q $src
runHook postUnpack
'';
dontPatch = true;
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -m755 xcodes $out/bin/xcodes
runHook postInstall
'';
dontFixup = true;
meta = with lib; {
description = "Command-line tool to install and switch between multiple versions of Xcode";
homepage = "https://github.com/XcodesOrg/xcodes";
license = licenses.mit;
maintainers = with maintainers; [ _0x120581f ];
platforms = platforms.darwin;
};
})

77
pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
View File

@ -1,77 +0,0 @@
From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001
From: Sebastian Galkin <paraseba@gmail.com>
Date: Wed, 20 Dec 2017 18:23:03 -0200
Subject: [PATCH] put fonts in $out
---
Makefile.conf | 22 ++++------------------
configure | 12 ------------
2 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/Makefile.conf b/Makefile.conf
index e7f8de9..87f3fff 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -226,19 +226,11 @@ install_scid: all_scid
fi
install -m 755 -d $(SHAREDIR)/bitmaps
cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/
- @if [ "`id -u`" -eq 0 ]; then \
- install -m 755 -d $(FONTDIR); \
- install -m 644 -p fonts/*.ttf $(FONTDIR); \
- else \
- install -m 755 -d ~/.fonts; \
- install -m 644 -p fonts/*.ttf ~/.fonts; \
- fi
+ install -m 755 -d $(FONTDIR); \
+ install -m 644 -p fonts/*.ttf $(FONTDIR); \
+
@if [ ! -z "`which fc-cache`" ]; then \
- if [ "`id -u`" -eq 0 ]; then \
- fc-cache -fv $(FONTDIR); \
- else \
- fc-cache -fv ~/.fonts; \
- fi; \
+ fc-cache -fv $(FONTDIR); \
else \
echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
echo "Please contact your system administrator."; \
@@ -292,12 +284,6 @@ uninstall:
for f in `ls fonts/*.ttf`; do \
rm -f ~/.$$f; \
done; \
- if [ ! -z "`which fc-cache`" ]; then \
- fc-cache -fv ~/.fonts; \
- fi; \
- if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \
- rmdir ~/.fonts; \
- fi; \
fi
clean:
diff --git a/configure b/configure
index 4599c77..8b09678 100755
--- a/configure
+++ b/configure
@@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} {
exit 1
}
- if {[isDarwin]} {
- set var(FONTDIR) /Library/Fonts/
- } else {
- # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active
- set prefix /usr
- if {![file isdirectory $prefix/share/fonts]} {
- set var(FONTDIR) "~/.fonts"
- } else {
- set var(FONTDIR) $prefix/share/fonts/truetype/Scid
- }
- }
-
set line [gets $from]
while {1} {
set line [gets $from]
--
2.15.1

57
pkgs/games/scid-vs-pc/default.nix
View File

@ -1,59 +1,28 @@
{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, which, makeDesktopItem }:
tcl.mkTclDerivation rec {
pname = "scid-vs-pc";
version = "4.22";
version = "4.24";
src = fetchurl {
url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz";
sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM=";
hash = "sha256-x4Ljn1vaXrue16kUofWAH2sDNYC8h3NvzFjffRo0EhA=";
};
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace configure Makefile.conf \
--replace "~/.fonts" "$out/share/fonts/truetype/Scid" \
--replace "which fc-cache" "false"
'';
nativeBuildInputs = [ makeWrapper which ];
buildInputs = [ tk libX11 zlib ];
prePatch = ''
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
-e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \
-e '/^ *set x11Path *{/a ${libX11}/lib/' \
configure
sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \
tcl/config.tcl
'';
# configureFlags = [
# "BINDIR=$(out)/bin"
# "SHAREDIR=$(out)/share"
# "FONTDIR=$(out)/fonts"
# ];
preConfigure = ''configureFlags="
BINDIR=$out/bin
SHAREDIR=$out/share
FONTDIR=$out/fonts"
'';
patches = [
./0001-put-fonts-in-out.patch
configureFlags = [
"BINDIR=${placeholder "out"}/bin"
"SHAREDIR=${placeholder "out"}/share"
];
hardeningDisable = [ "format" ];
dontPatchShebangs = true;
# TODO: can this use tclWrapperArgs?
postFixup = ''
sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn"
sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote"
sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid"
for cmd in $out/bin/* ; do
wrapProgram "$cmd" \
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
done
'';
postInstall = ''
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications/

14
pkgs/tools/graphics/pdftoipe/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "otfried";
repo = "ipe-tools";
rev = "v${version}";
sha256 = "jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
};
patches = [
@ -22,9 +22,16 @@ stdenv.mkDerivation rec {
# https://github.com/otfried/ipe-tools/pull/48
(fetchpatch {
url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch";
sha256 = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc=";
hash = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc=";
stripLen = 1;
name = "poppler_fix_build.patch";
name = "poppler_fix_build_48.patch";
})
# https://github.com/otfried/ipe-tools/pull/55
(fetchpatch {
url = "https://github.com/otfried/ipe-tools/commit/65586fcd9cc39e482ae5a9abdb6f4932d9bb88c4.patch";
hash = "sha256-qr1AQyWHz1e2a65m05xSHFnP6oSP6qSmMVekNk2flRc=";
stripLen = 1;
name = "poppler_fix_build_55.patch";
})
];
@ -40,6 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A program that tries to convert arbitrary PDF documents to Ipe files";
homepage = "https://github.com/otfried/ipe-tools";
changelog = "https://github.com/otfried/ipe-tools/releases";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ yrd ];
};

32
pkgs/tools/misc/ical2orgpy/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, python3Packages, ... }:
python3Packages.buildPythonPackage rec {
pname = "ical2orgpy";
version = "0.4.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-7/kWW1oTSJXPJtN02uIDrFdNJ9ExKRUa3tUNA0oJSoc=";
};
disabled = python3Packages.pythonOlder "3.9";
propagatedBuildInputs = with python3Packages; [
click
future
icalendar
pytz
tzlocal
recurring-ical-events
];
checkInputs = with python3Packages; [ freezegun pytest pyyaml ];
nativeBuildInputs = [ python3Packages.pbr ];
meta = with lib; {
description = "Converting ICAL file into org-mode format.";
homepage = "https://github.com/ical2org-py/ical2org.py";
license = licenses.gpl3;
maintainers = with maintainers; [ StillerHarpo ];
};
}

9
pkgs/tools/security/browserpass/default.nix
View File

@ -5,6 +5,8 @@
, gnupg
, makeWrapper
, autoPatchelfHook
, testers
, browserpass
}:
buildGoModule rec {
@ -18,7 +20,7 @@ buildGoModule rec {
sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
};
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
@ -56,6 +58,11 @@ buildGoModule rec {
ln -s $out/lib/browserpass/hosts/firefox/*.json $out/lib/mozilla/native-messaging-hosts
'';
passthru.tests.version = testers.testVersion {
package = browserpass;
command = "browserpass --version";
};
meta = with lib; {
description = "Browserpass native client app";
homepage = "https://github.com/browserpass/browserpass-native";

10
pkgs/tools/security/frida-tools/default.nix
View File

@ -1,17 +1,17 @@
{ lib, python3 }:
{ lib, fetchPypi, python3Packages }:
python3.pkgs.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "frida-tools";
version = "12.1.2";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
hash = "sha256-9SlDyp1fLOzLqu6sxVqY2jwEzQjrnbzfQXIRoyviPJY=";
};
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with python3Packages; [
pygments
prompt_toolkit
prompt-toolkit
colorama
frida-python
];

13
pkgs/top-level/all-packages.nix
View File

@ -3765,6 +3765,8 @@ with pkgs;
xcodeenv = callPackage ../development/mobile/xcodeenv { };
xcodes = callPackage ../development/tools/xcodes { };
gomobile = callPackage ../development/mobile/gomobile { };
ssh-agents = callPackage ../tools/networking/ssh-agents { };
@ -31111,6 +31113,8 @@ with pkgs;
svox = callPackage ../applications/audio/svox { };
genesys = callPackage ../applications/misc/genesys { };
giada = callPackage ../applications/audio/giada { };
giara = callPackage ../applications/networking/giara { };
@ -31667,6 +31671,8 @@ with pkgs;
i810switch = callPackage ../os-specific/linux/i810switch { };
ical2orgpy = callPackage ../tools/misc/ical2orgpy { };
icewm = callPackage ../applications/window-managers/icewm { };
icon-library = callPackage ../applications/graphics/icon-library { };
@ -32944,6 +32950,8 @@ with pkgs;
nwg-dock = callPackage ../applications/misc/nwg-dock { };
nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { };
nwg-drawer = callPackage ../applications/misc/nwg-drawer { };
nwg-launchers = callPackage ../applications/misc/nwg-launchers { };
@ -37102,10 +37110,7 @@ with pkgs;
scid = callPackage ../games/scid { };
scid-vs-pc = callPackage ../games/scid-vs-pc {
tcl = tcl-8_6;
tk = tk-8_6;
};
scid-vs-pc = callPackage ../games/scid-vs-pc { };
scummvm = callPackage ../games/scummvm {
stdenv = if (stdenv.isDarwin && stdenv.isAarch64) then llvmPackages_14.stdenv else stdenv;