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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-12-11 00:14:38 +00:00 committed by GitHub
commit 2117c50988
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
127 changed files with 850 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nixos/modules/programs/firejail.nix
View File

@ -8,18 +8,21 @@ let
wrappedBins = pkgs.runCommand "firejail-wrapped-binaries"
{ preferLocalBuild = true;
allowSubstitutes = false;
# take precedence over non-firejailed versions
meta.priority = -1;
}
''
mkdir -p $out/bin
mkdir -p $out/share/applications
${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: value:
let
opts = if builtins.isAttrs value
then value
else { executable = value; profile = null; extraArgs = []; };
else { executable = value; desktop = null; profile = null; extraArgs = []; };
args = lib.escapeShellArgs (
opts.extraArgs
++ (optional (opts.profile != null) "--profile=${toString opts.profile}")
);
);
in
''
cat <<_EOF >$out/bin/${command}
@ -27,6 +30,11 @@ let
exec /run/wrappers/bin/firejail ${args} -- ${toString opts.executable} "\$@"
_EOF
chmod 0755 $out/bin/${command}
${lib.optionalString (opts.desktop != null) ''
substitute ${opts.desktop} $out/share/applications/$(basename ${opts.desktop}) \
--replace ${opts.executable} $out/bin/${command}
''}
'') cfg.wrappedBinaries)}
'';
@ -42,6 +50,12 @@ in {
description = lib.mdDoc "Executable to run sandboxed";
example = literalExpression ''"''${lib.getBin pkgs.firefox}/bin/firefox"'';
};
desktop = mkOption {
type = types.nullOr types.path;
default = null;
description = lib.mkDoc ".desktop file to modify. Only necessary if it uses the absolute path to the executable.";
example = literalExpression ''"''${pkgs.firefox}/share/applications/firefox.desktop"'';
};
profile = mkOption {
type = types.nullOr types.path;
default = null;
@ -71,12 +85,6 @@ in {
'';
description = lib.mdDoc ''
Wrap the binaries in firejail and place them in the global path.
You will get file collisions if you put the actual application binary in
the global environment (such as by adding the application package to
`environment.systemPackages`), and applications started via
.desktop files are not wrapped if they specify the absolute path to the
binary.
'';
};
};

2
nixos/modules/services/backup/borgbackup.nix
View File

@ -58,7 +58,7 @@ let
'' + optionalString (cfg.prune.keep != { }) ''
borg prune $extraArgs \
${mkKeepArgs cfg} \
${optionalString (cfg.prune.prefix != null) "--prefix ${escapeShellArg cfg.prune.prefix} \\"}
${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \
$extraPruneArgs
${cfg.postPrune}
'';

27
nixos/modules/services/databases/surrealdb.nix
View File

@ -37,6 +37,20 @@ in {
default = 8000;
example = 8000;
};
userNamePath = mkOption {
type = types.path;
description = lib.mdDoc ''
Path to read the username from.
'';
};
passwordPath = mkOption {
type = types.path;
description = lib.mdDoc ''
Path to read the password from.
'';
};
};
};
@ -50,8 +64,19 @@ in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
script = ''
${pkgs.surrealdb}/bin/surreal start \
--user $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_USERNAME) \
--pass $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_PASSWORD) \
--bind ${cfg.host}:${toString cfg.port} \
-- ${cfg.dbPath}
'';
serviceConfig = {
ExecStart = "${pkgs.surrealdb}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${optionalString (cfg.dbPath != null) "-- ${cfg.dbPath}"}";
LoadCredential = [
"SURREALDB_USERNAME:${cfg.userNamePath}"
"SURREALDB_PASSWORD:${cfg.passwordPath}"
];
DynamicUser = true;
Restart = "on-failure";
StateDirectory = "surrealdb";

5
nixos/modules/services/web-apps/mastodon.nix
View File

@ -658,8 +658,9 @@ in {
recommendedProxySettings = true; # required for redirections to work
virtualHosts."${cfg.localDomain}" = {
root = "${cfg.package}/public/";
forceSSL = true; # mastodon only supports https
enableACME = true;
# mastodon only supports https, but you can override this if you offload tls elsewhere.
forceSSL = lib.mkDefault true;
enableACME = lib.mkDefault true;
locations."/system/".alias = "/var/lib/mastodon/public-system/";

4
pkgs/applications/audio/mopidy/mopidy.nix
View File

@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
pname = "mopidy";
version = "3.4.0";
version = "3.4.1";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy";
rev = "refs/tags/v${version}";
sha256 = "sha256-cr4v1ScrXLRjqlsCXTm0KvLc+jJbFX1HVKJLrDAtIw8=";
sha256 = "sha256-IUQe5WH2vsrAOgokhTNVVM3lnJXphT2xNGu27hWBLSo=";
};
nativeBuildInputs = [ wrapGAppsHook ];

4
pkgs/applications/audio/youtube-music/default.nix
View File

@ -2,11 +2,11 @@
let
pname = "youtube-music";
version = "1.17.0";
version = "1.18.0";
src = fetchurl {
url = "https://github.com/th-ch/youtube-music/releases/download/v${version}/YouTube-Music-${version}.AppImage";
sha256 = "sha256-3QNmCek6UD0WNaqalIksYWLHGfMgetLRLi8mEM1J39I=";
sha256 = "sha256-7U+zyLyXMVVMtRAT5yTEUqS3/qP5Kx/Yuu263VcsbAE=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

6
pkgs/applications/graphics/hugin/default.nix
View File

@ -43,6 +43,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk=";
};
patches = [
# committed upstream but unreleased:
# https://sourceforge.net/p/hugin/hugin/ci/edfddc6070ca6d4223d359fb4b38273a5aed2f2d
./dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch
];
buildInputs = [
boost
cairo

14
pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:26.873574924 -0800
+++ b/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:09.069575641 -0800
@@ -472,9 +472,9 @@
#else
#ifdef USE_XDG_DIRS
char *xdgDataDir = getenv("XDG_DATA_HOME");
- if (strlen(xdgDataDir) == 0)
+ if (xdgDataDir == NULL || strlen(xdgDataDir) == 0)
{
- // no XDG_DATA_HOME enviroment variable set
+ // no XDG_DATA_HOME enviroment variable set or empty variable
// use $HOME/.local/share instead
const std::string homeDir = GetHomeDir();
if (homeDir.empty())

17
pkgs/applications/misc/process-compose/default.nix
View File

@ -6,20 +6,26 @@
buildGoModule rec {
pname = "process-compose";
version = "0.28.0";
version = "0.29.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
sha256 = "7UVCGyFay0yQAcO1NKb1+vsNqX1v9Hf5NUgjnHlgnG0=";
hash = "sha256-FxOgddgwehzrteMBjTrdksKpTR43VZV7PHI7NClZ3OU=";
};
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
ldflags = [
"-s"
"-w"
"-X main.version=v${version}"
];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
];
vendorSha256 = "IsO1B6z1/HoGQ8xdNKQqZ/eZd90WikDbU9XiP0z28mU=";
vendorHash = "sha256-fL12Rx/0TF2jjciSHgfIDfrqdQxxm2JiGfgO3Dgz81M=";
doCheck = false;
@ -35,6 +41,7 @@ buildGoModule rec {
meta = with lib; {
description = "A simple and flexible scheduler and orchestrator to manage non-containerized applications";
homepage = "https://github.com/F1bonacc1/process-compose";
changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ thenonameguy ];
};

22
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -103,11 +103,11 @@
"vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE="
},
"aviatrix": {
"hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=",
"hash": "sha256-2KJVXIThZ3g1++y5fhKLQjeXZ9r685B8stmWfs2MAs0=",
"homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
"owner": "AviatrixSystems",
"repo": "terraform-provider-aviatrix",
"rev": "v2.24.1",
"rev": "v3.0.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -130,11 +130,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-2RjraGiMtITdBJ47crqlqFR51WbKpk4U6fkGHCTNXuo=",
"hash": "sha256-GNp4Am/ooMm//LGMMxJlMxQIh4rHmQdnpVEYZn3Hjb8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.34.0",
"rev": "v3.35.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -424,11 +424,11 @@
"vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ="
},
"github": {
"hash": "sha256-1C/GG3VhQfnU71rucYefpRsfrS//lpPXHqT/QAHM2z0=",
"hash": "sha256-o7Sge0rCfP6Yueq+DP7siBsEinawgGe+nEu0/Olu8uQ=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
"rev": "v5.11.0",
"rev": "v5.12.0",
"spdx": "MIT",
"vendorHash": null
},
@ -507,11 +507,11 @@
"vendorHash": null
},
"heroku": {
"hash": "sha256-GmrzvE1Wc1dQSlEL4mLYHIkAVxKwElx2fCWkrnZra18=",
"hash": "sha256-6SNBi4hSGD6XhUSmIOjmPVzo2HnvRBGFW1jMHJLDhuI=",
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
"owner": "heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.1.8",
"rev": "v5.1.9",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -734,13 +734,13 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"minio": {
"hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=",
"hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=",
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
"owner": "aminueza",
"repo": "terraform-provider-minio",
"rev": "v1.9.1",
"rev": "v1.10.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I="
"vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw="
},
"mongodbatlas": {
"hash": "sha256-QMwsVD1RZwL9DPF0gnio4quqUa1b4G0SK73yd6BYnG4=",

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.21";
ptb = "0.0.38";
canary = "0.0.144";
canary = "0.0.145";
} else {
stable = "0.0.264";
ptb = "0.0.59";
@ -22,7 +22,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-/le3YT8djSj60H+Pq1qUxqc8CNgEZladOeFa9D2ZGl8=";
sha256 = "sha256-TF+7SnCTsbh+Z8AeEESEFVLSpD3c5HOAwpU1UBuB1BU=";
};
};
x86_64-darwin = {

3
pkgs/applications/networking/p2p/transmission/default.nix
View File

@ -16,6 +16,7 @@
, miniupnpc
, dht
, libnatpmp
, libiconv
# Build options
, enableGTK3 ? false
, gtk3
@ -93,7 +94,7 @@ in stdenv.mkDerivation {
++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]
++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ]
;
++ lib.optionals stdenv.isDarwin [ libiconv ];
postInstall = ''
mkdir $apparmor

5
pkgs/applications/networking/remote/rustdesk/default.nix
View File

@ -38,6 +38,11 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-IlrfqwNyaSHE9Ct0mn7MUxEg7p1Ku34eOMYelEAYFW8=";
};
patches = [
# based on https://github.com/rustdesk/rustdesk/pull/1900
./fix-for-rust-1.65.diff
];
cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE=";
LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";

