nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 03:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-02 00:14:56 +00:00 committed by GitHub
commit 70fcdaa82a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
138 changed files with 1977 additions and 1213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -97,6 +97,12 @@
github = "1000teslas";
githubId = 47207223;
};
_2gn = {
name = "Hiram Tanner";
email = "101851090+2gn@users.noreply.github.com";
github = "2gn";
githubId = 101851090;
};
_3699n = {
email = "nicholas@nvk.pm";
github = "3699n";
@ -2031,6 +2037,12 @@
githubId = 1945;
name = "Casey Rodarmor";
};
catap = {
email = "kirill@korins.ky";
github = "catap";
githubId = 37775;
name = "Kirill A. Korinsky";
};
catern = {
email = "sbaugh@catern.com";
github = "catern";

2
nixos/lib/make-multi-disk-zfs-image.nix
View File

@ -128,7 +128,7 @@ let
gptfdisk
nix
parted
utillinux
util-linux
zfs
]
);

2
nixos/lib/make-single-disk-zfs-image.nix
View File

@ -116,7 +116,7 @@ let
gptfdisk
nix
parted
utillinux
util-linux
zfs
]
);

1
nixos/modules/module-list.nix
View File

@ -827,6 +827,7 @@
./services/networking/libreswan.nix
./services/networking/lldpd.nix
./services/networking/logmein-hamachi.nix
./services/networking/lokinet.nix
./services/networking/lxd-image-server.nix
./services/networking/magic-wormhole-mailbox-server.nix
./services/networking/matterbridge.nix

3
nixos/modules/services/development/jupyter/default.nix
View File

@ -143,6 +143,9 @@ in {
language = "python";
logo32 = "''${env.sitePackages}/ipykernel/resources/logo-32x32.png";
logo64 = "''${env.sitePackages}/ipykernel/resources/logo-64x64.png";
extraPaths = {
"cool.txt" = pkgs.writeText "cool" "cool content";
};
};
}
'';

9
nixos/modules/services/development/jupyter/kernel-options.nix
View File

@ -56,5 +56,14 @@ with lib;
Path to 64x64 logo png.
'';
};
extraPaths = mkOption {
type = types.attrsOf types.path;
default = { };
example = literalExpression ''"{ examples = ''${env.sitePack}/IRkernel/kernelspec/kernel.js"; }'';
description = ''
Extra paths to link in kernel directory
'';
};
};
}

4
nixos/modules/services/misc/dictd.nix
View File

@ -45,6 +45,10 @@ in
# get the command line client on system path to make some use of the service
environment.systemPackages = [ pkgs.dict ];
environment.etc."dict.conf".text = ''
server localhost
'';
users.users.dictd =
{ group = "dictd";
description = "DICT.org dictd server";

157
nixos/modules/services/networking/lokinet.nix Normal file
View File

@ -0,0 +1,157 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.lokinet;
dataDir = "/var/lib/lokinet";
settingsFormat = pkgs.formats.ini { listsAsDuplicateKeys = true; };
configFile = settingsFormat.generate "lokinet.ini" (lib.filterAttrsRecursive (n: v: v != null) cfg.settings);
in with lib; {
options.services.lokinet = {
enable = mkEnableOption "Lokinet daemon";
package = mkOption {
type = types.package;
default = pkgs.lokinet;
defaultText = literalExpression "pkgs.lokinet";
description = "Lokinet package to use.";
};
useLocally = mkOption {
type = types.bool;
default = false;
example = true;
description = "Whether to use Lokinet locally.";
};
settings = mkOption {
type = with types;
submodule {
freeformType = settingsFormat.type;
options = {
dns = {
bind = mkOption {
type = str;
default = "127.3.2.1";
description = "Address to bind to for handling DNS requests.";
};
upstream = mkOption {
type = listOf str;
default = [ "9.9.9.10" ];
example = [ "1.1.1.1" "8.8.8.8" ];
description = ''
Upstream resolver(s) to use as fallback for non-loki addresses.
Multiple values accepted.
'';
};
};
network = {
exit = mkOption {
type = bool;
default = false;
description = ''
Whether to act as an exit node. Beware that this
increases demand on the server and may pose liability concerns.
Enable at your own risk.
'';
};
exit-node = mkOption {
type = nullOr (listOf str);
default = null;
example = ''
exit-node = [ "example.loki" ]; # maps all exit traffic to example.loki
exit-node = [ "example.loki:100.0.0.0/24" ]; # maps 100.0.0.0/24 to example.loki
'';
description = ''
Specify a `.loki` address and an optional ip range to use as an exit broker.
See <link xlink:href="http://probably.loki/wiki/index.php?title=Exit_Nodes"/> for
a list of exit nodes.
'';
};
keyfile = mkOption {
type = nullOr str;
default = null;
example = "snappkey.private";
description = ''
The private key to persist address with. If not specified the address will be ephemeral.
This keyfile is generated automatically if the specified file doesn't exist.
'';
};
};
};
};
default = { };
example = literalExpression ''
{
dns = {
bind = "127.3.2.1";
upstream = [ "1.1.1.1" "8.8.8.8" ];
};
network.exit-node = [ "example.loki" "example2.loki" ];
}
'';
description = ''
Configuration for Lokinet.
Currently, the best way to view the available settings is by
generating a config file using `lokinet -g`.
'';
};
};
config = mkIf cfg.enable {
networking.resolvconf.extraConfig = mkIf cfg.useLocally ''
name_servers="${cfg.settings.dns.bind}"
'';
systemd.services.lokinet = {
description = "Lokinet";
after = [ "network-online.target" "network.target" ];
wants = [ "network-online.target" "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
ln -sf ${cfg.package}/share/bootstrap.signed ${dataDir}
${pkgs.coreutils}/bin/install -m 600 ${configFile} ${dataDir}/lokinet.ini
${optionalString (cfg.settings.network.keyfile != null) ''
${pkgs.crudini}/bin/crudini --set ${dataDir}/lokinet.ini network keyfile "${dataDir}/${cfg.settings.network.keyfile}"
''}
'';
serviceConfig = {
DynamicUser = true;
StateDirectory = "lokinet";
AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_BIND_SERVICE" ];
ExecStart = "${cfg.package}/bin/lokinet ${dataDir}/lokinet.ini";
Restart = "always";
RestartSec = "5s";
# hardening
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateTmp = true;
PrivateMounts = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectSystem = "strict";
ReadWritePaths = "/dev/net/tun";
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
};
};
environment.systemPackages = [ cfg.package ];
};
}

17
nixos/modules/services/networking/radvd.nix
View File

@ -16,9 +16,9 @@ in
###### interface
options = {
options.services.radvd = {
services.radvd.enable = mkOption {
enable = mkOption {
type = types.bool;
default = false;
description =
@ -32,7 +32,16 @@ in
'';
};
services.radvd.config = mkOption {
package = mkOption {
type = types.package;
default = pkgs.radvd;
defaultText = literalExpression "pkgs.radvd";
description = ''
The RADVD package to use for the RADVD service.
'';
};
config = mkOption {
type = types.lines;
example =
''
@ -67,7 +76,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig =
{ ExecStart = "@${pkgs.radvd}/bin/radvd radvd -n -u radvd -C ${confFile}";
{ ExecStart = "@${cfg.package}/bin/radvd radvd -n -u radvd -C ${confFile}";
Restart = "always";
};
};

4
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -72,7 +72,9 @@ in
apply = map (d: d // {
manage = "desktop";
start = d.start
+ optionalString (needBGCond d) ''\n\n
# literal newline to ensure d.start's last line is not appended to
+ optionalString (needBGCond d) ''
if [ -e $HOME/.background-image ]; then
${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image
fi

4
pkgs/applications/audio/airwindows-lv2/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "airwindows-lv2";
version = "1.0";
version = "5.0";
src = fetchFromGitHub {
owner = "hannesbraun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M=";
sha256 = "sha256-sLkcEEYez0Z3pkhMCC7raiwe/m9Tk/lFmOuybZvFqSk=";
};
nativeBuildInputs = [ cmake pkg-config ];

25
pkgs/applications/audio/lsp-plugins/default.nix
View File

@ -1,17 +1,15 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
{ lib, stdenv, fetchurl, pkg-config, makeWrapper
, libsndfile, jack2
, libGLU, libGL, lv2, cairo
, ladspaH, php }:
stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.1.31";
version = "1.2.1";
src = fetchFromGitHub {
owner = "sadko4u";
repo = pname;
rev = version;
sha256 = "sha256-P1woSkenSlVUwWr3q0sNv8K2fVtTa6zWwKfSHQgg9Xw=";
src = fetchurl {
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
sha256 = "sha256-wHibZJbrgy7t0z2rRDe1FUAG38BW/dR0JgoKVWYCn60=";
};
nativeBuildInputs = [ pkg-config php makeWrapper ];
@ -19,22 +17,15 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=${placeholder "out"}"
"ETC_PATH=$(out)/etc"
];
NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";
doCheck = true;
checkPhase = ''
runHook preCheck
TEST_PATH=$(pwd)".build-test"
make OBJDIR=$TEST_PATH test
$TEST_PATH/lsp-plugins-test utest
runHook postCheck
configurePhase = ''
make config PREFIX=${placeholder "out"}
'';
buildFlags = [ "release" ];
doCheck = true;
enableParallelBuilding = true;

4
pkgs/applications/backup/timeshift/unwrapped.nix
View File

@ -8,7 +8,7 @@
, gtk3
, json-glib
, libgee
, utillinux
, util-linux
, vte
, xapps
}:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
postPatch = ''
while IFS="" read -r -d $'\0' FILE; do
substituteInPlace "$FILE" \
--replace "/sbin/blkid" "${utillinux}/bin/blkid"
--replace "/sbin/blkid" "${util-linux}/bin/blkid"
done < <(find ./src -mindepth 1 -name "*.vala" -type f -print0)
substituteInPlace ./src/Utility/IconManager.vala \
--replace "/usr/share" "$out/share"

4
pkgs/applications/blockchains/bitcoin/default.nix
View File

@ -74,6 +74,10 @@ stdenv.mkDerivation rec {
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
];
# fix "Killed: 9 test/test_bitcoin"
# https://github.com/NixOS/nixpkgs/issues/179474
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
checkInputs = [ python3 ];
doCheck = true;

18
pkgs/applications/editors/jupyter/kernel.nix
View File

@ -39,26 +39,22 @@ in
${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel:
let
allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64"];
allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64" "extraPaths"];
kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel;
config = builtins.toJSON (
kernel
// {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;}
// (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; })
);
logo32 =
if (kernel.logo32 != null)
then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';"
else "";
logo64 =
if (kernel.logo64 != null)
then "ln -s ${kernel.logo64} 'kernels/${kernelName}/logo-64x64.png';"
else "";
extraPaths = kernel.extraPaths or {}
// lib.optionalAttrs (kernel.logo32 != null) { "logo-32x32.png" = kernel.logo32; }
// lib.optionalAttrs (kernel.logo64 != null) { "logo-64x64.png" = kernel.logo64; }
;
linkExtraPaths = lib.mapAttrsToList (name: value: "ln -s ${value} 'kernels/${kernelName}/${name}';") extraPaths;
in ''
mkdir 'kernels/${kernelName}';
echo '${config}' > 'kernels/${kernelName}/kernel.json';
${logo32}
${logo64}
${lib.concatStringsSep "\n" linkExtraPaths}
'') definitions)}
mkdir $out

10
pkgs/applications/editors/neovim/neovide/default.nix
View File

@ -25,16 +25,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "neovide";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "Kethku";
repo = "neovide";
rev = version;
sha256 = "sha256-pbniOWjEw1Z+PoXqbbFOUkW5Ii1UDOMoZpAvVF1uNEg=";
sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI=";
};
cargoSha256 = "sha256-7o7uJXH68pvfuiG1eSNmbPx8OO8QJjCe+oEFl38bFm4=";
cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE=";
SKIA_SOURCE_DIR =
let
@ -42,8 +42,8 @@ rustPlatform.buildRustPackage rec {
owner = "rust-skia";
repo = "skia";
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
rev = "m93-0.42.0";
sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ=";
rev = "m100-0.48.7";
sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs=";
};
# The externals for skia are taken from skia/DEPS
externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json);

8
pkgs/applications/editors/neovim/neovide/skia-externals.json
View File

@ -6,8 +6,8 @@
},
"libjpeg-turbo": {
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
"rev": "24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20",
"sha256": "sha256-bhbUnA36rKYLJSLpElmXJqccXQDjjbMcNMsVM4Eekrs="
"rev": "02959c3ee17abacfd1339ec22ea93301292ffd56",
"sha256": "sha256-gs8JUT8AoKL+9vlmz3evq61+h2QxNcWqOHN4elb2Grc="
},
"icu": {
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
@ -21,8 +21,8 @@
},
"harfbuzz": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
"rev": "3a74ee528255cc027d84b204a87b5c25e47bff79",
"sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM="
"rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc",
"sha256": "sha256-TQdgg0G8Dk10tg2MLv405nG8DAaPm7JiZjiZ6tOSGW4="
},
"libpng": {
"url": "https://skia.googlesource.com/third_party/libpng.git",

7
pkgs/applications/graphics/ocrfeeder/default.nix
View File

@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
pygobject3
]))
];
patches = [
# Compiles, but doesn't launch without this, see:
# https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83
./fix-launch.diff
];
enginesPath = lib.makeBinPath ([
tesseract4
@ -64,7 +69,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ doronbehar ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
# Compiles, but doesn't launch, see: https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83
broken = true;
};
}

