gador/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]
2022-12-10 18:01:48 +00:00
committed by GitHub
parent 34342e25cf fe25c2a8d8
commit 54cd3a359f
110 changed files with 670 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -3704,6 +3704,12 @@
fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16";
}];
};
DPDmancul = {
name = "Davide Peressoni";
email = "davide.peressoni@tuta.io";
matrix = "@dpd-:matrix.org";
githubId = 3186857;
};
dpercy = {
email = "dpercy@dpercy.dev";
github = "dpercy";
nixos/modules/config/zram.nix
+5 -3
View File
@@ -132,6 +132,8 @@ in
options zram num_devices=${toString cfg.numDevices}
'';
boot.kernelParams = ["zram.num_devices=${toString cfg.numDevices}"];
services.udev.extraRules = ''
KERNEL=="zram[0-9]*", ENV{SYSTEMD_WANTS}="zram-init-%k.service", TAG+="systemd"
'';
@@ -178,9 +180,9 @@ in
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStartPre = "${modprobe} -r zram";
ExecStart = "${modprobe} zram";
ExecStop = "${modprobe} -r zram";
ExecStartPre = "-${modprobe} -r zram";
ExecStart = "-${modprobe} zram";
ExecStop = "-${modprobe} -r zram";
};
restartTriggers = [
cfg.numDevices
nixos/modules/programs/firejail.nix
+16 -8
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.
'';
};
};
nixos/modules/services/backup/borgbackup.nix
+1 -1
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}
'';
nixos/modules/services/databases/surrealdb.nix
+26 -1
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";
nixos/modules/services/web-apps/mastodon.nix
+3 -2
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/";
pkgs/applications/audio/alsa-scarlett-gui/default.nix
+33
View File
@@ -0,0 +1,33 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, alsa-lib
, gtk4
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "alsa-scarlett-gui";
version = "unstable-2022-08-11";
src = fetchFromGitHub {
owner = "geoffreybennett";
repo = pname;
rev = "65c0f6aa432501355803a823be1d3f8aafe907a8";
sha256 = "sha256-wzBOPTs8PTHzu5RpKwKhx552E7QnDx2Zn4OFaes8Q2I=";
};
makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ];
sourceRoot = "source/src";
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
buildInputs = [ gtk4 alsa-lib ];
meta = with lib; {
description = "GUI for alsa controls presented by Focusrite Scarlett Gen 2/3 Mixer Driver";
homepage = "https://github.com/geoffreybennett/alsa-scarlett-gui";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sebtm ];
platforms = platforms.linux;
};
}
pkgs/applications/audio/mopidy/mopidy.nix
+2 -2
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 ];
pkgs/applications/misc/bleachbit/default.nix
-2
View File
@@ -7,7 +7,6 @@
, glib
, gtk3
, libnotify
, scandir ? null
}:
python3Packages.buildPythonApplication rec {
@@ -37,7 +36,6 @@ python3Packages.buildPythonApplication rec {
chardet
pygobject3
requests
scandir
];
# Patch the many hardcoded uses of /usr/share/ and /usr/bin
pkgs/applications/misc/metadata-cleaner/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
version = "2.2.7";
version = "2.2.8";
format = "other";
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = pname;
rev = "v${version}";
hash = "sha256-Kqvnw0cPPkqgJQdc6vkP4U96AQuyFSNMQTzTdIUghWw=";
hash = "sha256-646jGcgcEbhHk3PWdkKHWLVX8bNIB3BmYVMoXaGxHUw=";
};
nativeBuildInputs = [
pkgs/applications/networking/browsers/luakit/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "luakit";
version = "2.3.1";
version = "2.3.3";
src = fetchFromGitHub {
owner = "luakit";
repo = pname;
rev = version;
hash = "sha256-6baN3e5ZJ8hw6mhQ0AapyVIYFSdmXcfo45ReQNliIPw=";
hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo=";
};
nativeBuildInputs = [
pkgs/applications/networking/cluster/terraform-providers/providers.json
+11 -11
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=",
pkgs/applications/networking/instant-messengers/discord/default.nix
+4 -4
View File
@@ -2,8 +2,8 @@
let
versions = if stdenv.isLinux then {
stable = "0.0.21";
ptb = "0.0.35";
canary = "0.0.144";
ptb = "0.0.38";
canary = "0.0.145";
} else {
stable = "0.0.264";
ptb = "0.0.59";
@@ -18,11 +18,11 @@ let
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
sha256 = "bnp5wfcR21s7LMPxFgj5G3UsxPWlFj4t6CbeosiufHY=";
sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s=";
};
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 = {
pkgs/applications/networking/nextcloud-client/default.nix
+3 -2
View File
@@ -26,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.6.2";
version = "3.6.4";
outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-eTcQrbYYY+V87i6PuIEWCFczIqL8oxtdojPY/mZpJBU=";
sha256 = "sha256-ZtDgm9xlBQflVXsxjt4bFmRby6ni0wjaGYaoiEWH9Q0=";
};
patches = [
@@ -82,6 +82,7 @@ mkDerivation rec {
];
cmakeFlags = [
"-DBUILD_UPDATER=off"
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
];
pkgs/applications/networking/p2p/transmission/default.nix
+2 -1
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
pkgs/applications/networking/pjsip/default.nix
+3 -13
View File
@@ -1,28 +1,18 @@
{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }:
{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }:
stdenv.mkDerivation rec {
pname = "pjsip";
version = "2.12.1";
version = "2.13";
src = fetchFromGitHub {
owner = pname;
repo = "pjproject";
rev = version;
sha256 = "sha256-HIDL4xzzTu3irzrIOf8qSNCAvHGOMpi8EDeqZb8mMnc=";
sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE=";
};
patches = [
./fix-aarch64.patch
(fetchpatch {
name = "CVE-2022-39269.patch";
url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch";
sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ=";
})
(fetchpatch {
name = "CVE-2022-39244.patch";
url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch";
sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4=";
})
];
buildInputs = [ openssl libsamplerate ]
pkgs/applications/networking/remote/rustdesk/default.nix
+5
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";
pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff
+31
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) => {
pkgs/applications/office/appflowy/default.nix
+22 -26
View File
@@ -1,35 +1,35 @@
{ stdenv,
lib,
fetchzip,
autoPatchelfHook,
makeWrapper,
copyDesktopItems,
makeDesktopItem,
gtk3,
openssl,
xdg-user-dirs,
keybinder3
{ stdenv
, lib
, fetchzip
, autoPatchelfHook
, makeWrapper
, copyDesktopItems
, makeDesktopItem
, gtk3
, openssl
, xdg-user-dirs
, keybinder3
}:
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.0.6.2";
version = "0.0.8";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
sha256 = "sha256-LOrXGFctAaiz2z9M8ghrXsQ+qygwNPyYragmL/EjlDQ=";
sha256 = "sha256-+nizRA42c0ZzuN8D/puh0TFLnRJVgyAujcTmJZ1UVzo=";
};
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
copyDesktopItems
autoPatchelfHook
makeWrapper
copyDesktopItems
];
buildInputs = [
gtk3
openssl
keybinder3
gtk3
openssl
keybinder3
];
dontBuild = true;
@@ -47,15 +47,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
preFixup = let
binPath = lib.makeBinPath [
xdg-user-dirs
];
in ''
preFixup = ''
# Add missing libraries to appflowy using the ones it comes with
makeWrapper $out/opt/app_flowy $out/bin/appflowy \
--set LD_LIBRARY_PATH "$out/opt/lib/" \
--prefix PATH : "${binPath}"
--set LD_LIBRARY_PATH "$out/opt/lib/" \
--prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}"
'';
desktopItems = [
pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+11 -6
View File
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "git-bug";
version = "0.7.2"; # the `rev` below pins the version of the source to get
rev = "cc4a93c8ce931b1390c61035b888ad17110b7bd6";
version = "0.8.0"; # the `rev` below pins the version of the source to get
rev = "v0.8.0";
src = fetchFromGitHub {
inherit rev;
owner = "MichaelMure";
repo = "git-bug";
sha256 = "0r6wh0y1fj3d3fbbrzq5n9k6z94xvwqww3xfbslkgyrin5bmziiq";
sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8";
};
vendorSha256 = "15hhsrwwjc4krfc2d0r15lys3vr9rb9xk62pan4jr9ycbv0dny90";
vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE=";
doCheck = false;
@@ -23,9 +23,14 @@ buildGoModule rec {
];
postInstall = ''
install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug"
install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug"
install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug"
install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug"
install -D -m 0644 -t "$out/share/man/man1" doc/man/*
# not sure why the following executables are in $out/bin/
rm -f $out/bin/cmd
rm -f $out/bin/completion
rm -f $out/bin/doc
'';
meta = with lib; {
pkgs/applications/version-management/monotone-viz/default.nix
+2 -2
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
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+3 -3
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";
pkgs/applications/version-management/sapling/default.nix
+22 -6
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
'';
pkgs/applications/video/streamlink/default.nix
+4 -2
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
];
pkgs/development/interpreters/luajit/default.nix
+2
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;
}
pkgs/development/interpreters/nickel/default.nix
+3 -3
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/";
pkgs/development/libraries/aws-c-mqtt/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
sha256 = "sha256-+Ah3D+cgGfunX46Fqv6NSNAOzVwrRdZz6oJKP+tHCmU=";
sha256 = "sha256-nmSNG5o2Ck80OG4ZGYIayVdnw3Z2fn1VkUIuI9RYfL8=";
};
nativeBuildInputs = [
pkgs/development/libraries/libmodbus/default.nix
+2 -2
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 ];
pkgs/development/libraries/ois/default.nix
+8 -3
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";
pkgs/development/libraries/physics/clhep/default.nix
+2 -2
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 = ''
pkgs/development/libraries/science/math/liblapack/default.nix
+5 -1
View File
@@ -30,7 +30,11 @@ stdenv.mkDerivation rec {
"-DCBLAS=ON"
"-DBUILD_TESTING=ON"
] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"
++ lib.optional blas64 "-DBUILD_INDEX64=ON";
++ lib.optional blas64 "-DBUILD_INDEX64=ON"
# Tries to run host platform binaries during the build
# Will likely be disabled by default in 3.12, see:
# https://github.com/Reference-LAPACK/lapack/issues/757
++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) "-DTEST_FORTRAN_COMPILER=OFF";
passthru = { inherit blas64; };
pkgs/development/misc/brev-cli/default.nix
+2 -2
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=";
pkgs/development/misc/resholve/default.nix
+1
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
pkgs/development/misc/resholve/deps.nix
Generated
+63 -2
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;
};
};
}
pkgs/development/misc/resholve/oildev.nix
+3 -1
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;
pkgs/development/misc/resholve/resholve.nix
+2 -1
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 = ''
pkgs/development/ocaml-modules/carton/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildDunePackage rec {
pname = "carton";
version = "0.4.4";
version = "0.6.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz";
sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw=";
sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U=";
};
# remove changelogs for mimic and the git* packages
pkgs/development/ocaml-modules/carton/git.nix
+2 -4
View File
@@ -1,6 +1,6 @@
{ buildDunePackage, carton, carton-lwt
, bigarray-compat, bigstringaf, lwt, fpath, result
, mmap, fmt, decompress, astring
, bigstringaf, lwt, fpath, result
, fmt, decompress, astring
, alcotest, alcotest-lwt, cstruct, logs
, mirage-flow, rresult, ke
}:
@@ -13,12 +13,10 @@ buildDunePackage {
propagatedBuildInputs = [
carton
carton-lwt
bigarray-compat
bigstringaf
lwt
fpath
result
mmap
fmt
decompress
astring
pkgs/development/ocaml-modules/carton/lwt.nix
+2 -4
View File
@@ -1,8 +1,8 @@
{ buildDunePackage, carton
, lwt, decompress, optint, bigstringaf
, alcotest, alcotest-lwt, cstruct, fmt, logs
, mirage-flow, result, rresult, bigarray-compat
, ke, base64, bos, checkseum, digestif, fpath, mmap
, mirage-flow, result, rresult
, ke, base64, bos, checkseum, digestif, fpath
, stdlib-shims
, git-binary # pkgs.git
}:
@@ -31,14 +31,12 @@ buildDunePackage {
mirage-flow
result
rresult
bigarray-compat
ke
base64
bos
checkseum
digestif
fpath
mmap
stdlib-shims
];
pkgs/development/ocaml-modules/git/paf.nix
-2
View File
@@ -13,7 +13,6 @@
, rresult
, tls
, uri
, bigarray-compat
, bigstringaf
, domain-name
, httpaf
@@ -43,7 +42,6 @@ buildDunePackage {
mirage-time
tls
uri
bigarray-compat
bigstringaf
domain-name
httpaf
pkgs/development/ocaml-modules/otfm/default.nix
+6 -7
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;
pkgs/development/python-modules/acquire/default.nix
+2 -2
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;
pkgs/development/python-modules/aionanoleaf/default.nix
+4 -3
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 ];
};
pkgs/development/python-modules/aioshelly/default.nix
+2 -2
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 = [
pkgs/development/python-modules/authlib/default.nix
+3 -2
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 ];
};
pkgs/development/python-modules/calver/default.nix
+24
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 = [ ];
};
}
pkgs/development/python-modules/dbus-fast/default.nix
+2 -2
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 = [
pkgs/development/python-modules/django-hijack/default.nix
+2 -2
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 ];
pkgs/development/python-modules/django_classytags/default.nix
+15 -5
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; [ ];
};
}
pkgs/development/python-modules/docutils/default.nix
+5 -2
View File
@@ -2,13 +2,16 @@
, lib
, fetchPypi
, buildPythonPackage
, isPy3k
, python
, pythonOlder
}:
buildPythonPackage rec {
pname = "docutils";
version = "0.19";
disabled = pythonOlder "3.7";
format = "setuptools";
src = fetchPypi {
@@ -18,7 +21,7 @@ buildPythonPackage rec {
# Only Darwin needs LANG, but we could set it in general.
# It's done here conditionally to prevent mass-rebuilds.
checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + ''
checkPhase = lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + ''
${python.interpreter} test/alltests.py
'';
pkgs/development/python-modules/fs/default.nix
-2
View File
@@ -5,7 +5,6 @@
, setuptools
, six
, appdirs
, scandir ? null
, backports_os ? null
, typing ? null
, pytz
@@ -36,7 +35,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six appdirs pytz setuptools ]
++ lib.optionals (!isPy3k) [ backports_os ]
++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]
++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
LC_ALL="en_US.utf-8";
pkgs/development/python-modules/nettigo-air-monitor/default.nix
+2 -1
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 ];
};
pkgs/development/python-modules/parameterizedtestcase/default.nix
-32
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
};
}
pkgs/development/python-modules/pathlib2/default.nix
+1 -2
View File
@@ -3,7 +3,6 @@
, fetchPypi
, six
, pythonOlder
, scandir ? null
, glibcLocales
, mock
, typing
@@ -19,7 +18,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ six ]
++ lib.optionals (pythonOlder "3.5") [ scandir typing ];
++ lib.optionals (pythonOlder "3.5") [ typing ];
checkInputs = [ glibcLocales ]
++ lib.optional (pythonOlder "3.3") mock;
pkgs/development/python-modules/pygobject/default.nix
-47
View File
@@ -1,47 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:
buildPythonPackage rec {
pname = "pygobject";
version = "2.28.7";
format = "other";
disabled = pythonAtLeast "3.9";
src = fetchurl {
url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv";
};
outputs = [ "out" "devdoc" ];
patches = lib.optionals stdenv.isDarwin [
./pygobject-2.0-fix-darwin.patch
(fetchpatch {
url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch";
sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg=";
extraPrefix = "";
})
];
configureFlags = [ "--disable-introspection" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib ];
# in a "normal" setup, pygobject and pygtk are installed into the
# same site-packages: we need a pth file for both. pygtk.py would be
# used to select a specific version, in our setup it should have no
# effect, but we leave it in case somebody expects and calls it.
postInstall = lib.optionalString (!isPy3k) ''
mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}
# Prevent wrapping of codegen files as these are meant to be
# executed by the python program
chmod a-x $out/share/pygobject/*/codegen/*.py
'';
meta = with lib; {
homepage = "https://pygobject.readthedocs.io/";
description = "Python bindings for GLib";
platforms = platforms.unix;
};
}
pkgs/development/python-modules/pyswitchbot/default.nix
+2 -2
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 = [
pkgs/development/python-modules/python-fsutil/default.nix
+3 -2
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 ];
};
pkgs/development/python-modules/teslajsonpy/default.nix
+2 -2
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 = [
pkgs/development/python-modules/types-setuptools/default.nix
+2 -2
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
pkgs/development/python2-modules/Pygments/default.nix
-37
View File
@@ -1,37 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, docutils
}:
buildPythonPackage rec {
pname = "Pygments";
version = "2.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe";
};
patches = [
(fetchpatch {
name = "CVE-2021-27291.patch";
url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch";
sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa";
excludes = ["CHANGES"];
})
];
propagatedBuildInputs = [ docutils ];
# Circular dependency with sphinx
doCheck = false;
meta = {
homepage = "https://pygments.org/";
description = "A generic syntax highlighter";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ ];
};
}
pkgs/development/python2-modules/boto3/default.nix
-50
View File
@@ -1,50 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, botocore
, jmespath
, s3transfer
, futures ? null
, docutils
, nose
, mock
, isPy3k
}:
buildPythonPackage rec {
pname = "boto3";
version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
checkInputs = [ docutils nose mock ];
checkPhase = ''
runHook preCheck
# This method is not in mock. It might have appeared in some versions.
sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \
tests/unit/resources/test_factory.py
nosetests -d tests/unit --verbose
runHook postCheck
'';
# Network access
doCheck = false;
pythonImportsCheck = [ "boto3" ];
meta = {
homepage = "https://github.com/boto/boto3";
license = lib.licenses.asl20;
description = "AWS SDK for Python";
longDescription = ''
Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
Python, which allows Python developers to write software that makes use of
services like Amazon S3 and Amazon EC2.
'';
};
}
pkgs/development/python2-modules/botocore/default.nix
-46
View File
@@ -1,46 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, python-dateutil
, jmespath
, docutils
, simplejson
, mock
, nose
, urllib3
}:
buildPythonPackage rec {
pname = "botocore";
version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab";
};
propagatedBuildInputs = [
python-dateutil
jmespath
docutils
simplejson
urllib3
];
checkInputs = [ mock nose ];
checkPhase = ''
nosetests -v
'';
# Network access
doCheck = false;
pythonImportsCheck = [ "botocore" ];
meta = with lib; {
homepage = "https://github.com/boto/botocore";
license = licenses.asl20;
description = "A low-level interface to a growing number of Amazon Web Services";
};
}
pkgs/development/python2-modules/certifi/default.nix
-34
View File
@@ -1,34 +0,0 @@
{ lib
, fetchPypi
, buildPythonPackage
, python3
}:
let
inherit (python3.pkgs) certifi;
in buildPythonPackage rec {
pname = "certifi";
version = "2019.11.28";
src = fetchPypi {
inherit pname version;
sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f";
};
postPatch = ''
cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem
'';
pythonImportsCheck = [ "certifi" ];
# no tests implemented
doCheck = false;
meta = with lib; {
homepage = "https://github.com/certifi/python-certifi";
description = "Python package for providing Mozilla's CA Bundle";
license = licenses.isc;
maintainers = with maintainers; [ ]; # NixOps team
};
}
pkgs/development/python2-modules/chardet/default.nix
-29
View File
@@ -1,29 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch
, pytest, pytest-runner, hypothesis }:
buildPythonPackage rec {
pname = "chardet";
version = "3.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
};
patches = [
# Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174
(fetchpatch {
url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch";
sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q";
})
];
checkInputs = [ pytest pytest-runner hypothesis ];
meta = with lib; {
homepage = "https://github.com/chardet/chardet";
description = "Universal encoding detector";
license = licenses.lgpl2;
maintainers = with maintainers; [ domenkozar ];
};
}
pkgs/development/python2-modules/google-apputils/default.nix
-41
View File
@@ -1,41 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, pytz
, gflags
, python-dateutil
, mox
, python
}:
buildPythonPackage rec {
pname = "google-apputils";
version = "0.4.2";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7";
};
preConfigure = ''
sed -i '/ez_setup/d' setup.py
'';
propagatedBuildInputs = [ pytz gflags python-dateutil mox ];
checkPhase = ''
${python.executable} setup.py google_test
'';
# ERROR:root:Trying to access flag test_tmpdir before flags were parsed.
doCheck = false;
meta = with lib; {
description = "Google Application Utilities for Python";
homepage = "https://github.com/google/google-apputils";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
pkgs/development/python2-modules/gtkme/default.nix
-36
View File
@@ -1,36 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, pkg-config
, gobject-introspection
, pygobject3
, gtk3
, glib
}:
buildPythonPackage rec {
pname = "gtkme";
version = "1.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NIUgnbfcHjbPfsH3CF2Bywo8owrdsi1wqDoMxOa+2U4=";
};
nativeBuildInputs = [ pkg-config gobject-introspection gtk3 ];
buildInputs = [ pygobject3 glib ];
propagatedBuildInputs = [ gtk3 ];
pythonImportsCheck = [
"gtkme"
];
meta = with lib; {
description = "Manages an Application with Gtk windows, forms, lists and other complex items easily";
homepage = "https://gitlab.com/doctormo/gtkme";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
revol-xut
];
};
}
pkgs/development/python2-modules/idna/default.nix
-23
View File
@@ -1,23 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "idna";
version = "2.10";
src = fetchPypi {
inherit pname version;
sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6";
};
checkInputs = [ pytestCheckHook ];
meta = {
homepage = "https://github.com/kjd/idna/";
description = "Internationalized Domain Names in Applications (IDNA)";
license = lib.licenses.bsd3;
};
}
pkgs/development/python2-modules/marisa/default.nix
-29
View File
@@ -1,29 +0,0 @@
{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig
, isPy3k
}:
buildPythonPackage rec {
pname = "marisa";
version = "1.3.40";
disabled = isPy3k;
src = fetchFromGitHub {
owner = "s-yata";
repo = "marisa-trie";
rev = "8dba9850b89d7828ebf33b8ab84df2b54d31260b";
sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933";
};
nativeBuildInputs = [ swig marisa ];
buildInputs = [ marisa ];
sourceRoot = "${src.name}/bindings/python";
meta = with lib; {
description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)";
homepage = "https://github.com/s-yata/marisa-trie";
license = with licenses; [ bsd2 lgpl2 ];
maintainers = with maintainers; [ vanzef ];
};
}
pkgs/development/python2-modules/protobuf/default.nix
-59
View File
@@ -1,59 +0,0 @@
{ buildPackages
, lib
, fetchpatch
, python
, buildPythonPackage
, isPy37
, protobuf
, google-apputils ? null
, six
, pyext
, isPy27
, disabled
, doCheck ? true
}:
buildPythonPackage {
inherit (protobuf) pname src version;
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];
propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.
nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ];
buildInputs = [ protobuf ];
patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2"))
# Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)
(fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
stripLen = 1;
})
;
prePatch = ''
while [ ! -d python ]; do
cd *
done
cd python
'';
setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0")
"--cpp_implementation";
pythonImportsCheck = [
"google.protobuf"
] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [
"google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked
];
meta = with lib; {
description = "Protocol Buffers are Google's data interchange format";
homepage = "https://developers.google.com/protocol-buffers/";
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp ];
};
passthru.protobuf = protobuf;
}
pkgs/development/python2-modules/pygobject/default.nix
+31 -16
View File
@@ -1,33 +1,48 @@
{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }:
{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:
buildPythonPackage rec {
pname = "pygobject";
version = "3.36.1";
version = "2.28.7";
format = "other";
disabled = pythonAtLeast "3.9";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv";
};
outputs = [ "out" "dev" ];
outputs = [ "out" "devdoc" ];
mesonFlags = [
"-Dpython=python${if isPy3k then "3" else "2" }"
patches = lib.optionals stdenv.isDarwin [
./pygobject-2.0-fix-darwin.patch
(fetchpatch {
url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch";
sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg=";
extraPrefix = "";
})
];
nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
buildInputs = [ glib gobject-introspection ]
++ lib.optionals stdenv.isDarwin [ which ncurses ];
propagatedBuildInputs = [ pycairo cairo ];
configureFlags = [ "--disable-introspection" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib ];
# in a "normal" setup, pygobject and pygtk are installed into the
# same site-packages: we need a pth file for both. pygtk.py would be
# used to select a specific version, in our setup it should have no
# effect, but we leave it in case somebody expects and calls it.
postInstall = lib.optionalString (!isPy3k) ''
mv $out/${python.sitePackages}/{pygtk.pth,${pname}-${version}.pth}
# Prevent wrapping of codegen files as these are meant to be
# executed by the python program
chmod a-x $out/share/pygobject/*/codegen/*.py
'';
meta = with lib; {
homepage = "https://pygobject.readthedocs.io/";
description = "Python bindings for Glib";
description = "Python bindings for GLib";
license = licenses.gpl2;
maintainers = with maintainers; [ orivej ];
platforms = platforms.unix;
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch → pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch
View File
pkgs/development/python2-modules/pyroma/default.nix
-26
View File
@@ -1,26 +0,0 @@
{ lib, buildPythonPackage, fetchPypi
, docutils, pygments, setuptools
}:
buildPythonPackage rec {
pname = "pyroma";
version = "2.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pygments < 2.6" "pygments"
'';
propagatedBuildInputs = [ docutils pygments setuptools ];
meta = with lib; {
description = "Test your project's packaging friendliness";
homepage = "https://github.com/regebro/pyroma";
license = licenses.mit;
};
}
pkgs/development/python2-modules/pysqlite/default.nix
-57
View File
@@ -1,57 +0,0 @@
{ lib, stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, pkgs
}:
buildPythonPackage rec {
pname = "pysqlite";
version = "2.8.3";
src = fetchPypi {
inherit pname version;
sha256 = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490";
};
# Need to use the builtin sqlite3 on Python 3
disabled = isPy3k;
# Since the `.egg' file is zipped, the `NEEDED' of the `.so' files
# it contains is not taken into account. Thus, we must explicitly make
# it a propagated input.
propagatedBuildInputs = [ pkgs.sqlite ];
patchPhase = ''
substituteInPlace "setup.cfg" \
--replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \
--replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"
${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}
'';
meta = with lib; {
homepage = "https://pysqlite.org/";
description = "Python bindings for the SQLite embedded relational database engine";
longDescription = ''
pysqlite is a DB-API 2.0-compliant database interface for SQLite.
SQLite is a relational database management system contained in
a relatively small C library. It is a public domain project
created by D. Richard Hipp. Unlike the usual client-server
paradigm, the SQLite engine is not a standalone process with
which the program communicates, but is linked in and thus
becomes an integral part of the program. The library
implements most of SQL-92 standard, including transactions,
triggers and most of complex queries.
pysqlite makes this powerful embedded SQL engine available to
Python programmers. It stays compatible with the Python
database API specification 2.0 as much as possible, but also
exposes most of SQLite's native API, so that it is for example
possible to create user-defined SQL functions and aggregates
in Python.
'';
license = licenses.bsd3;
};
}
pkgs/development/python2-modules/pytest-runner/default.nix
-30
View File
@@ -1,30 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:
buildPythonPackage rec {
pname = "pytest-runner";
version = "5.2";
src = fetchPypi {
inherit pname version;
sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b";
};
nativeBuildInputs = [ setuptools-scm pytest ];
postPatch = ''
rm pytest.ini
'';
checkPhase = ''
py.test tests
'';
# Fixture not found
doCheck = false;
meta = with lib; {
description = "Invoke py.test as distutils command with dependency resolution";
homepage = "https://github.com/pytest-dev/pytest-runner";
license = licenses.mit;
};
}
pkgs/development/python2-modules/s3transfer/default.nix
-50
View File
@@ -1,50 +0,0 @@
{ lib
, fetchPypi
, pythonOlder
, buildPythonPackage
, docutils
, mock
, nose
, coverage
, wheel
, botocore
, futures ? null
}:
buildPythonPackage rec {
pname = "s3transfer";
version = "0.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";
};
propagatedBuildInputs =
[
botocore
] ++ lib.optional (pythonOlder "3") futures;
buildInputs = [
docutils
mock
nose
coverage
wheel
];
checkPhase = ''
pushd s3transfer/tests
nosetests -v unit/ functional/
popd
'';
# version on pypi has no tests/ dir
doCheck = false;
meta = with lib; {
homepage = "https://github.com/boto/s3transfer";
license = licenses.asl20;
description = "A library for managing Amazon S3 transfers";
};
}
pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch
-28
View File
@@ -1,28 +0,0 @@
diff --git a/scandir.py b/scandir.py
index 3f602fb..40af3e5 100644
--- a/scandir.py
+++ b/scandir.py
@@ -23,6 +23,7 @@ from os import listdir, lstat, stat, strerror
from os.path import join, islink
from stat import S_IFDIR, S_IFLNK, S_IFREG
import collections
+import platform
import sys
try:
@@ -432,6 +433,15 @@ elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.plat
('__d_padding', ctypes.c_uint8 * 4),
('d_name', ctypes.c_char * 256),
)
+ elif 'darwin' in sys.platform and 'arm64' in platform.machine():
+ _fields_ = (
+ ('d_ino', ctypes.c_uint64),
+ ('d_off', ctypes.c_uint64),
+ ('d_reclen', ctypes.c_uint16),
+ ('d_namlen', ctypes.c_uint16),
+ ('d_type', ctypes.c_uint8),
+ ('d_name', ctypes.c_char * 1024),
+ )
else:
_fields_ = (
('d_ino', ctypes.c_uint32), # must be uint32, not ulong
pkgs/development/python2-modules/scandir/default.nix
-24
View File
@@ -1,24 +0,0 @@
{ lib, python, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "scandir";
version = "1.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
};
patches = [
./add-aarch64-darwin-dirent.patch
];
checkPhase = "${python.interpreter} test/run_tests.py";
meta = with lib; {
description = "A better directory iterator and faster os.walk()";
homepage = "https://github.com/benhoyt/scandir";
license = licenses.gpl3;
maintainers = with maintainers; [ abbradar ];
};
}
pkgs/development/python2-modules/sphinx/default.nix
-82
View File
@@ -1,82 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, simplejson
, mock
, glibcLocales
, html5lib
, pythonOlder
, enum34
, python
, docutils
, jinja2
, pygments
, alabaster
, babel
, snowballstemmer
, six
, sqlalchemy
, whoosh
, imagesize
, requests
, typing
, sphinxcontrib-websupport
, setuptools
}:
buildPythonPackage rec {
pname = "sphinx";
version = "1.8.5";
src = fetchPypi {
pname = "Sphinx";
inherit version;
sha256 = "c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08";
};
LC_ALL = "en_US.UTF-8";
checkInputs = [ pytest ];
buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
# Disable two tests that require network access.
checkPhase = ''
cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
'';
propagatedBuildInputs = [
docutils
jinja2
pygments
alabaster
babel
setuptools
snowballstemmer
six
sphinxcontrib-websupport
sqlalchemy
whoosh
imagesize
requests
] ++ lib.optional (pythonOlder "3.5") typing;
# Lots of tests. Needs network as well at some point.
doCheck = false;
patches = [
# Since pygments 2.5, PythonLexer refers to python3. If we want to use
# python2, we need to explicitly specify Python2Lexer.
# Not upstreamed since there doesn't seem to be any upstream maintenance
# branch for 1.8 (and this patch doesn't make any sense for 2.x).
./python2-lexer.patch
];
# https://github.com/NixOS/nixpkgs/issues/22501
# Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
postPatch = ''
substituteInPlace sphinx/make_mode.py --replace "sys.executable, " ""
'';
meta = {
description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
homepage = "http://sphinx.pocoo.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ ];
};
}
pkgs/development/python2-modules/sphinx/python2-lexer.patch
-22
View File
@@ -1,22 +0,0 @@
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index ac2bd1b06..63ca52de2 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken
from pygments.formatters import HtmlFormatter, LatexFormatter
from pygments.lexer import Lexer # NOQA
from pygments.lexers import get_lexer_by_name, guess_lexer
-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \
CLexer, TextLexer, RstLexer
from pygments.styles import get_style_by_name
from pygments.util import ClassNotFound
@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)
lexers = dict(
none = TextLexer(stripnl=False),
- python = PythonLexer(stripnl=False),
+ python = Python2Lexer(stripnl=False),
python3 = Python3Lexer(stripnl=False),
pycon = PythonConsoleLexer(stripnl=False),
pycon3 = PythonConsoleLexer(python3=True, stripnl=False),
pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix
-25
View File
@@ -1,25 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
}:
buildPythonPackage rec {
pname = "sphinxcontrib-websupport";
version = "1.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc";
};
propagatedBuildInputs = [ six ];
doCheck = false;
meta = {
description = "Sphinx API for Web Apps";
homepage = "http://sphinx-doc.org/";
license = lib.licenses.bsd2;
};
}
pkgs/development/python2-modules/typing/default.nix
-32
View File
@@ -1,32 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, unittestCheckHook
, pythonAtLeast }:
let
testDir = if isPy3k then "src" else "python2";
in buildPythonPackage rec {
pname = "typing";
version = "3.10.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";
};
disabled = pythonAtLeast "3.5";
# Error for Python3.6: ImportError: cannot import name 'ann_module'
# See https://github.com/python/typing/pull/280
# Also, don't bother on PyPy: AssertionError: TypeError not raised
doCheck = pythonOlder "3.6" && !isPyPy;
checkInputs = [ unittestCheckHook ];
unittestFlagsArray = [ "-s" testDir ];
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;
};
}
pkgs/development/tools/build-managers/bmake/default.nix
+5 -5
View File
@@ -3,18 +3,18 @@
, fetchurl
, fetchpatch
, getopt
, tzdata
, ksh
, tzdata
, pkgsMusl # for passthru.tests
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bmake";
version = "20220726";
version = "20220928";
src = fetchurl {
url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA=";
hash = "sha256-yAS3feP+uOMd7ipMn7Hp7CTFo0dk56KBXIi07QFlDpA=";
};
# Make tests work with musl
@@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
(fetchpatch {
name = "separate-tests.patch";
url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch";
sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a";
hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM=";
})
# add a shebang to bmake's install(1) replacement
(fetchpatch {
name = "install-sh.patch";
url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch";
sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6";
hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0=";
})
];
pkgs/development/tools/memray/default.nix
+2 -2
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 = [
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix
+3
View File
@@ -52,5 +52,8 @@ poetry2nix.mkPoetryApplication {
meta = with lib; {
inherit (python.meta) platforms;
maintainers = with maintainers; [ adisbladis jakewaksbaum ];
knownVulnerabilities = [
"CVE-2022-42966" # cleo version in poetry.lock is vulnerable
];
};
}
pkgs/development/tools/rust/cargo-tally/default.nix
+6 -6
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";
pkgs/development/web/bun/default.nix
+5 -5
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" ''
pkgs/games/spring/default.nix
+43 -60
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" ];
};
}
pkgs/os-specific/darwin/pam-reattach/default.nix
+45
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;
};
}
pkgs/servers/jackett/default.nix
+2 -2
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";
pkgs/servers/jackett/deps.nix
Generated
+1
View File
@@ -181,6 +181,7 @@
(fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "matrix-appservice-slack",
"version": "2.0.1",
"version": "2.0.2",
"description": "A Matrix <--> Slack bridge",
"engines": {
"node": ">=16 <=18"
@@ -38,7 +38,7 @@
"Slackdown": "git+https://Half-Shot@github.com/half-shot/slackdown.git",
"axios": "^0.27.2",
"escape-string-regexp": "^4.0.0",
"matrix-appservice-bridge": "^5.1.0",
"matrix-appservice-bridge": "^6.0.0",
"minimist": "^1.2.6",
"nedb": "^1.8.0",
"node-emoji": "^1.10.0",
pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
+3 -3
View File
@@ -1,5 +1,5 @@
{
"version": "2.0.1",
"srcHash": "N7EzhqKL3GiuoU2d/Y33eZhKJSCvtLDRVO40mpIBEkw=",
"yarnHash": "1d9kyrzcs1c54xk0yl8n3jp61l3n8dzph1d5a4daifa7ad635hv7"
"version": "2.0.2",
"srcHash": "Z8PQuAOQbQMxmso/KV9n8fu2FqzqLsADqLczmm584QQ=",
"yarnHash": "1ngmgr9li7jagvzfl0jq4bxqw0q1sdqh8k9wlar6q292263g287z"
}
pkgs/servers/search/manticoresearch/default.nix
+4
View File
@@ -58,12 +58,16 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DWITH_GALERA=0"
"-DWITH_MYSQL=1"
"-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb"
"-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a"
];
meta = with lib; {
description = "Easy to use open source fast database for search";
homepage = "https://manticoresearch.com";
license = licenses.gpl2;
mainProgram = "searchd";
maintainers = with maintainers; [ jdelStrother ];
platforms = platforms.all;
};
pkgs/servers/search/meilisearch/default.nix
+14 -4
View File
@@ -8,21 +8,30 @@
, nixosTests
}:
let version = "0.30.0";
let version = "0.30.2";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
inherit version;
src = fetchFromGitHub {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "v${version}";
sha256 = "sha256-nw2aSEdd21iiFrV2EPOyCfSru84eNM59wsL+ipcSoDw=";
hash = "sha256-kxANzEORvR+BJDfLUD1FLorBuYjnUQixgD2jDoX6jrg=";
};
cargoSha256 = "sha256-0JdI5I63ImdUUBQuC4LYqHpEA1xJ5QJ+3n3MTaIHKDI=";
cargoHash = "sha256-IYNIr7PBNNloPizaauFYR9/NPnBMS8kQi+RNsKsNjLE=";
# Default features include mini dashboard which downloads something from the internet.
buildNoDefaultFeatures = true;
buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];
buildInputs = lib.optionals stdenv.isDarwin [
Security
DiskArbitration
Foundation
];
passthru.tests = {
meilisearch = nixosTests.meilisearch;
};
@@ -33,6 +42,7 @@ rustPlatform.buildRustPackage {
meta = with lib; {
description = "Powerful, fast, and an easy to use search engine ";
homepage = "https://docs.meilisearch.com/";
changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ];
pkgs/servers/web-apps/freshrss/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "FreshRSS";
version = "1.20.1";
version = "1.20.2";
src = fetchFromGitHub {
owner = "FreshRSS";
repo = "FreshRSS";
rev = version;
hash = "sha256-hpxBPYNFw5Wz07SdYT9GLX8XicAtKi82HjlLCccQMtk=";
hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE=";
};
passthru.tests = nixosTests.freshrss;
pkgs/tools/admin/credhub-cli/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "credhub-cli";
version = "2.9.8";
version = "2.9.9";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
repo = "credhub-cli";
rev = version;
sha256 = "sha256-lhnH4+/fwZKEDN1465T8+elinTkhjYbOX2aj5eRnwZk=";
sha256 = "sha256-hqmPv+/TNGzI9yMB7AnK7UOw6MI0jeII8A5KSIlulyk=";
};
# these tests require network access that we're not going to give them
pkgs/tools/audio/abcmidi/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2022.09.01";
version = "2022.12.05";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
hash = "sha256-to9hbhW7t5On4PrQEm2CDrpexaMB4frbVQOdS4DGseg=";
hash = "sha256-DLPew6pz+ABgdxSdHSX62VieRnTvbaj2sY3ujti1aj0=";
};
meta = with lib; {
pkgs/tools/graphics/adriconf/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "adriconf";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nxqrs8c1sRruZLwFwK/JfXQPfpEq08Pe2n7ojQkH3SM=";
sha256 = "sha256-RhHmrjb5TvJnZ6R0aefqdmwMBpu4iTrxSHru7JAwrgs=";
};
nativeBuildInputs = [ cmake pkg-config ];
pkgs/tools/misc/fd/default.nix
+4 -7
View File
@@ -2,19 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fd";
version = "8.5.3";
version = "8.6.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
# On the next release, go back to `rev = "v${version}";`
# The 8.5.3 release appears to have been mysteriously re-tagged:
# https://github.com/sharkdp/fd/issues/1184
rev = "f6e74407e80a5563a9e4d0530371aed281e05838";
sha256 = "sha256-7QQHLw+isXtr1FDQr4aiUhvOjJUPbaxFGDwukiWBG9g=";
rev = "v${version}";
sha256 = "sha256-RVGCSUYyWo2wKRIrnci+aWEAPW9jHhMfYkYJkCgd7f8=";
};
cargoSha256 = "sha256-QFh47Pr+7lIdT++huziKgMJxvsZElTTwu11c7/wjyHE=";
cargoSha256 = "sha256-PT95U1l+BVX7sby3GKktZMmbNNQoPYR8nL+H90EnqZY=";
auditable = true; # TODO: remove when this is the default
pkgs/tools/misc/procyon/default.nix
+3 -3
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "procyon";
version = "0.6-prerelease";
version = "0.6.0";
src = fetchurl {
url = "https://github.com/mstrobel/procyon/releases/download/${version}/procyon-decompiler-${version}.jar";
sha256 = "sha256-eBVWKCo8ccAT/T9HgjxUCNFzGyzofc9Mbyp0ldUmrdk=";
url = "https://github.com/mstrobel/procyon/releases/download/v${version}/procyon-decompiler-${version}.jar";
sha256 = "sha256-gh2pYBL8aSRPoeopjJBFXuTgIUNLx5bTuVRqskYBt3k=";
};
dontUnpack = true;

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