31
pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff Normal file
View File

@ -0,0 +1,31 @@
diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs
index 74982de5..308bcf80 100644
--- a/libs/hbb_common/src/config.rs
+++ b/libs/hbb_common/src/config.rs
@@ -656,7 +656,7 @@ const PEERS: &str = "peers";
impl PeerConfig {
pub fn load(id: &str) -> PeerConfig {
- let _ = CONFIG.read().unwrap(); // for lock
+ let _lock = CONFIG.read().unwrap();
match confy::load_path(&Self::path(id)) {
Ok(config) => config,
Err(err) => {
@@ -667,7 +667,7 @@ impl PeerConfig {
}
pub fn store(&self, id: &str) {
- let _ = CONFIG.read().unwrap(); // for lock
+ let _lock = CONFIG.read().unwrap();
if let Err(err) = confy::store_path(Self::path(id), self) {
log::error!("Failed to store config: {}", err);
}
@@ -808,7 +808,7 @@ pub struct LanPeers {
impl LanPeers {
pub fn load() -> LanPeers {
- let _ = CONFIG.read().unwrap(); // for lock
+ let _lock = CONFIG.read().unwrap();
match confy::load_path(&Config::file_("_lan_peers")) {
Ok(peers) => peers,
Err(err) => {

6
pkgs/applications/version-management/jujutsu/default.nix
View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "jujutsu";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "martinvonz";
repo = "jj";
rev = "v${version}";
sha256 = "sha256-xS4uktydrvkeTsR9QGT9gYdhFh92XdpoG0TrDt7IPdc=";
sha256 = "sha256-ajBL2o5i4UmclL/s9eEVtn/p51/F4gsClmcYBrAZ+1o=";
};
cargoSha256 = "sha256-VM+Oq0nf4pMK3nbPbHbl7E2qgUnGlu7kf2p47d8cm1c=";
cargoSha256 = "sha256-RgF2StIMfFzbp0azG4yRPvzrZ4kczWtOWVd+KTTPbRw=";
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;

4
pkgs/applications/version-management/monotone-viz/default.nix
View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib
, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, libX11, libXaw
}:
# We need an old version of Graphviz for format compatibility reasons.
# This version is vulnerable, but monotone-viz will never feed it bad input.
let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw
inherit lib stdenv fetchurl pkg-config libX11 libpng libjpeg expat libXaw
bison libtool fontconfig pango gd libwebp;
}; in
let inherit (gnome2) libgnomecanvas; in

6
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
View File

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, pkg-config
, xlibsWrapper
, libX11
, libpng
, libjpeg
, expat
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xlibsWrapper
libX11
libpng
libjpeg
expat
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
"--with-ltdl-include=${libtool}/include"
"--with-ltdl-lib=${libtool.lib}/lib"
]
++ lib.optional (xlibsWrapper == null) "--without-x";
++ lib.optional (libX11 == null) "--without-x";
meta = {
description = "A program for visualising graphs";

44
pkgs/applications/version-management/nbstripout/default.nix
View File

@ -1,20 +1,17 @@
{lib, python, git, mercurial, coreutils}:
{ lib
, python3
, coreutils
, git
, mercurial
}:
with python.pkgs;
buildPythonApplication rec {
version = "0.6.0";
python3.pkgs.buildPythonApplication rec {
version = "0.6.1";
pname = "nbstripout";
# Mercurial should be added as a build input but because it's a Python
# application, it would mess up the Python environment. Thus, don't add it
# here, instead add it to PATH when running unit tests
checkInputs = [ pytest pytest-flake8 git ];
nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ ipython nbformat ];
src = fetchPypi {
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-TWxDAhVqskaMyOcgLvKPNN2RhFFOIeRDQLzShpaMgss=";
hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM=";
};
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
@ -23,9 +20,24 @@ buildPythonApplication rec {
substituteInPlace tests/test-git.t --replace "echo" "${coreutils}/bin/echo"
'';
# ignore flake8 tests for the nix wrapped setup.py
checkPhase = ''
PATH=$PATH:$out/bin:${mercurial}/bin pytest .
propagatedBuildInputs = with python3.pkgs; [
ipython
nbformat
];
checkInputs = [
coreutils
git
mercurial
] ++ (with python3.pkgs; [
pytest-cram
pytestCheckHook
]);
preCheck = ''
export HOME=$(mktemp -d)
export PATH=$out/bin:$PATH
git config --global init.defaultBranch main
'';
meta = {

28
pkgs/applications/version-management/sapling/default.nix
View File

@ -17,6 +17,8 @@
, CoreFoundation
, CoreServices
, Security
, enableMinimal ? false
}:
let
@ -123,6 +125,25 @@ let
sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py
'';
# Now, copy the "sl web" (aka edenscm-isl) results into the output of this
# package, so that the command can actually work. NOTES:
#
# 1) This applies on all systems (so no conditional a la postFixup)
# 2) This doesn't require any kind of fixup itself, so we leave it out
# of postFixup for that reason, too
# 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package,
# so that 'sl web' always works
# 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB
preFixup = ''
sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages
chmod +w $sitepackages
cp -r ${isl} $sitepackages/edenscm-isl
'' + lib.optionalString (!enableMinimal) ''
chmod +w $sitepackages/edenscm-isl/run-isl
substituteInPlace $sitepackages/edenscm-isl/run-isl \
--replace 'NODE=node' 'NODE=${nodejs}/bin/node'
'';
postFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/sl \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
@ -138,9 +159,9 @@ let
]);
buildInputs = [
curl
openssl
] ++ lib.optionals stdenv.isDarwin [
curl
libiconv
CoreFoundation
CoreServices
@ -165,13 +186,8 @@ stdenv.mkDerivation {
runHook preInstall
mkdir -p $out
cp -r ${sapling}/* $out
sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages
chmod +w $sitepackages
cp -r ${isl} $sitepackages/edenscm-isl
runHook postInstall
'';

15
pkgs/applications/video/kodi/addons/youtube/default.nix
View File

@ -1,13 +1,13 @@
{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
buildKodiAddon rec {
pname = "youtube";
namespace = "plugin.video.youtube";
version = "6.8.18+matrix.1";
version = "6.8.22+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "F950rnE/YxwWI0ieHC2TdGNSfrQDHlStnxLbA6UjEaM=";
sha256 = "V1ALhD0zLm6Rq2KFpZXULPiB7sAPaNDhCpxScr+apDE=";
};
propagatedBuildInputs = [
@ -23,15 +23,6 @@ buildKodiAddon rec {
};
};
patches = [
# This patch can be removed once https://github.com/anxdpanic/plugin.video.youtube/pull/260 has been merged.
(fetchpatch {
name = "fix-addon-path";
url = "https://patch-diff.githubusercontent.com/raw/anxdpanic/plugin.video.youtube/pull/260.patch";
sha256 = "11c9sfwl5kvfll2jws5b4i46s60v6gkfns4al13p4m5ch9rk06hs";
})
];
meta = with lib; {
homepage = "https://github.com/anxdpanic/plugin.video.youtube";
description = "YouTube is one of the biggest video-sharing websites of the world";

6
pkgs/applications/video/streamlink/default.nix
View File

@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "5.0.1";
version = "5.1.2";
format = "pyproject";
src = python3Packages.fetchPypi {
inherit pname version;
hash = "sha256-PKRioPBhTV6i3ckQgcKuhQFmpBvUQE4o3FLej8qx4mM=";
hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno=";
};
checkInputs = with python3Packages; [
@ -19,6 +19,7 @@ python3Packages.buildPythonApplication rec {
mock
requests-mock
freezegun
pytest-asyncio
];
nativeBuildInputs = with python3Packages; [
@ -33,6 +34,7 @@ python3Packages.buildPythonApplication rec {
pysocks
requests
websocket-client
urllib3
]) ++ [
ffmpeg
];

6
pkgs/applications/virtualization/nixpacks/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-c1AqqbeBKXfXUKgalbo5OXc0oVyQyntqwmpB0AFlwRs=";
sha256 = "sha256-p9kKTNtZoWl2rZyL1cD7fK9+IwDtBCfdRzWjKQmje5M=";
};
cargoSha256 = "sha256-SybFjc1oyfJpen+KH2xj/u3i1S5SLiprwkUPp9IpMfc=";
cargoSha256 = "sha256-UWefCe5DLaxUFNbQV0XNyqNI1dx9HPHfwj+aJaEasFc=";
# skip test due FHS dependency
doCheck = false;

2
pkgs/development/interpreters/luajit/default.nix
View File

@ -127,6 +127,8 @@ stdenv.mkDerivation rec {
homepage = "http://luajit.org";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
# See https://github.com/LuaJIT/LuaJIT/issues/628
badPlatforms = [ "riscv64-linux" "riscv64-linux" ];
maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ];
} // extraMeta;
}

6
pkgs/development/interpreters/nickel/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "nickel";
version = "0.2.1";
version = "0.3.0";
src = fetchFromGitHub {
owner = "tweag";
repo = pname;
rev = "refs/tags/${version}"; # because pure ${version} doesn't work
hash = "sha256-Sf0UJAfUtP7oU31VkVqCtdRmfjaHV34gYeUPNsTmQvo=";
hash = "sha256-L2MQ0dS9mZ+SOFoS/rclPtEl3/iFyEKn6Bse/ysHyKo=";
};
cargoSha256 = "sha256-oY4PYMZBN5+nsARHV+A5D7a6fUt9UMHBn83ONgaQp8E=";
cargoSha256 = "sha256-3ucWGmylRatJOl8zktSRMXr5p6L+5+LQV6ALJTtQpiA=";
meta = with lib; {
homepage = "https://nickel-lang.org/";

6
pkgs/development/libraries/geos/default.nix
View File

@ -6,15 +6,17 @@
stdenv.mkDerivation rec {
pname = "geos";
version = "3.11.0";
version = "3.11.1";
src = fetchurl {
url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2";
sha256 = "sha256-eauMq/SqhgTRYVV7UuPk2EV1rNwNCMsJqz96rvpNhYo=";
hash = "sha256-bQ6zz6n5LZR3Mcx18XUDVrO9/AfqAgVT2vavHHaOC+I=";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
meta = with lib; {
description = "C++ port of the Java Topology Suite (JTS)";
homepage = "https://trac.osgeo.org/geos";

4
pkgs/development/libraries/libmodbus/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmodbus";
version = "3.1.9";
version = "3.1.10";
src = fetchFromGitHub {
owner = "stephane";
repo = "libmodbus";
rev = "v${version}";
hash = "sha256-aq8JB7CgzK6idU9AAJWkMXyYDXRynSTlNBMyPrNdpLw=";
hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k=";
};
nativeBuildInputs = [ autoreconfHook ];

4
pkgs/development/libraries/libspng/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "libspng";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "randy408";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GgrTWC/cesDlEh2J6StCyKiLRk62xfy2+E4lnmJMLGs=";
sha256 = "sha256-t5qVhRxepl1rOQk/F5GhcvU1nk9oGb+kWXmybP+iAfY=";
};
doCheck = true;

11
pkgs/development/libraries/ois/default.nix
View File

@ -2,18 +2,23 @@
stdenv.mkDerivation rec {
pname = "ois";
version = "1.5";
version = "1.5.1";
src = fetchFromGitHub {
owner = "wgois";
repo = "OIS";
rev = "v${version}";
sha256 = "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa";
sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ];
buildInputs = lib.optionals stdenv.isLinux [ libX11 ]
++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ];
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
];
meta = with lib; {
description = "Object-oriented C++ input system";

4
pkgs/development/libraries/physics/clhep/default.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "clhep";
version = "2.4.6.1";
version = "2.4.6.2";
src = fetchurl {
url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";
hash = "sha256-FwFhuOSYVV91xt55Nq/elWqT/JqhIaFtd56mAgh6Mjk=";
hash = "sha256-re1z5JushaW06G9koO49bzz+VVGw93MceLbY+drG6Nw=";
};
prePatch = ''

6
pkgs/development/libraries/wasilibc/default.nix
View File

@ -8,7 +8,7 @@
let
pname = "wasilibc";
version = "16";
version = "17";
in
stdenv.mkDerivation {
inherit pname version;
@ -17,7 +17,7 @@ stdenv.mkDerivation {
owner = "WebAssembly";
repo = "wasi-libc";
rev = "refs/tags/wasi-sdk-${version}";
hash = "sha256-WnkAWA6F+Cl0ygcY5IteDA/HT1v2ykGWJnEm6Q5Q7Jc=";
hash = "sha256-h2X78icCmnn6Y6baOxp8Xm7F2+RZZgaV2fszzi2q/iA=";
fetchSubmodules = true;
};
@ -62,7 +62,7 @@ stdenv.mkDerivation {
description = "WASI libc implementation for WebAssembly";
homepage = "https://wasi.dev";
platforms = platforms.wasi;
maintainers = with maintainers; [ matthewbauer ];
maintainers = with maintainers; [ matthewbauer rvolosatovs ];
license = with licenses; [ asl20 mit llvm-exception ];
};
}

4
pkgs/development/misc/brev-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.185";
version = "0.6.186";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vxU+UDPnW4OfhEs66ynN7tFbi8aIHIgLFx/jx+2Fp2w=";
sha256 = "sha256-h8PUxSjC21BsjqFgOOvDPClFLwOTFTTEB57zxUtbuTw=";
};
vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8=";

1
pkgs/development/misc/resholve/default.nix
View File

@ -22,6 +22,7 @@ rec {
resholve = callPackage ./resholve.nix {
inherit (source) rSrc version;
inherit (deps.oil) oildev;
inherit (deps) configargparse;
inherit resholve-utils;
};
# funcs to validate and phrase invocations of resholve

65
pkgs/development/misc/resholve/deps.nix generated
View File

@ -1,4 +1,6 @@
{ callPackage
{ lib
, callPackage
, fetchFromGitHub
, python27
, ...
}:
@ -15,5 +17,64 @@
rec {
# binlore = callPackage ./binlore.nix { };
oil = callPackage ./oildev.nix { inherit python27; };
oil = callPackage ./oildev.nix {
inherit python27;
inherit six;
inherit typing;
};
configargparse = python27.pkgs.buildPythonPackage rec {
pname = "configargparse";
version = "1.5.3";
src = fetchFromGitHub {
owner = "bw2";
repo = "ConfigArgParse";
rev = "v${version}";
sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz";
};
doCheck = false;
pythonImportsCheck = [ "configargparse" ];
meta = with lib; {
description = "A drop-in replacement for argparse";
homepage = "https://github.com/bw2/ConfigArgParse";
license = licenses.mit;
};
};
six = python27.pkgs.buildPythonPackage rec {
pname = "six";
version = "1.16.0";
src = python27.pkgs.fetchPypi {
inherit pname version;
sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";
};
doCheck = false;
meta = {
description = "A Python 2 and 3 compatibility library";
homepage = "https://pypi.python.org/pypi/six/";
license = lib.licenses.mit;
};
};
typing = python27.pkgs.buildPythonPackage rec {
pname = "typing";
version = "3.10.0.0";
src = python27.pkgs.fetchPypi {
inherit pname version;
sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";
};
doCheck = false;
meta = with lib; {
description = "Backport of typing module to Python versions older than 3.5";
homepage = "https://docs.python.org/3/library/typing.html";
license = licenses.psfl;
};
};
}

4
pkgs/development/misc/resholve/oildev.nix
View File

@ -13,6 +13,8 @@
, cmark
, file
, glibcLocales
, six
, typing
}:
rec {
@ -95,7 +97,7 @@ rec {
nativeBuildInputs = [ re2c file makeWrapper ];
propagatedBuildInputs = with python27.pkgs; [ six typing ];
propagatedBuildInputs = [ six typing ];
doCheck = true;

3
pkgs/development/misc/resholve/resholve.nix
View File

@ -6,6 +6,7 @@
, rSrc
, version
, oildev
, configargparse
, binlore
, resholve-utils
}:
@ -19,7 +20,7 @@ python27.pkgs.buildPythonApplication {
propagatedBuildInputs = [
oildev
python27.pkgs.configargparse
configargparse
];
postPatch = ''

13
pkgs/development/ocaml-modules/otfm/default.nix
View File

@ -1,26 +1,25 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }:
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:
let
pname = "otfm";
version = "0.3.0";
version = "0.4.0";
webpage = "https://erratique.ch/software/${pname}";
in
assert lib.versionAtLeast ocaml.version "4.01.0";
stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
pname = "ocaml${ocaml.version}-${pname}";
inherit version;
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k";
hash = "sha256-02U23mYTy0ZJgSObDoyygPTGEMC4/Zge5bux4wshaEE=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
buildInputs = [ topkg ];
propagatedBuildInputs = [ uutf result ];
propagatedBuildInputs = [ uutf ];
strictDeps = true;

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "acquire";
version = "3.2";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "acquire";
rev = version;
hash = "sha256-YwmrdqWG5qD621+jQMVyTM0Uy0yXCVPv9zfVhZ+ohg0=";
hash = "sha256-S7EZZxNcoLcZyyRNGlZj6nGoCAlqCxNdh3azIVKvOTM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

5
pkgs/development/python-modules/aiobiketrax/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiobiketrax";
version = "0.4.0";
version = "0.5.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "basilfx";
repo = pname;
rev = "v${version}";
hash = "sha256-P8BExzL22rRj1IFPpojKR8ITdVq0RF8e3qLgb+H1PzE=";
hash = "sha256-exxpJJA+JnVuehCnWs/ihk/SSPUqV7ODXZxvbmuHe8U=";
};
nativeBuildInputs = [
@ -47,6 +47,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for interacting with the PowUnity BikeTrax GPS tracker";
homepage = "https://github.com/basilfx/aiobiketrax";
changelog = "https://github.com/basilfx/aiobiketrax/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

7
pkgs/development/python-modules/aionanoleaf/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aionanoleaf";
version = "0.2.0";
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "milanmeu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY=";
rev = "refs/tags/v${version}";
hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0=";
};
propagatedBuildInputs = [
@ -33,6 +33,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python wrapper for the Nanoleaf API";
homepage = "https://github.com/milanmeu/aionanoleaf";
changelog = "https://github.com/milanmeu/aionanoleaf/releases/tag/v${version}";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ fab ];
};

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "5.1.0";
version = "5.1.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-jhoPgwydB/DZx7hC16XgM0UBhmByVZRT5b7BDETA+FY=";
hash = "sha256-6HUykGN0zx97K4372dU1RPncajJt2n20zp2FhrJG1sM=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "androidtv";
version = "0.0.69";
version = "0.0.70";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "python-androidtv";
rev = "v${version}";
hash = "sha256-GfwXYugDrxOe9ekC1M7mi0BuqmohHdgZVTO4J8+B5iI=";
hash = "sha256-LKV5aO3sptHz48UYpP+zPk6pPhyHAZWAxiTTIWKHiSg=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/authlib/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "authlib";
version = "1.1.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "lepture";
repo = "authlib";
rev = "refs/tags/v${version}";
hash = "sha256-UTsQRAgmYu4BwT0WWE6XOjTYyGWZIt8bMH9qJ8KLOWA=";
hash = "sha256-OYfvfPnpWE9g7L9cFXUD95B/9+OZy55ZVbmFhFgguUg=";
};
propagatedBuildInputs = [
@ -60,6 +60,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for building OAuth and OpenID Connect servers";
homepage = "https://github.com/lepture/authlib";
changelog = "https://github.com/lepture/authlib/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ flokli ];
};

24
pkgs/development/python-modules/calver/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
let
pname = "calver";
version = "2022.6.26";
in
buildPythonPackage {
inherit pname version;
src = fetchPypi {
inherit pname version;
hash = "sha256-4FSTo7F1F+8XSPvmENoR8QSF+qfEFrnTP9SlLXSJT4s=";
};
meta = {
description = "Setuptools extension for CalVer package versions";
homepage = "https://github.com/di/calver";
license = lib.licenses.asl20;
maintainers = [ ];
};
}

54
pkgs/development/python-modules/camel-converter/default.nix Normal file
View File

@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pydantic
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "camel-converter";
version = "3.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sanders41";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-SUuSaQU6o2OtjDNrDcO3nS0EZH2ammEkP7AEp4H5ysI=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=camel_converter --cov-report term-missing" ""
'';
nativeBuildInputs = [
poetry-core
];
passthru.optional-dependencies = {
pydantic = [
pydantic
];
};
checkInputs = [
pytestCheckHook
] ++ passthru.optional-dependencies.pydantic;
pythonImportsCheck = [
"camel_converter"
];
meta = with lib; {
description = "Client for the Meilisearch API";
homepage = "https://github.com/sanders41/camel-converter";
changelog = "https://github.com/sanders41/camel-converter/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dbus-fast";
version = "1.80.0";
version = "1.82.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-TeOS4tfJmEQnbHkoRueyTmmIAw2De9w6gWjzD1hlwVI=";
hash = "sha256-mJJElYWTN09zVkx36GqPoILdALAo+fO2JlX4n0dmQ5M=";
};
nativeBuildInputs = [

15
pkgs/development/python-modules/devpi-common/default.nix
View File

@ -1,8 +1,7 @@
{ lib, buildPythonPackage, fetchPypi
, requests
, py
, pytest
, pytest-flake8
, pytestCheckHook
, lazy
}:
@ -15,16 +14,20 @@ buildPythonPackage rec {
sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM=";
};
postPatch = ''
substituteInPlace tox.ini \
--replace "--flake8" ""
'';
propagatedBuildInputs = [
requests
py
lazy
];
checkInputs = [ pytest pytest-flake8 ];
checkPhase = ''
py.test
'';
checkInputs = [
pytestCheckHook
];
meta = with lib; {
homepage = "https://github.com/devpi/devpi";

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-cim";
version = "3.2";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.cim";
rev = version;
hash = "sha256-rWlAYndqqZ6l/iwk1u2gG0mtQHvAMYUUEWo23hLykXI=";
hash = "sha256-d02P6RXIiriOujGns9mOkyiJLNQFNTTW61kInzS17Y4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-clfs";
version = "1.1";
version = "1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.clfs";
rev = version;
hash = "sha256-5rG8YiVBU4ETLgQoFnMaeXHttIB26+OhIdYjKDKmPBc=";
hash = "sha256-1nh81ppJpYre3y7hJ9xS+TNU1NfTH+9NMHdV55kPEXI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "dissect-cstruct";
version = "3.2";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.cstruct";
rev = version;
hash = "sha256-iP00EcEkUWoYi+SCo/gY9LSVtCSQZ3g2wMs4Z8m+X2M=";
hash = "sha256-8OxAsrECgsQf8+EaZtJ3XNhwdhBI08o3r+xhD/D1NhQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-esedb";
version = "3.2";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.esedb";
rev = version;
hash = "sha256-DLu6FCWqeESFlsIB21jN/IKCwSKlBoibildv07/hPcw=";
hash = "sha256-ErPihjAcukMerCAxLdDQVUApeNdFnFn0Zejo3LhgZFc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-etl";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.etl";
rev = version;
hash = "sha256-EqEYw2MpNjdw8nXkxe76R5y99Y+rsK42qfTpT/kxtZ0=";
hash = "sha256-s3Ls8tuqp/COBF+WV9RRyfo7FAqPcXmBZ08gHZMPzOU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-eventlog";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.eventlog";
rev = version;
hash = "sha256-cLIsK2/pL9nNOitoTZprqAio1BOo3/Uqfbl8uL/1tG4=";
hash = "sha256-emNGZs/5LWD29xE5BmXQKQfkZApLZlGs6KNIqobaKvM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-evidence";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.evidence";
rev = version;
hash = "sha256-X0WMv96Wo3vDZ6HYGdWfn7OKhFuT5Qjzkyj4HzMqCiM=";
hash = "sha256-rm9IjsXHz4GS8M/oPaDoaxjwqMMtD0qjRtQ3vFJQyQY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-extfs";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.extfs";
rev = version;
hash = "sha256-i52hlTh0uJJcprA6oVlFQ3v6BpOtSnQAQ0p6BHt56Ac=";
hash = "sha256-KGqmguKwCSQw2USKuWFMQCz+D8XMv5W12eJfUxgz324=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-fat";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.fat";
rev = version;
hash = "sha256-GBeacQtNA1onh67Svqo5R43gap/Lzpm+20TXcUMmU5k=";
hash = "sha256-kqdVgUkvW9I5CI4T9b7VeX6hPm3Ufwrdnhmo1jR5Fdg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-ffs";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ffs";
rev = version;
hash = "sha256-JI0i0pvOOChWCDB8rynDuf0txvPQT7z2JJ1EsE4VNLw=";
hash = "sha256-kcYSoY3a8ljY9LWzOUekLBzokE+wJrG1KEr0p5CCj0U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dissect-hypervisor";
version = "3.2";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.hypervisor";
rev = version;
hash = "sha256-yc9QfzvWX8jsRVZYglZZuMfxsYUoPr5gf407DABjQcU=";
hash = "sha256-Q7lbFr+gc6inQEJT54DXjpyyis5GxrKQHI5qqa1INKo=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-ntfs";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ntfs";
rev = version;
hash = "sha256-hZz/v6qLZnbsZkS/cBU/to4XmZNgUJQwCaPkY2ebl4Q=";
hash = "sha256-4QEsWTdqlHIP1a9g45+zv1SdHY0Ofsr7Rf1z+ctssSw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-ole";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ole";
rev = version;
hash = "sha256-qnrbS+gdzBV/mQ08fQzpvevkDtrJ1qXpteW0lxJ+ZUI=";
hash = "sha256-0bIlnRFKBvSXnBIU4+1V7WzyXCvulUpNSXG1Rj2k4jY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-regf";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.regf";
rev = version;
hash = "sha256-88qG90jza0EVP5dgz09ZA8Z+zFwqanOODlUgsvkMxGo=";
hash = "sha256-hSMdgGkSmFDAiO6C1xTJDmKClHwrGc887wqO3/5NZn4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-shellitem";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.shellitem";
rev = version;
hash = "sha256-HVnfHsD1V+4kWt9qOClsKuIZMpX4VKrr/5eD7KRq5ww=";
hash = "sha256-z0/KSOgo5Gnl4MLOY5eUPHlI/8dCyYaEEiKMmkP7cgg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-sql";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.sql";
rev = version;
hash = "sha256-uKCCwTFLQSos+L0qc1pFlF3O4FV13up0qFqDYdTZJBk=";
hash = "sha256-yw0EUxlgm7/3FpecGGvxkukudyFMv0fmPbOLJqc2tC0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

6
pkgs/development/python-modules/dissect-target/default.nix
View File

@ -16,6 +16,7 @@
, dissect-ntfs
, dissect-regf
, dissect-sql
, dissect-thumbcache
, dissect-util
, dissect-volume
, dissect-xfs
@ -35,7 +36,7 @@
buildPythonPackage rec {
pname = "dissect-target";
version = "3.3";
version = "3.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -44,7 +45,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.target";
rev = version;
hash = "sha256-EWUYN2OsYeDo3C+QgjAVq9NXiVk1KWGILwtT0cI0tB0=";
hash = "sha256-QwEznweETwDTuTctOnq0n27JYXC9BO5l6BYpXsMRVq4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -79,6 +80,7 @@ buildPythonPackage rec {
dissect-fat
dissect-ffs
dissect-sql
dissect-thumbcache
dissect-xfs
fusepy
ipython

57
pkgs/development/python-modules/dissect-thumbcache/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dissect-thumbcache";
version = "1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.thumbcache";
rev = version;
hash = "sha256-4yUVJwIQniE9AAtAgzHczOZfyWZly86JKc0Qh3byYf4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.thumbcache"
];
disabledTests = [
# Don't run Windows related tests
"windows"
];
meta = with lib; {
description = "Dissect module implementing a parser for the Windows thumbcache";
homepage = "https://github.com/fox-it/dissect.thumbcache";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "dissect-util";
version = "3.2";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.util";
rev = version;
hash = "sha256-vit+SQ368limLvdVP/0eVINiEAY/dzD/simHFw489Ck=";
hash = "sha256-HGlWyRjvXu1d0n1PPkMyl8NNRRhsjMzXZJMS1MjdTWQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-vmfs";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.vmfs";
rev = version;
hash = "sha256-JVJvuH+ZTlGOnmTSB/nnBuMrc/VtkKVrLDRYnukDXBA=";
hash = "sha256-6ZNybNRL97Zz6O32r4X0K3/+vZF3Qid98rj2pgGWgvI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-volume";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.volume";
rev = version;
hash = "sha256-9SbluaB2wV4gOCry5c7ZLABMwhGfnYg7dTPdKMXYSZM=";
hash = "sha256-NwY4J1FSCvNIoH9uUHJVlM3jJt6A9CZ7uCWhlIdYztM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-xfs";
version = "3.1";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.xfs";
rev = version;
hash = "sha256-Tg4su78Na6IAQhi7aOY8QNs3tnYOYvdnNQV6rn8QpSE=";
hash = "sha256-S05Y+Oe1q4DcTR9al2K82Q41EP0FnDGUp1gfzYiS/Yk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -29,7 +29,7 @@
buildPythonPackage rec {
pname = "dissect";
version = "3.2";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect";
rev = version;
hash = "sha256-DtiaBKQtz6CgU1csfGhCw0LJLoiKwyH6N6b7/elpJkU=";
hash = "sha256-1m5reKmPFSqMW/wYdiMw95l8A9E5FS8RHLb8/i1rQKY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "django-hijack";
version = "3.2.4";
version = "3.2.5";
# the wheel comes with pre-built assets, allowing us to avoid fighting
# with npm/webpack/gettext to build them ourselves.
@ -19,7 +19,7 @@ buildPythonPackage rec {
pname = "django_hijack";
dist = "py3";
python = "py3";
sha256 = "sha256-tSIovIPEszq00Y0PMl/Wlx5YK5MTxLhCpNpHFZDi9rQ=";
sha256 = "sha256-8BHnC3uK6zmSWKfvtDJuTjAKwQlL75G/QwRPgtNJYkE=";
};
propagatedBuildInputs = [ django django_compat ];

20
pkgs/development/python-modules/django_classytags/default.nix
View File

@ -2,27 +2,37 @@
, buildPythonPackage
, fetchPypi
, django
, six
, pythonOlder
}:
buildPythonPackage rec {
pname = "django-classy-tags";
version = "3.0.1";
version = "4.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg=";
hash = "sha256-25/Hxe0I3CYZzEwZsZUUzawT3bYYJ4qwcJTGJtKO7w0=";
};
propagatedBuildInputs = [ django six ];
propagatedBuildInputs = [
django
];
# pypi version doesn't include runtest.py, needed to run tests
doCheck = false;
pythonImportsCheck = [
"classytags"
];
meta = with lib; {
description = "Class based template tags for Django";
homepage = "https://github.com/divio/django-classy-tags";
changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

6
pkgs/development/python-modules/flake8/default.nix
View File

@ -12,9 +12,9 @@
buildPythonPackage rec {
pname = "flake8";
version = "5.0.4";
version = "6.0.0";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
format = "setuptools";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "PyCQA";
repo = "flake8";
rev = version;
hash = "sha256-Os8HIoM07/iOBMm+0WxdQj32pJJOJ8mkh+yLHpqkLXg=";
hash = "sha256-dN9LlLpQ/ZoVIFrAQ1NxMvsHqWsgdJVLUIAFwkheEL4=";
};
propagatedBuildInputs = [

11
pkgs/development/python-modules/flow-record/default.nix
View File

@ -8,12 +8,13 @@
, pythonOlder
, setuptools
, setuptools-scm
, wheel
, zstandard
}:
buildPythonPackage rec {
pname = "flow-record";
version = "3.5";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +23,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "flow.record";
rev = version;
hash = "sha256-hULz5pIqCKujVH3SpzFgzNM9R7WTtqAmuNOxG7VlUd0=";
hash = "sha256-bXI7q+unlrXvagKisAO4INfzeXlC4g918xmPmwMDCK8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -30,6 +31,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
@ -59,6 +61,11 @@ buildPythonPackage rec {
"tests/test_rdump.py"
];
disabledTests = [
"test_rdump_fieldtype_path_json"
];
meta = with lib; {
description = "Library for defining and creating structured data";
homepage = "https://github.com/fox-it/flow.record";

12
pkgs/development/python-modules/hap-python/default.nix
View File

@ -16,15 +16,16 @@
buildPythonPackage rec {
pname = "hap-python";
version = "4.5.0";
version = "4.6.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ikalchev";
repo = "HAP-python";
rev = "refs/tags/v${version}";
sha256 = "sha256-/XJvCL9hMIrOUwGPcrvSrJ6SZ/E6BQy+isFFlAniIM4=";
hash = "sha256-fAJB1gk8zTS/mW5KzWr3z26qctZc/EQlk//WM1Xwpl0=";
};
propagatedBuildInputs = [
@ -64,11 +65,14 @@ buildPythonPackage rec {
"test_migration_to_include_client_properties"
];
pythonImportsCheck = [ "pyhap" ];
pythonImportsCheck = [
"pyhap"
];
meta = with lib; {
description = "HomeKit Accessory Protocol implementation";
homepage = "https://github.com/ikalchev/HAP-python";
description = "HomeKit Accessory Protocol implementation in python";
changelog = "https://github.com/ikalchev/HAP-python/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ oro ];
};

5
pkgs/development/python-modules/mailchecker/default.nix
View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "5.0.4";
version = "5.0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-CTeZ63hOBUHuuIJgWRNttBRgrHSsuL78zo6MW8VwEDE=";
hash = "sha256-RtARu9+EKUMOOJjUdkEZ5KYz9DzzlLeNhkRMLSm4AYo=";
};
# Module has no tests
@ -26,6 +26,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for temporary (disposable/throwaway) email detection";
homepage = "https://github.com/FGRibreau/mailchecker";
changelog = "https://github.com/FGRibreau/mailchecker/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

9
pkgs/development/python-modules/meilisearch/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, camel-converter
, fetchFromGitHub
, pythonOlder
, requests
@ -7,7 +8,7 @@
buildPythonPackage rec {
pname = "meilisearch";
version = "0.19.1";
version = "0.23.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,12 +17,13 @@ buildPythonPackage rec {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "refs/tags/v${version}";
hash = "sha256-/z1UtZJE91dUHogXCbCv8nI8bd26HYVi1OzUV3sArJU=";
hash = "sha256-7TiXyuB2veNJtK6UmQg01O82r549aRmEa/DFzJtnQug=";
};
propagatedBuildInputs = [
camel-converter
requests
];
] ++ camel-converter.optional-dependencies.pydantic;
pythonImportsCheck = [
"meilisearch"
@ -33,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Client for the Meilisearch API";
homepage = "https://github.com/meilisearch/meilisearch-python";
changelog = "https://github.com/meilisearch/meilisearch-python/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

16
pkgs/development/python-modules/netio/default.nix
View File

@ -1,22 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, pyopenssl
, pythonOlder
, requests
, pyopenssl
}:
buildPythonPackage rec {
pname = "netio";
version = "1.0.6";
version = "1.0.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "Netio";
inherit version;
hash = "sha256-G1NSCchoRjgX2K9URNXsxpp9jxrQo0RgZ00tzWdexGU=";
src = fetchFromGitHub {
owner = "netioproducts";
repo = "PyNetio";
rev = "v${version}";
hash = "sha256-07GzT9j27KmrTQ7naIdlIz7HB9knHpjH4mQhlwUKucU=";
};
propagatedBuildInputs = [
@ -39,6 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for interacting with NETIO devices";
homepage = "https://github.com/netioproducts/PyNetio";
changelog = "https://github.com/netioproducts/PyNetio/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

3
pkgs/development/python-modules/nettigo-air-monitor/default.nix
View File

@ -1,10 +1,10 @@
{ lib
, aiohttp
, aioresponses
, aqipy-atmotech
, buildPythonPackage
, dacite
, fetchFromGitHub
, aqipy-atmotech
, orjson
, pytest-asyncio
, pytest-error-for-skips
@ -47,6 +47,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to get air quality data from Nettigo Air Monitor devices";
homepage = "https://github.com/bieniu/nettigo-air-monitor";
changelog = "https://github.com/bieniu/nettigo-air-monitor/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

32
pkgs/development/python-modules/parameterizedtestcase/default.nix
View File

@ -1,32 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, isPy27
}:
buildPythonPackage rec {
pname = "parameterizedtestcase";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "4ccc1d15d7e7ef153619a6a9cd45b170268cf82c67fdd336794c75139aae127e";
};
checkPhase = ''
runHook preCheck
${python.interpreter} -m parameterizedtestcase.tests
runHook postCheck
'';
doCheck = isPy27;
meta = with lib; {
description = "Parameterized tests for Python's unittest module";
homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
broken = python.isPy3k; # uses use_2to3
};
}

7
pkgs/development/python-modules/pycodestyle/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pycodestyle";
version = "2.9.1";
version = "2.10.0";
disabled = pythonOlder "3.6";
@ -15,10 +15,10 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785";
hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM=";
};
# https://github.com/PyCQA/pycodestyle/blob/2.9.1/tox.ini#L13
# https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13
checkPhase = ''
${python.interpreter} -m pycodestyle --statistics pycodestyle.py
${python.interpreter} -m pycodestyle --max-doc-length=72 --testsuite testsuite
@ -29,6 +29,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pycodestyle" ];
meta = with lib; {
changelog = "https://github.com/PyCQA/pyflakes/blob/${version}/NEWS.rst";
description = "Python style guide checker";
homepage = "https://pycodestyle.pycqa.org/";
license = licenses.mit;

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyflakes";
version = "2.5.0";
version = "3.0.1";
disabled = pythonOlder "3.6";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3";
hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0=";
};
checkInputs = [

1
pkgs/development/python-modules/pyswitchbee/default.nix
View File

@ -44,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to control SwitchBee smart home device";
homepage = "https://github.com/jafar-atili/pySwitchbee/";
changelog = "https://github.com/jafar-atili/pySwitchbee/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.22.0";
version = "0.23.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-/FECjJ/iVx4CTtOgxpPBF0lZCctghmD4qUrQQYwmAkQ=";
hash = "sha256-vBXOZ+AhhqWUD6XukmkHF4wjjJxXbK7r0V+qCuZGc6s=";
};
propagatedBuildInputs = [

1
pkgs/development/python-modules/pytest-flake8/default.nix
View File

@ -42,5 +42,6 @@ buildPythonPackage rec {
homepage = "https://github.com/tholo/pytest-flake8";
maintainers = with lib.maintainers; [ jluttine ];
license = lib.licenses.bsd2;
broken = lib.versionAtLeast flake8.version "6.0.0";
};
}

5
pkgs/development/python-modules/python-fsutil/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "python-fsutil";
version = "0.7.0";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-2T2C2bIOAdxppZxqI+QGE2R/+46LoqB7eNdlt4sVAd8=";
hash = "sha256-J5B5THfB/yPG1JSCpO2HTHTH0jn0nbKFzXpZMGJ/dKA=";
};
propagatedBuildInputs = [
@ -45,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module with file-system utilities";
homepage = "https://github.com/fabiocaccamo/python-fsutil";
changelog = "https://github.com/fabiocaccamo/python-fsutil/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

12
pkgs/development/python-modules/rapidfuzz/default.nix
View File

@ -8,10 +8,8 @@
, ninja
, scikit-build
, setuptools
, jarowinkler
, numpy
, hypothesis
, jarowinkler-cpp
, pandas
, pytestCheckHook
, rapidfuzz-cpp
@ -20,7 +18,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "2.13.3";
version = "2.13.4";
disabled = pythonOlder "3.7";
@ -30,7 +28,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "refs/tags/v${version}";
hash = "sha256-hx8DNFxzD41tvxcKaSqqKkxJMlcrxAaihulUdkzyOt0=";
hash = "sha256-ztGeWQTEilKzL93fruBpMvQY1W6OiMGvWUK/bgMhYd8=";
};
nativeBuildInputs = [
@ -44,7 +42,6 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true;
buildInputs = [
jarowinkler-cpp
rapidfuzz-cpp
taskflow
];
@ -60,10 +57,13 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
jarowinkler
numpy
];
preCheck = ''
export RAPIDFUZZ_IMPLEMENTATION=cpp
'';
checkInputs = [
hypothesis
pandas

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
version = "3.4.1";
version = "3.5.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-RPCzxcuD57ma306GLYsxxvvvZ0e8RTd/KxOeMSaQQQQ=";
hash = "sha256-mjKbCy4WalB3kRk1x6bTBLARCW0vrUbSdcvvDP//TzM=";
};
nativeBuildInputs = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "ttls";
version = "1.5.1";
version = "1.6.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jschlyter";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Oh70mLwTaJ2+uQDr2t6wAgskW5L06mZxtD/8dE01YA0=";
hash = "sha256-W7r2XgH8SloL9l/Lw1xWLmjF8aMBHWFe2DQ3tkqu+JQ=";
};
nativeBuildInputs = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "65.6.0.0";
version = "65.6.0.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MnC+rbmbxvpLmlzDUQbnFEpcMwKM5ImSsQ50rcjMXII=";
sha256 = "sha256-rWDM8B1ibel2IiREjzbBPgZg6GOv1twR2Xmzc5psfSQ=";
};
# Module doesn't have tests

5
pkgs/development/python-modules/velbus-aio/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2022.10.4";
version = "2022.12.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = pname;
rev = version;
sha256 = "sha256-6Sg2t8UmIyVCfjTW3GDldOk09gVg2ngV9sXhyQI4Kz4=";
hash = "sha256-hhomNynH2X2tnCzVBmyF/sYsHLHyGGaR9oX6M7kcWVc=";
fetchSubmodules = true;
};
@ -40,6 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to support the Velbus home automation system";
homepage = "https://github.com/Cereal2nd/velbus-aio";
changelog = "https://github.com/Cereal2nd/velbus-aio/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

7
pkgs/development/tools/devpi-client/default.nix
View File

@ -13,7 +13,6 @@
, pluggy
, py
, pytestCheckHook
, pytest-flake8
, setuptools
, sphinx
, tox
@ -30,6 +29,11 @@ buildPythonApplication rec {
hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw=";
};
postPatch = ''
substituteInPlace tox.ini \
--replace "--flake8" ""
'';
buildInputs = [
glibcLocales
];
@ -50,7 +54,6 @@ buildPythonApplication rec {
mercurial
mock
pytestCheckHook
pytest-flake8
sphinx
tox
webtest

7
pkgs/development/tools/devpi-server/default.nix
View File

@ -12,7 +12,6 @@
, platformdirs
, pluggy
, pyramid
, pytest-flake8
, pytestCheckHook
, repoze_lru
, setuptools
@ -37,6 +36,11 @@ buildPythonApplication rec {
sourceRoot = "source/server";
postPatch = ''
substituteInPlace tox.ini \
--replace "--flake8" ""
'';
propagatedBuildInputs = [
aiohttp
appdirs
@ -58,7 +62,6 @@ buildPythonApplication rec {
checkInputs = [
beautifulsoup4
nginx
pytest-flake8
pytestCheckHook
webtest
];

4
pkgs/development/tools/memray/default.nix
View File

@ -8,14 +8,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "memray";
version = "1.4.1";
version = "1.5.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "bloomberg";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Lq2qDTGkyG3qZaxF3umUHBWf0Dgy1ds6bTUe4y3u7Qc=";
hash = "sha256-BnsboMjlMDfDsqR3UU/bxQpyUaqCDuglaqwTPOF79Fc=";
};
nativeBuildInputs = [

4
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "12.25.0";
version = "12.26.1";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-xhSNt6ia+M4vNXOdHCVKPSM/ypb4CP4HWY9oXlsM/UM=";
hash = "sha256-c8O3kZefTZ/IvSRMRxR+Oc6L4Tkcl2PrnuflgbTb7eQ=";
};
vendorHash = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";

6
pkgs/development/tools/ruff/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.171";
version = "0.0.173";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2aqpQo7U17wqQ/YUMreOOKkcVWiKHAdFAUL/6HP6zN8=";
sha256 = "sha256-Z2BcLgqtIWYFq2go0a35WmQXvnWMrj+7OxHmmb2dgxk=";
};
cargoSha256 = "sha256-N/WoPc2BxujqE/OSp9RWS7dBHGKxIixtBqwDwR3p6TM=";
cargoSha256 = "sha256-uhMTikyfbMMAf122Nc5NFbOqsICc6nK7s1n1+97mzxQ=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

12
pkgs/development/tools/rust/cargo-tally/default.nix
View File

@ -1,21 +1,21 @@
{ lib, rustPlatform, fetchCrate, stdenv, DiskArbitration, Foundation, IOKit }:
{ lib, rustPlatform, fetchCrate, stdenv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
version = "1.0.17";
version = "1.0.18";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-vtVE7BITzYP9vhSj7HfDm0Mar2bRPmeW1/mE977vvrA=";
sha256 = "sha256-BlWPdZb85XaTGV6ZE3XRVKHJyXimfrezhRyqJVmCFMY=";
};
cargoSha256 = "sha256-VHlnRk5EXZjf+EW/clDOFA+ohh9SqJiRvq1xQcP0Wrk=";
cargoSha256 = "sha256-1qtlsItLP8MdxebgktzTr3R4Kq+PBIAiHGaikbQ796E=";
buildInputs = lib.optionals stdenv.isDarwin [
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
DiskArbitration
Foundation
IOKit
];
]);
meta = with lib; {
description = "Graph the number of crates that depend on your crate over time";

10
pkgs/development/web/bun/default.nix
View File

@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "0.2.2";
version = "0.3.0";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
sha256 = "IIy5ZEx/+StAhtRcGqM3uvvEqu4wGzGUls0K/ot4jRI=";
sha256 = "CPoSo8Kqu87c0bF4J2KSoamz6bsfS/DnkYqRi+XL8Qw=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
sha256 = "5cScLXujNm14+SCr8OcO93RDL3EfAjsuAzfcwj+EMKs=";
sha256 = "0ymZ4cYJn3Qth4jiTeXuAAsY0wFrYO2OHumY5WLamME=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
sha256 = "3PdLVz4qTJQHmM9laL413xnZaSuD6xlaSy8cuJ9M8us=";
sha256 = "8f5w+wu1vId0R7UQsdbi/yopw1R00lR9ibEAOYwUglI=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
sha256 = "eVEopSvyjzY8J3q52wowTlSVHZ4s1lIc8/yU6Ya+0QU=";
sha256 = "bnuz+n8pAhBUgQKImCUKRZCwIqGHHaB3KtZOVfqy4Zw=";
};
};
updateScript = writeShellScript "update-bun" ''

103
pkgs/games/spring/default.nix
View File

@ -1,63 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, xz
, boost
, libdevil
, zlib
, p7zip
, openal
, libvorbis
, glew
, freetype
, xorg
, SDL2
, libGLU
, libGL
, asciidoc
, boost
, cmake
, curl
, docbook_xsl
, docbook_xsl_ns
, curl
, makeWrapper
, fetchurl
, freetype
, glew
, jdk
, python
, systemd
, libdevil
, libGL
, libGLU
, libunwind
, which
, libvorbis
, makeWrapper
, minizip
, openal
, p7zip
, python3
, SDL2
, xorg
, xz
, zlib
, withAI ? true # support for AI Interfaces and Skirmish AIs
}:
stdenv.mkDerivation rec {
pname = "spring";
version = "105.0.1-${buildId}-g${shortRev}";
# usually the latest in https://github.com/spring/spring/commits/maintenance
rev = "8581792eac65e07cbed182ccb1e90424ce3bd8fc";
shortRev = builtins.substring 0 7 rev;
buildId = "1486";
version = "106.0";
# taken from https://github.com/spring/spring/commits/maintenance
src = fetchFromGitHub {
owner = "spring";
repo = pname;
inherit rev;
sha256 = "05lvd8grqmv7vl8rrx02rhl0qhmm58dyi6s78b64j3fkia4sfj1r";
fetchSubmodules = true;
src = fetchurl {
url = "https://springrts.com/dl/buildbot/default/master/${version}/source/spring_${version}_src.tar.gz";
sha256 = "sha256-mSA4ioIv68NMEB72lYnwDb1QOuWr1VHwu4+grAoHlV0=";
};
# The cmake included module correcly finds nix's glew, however
# it has to be the bundled FindGLEW for headless or dedicated builds
prePatch = ''
postPatch = ''
patchShebangs .
substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \
--replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\
--replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages"
substituteInPlace ./rts/Rendering/GL/myGL.cpp \
--replace "static constexpr const GLubyte* qcriProcName" "static const GLubyte* qcriProcName"
patchShebangs .
rm rts/build/cmake/FindGLEW.cmake
echo "${version} maintenance" > VERSION
# The cmake included module correcly finds nix's glew, however
# it has to be the bundled FindGLEW for headless or dedicated builds
rm rts/build/cmake/FindGLEW.cmake
'';
cmakeFlags = [
@ -68,34 +56,29 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ];
buildInputs = [
xz
boost
libdevil
zlib
p7zip
openal
libvorbis
curl
freetype
glew
libdevil
libGL
libGLU
libunwind
libvorbis
minizip
openal
p7zip
SDL2
xorg.libX11
xorg.libXcursor
libGLU
libGL
glew
curl
systemd
libunwind
which
minizip
xz
zlib
]
++ lib.optional withAI jdk
++ lib.optional withAI python;
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
++ lib.optionals withAI [ python3 jdk ];
postInstall = ''
wrapProgram "$out/bin/spring" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc systemd ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
'';
meta = with lib; {
@ -103,6 +86,6 @@ stdenv.mkDerivation rec {
description = "A powerful real-time strategy (RTS) game engine";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ qknight domenkozar sorki ];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = [ "x86_64-linux" ];
};
}

45
pkgs/os-specific/darwin/pam-reattach/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib, stdenv, fetchFromGitHub, cmake, openpam, darwin }:
let
sdk =
if stdenv.isAarch64
then null
else darwin.apple_sdk.sdk;
in
stdenv.mkDerivation rec {
pname = "pam_reattach";
version = "1.3";
src = fetchFromGitHub {
owner = "fabianishere";
repo = pname;
rev = "v${version}";
sha256 = "1k77kxqszdwgrb50w7algj22pb4fy5b9649cjb08zq9fqrzxcbz7";
};
cmakeFlags = [
"-DCMAKE_OSX_ARCHITECTURES=${
if stdenv.hostPlatform.system == "x86_64-darwin" then
"x86_64"
else
"arm64"
}"
"-DENABLE_CLI=ON"
]
++ lib.optional (sdk != null)
"-DCMAKE_LIBRARY_PATH=${sdk}/usr/lib";
buildInputs = [ openpam ]
++ lib.optional (sdk != null) sdk;
nativeBuildInputs = [ cmake ];
meta = with lib; {
homepage = "https://github.com/fabianishere/pam_reattach";
description = "Reattach to the user's GUI session on macOS during authentication (for Touch ID support in tmux)";
license = licenses.mit;
maintainers = with maintainers; [ lockejan ];
platforms = platforms.darwin;
};
}

4
pkgs/servers/jackett/default.nix
View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.2325";
version = "0.20.2352";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "LFdgvLFdVSkSaJKonbFz+Wi6+BWkIcybNLvW0C21FOU=";
sha256 = "vxe5B+R5zxKlvnxnXXw9tfgtXGNlEZF3z14NZ7pA3zE=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

Some files were not shown because too many files have changed in this diff Show More