13
pkgs/applications/graphics/ocrfeeder/fix-launch.diff Normal file
View File

@ -0,0 +1,13 @@
diff --git i/src/ocrfeeder/studio/studioBuilder.py w/src/ocrfeeder/studio/studioBuilder.py
index 7a2ccdc..7af19d9 100644
--- i/src/ocrfeeder/studio/studioBuilder.py
+++ w/src/ocrfeeder/studio/studioBuilder.py
@@ -144,7 +144,7 @@ class Studio:
if not self.ocr_engines:
engines = self.configuration_manager.getEnginesInSystem()
if engines:
- add_engines_dialog = widgetPresenter.SystemEnginesDialog(engines)
+ add_engines_dialog = widgetPresenter.SystemEnginesDialog(self.main_window, engines)
response = add_engines_dialog.run()
if response == Gtk.ResponseType.ACCEPT:
for engine in add_engines_dialog.getChosenEngines():

8
pkgs/applications/misc/spicetify-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.10.1";
version = "2.10.2";
src = fetchFromGitHub {
owner = "khanhas";
owner = "spicetify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-d5YuBLCsC7tHSzSa12rUcO0gr5f6gQ2s0wnQ3OMZO3U=";
sha256 = "sha256-chaCz4+RXPUP/MZymxA0h1ATuWYRgru3JMELiWPEBcE=";
};
vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";
@ -25,7 +25,7 @@ buildGoModule rec {
meta = with lib; {
description = "Command-line tool to customize Spotify client";
homepage = "https://github.com/khanhas/spicetify-cli/";
homepage = "https://github.com/spicetify/spicetify-cli/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jonringer ];
};

4
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -32,12 +32,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
version = "2.5.1";
version = "2.5.2";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
hash = "sha256-5ohYhqhM0WamumM3lKWKTGfYccJxiBJ+XdvFJ2127bw=";
hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg=";
};
# Needs tox

6
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -12,9 +12,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.25.2";
version = "1.26.0";
vendorSha256 = "sha256-8QqRIWry15/xwBxEOexMEq57ol8riy+kW8WrQqr53Q8=";
vendorSha256 = "sha256-3ME8bs4TAQRAECko7+ZXBCFf4IyTn1P/+hParpc5QTU=";
doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg=";
sha256 = "sha256-vGlW65jf3XGFNK9aSvsK7V0OmUOCtgJcWeNFOZVuH00=";
};
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];

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

@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
pname = "bluejeans";
version = "2.27.0.130";
version = "2.29.1.3";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
sha256 = "sha256-J0BGL03k1NAJLLEUOfvKjZEsBlupeHJR2Bp3c0ANBwg=";
sha256 = "sha256-vWViSJXRPZ4B40LNnoKRZNbxB1YKnaW2ay6GCjnFLGY=";
};
nativeBuildInputs = [ rpmextract makeWrapper ];

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

@ -1,4 +1,4 @@
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg }:
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, withOpenASAR }:
stdenv.mkDerivation {
inherit pname version src meta;
@ -16,7 +16,7 @@ stdenv.mkDerivation {
runHook postInstall
'';
postInstall = lib.strings.optionalString (openasar != null) ''
postInstall = lib.strings.optionalString withOpenASAR ''
cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar
'';
}

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

@ -62,10 +62,15 @@ let
};
package = if stdenv.isLinux then ./linux.nix else ./darwin.nix;
openasar = if withOpenASAR then callPackage ./openasar.nix { } else null;
openasar = callPackage ./openasar.nix { };
packages = (builtins.mapAttrs
(_: value: callPackage package (value // { inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; }))
(_: value: callPackage package
(value // {
inherit src version openasar withOpenASAR;
meta = meta // { mainProgram = value.binaryName; };
})
)
{
stable = rec {
pname = "discord";

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

@ -5,7 +5,7 @@
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript
, common-updater-scripts }:
, common-updater-scripts, withOpenASAR }:
stdenv.mkDerivation rec {
inherit pname version src meta;
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
postInstall = lib.strings.optionalString (openasar != null) ''
postInstall = lib.strings.optionalString withOpenASAR ''
cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar
'';

26
pkgs/applications/networking/instant-messengers/discord/openasar.nix
View File

@ -1,16 +1,34 @@
{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages }:
{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }:
let
# OpenAsar fails with default unzip, throwing "lchmod (file attributes) error: Operation not supported"
unzipFix =
if stdenv.isLinux then
unzip.overrideAttrs (oldAttrs: {
buildFlags = oldAttrs.buildFlags ++ [ "LOCAL_UNZIP=-DNO_LCHMOD" ];
})
else
unzip;
in
stdenv.mkDerivation rec {
version = "unstable-2022-06-10";
pname = "openasar";
version = "unstable-2022-06-27";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "c6f2f5eb7827fea14cb4c54345af8ff6858c633a";
sha256 = "m6e/WKGgkR8vjKcHSNdWE25MmDQM1Z3kgB24OJgbw/w=";
rev = "6f7505fb91a07035d3661a3a7bf68b3018ddfd82";
sha256 = "2tb6OgYOnpryiyk7UH39sgzwtGJf9hNOpy74YqLI+Uk=";
};
postPatch = ''
# Hardcode unzip path
substituteInPlace ./src/updater/moduleUpdater.js \
--replace \'unzip\' \'${unzipFix}/bin/unzip\'
# Remove auto-update feature
echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js
'';
buildPhase = ''
runHook preBuild

1
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -82,6 +82,7 @@ in stdenv.mkDerivation rec {
runtimeDependencies = [
(lib.getLib systemd)
libappindicator-gtk3
libnotify
libdbusmenu
xdg-utils

1
pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix Normal file
View File

@ -0,0 +1 @@
"0cwplzza8vv4nzxf35i2p4gfnna4dpgp0ddqbpdxl8cxrikq5rji"

1
pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix Normal file
View File

@ -0,0 +1 @@
"5.11.1.8356"

16
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, pipewire
, makeWrapper
, xar
, cpio
@ -44,23 +45,23 @@ let
# Zoom versions are released at different times for each platform
version = {
aarch64-darwin = "5.10.4.6592";
x86_64-darwin = "5.10.4.6592";
x86_64-linux = "5.10.6.3192";
aarch64-darwin =import ./arm64-darwin-version.nix;
x86_64-darwin = import ./x86_64-darwin-version.nix;
x86_64-linux = import ./x86_64-linux-version.nix;
}.${system} or throwSystem;
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq";
url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
sha256 = import ./arm64-darwin-sha.nix;
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${version}/Zoom.pkg";
sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83";
sha256 = import ./x86_64-darwin-sha.nix;
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk=";
sha256 = import ./x86_64-linux-sha.nix;
};
};
@ -76,6 +77,7 @@ let
expat
libdrm
libGL
pipewire
fontconfig
freetype
gtk3

30
pkgs/applications/networking/instant-messengers/zoom-us/update.sh
View File

@ -1,10 +1,30 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl pup common-updater-scripts
#!nix-shell -i bash -p curl pup
set -eu -o pipefail
version="$(curl -Ls https://zoom.us/download\?os\=linux | \
pup '.linux-ver-text text{}' | \
awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
dirname="$(dirname "$0")"
update-source-version zoom-us "$version"
uname="$(uname)"
if [[ "$uname" == "Linux" ]]; then
version="$(curl -Ls https://zoom.us/download\?os\=linux | \
pup '.linux-ver-text text{}' | \
awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
printf '"%s"\n' ${version} > $dirname/x86_64-linux-version.nix
printf '"%s"\n' \
$(nix-prefetch-url https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz) > \
$dirname/x86_64-linux-sha.nix
elif [[ $uname == "Darwin" ]]; then
# The 1st line might be empty
# 2nd line is the version of the conference room application
version="$(curl -Ls https://zoom.us/download\?os\=mac | \
pup '.ver text{}' | \
sed '/^$/d' |\
head -1 | \
awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
printf '"%s"\n' ${version} > "$dirname/$(uname -m)-darwin-version.nix"
printf '"%s"\n' \
$(nix-prefetch-url "https://zoom.us/client/${version}/Zoom.pkg?archType=$(uname -m)") > \
"$dirname/$(uname -m)-darwin-sha.nix"
fi

1
pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix Normal file
View File

@ -0,0 +1 @@
"12s4z80n1qk1vcp5vppabj6fxanm4q7pjj7mggalmjbj6984fsza"

1
pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix Normal file
View File

@ -0,0 +1 @@
"5.11.1.8356"

1
pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix Normal file
View File

@ -0,0 +1 @@
"1ir5akl4vrzb0b5s37s2viqisvf4sylw8rfnfj434h1q0gqz79sc"

1
pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix Normal file
View File

@ -0,0 +1 @@
"5.11.1.3595"

64
pkgs/applications/networking/p2p/lokinet/default.nix Normal file
View File

@ -0,0 +1,64 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, libevent
, libsodium
, libuv
, nlohmann_json
, pkg-config
, sqlite
, systemd
, unbound
, zeromq
}:
stdenv.mkDerivation rec {
pname = "lokinet";
version = "0.9.9";
src = fetchFromGitHub {
owner = "oxen-io";
repo = "lokinet";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-AaGsRg9S9Cng9emI/mN09QSOIRbE+x3916clWAwLnRs=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
libevent
libuv
libsodium
nlohmann_json
sqlite
systemd
unbound
zeromq
];
cmakeFlags = [
"-DGIT_VERSION=v${version}"
"-DWITH_BOOTSTRAP=OFF" # we provide bootstrap files manually
"-DWITH_SETCAP=OFF"
];
# copy bootstrap files
# see https://github.com/oxen-io/lokinet/issues/1765#issuecomment-938208774
postInstall = ''
mkdir -p $out/share/testnet
cp $src/contrib/bootstrap/mainnet.signed $out/share/bootstrap.signed
cp $src/contrib/bootstrap/testnet.signed $out/share/testnet/bootstrap.signed
'';
meta = with lib; {
description = "Anonymous, decentralized and IP based overlay network for the internet";
homepage = "https://lokinet.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ wyndon ];
};
}

24
pkgs/applications/office/banking/default.nix
View File

@ -17,34 +17,17 @@
python3.pkgs.buildPythonApplication rec {
pname = "banking";
version = "0.4.0";
version = "0.5.1";
format = "other";
src = fetchFromGitLab {
owner = "tabos";
repo = "banking";
rev = version;
sha256 = "sha256-VGNCSirQslRfLIFeo375BNlHujoNXm+s55Ty+hB+ZRI=";
sha256 = "sha256-tZlBpDcwQ/aWroP2sFQBZcvmBD26PiY7q/8xFA8GnVc=";
};
patches = [
# Fix build with meson 0.61
# https://gitlab.com/tabos/banking/-/merge_requests/90
(fetchpatch {
url = "https://gitlab.com/tabos/banking/-/commit/c3cc9afc380fe666ae6e331aa8a97659c60397a4.patch";
sha256 = "r9n9l47XU4Tg4U5sfiFdGkbG8QB7O4ol9CB1ya06yOc=";
})
# fix build with libadwaita 1.0.0
(fetchpatch {
url = "https://gitlab.com/tabos/banking/-/commit/27ac4a89ba6047005d43de71a469ef30d1fda8b5.patch";
hash = "sha256-dpDjdYf3gDsyFMTfGes+x27yUxKEnKjLulJxX2encG0=";
})
];
postPatch = ''
substituteInPlace meson_post_install.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
patchShebangs meson_post_conf.py meson_post_install.py
'';
@ -70,12 +53,15 @@ python3.pkgs.buildPythonApplication rec {
fints
mt-940
pygobject3
pysqlitecipher
schwifty
];
meta = with lib; {
description = "Banking application for small screens";
homepage = "https://tabos.gitlab.io/projects/banking/";
license = licenses.gpl3Plus;
mainProgram = "org.tabos.banking";
maintainers = with maintainers; [ dotlambda ];
};
}

1
pkgs/applications/science/math/sage/default.nix
View File

@ -113,6 +113,7 @@ let
tkinter # optional, as a matplotlib backend (use with `%matplotlib tk`)
scipy
ipywidgets
notebook # for "sage -n"
rpy2
sphinx
pillow

4
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
version = "1.0.0";
version = "1.0.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-UpMzqp4NVvj/Y3OdtI5nGhJHgPIfSlopmyv7jDDpWdM=";
sha256 = "sha256-uaIZrxfzV2WPvnAPm6Q67yKx1EVmSMcChSxZG/Huw48=";
};
vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI=";

10
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,14 +1,14 @@
{
"version": "15.1.0",
"repo_hash": "sha256-vOPI9kxdJlQNmI/DZueFcbvZPy2/0d+2CYM/RBAkIcU=",
"version": "15.1.1",
"repo_hash": "sha256-wCO0Ksi5c8kgerpK/O3IkI6CJARQbQj9nWmnxBVhBIM=",
"yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.1.0-ee",
"rev": "v15.1.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.1.0",
"GITALY_SERVER_VERSION": "15.1.1",
"GITLAB_PAGES_VERSION": "1.59.0",
"GITLAB_SHELL_VERSION": "14.7.4",
"GITLAB_WORKHORSE_VERSION": "15.1.0"
"GITLAB_WORKHORSE_VERSION": "15.1.1"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.1.0";
version = "15.1.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
in
@ -24,7 +24,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-rhMQRskum4c5bQL1sE7O4gMxIGX7q3bntuV1HkttA8M=";
sha256 = "sha256-JMKB6lrmQBbBgXSKinL2shlXRXhZrf4QwoJrm+VpKdE=";
};
vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.1.0";
version = "15.1.1";
src = fetchFromGitLab {
owner = data.owner;

15
pkgs/data/fonts/pretendard/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.3.0";
version = "1.3.3";
mkPretendard = { pname, typeface, sha256 }:
fetchzip {
@ -10,9 +10,12 @@ let
url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip";
inherit sha256;
stripRoot = false;
postFetch = ''
mkdir -p $out/share/fonts/opentype
unzip -j $downloadedFile "*.otf" -d $out/share/fonts/opentype
mkdir -p $out/share/fonts/
install -Dm644 $out/public/static/*.otf -t $out/share/fonts/opentype
rm -rf $out/{public,web,LICENSE.txt}
'';
meta = with lib; {
@ -29,18 +32,18 @@ in
pretendard = mkPretendard {
pname = "pretendard";
typeface = "Pretendard";
sha256 = "sha256-4DM8PZjxW93sgQChs+qu5Svo+iGlFnpglu6acYMCkSQ=";
sha256 = "sha256-lRHRdCAg3i3+3Y6j0dCXUgwLdeS/VeI6KNkbDKchNEY=";
};
pretendard-jp = mkPretendard {
pname = "pretendard-jp";
typeface = "PretendardJP";
sha256 = "sha256-3OOUUDiurCpIGNIVjrr2KW0CB3fCXt11P+13teK5kOQ=";
sha256 = "sha256-VgGt/WoaaJJDAzw+gUQVgTQ+q34bdAaKUB4cA9eU0dQ=";
};
pretendard-std = mkPretendard {
pname = "pretendard-std";
typeface = "PretendardStd";
sha256 = "sha256-iVAPdA6qAiE7pseaB0NKPJBPNGdw/nT6PzXIsLajJH4=";
sha256 = "sha256-FOlZrr6CHPfUm9Q+Yoi0HLQUI7cAhQYq6P6sJGXBIWg=";
};
}

4
pkgs/data/misc/wireless-regdb/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wireless-regdb";
version = "2022.02.18";
version = "2022.06.06";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-iCjCWk7iUCAEQAT1c3S7nerIUoCfrXD409AXcL+ayX8=";
sha256 = "sha256-rAD5fv7M5QRu0GnR2T8zZf35lMfHhUqPxQgx6VlTcjA=";
};
dontBuild = true;

4
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View File

@ -63,11 +63,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "42.2";
version = "42.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-eLolewn73cBYh5F00Tg3p5zVnpWoSQEX5Myi5SLJ6wA=";
sha256 = "sha256-zgrjZQ3ir368sKfh/JkS7dtu/40lfz/lD/iynBk0HH4=";
};
patches = [

4
pkgs/desktops/gnome/core/gnome-software/default.nix
View File

@ -42,11 +42,11 @@ in
stdenv.mkDerivation rec {
pname = "gnome-software";
version = "42.2";
version = "42.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "6ENJYyp/XQhmzlwMVi5f6oQRoF8ickRBzZqCQgRiMiQ=";
sha256 = "OM9whWmj12TU0NLt7KqG9Og57CK5ZvQf2tVleKDdM8A=";
};
patches = [

2
pkgs/desktops/lxqt/lximage-qt/default.nix
View File

@ -7,6 +7,7 @@
, qttools
, qtx11extras
, qtsvg
, qtimageformats
, xorg
, lxqt-build-tools
, libfm-qt
@ -36,6 +37,7 @@ mkDerivation rec {
qttools
qtx11extras
qtsvg
qtimageformats # add-on module to support more image file formats
libfm-qt
xorg.libpthreadstubs
xorg.libXdmcp

2
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
View File

@ -7,6 +7,7 @@
, qtbase
, qttools
, qtx11extras
, qtimageformats
, libfm-qt
, menu-cache
, lxmenu-data
@ -34,6 +35,7 @@ mkDerivation rec {
qtbase
qttools
qtx11extras
qtimageformats # add-on module to support more image file formats
libfm-qt
libfm-qt
menu-cache

14
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
View File

@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, nix-update-script
, fetchpatch
, meson
, ninja
, pkg-config
@ -16,24 +15,15 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-printers";
version = "2.1.10";
version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0frvybbx7mcs87kww0if4zn0c6c2gb400cpiqrl8b0294py58xpb";
sha256 = "sha256-NY52surcvhUtyP+T4RMZ0cd+H7fSwo1V0qEGY//oXGs=";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-printers/pull/153
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-printers/commit/3e2b01378cbb8e666d23daeef7f40fcaa90daa45.patch";
sha256 = "0b8pq525xnir06pn65rcz68bcp5xdxl0gpbj7p5x1hs23p5dp04n";
})
];
nativeBuildInputs = [
meson
ninja

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
version = "2.3.2";
version = "2.3.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-4Fg8/Gm9mUqaL3wEc8h+/pMvOfD75ILjo7LhLz6LQmo=";
sha256 = "sha256-fcR8gcexxIzSvR27SUyDhyCOlev+0r7YPPJlCNydCYM=";
};
nativeBuildInputs = [

11
pkgs/development/compilers/blueprint/default.nix
View File

@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "blueprint-compiler";
version = "unstable-2022-05-27";
version = "0.2.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "jwestman";
repo = pname;
rev = "cebd9ecadc53790cd547392899589dd5de0ac552";
sha256 = "sha256-mNR0ooJSRBIXy2E4avXYEdO1aSST+j41TsVg8+kitwo=";
rev = "v${version}";
sha256 = "sha256-LXZ6n1oCbPa0taVbUZf52mGECrzXIcF8EaMVJ30rMtc=";
};
# Requires pythonfuzz, which I've found difficult to package
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
python3.pkgs.wrapPython
];
buildInputs = [
@ -37,10 +36,6 @@ stdenv.mkDerivation rec {
gobject-introspection
];
postFixup = ''
wrapPythonPrograms
'';
meta = with lib; {
description = "A markup language for GTK user interface files";
homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler";

12
pkgs/development/compilers/zulu/default.nix
View File

@ -25,12 +25,14 @@ let
version = "11.52.13";
openjdk = "11.0.13";
sha256_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f";
sha256_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e";
sha256_x64_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f";
sha256_x64_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e";
sha256_aarch64_darwin = "dmzfergSUVz39T30PT/6ZtT8JNqv5lzdX7zUsXsFGJg=";
platform = if stdenv.isDarwin then "macosx" else "linux";
hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
hash = if stdenv.isAarch64 && stdenv.isDarwin then sha256_aarch64_darwin else if stdenv.isDarwin then sha256_x64_darwin else sha256_x64_linux;
extension = if stdenv.isDarwin then "zip" else "tar.gz";
architecture = if stdenv.isAarch64 then "aarch64" else "x64";
runtimeDependencies = [
cups
@ -45,7 +47,7 @@ in stdenv.mkDerivation {
pname = "zulu";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${version}-ca-jdk${openjdk}-${platform}_x64.${extension}";
url = "https://cdn.azul.com/zulu/bin/zulu${version}-ca-jdk${openjdk}-${platform}_${architecture}.${extension}";
sha256 = hash;
};
@ -116,7 +118,7 @@ in stdenv.mkDerivation {
operating systems, containers, hypervisors and Cloud platforms.
'';
maintainers = with maintainers; [ fpletz ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
mainProgram = "java";
};
}

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

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "amtk";
version = "5.4.1";
version = "5.5.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI=";
sha256 = "7Ilt0BfiwUNoUuXmCXD80IML0SFI1XzBvcDZOCa925w=";
};
nativeBuildInputs = [

5
pkgs/development/libraries/duckdb/default.nix
View File

@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch";
sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU=";
})
(fetchpatch {
name = "fix-list-type-metadata.patch";
url = "https://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch";
sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo=";
})
];
postPatch = ''

27
pkgs/development/libraries/geoip/default.nix
View File

@ -1,24 +1,29 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, drvName ? "geoip"
# in geoipDatabase, you can insert a package defining
# "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy
# in geoipDatabase, you can insert a package defining
# "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy
, geoipDatabase ? "/var/lib/geoip-databases"
}:
let
dataDir = if lib.isDerivation geoipDatabase
dataDir =
if lib.isDerivation geoipDatabase
then "${toString geoipDatabase}/share/GeoIP"
else geoipDatabase;
in
stdenv.mkDerivation rec {
pname = drvName;
version = "1.6.12";
src = fetchFromGitHub {
owner = "maxmind";
repo = "geoip-api-c";
rev = "v${version}";
owner = "maxmind";
repo = "geoip-api-c";
rev = "v${version}";
sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv";
};
@ -35,11 +40,13 @@ stdenv.mkDerivation rec {
find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
'';
passthru = { inherit dataDir; };
meta = with lib; {
description = "An API for GeoIP/Geolocation databases";
maintainers = with maintainers; [ thoughtpolice raskin ];
license = licenses.lgpl21;
platforms = platforms.unix;
homepage = "https://www.maxmind.com";
license = licenses.lgpl21;
platforms = platforms.unix;
homepage = "https://www.maxmind.com";
};
}

4
pkgs/development/libraries/glib-networking/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "glib-networking";
version = "2.72.0";
version = "2.72.1";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs=";
sha256 = "b8G+3IBiSE3IoCBJZZle8jZ8PbXJNAWP8WB+WiTZWnQ=";
};
patches = [

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

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.86.0";
version = "1.87.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
hash = "sha256-iRGLNMGs5WawzcqQb5AQTuD4NCJoBUSHfFUXXvm5+jE=";
};
patches = [
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
hash = "sha256-bmtm+cvjBIlZVRq/vjHd5Sl4FXJHP3cPp4+bWY5SKus=";
};
nativeBuildInputs = [

2
pkgs/development/libraries/libpg_query/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "C library for accessing the PostgreSQL parser outside of the server environment";
changelog = "https://github.com/pganalyze/libpg_query/raw/${version}/CHANGELOG.md";
license = licenses.bsd3;
platforms = platforms.x86_64;
platforms = platforms.unix;
maintainers = [ maintainers.marsam ];
};
}

2
pkgs/development/libraries/libvirt/default.nix
View File

@ -97,6 +97,8 @@ let
] ++ optionals enableIscsi [
libiscsi
openiscsi
] ++ optionals enableZfs [
zfs
]);
in

28
pkgs/development/libraries/netcdf/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv
, fetchurl, unzip
, hdf5
, libxml2
, m4
, curl # for DAP
, removeReferencesTo
@ -10,11 +11,11 @@ let
inherit (hdf5) mpiSupport mpi;
in stdenv.mkDerivation rec {
pname = "netcdf" + lib.optionalString mpiSupport "-mpi";
version = "4.8.1";
version = "4.9.0";
src = fetchurl {
url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz";
sha256 = "1cbjwjmp9691clacw5v88hmpz46ngxs3bfpkf2xy1j7cvlkc72l0";
hash = "sha256-TJVgIrecCOXhTu6N9RsTwo5hIcK35/qtwhs3WUlAC0k=";
};
postPatch = ''
@ -27,7 +28,13 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ m4 removeReferencesTo ];
buildInputs = [ hdf5 curl mpi ];
buildInputs = [
curl
hdf5
libxml2
mpi
];
passthru = {
inherit mpiSupport mpi;
@ -50,12 +57,15 @@ in stdenv.mkDerivation rec {
doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64));
checkInputs = [ unzip ];
preCheck = ''
export HOME=$TEMP
'';
meta = {
description = "Libraries for the Unidata network Common Data Format";
platforms = lib.platforms.unix;
homepage = "https://www.unidata.ucar.edu/software/netcdf/";
license = {
url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html";
};
description = "Libraries for the Unidata network Common Data Format";
platforms = lib.platforms.unix;
homepage = "https://www.unidata.ucar.edu/software/netcdf/";
changelog = "https://docs.unidata.ucar.edu/netcdf-c/${version}/RELEASE_NOTES.html";
license = lib.licenses.bsd3;
};
}

4
pkgs/development/libraries/rapidfuzz-cpp/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8=";
hash = "sha256-ocR88dgRo7dF7scATv8kPYmcK3R6a8DcoJfNHq1hZnM=";
};
patches = [

2
pkgs/development/node-packages/overrides.nix
View File

@ -350,7 +350,7 @@ final: prev: {
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
sha512 = "sha512-MLO3JUGJpe5+EVisA/i47+zlyF8Ug0ivvGYG4B9oSXQcPiUHB1ccmnpxqR7o0Up5SQgmxkBiEU//HgR6UuIKOw==";
sha512 = "sha512-Dtsar03XpCBkcEb2ooGWO/WcgblDTLzGhPcustbehwlFXuTMliMDRzXsfygsgYwQoZnAUKRd1rhpvBNEUziOVw==";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \

8
pkgs/development/ocaml-modules/shared-memory-ring/default.nix
View File

@ -10,13 +10,11 @@
buildDunePackage rec {
pname = "shared-memory-ring";
version = "3.1.0";
useDune2 = true;
version = "3.1.1";
src = fetchurl {
url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-v${version}.tbz";
sha256 = "06350ph3rdfvybi0cgs3h3rdkmjspk3c4375rxvbdg0kza1w22x1";
url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz";
sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU=";
};
nativeBuildInputs = [

2
pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
View File

@ -12,7 +12,7 @@
buildDunePackage {
pname = "shared-memory-ring-lwt";
inherit (shared-memory-ring) version src useDune2;
inherit (shared-memory-ring) version src;
buildInputs = [
ppx_cstruct

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "asana";
version = "0.10.9";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "asana";
repo = "python-asana";
rev = "v${version}";
sha256 = "sha256-9gOkCMY15ChdhiFdzS0TjvWpVTKKEGt7XIcK6EhkSK8=";
rev = "refs/tags/v${version}";
sha256 = "sha256-SbYTLGBCfKbjhyzM5OnVX6kxEMnofwPIyzwuJvYORhw=";
};
propagatedBuildInputs = [

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

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "boxx";
version = "0.10.4";
version = "0.10.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-HnEXvge1R2GAcrP+2yEecwIlT95/oKrWiK+TB9+CRxs=";
hash = "sha256-6qO/aPegHk+1PAu8qzIkC3fULh2WjgJcqNui+XEaLQw=";
};
propagatedBuildInputs = [

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

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, fetchpatch
, duckdb
, google-cloud-storage
, mypy
@ -13,10 +14,12 @@
buildPythonPackage rec {
pname = "duckdb";
inherit (duckdb) version src;
inherit (duckdb) version src patches;
format = "setuptools";
sourceRoot = "source/tools/pythonpkg";
preConfigure = ''
cd tools/pythonpkg
'';
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -45,6 +48,6 @@ buildPythonPackage rec {
description = "Python binding for DuckDB";
homepage = "https://duckdb.org/";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ costrouc cpcloud ];
};
}

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "env-canada";
version = "0.5.23";
version = "0.5.24";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "michaeldavie";
repo = "env_canada";
rev = "refs/tags/v${version}";
sha256 = "sha256-ksQQ3jujfu2XR0ZaR5fc8GNYDL8Tos+8U4OHS1mMyRY=";
sha256 = "sha256-R6X4TY0yrfSj30FXHmHHK6QBHAT3pb+UXjjZ3SW1SP8=";
};
propagatedBuildInputs = [

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

@ -2,39 +2,44 @@
, buildPythonPackage
, fetchPypi
, future
, requests
, python-dateutil
, flake8
, isort
, mock
, pytest
, isPy27
, pytestCheckHook
, python-dateutil
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "hcloud";
version = "1.16.0";
disabled = isPy27;
version = "1.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc";
hash = "sha256-+BQuBDi+J3xvod3uE67NXaFStIxt7H/Ulw3vG13CGeI=";
};
propagatedBuildInputs = [ future requests python-dateutil ];
propagatedBuildInputs = [
future
requests
python-dateutil
];
checkInputs = [ flake8 isort mock pytest ];
checkInputs = [
mock
pytestCheckHook
];
# Skip integration tests since they require a separate external fake API endpoint.
checkPhase = ''
pytest --ignore=tests/integration
'';
pythonImportsCheck = [
"hcloud"
];
meta = with lib; {
description = "Official Hetzner Cloud python library";
description = "Library for the Hetzner Cloud API";
homepage = "https://github.com/hetznercloud/hcloud-python";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ liff ];
};
}

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "jarowinkler";
version = "1.0.4";
version = "1.0.5";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "JaroWinkler";
rev = "v${version}";
hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE=";
hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA=";
};
nativeBuildInputs = [

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

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "lsassy";
version = "3.1.1";
version = "3.1.2";
src = fetchFromGitHub {
owner = "Hackndo";
repo = pname;
rev = "v${version}";
sha256 = "0jd0kmp0mc8jn5qmgrspdx05vy6nyq773cj4yid1qyr8dmyx6a7n";
sha256 = "sha256-FnqWDPcWgRQpX1k/Sf2NQKpuu6srh6xWdNKtHzXZTtk=";
};
propagatedBuildInputs = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "multitasking";
version = "0.0.10";
version = "0.0.11";
# GitHub source releases aren't tagged
src = fetchPypi {
inherit pname version;
sha256 = "810640fa6670be41f4a712b287d9307a14ad849d966f06a17d2cf1593b66c3cd";
sha256 = "sha256-TWvDzGX5stynL7Wnh4UKiNro9iDCs2rptVJI5RvNYCY=";
};
doCheck = false; # No tests included

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

@ -3,13 +3,13 @@
}:
buildPythonPackage rec {
pname = "netCDF4";
version = "1.5.8";
version = "1.6.0";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "ca3d468f4812c0999df86e3f428851fb0c17ac34ce0827115c246b0b690e4e84";
sha256 = "sha256-le+jc9mj4c0N9xk+duZoDZ7KKOYAl8qBOa/qikNGumM=";
};
checkInputs = [ pytest ];

28
pkgs/development/python-modules/onetimepad/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "onetimepad";
version = "1.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1eaade76d8036e1cb79e944b75874bfe5ee4046a571c0724564e1721565c73fd";
};
# upstream has no tests
doCheck = false;
pythonImportsCheck = [ "onetimepad" ];
meta = {
description = "A hacky implementation of one-time pad";
homepage = "https://jailuthra.in/onetimepad";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pglast";
version = "3.12";
version = "3.13";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9lPyillQyCTXiHCCLq1DKG6YbKWSYu9h8AGijO3xN/M=";
hash = "sha256-H1IVoXBanNlmjUMhBHRbnBsbeK9LuruqXJaVgSgCFPo=";
};
propagatedBuildInputs = [

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

@ -6,6 +6,7 @@
, pythonOlder
, importlib-metadata
, jbig2dec
, deprecation
, lxml
, mupdf
, packaging
@ -23,7 +24,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "5.1.5.post1";
version = "5.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -38,7 +39,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-CGhkfQgsKUxiZzs1i2B2SlM++7G6Yrd9ruFh4sSJPbI=";
hash = "sha256-el7gnqnk8Mp5rpn8Q3WKOTAuB11j4ByCq2Gf60LBBEI=";
};
patches = [
@ -78,6 +79,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
deprecation
lxml
packaging
pillow

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.9.1";
version = "5.9.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-LYWxdqortazhev73JSTItrEyZZYFmeXkAko/2aFKaSw=";
hash = "sha256-5jeLSTG2HITEUdgQB3B9nQLAaNRliGspKnOgzUscCpU=";
};
sourceRoot = "${src.name}/sdk/python";

38
pkgs/development/python-modules/pysqlitecipher/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, cryptography
, onetimepad
}:
buildPythonPackage rec {
pname = "pysqlitecipher";
version = "0.22";
disabled = pythonOlder "3.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "daff63ca2719fbd698aa10f64493c4b31fb67877a8e8dbb8090e9c03a1b1a9e4";
};
propagatedBuildInputs = [
cryptography
onetimepad
];
# upstream has no tests
doCheck = false;
pythonImportsCheck = [ "pysqlitecipher" ];
meta = {
description = "Lightweight and easy to use sqlite wrapper with built-in encryption system";
homepage = "Ghttps://github.com/harshnative/pysqlitecipher";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

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

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "qiskit-finance";
version = "0.3.2";
version = "0.3.3";
disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-ZmK4nYuv3DBJ0Ah819zGAh7inGVBWDnzJvl0FABJ6KU=";
sha256 = "sha256-1XM4gBuMsvjwU4GSdQJobMyyDFZOOTbwvnUPG0nXFoc=";
};
postPatch = ''

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

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "2.0.15";
version = "2.1.0";
disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "v${version}";
hash = "sha256-wn77gA6UCgsdDf3FZgjrA5gSWpWJg3YoUhx88X7aVcM=";
hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ=";
};
nativeBuildInputs = [

23
pkgs/development/python-modules/safety/default.nix
View File

@ -7,28 +7,41 @@
, requests
, packaging
, dparse
, ruamel-yaml
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "safety";
version = "1.10.3";
version = "2.0.0";
disabled = pythonOlder "3.5";
disabled = pythonOlder "3.6";
format = "setuptools";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU=";
sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d";
};
postPatch = ''
substituteInPlace safety/safety.py \
--replace "telemetry=True" "telemetry=False"
substituteInPlace safety/cli.py \
--replace "telemetry', default=True" "telemetry', default=False"
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
setuptools
click
requests
packaging
dparse
ruamel-yaml
];
checkInputs = [
@ -37,6 +50,7 @@ buildPythonPackage rec {
# Disable tests depending on online services
disabledTests = [
"test_announcements_if_is_not_tty"
"test_check_live"
"test_check_live_cached"
];
@ -48,6 +62,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Checks installed dependencies for known vulnerabilities";
homepage = "https://github.com/pyupio/safety";
changelog = "https://github.com/pyupio/safety/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ thomasdesr dotlambda ];
};

29
pkgs/development/python-modules/splinter/default.nix
View File

@ -1,20 +1,29 @@
{ lib
, buildPythonPackage
, isPy27
, fetchFromGitHub
, selenium
, cssselect
, django
, flask
, lxml
, pytestCheckHook
, zope-testbrowser
}:
buildPythonPackage rec {
pname = "splinter";
version = "0.17.0";
version = "0.18.0";
disabled = isPy27;
format = "setuptools";
src = fetchFromGitHub {
owner = "cobrateam";
repo = "splinter";
rev = version;
hash = "sha256-7QhFz/qBh2ECyeyvjCyqOYy/YrUK7KVX13VC/gem5BQ=";
hash = "sha256-kJ5S/fBesaxTbxCQ0yBR30+CfCV6U5jgbfDZA7eF6ac=";
};
propagatedBuildInputs = [
@ -22,27 +31,35 @@ buildPythonPackage rec {
];
checkInputs = [
cssselect
django
flask
lxml
pytestCheckHook
zope-testbrowser
];
disabledTests = [
# driver is present and fails with a different error during loading
"test_browser_local_driver_not_present"
"test_local_driver_not_present"
];
disabledTestPaths = [
"samples"
# TODO: requires optional dependencies which should be defined in passthru.optional-dependencies.$name
"tests/test_djangoclient.py"
"tests/test_flaskclient.py"
# We run neither Chromium nor Firefox nor ...
"tests/test_async_finder.py"
"tests/test_html_snapshot.py"
"tests/test_iframes.py"
"tests/test_mouse_interaction.py"
"tests/test_popups.py"
"tests/test_screenshot.py"
"tests/test_shadow_root.py"
"tests/test_webdriver.py"
"tests/test_webdriver_chrome.py"
"tests/test_webdriver_edge_chromium.py"
"tests/test_webdriver_firefox.py"
"tests/test_webdriver_remote.py"
"tests/test_zopetestbrowser.py"
];
pythonImportsCheck = [ "splinter" ];

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "3.4.0";
version = "3.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-XcN979nWXgUwItq8tlnnNisFinr3QEfuWFGKKQenYfI=";
hash = "sha256-CPdMrmYZ1KfXj4Fi/3K8PpyRP1PsluzV3cfYI8Lnnd0=";
};
propagatedBuildInputs = [

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

@ -28,11 +28,11 @@
buildPythonApplication rec {
pname = "tempest";
version = "31.0.0";
version = "31.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-g/fpVDGa2TFAzMVvC/370bStPJvhWSZ2tkbmP54nzc4=";
sha256 = "sha256-EaDFnIxaAGBDViAVzMjZev3jXmb3NIlMlcg4BiwoAq4=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ua-parser";
version = "0.10.0";
version = "0.15.0";
format = "setuptools";
@ -16,13 +16,18 @@ buildPythonPackage rec {
repo = "uap-python";
rev = version;
fetchSubmodules = true;
hash = "sha256-kaTAfUtHj2vH7i7eIU61efuB4/XVHoc/z6o3ny+sgrQ=";
hash = "sha256-CwwVaToy5se5dZ4m1EHn8qgvprK82/Sgpos4lHedIUc=";
};
patches = [
./dont-fetch-submodule.patch
];
postPatch = ''
substituteInPlace setup.py \
--replace "pyyaml ~= 5.4.0" pyyaml
'';
nativeBuildInputs = [
pyyaml
];

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

@ -39,7 +39,7 @@
buildPythonPackage rec {
pname = "wandb";
version = "0.12.19";
version = "0.12.20";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -48,7 +48,7 @@ buildPythonPackage rec {
owner = pname;
repo = "client";
rev = "refs/tags/v${version}";
hash = "sha256-eH65vk3Pnm6d4vDiaWbs1tXD0lCRkfOB2hqD9MGxuXY=";
hash = "sha256-zS3DA06uLfUApe0kDAbqPA+2is70bnb9EifgFWqcuRg=";
};
patches = [

40
pkgs/development/python-modules/zope-cachedescriptors/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "zope-cachedescriptors";
version = "4.3.1";
format = "setuptools";
src = fetchPypi {
pname = "zope.cachedescriptors";
inherit version;
sha256 = "1f4d1a702f2ea3d177a1ffb404235551bb85560100ec88e6c98691734b1d194a";
};
propagatedBuildInputs = [
setuptools
];
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"src/zope/cachedescriptors/tests.py"
];
pythonImportsCheck = [ "zope.cachedescriptors" ];
meta = {
description = "Method and property caching decorators";
homepage = "https://github.com/zopefoundation/zope.cachedescriptors";
license = lib.licenses.zpl21;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

75
pkgs/development/python-modules/zope-testbrowser/default.nix Normal file
View File

@ -0,0 +1,75 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, zope_interface
, zope_schema
, zope-cachedescriptors
, pytz
, webtest
, beautifulsoup4
, soupsieve
, wsgiproxy2
, six
, mock
, zope_testing
, zope_testrunner
, python
}:
buildPythonPackage rec {
pname = "zope-testbrowser";
version = "5.6.1";
format = "setuptools";
src = fetchPypi {
pname = "zope.testbrowser";
inherit version;
sha256 = "035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7";
};
postPatch = ''
# remove test that requires network access
substituteInPlace src/zope/testbrowser/tests/test_doctests.py \
--replace "suite.addTests(wire)" ""
'';
propagatedBuildInputs = [
setuptools
zope_interface
zope_schema
zope-cachedescriptors
pytz
webtest
beautifulsoup4
soupsieve
wsgiproxy2
six
];
checkInputs = [
mock
zope_testing
zope_testrunner
];
checkPhase = ''
${python.interpreter} -m zope.testrunner --test-path=src
'';
pythonImportsCheck = [
"zope.testbrowser"
"zope.testbrowser.browser"
"zope.testbrowser.interfaces"
"zope.testbrowser.testing"
"zope.testbrowser.wsgi"
];
meta = {
description = "Programmable browser for functional black-box tests";
homepage = "https://github.com/zopefoundation/zope.testbrowser";
license = lib.licenses.zpl21;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

4
pkgs/development/tools/analysis/rizin/cutter.nix
View File

@ -11,13 +11,13 @@
mkDerivation rec {
pname = "cutter";
version = "2.0.5";
version = "2.1.0";
src = fetchFromGitHub {
owner = "rizinorg";
repo = "cutter";
rev = "v${version}";
sha256 = "sha256-ljws9S7ZxZK/Ou8jgGSoR++vtzFTEBywHMhCC/UOLEs=";
sha256 = "sha256-JfJQuEUeLXCjzm4d0ZNHRVazF0Bk6fVAsNvBb+okoXs=";
fetchSubmodules = true;
};

4
pkgs/development/tools/analysis/rizin/default.nix
View File

@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "rizin";
version = "0.3.4";
version = "0.4.0";
src = fetchurl {
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
sha256 = "sha256-7qSbOWOHwJ0ZcFqrAqYXzbFWgvymfxAf8rJ+75SnEOk=";
sha256 = "sha256-CeuoaE/oE89Cpxa1mobT1lr84BPX6LJ14UXoSdM2a1o=";
};
mesonFlags = [

1
pkgs/development/tools/aws-sam-cli/default.nix
View File

@ -48,6 +48,7 @@ python3.pkgs.buildPythonApplication rec {
substituteInPlace requirements/base.txt \
--replace "aws_lambda_builders==" "aws-lambda-builders #" \
--replace "click~=7.1" "click~=8.1" \
--replace "cookiecutter~=1.7.2" "cookiecutter>=1.7.2" \
--replace "dateparser~=1.0" "dateparser>=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "Flask~=1.1.2" "Flask~=2.0" \

6
pkgs/development/tools/database/prisma-engines/default.nix
View File

@ -13,19 +13,19 @@
# function correctly.
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
version = "3.15.1";
version = "4.0.0";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
sha256 = "sha256-p636B8NUu/XncHLTQTiAYfvBaMbiopLVRwGrFf45BW8=";
sha256 = "sha256-TlKjAfpygQq2c77d6ZoMIBtWC0bAiMiKygFkh5GrBBc=";
};
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
cargoSha256 = "sha256-miDdP4kokRwhR9tif6llI1PI+F4O6tC4pAWucRRyLNQ=";
cargoSha256 = "sha256-//Kis4lDi3SxeptCCnLi/GWPj+Kyay2pQbILYnlEkXE=";
nativeBuildInputs = [ pkg-config ];

24
pkgs/development/tools/go-langserver/default.nix
View File

@ -1,24 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "go-langserver";
version = "2.0.0";
goPackagePath = "github.com/sourcegraph/go-langserver";
subPackages = [ "." ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "sourcegraph";
repo = "go-langserver";
sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp";
};
meta = with lib; {
description = "A Go language server protocol server";
homepage = "https://github.com/sourcegraph/go-langserver";
license = licenses.mit;
maintainers = with maintainers; [ johnchildren ];
platforms = platforms.unix;
};
}

10
pkgs/development/tools/go-tools/default.nix
View File

@ -5,16 +5,18 @@
buildGoModule rec {
pname = "go-tools";
version = "2021.1.2";
version = "2022.1.2";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
sha256 = "sha256-C6ekgrc+zvm8ZLvw1uYR3ZiMLCNSUw1ANEuM4bT4C/o=";
sha256 = "sha256-pfZv/GZxb7weD+JFGCOknhRCsx8g5puQfpY9lZ4v6Rs=";
};
vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY=";
vendorSha256 = "sha256-19uLCtKuuZoVwC4SUKvYGWi2ryqAQbcKXY1iNjIqyn8=";
excludedPackages = [ "website" ];
doCheck = false;
@ -22,6 +24,6 @@ buildGoModule rec {
description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
homepage = "https://staticcheck.io";
license = licenses.mit;
maintainers = with maintainers; [ rvolosatovs kalbasit ];
maintainers = with maintainers; [ rvolosatovs kalbasit smasher164 ];
};
}

34
pkgs/development/tools/gosca/default.nix
View File

@ -1,34 +0,0 @@
{ lib
, buildGoModule
, fetchFromGitHub
, gosca
, testers
}:
buildGoModule rec {
pname = "gosca";
version = "0.4.2";
src = fetchFromGitHub {
owner = "TARI0510";
repo = pname;
rev = "v${version}";
hash = "sha256-mjQSYkcLl9X3IPv0liX26hvystsQOSVXvovKp4VekAY=";
};
vendorSha256 = "sha256-0EqMW4aNYPZEuk+mxmLTuenGdam56YneEad8lodVeBo=";
passthru.tests.version = testers.testVersion {
package = gosca;
command = "gosca -v";
version = "GoSCA_v${version}";
};
meta = with lib; {
description = "Golang dependence security checker";
homepage = "https://github.com/TARI0510/gosca";
changelog = "https://github.com/TARI0510/gosca/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

99
pkgs/development/tools/java/jprofiler/default.nix Normal file
View File

@ -0,0 +1,99 @@
{ stdenv
, lib
, fetchurl
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, undmg
, jdk
}:
let
inherit (stdenv.hostPlatform) system;
pname = "jprofiler";
# 11.1.4 is the last version which can be unpacked by undmg
# See: https://github.com/matthewbauer/undmg/issues/9
version = if stdenv.isLinux then "13.0.2" else "11.1.4";
nameApp = "JProfiler";
meta = with lib; {
description = "JProfiler's intuitive UI helps you resolve performance bottlenecks";
longDescription = ''
JProfiler's intuitive UI helps you resolve performance bottlenecks,
pin down memory leaks and understand threading issues.
'';
homepage = "https://www.ej-technologies.com/products/jprofiler/overview.html";
license = licenses.unfree;
maintainers = with maintainers; [ catap ];
};
src = if stdenv.isLinux then fetchurl {
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
sha256 = "sha256-x9I7l2ctquCqUymtlQpFXE6+u0Yg773qE6MvAxvCaEE=";
} else fetchurl {
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg";
sha256 = "sha256-WDMGrDsMdY1//WMHgr+/YKSxHWt6A1dD1Pd/MuDOaz8=";
};
srcIcon = fetchurl {
url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png";
sha256 = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE=";
};
desktopItems = makeDesktopItem {
name = pname;
exec = pname;
icon = pname;
comment = meta.description;
desktopName = nameApp;
genericName = "Java Profiler Tool";
categories = [ "Development" ];
};
linux = stdenv.mkDerivation {
inherit pname version src desktopItems;
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
installPhase = ''
runHook preInstall
cp -r . $out
rm -f $out/bin/updater
rm -rf $out/bin/linux-ppc*
rm -rf $out/bin/linux-armhf
rm -rf $out/bin/linux-musl*
for f in $(find $out/bin -type f -executable); do
wrapProgram $f --set JAVA_HOME "${jdk.home}"
done
install -Dm644 "${srcIcon}" \
"$out/share/icons/hicolor/scalable/apps/jprofiler.png"
runHook postInstall
'';
meta = meta // { platforms = lib.platforms.linux; };
};
darwin = stdenv.mkDerivation {
inherit pname version src;
# Archive extraction via undmg fails for this particular version.
nativeBuildInputs = [ makeWrapper undmg ];
sourceRoot = "${nameApp}.app";
installPhase = ''
runHook preInstall
mkdir -p $out/{Applications/${nameApp}.app,bin}
cp -R . $out/Applications/${nameApp}.app
makeWrapper $out/Applications/${nameApp}.app/Contents/MacOS/JavaApplicationStub $out/bin/${pname}
runHook postInstall
'';
meta = meta // { platforms = lib.platforms.darwin; };
};
in
if stdenv.isDarwin then darwin else linux

6
pkgs/development/tools/misc/act/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
version = "0.2.28";
version = "0.2.29";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wHBdmNFi//0nAgqRjTJYE3H+06HrW9l+xLVB97/XrnY=";
sha256 = "sha256-n5IUhx5nZ6+bbYc3Z0d3stBSvr2Ht2XUwtDorQTcOhs=";
};
vendorSha256 = "sha256-bWNDBoLGiV/eSUW/AE/yzvJN7NYCnT1GjzP3VmDVAg8=";
vendorSha256 = "sha256-rMM1BcL4FGFXs0DHoLV9kt+BxnreVTL7kwCd9li1i6g=";
doCheck = false;

53
pkgs/development/tools/revive/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "revive";
version = "1.2.1";
src = fetchFromGitHub {
owner = "mgechev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xZakVuw+QKzFh6wsnZbltLEEwyb9WcMvVWEzKnS9aWc=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
postFetch = ''
date -u -d "@$(git -C $out log -1 --pretty=%ct)" "+%Y-%m-%d %H:%M UTC" > $out/DATE
git -C $out rev-parse HEAD > $out/COMMIT
rm -rf $out/.git
'';
};
vendorSha256 = "sha256-Fpl5i+qMvJ/CDh8X0gps9C/BxF7/Uvln+3DpVOXE0WQ=";
ldflags = [
"-s"
"-w"
"-X github.com/mgechev/revive/cli.version=${version}"
"-X github.com/mgechev/revive/cli.builtBy=nix"
];
# ldflags based on metadata from git and source
preBuild = ''
ldflags+=" -X github.com/mgechev/revive/cli.commit=$(cat COMMIT)"
ldflags+=" -X 'github.com/mgechev/revive/cli.date=$(cat DATE)'"
'';
# The following tests fail when built by nix:
#
# $ nix log /nix/store/build-revive.1.2.1.drv | grep FAIL
#
# --- FAIL: TestAll (0.01s)
# --- FAIL: TestTimeEqual (0.00s)
# --- FAIL: TestTimeNaming (0.00s)
# --- FAIL: TestUnhandledError (0.00s)
# --- FAIL: TestUnhandledErrorWithBlacklist (0.00s)
doCheck = false;
meta = with lib; {
description = "Fast, configurable, extensible, flexible, and beautiful linter for Go";
homepage = "https://revive.run";
license = licenses.mit;
maintainers = with maintainers; [ maaslalani ];
};
}

6
pkgs/development/web/deno/default.nix
View File

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.23.1";
version = "1.23.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Z9dZrhH+zlYNuhFs+aicuepnUTSOfIHdLaz9sJp0LCA=";
sha256 = "sha256-rygBiDIZ8W51GIu36+g6zFOnIvmGe+HLGZg7x/pRFJ0=";
};
cargoSha256 = "sha256-VIpy5vRZinFvFhyyKQwi5ThrBNwqGy1TVg5tAoxxJyQ=";
cargoSha256 = "sha256-q7yZZXws58QuEfC0J+fZo8QyYUWx6sOKfphmIurxVkU=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

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