b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2022-02-23 00:11:07 +00:00 committed by GitHub
parent bfc0a60a24 49533e7c8c
commit 2b5c8147f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
114 changed files with 875 additions and 342 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/rust.section.md
View file

@ -464,6 +464,8 @@ you of the correct hash.
be disabled by setting `dontUseCargoParallelTests`.
* `cargoInstallHook`: install binaries and static/shared libraries
that were built using `cargoBuildHook`.
* `bindgenHook`: for crates which use `bindgen` as a build dependency, lets
`bindgen` find `libclang` and `libclang` find the libraries in `buildInputs`.
### Examples {#examples}

9
lib/tests/modules.sh
View file

@ -284,6 +284,15 @@ checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-var
checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix
## emptyValue's
checkConfigOutput "[ ]" config.list.a ./emptyValues.nix
checkConfigOutput "{ }" config.attrs.a ./emptyValues.nix
checkConfigOutput "null" config.null.a ./emptyValues.nix
checkConfigOutput "{ }" config.submodule.a ./emptyValues.nix
# These types don't have empty values
checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix
checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix
cat <<EOF
====== module tests ======
$pass Pass

36
lib/tests/modules/emptyValues.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib, ... }:
let
inherit (lib) types;
in {
options = {
int = lib.mkOption {
type = types.lazyAttrsOf types.int;
};
list = lib.mkOption {
type = types.lazyAttrsOf (types.listOf types.int);
};
nonEmptyList = lib.mkOption {
type = types.lazyAttrsOf (types.nonEmptyListOf types.int);
};
attrs = lib.mkOption {
type = types.lazyAttrsOf (types.attrsOf types.int);
};
null = lib.mkOption {
type = types.lazyAttrsOf (types.nullOr types.int);
};
submodule = lib.mkOption {
type = types.lazyAttrsOf (types.submodule {});
};
};
config = {
int.a = lib.mkIf false null;
list.a = lib.mkIf false null;
nonEmptyList.a = lib.mkIf false null;
attrs.a = lib.mkIf false null;
null.a = lib.mkIf false null;
submodule.a = lib.mkIf false null;
};
}

4
lib/types.nix
View file

@ -390,7 +390,7 @@ rec {
).optionalValue
) def.value
) defs)));
emptyValue = { value = {}; };
emptyValue = { value = []; };
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
getSubModules = elemType.getSubModules;
substSubModules = m: listOf (elemType.substSubModules m);
@ -402,7 +402,7 @@ rec {
let list = addCheck (types.listOf elemType) (l: l != []);
in list // {
description = "non-empty " + list.description;
# Note: emptyValue is left as is, because another module may define an element.
emptyValue = { }; # no .value attr, meaning unset
};
attrsOf = elemType: mkOptionType rec {

8
nixos/modules/services/home-automation/home-assistant.nix
View file

@ -135,7 +135,7 @@ in {
};
config = mkOption {
type = types.submodule {
type = types.nullOr (types.submodule {
freeformType = format.type;
options = {
# This is a partial selection of the most common options, so new users can quickly
@ -244,7 +244,7 @@ in {
};
};
};
};
});
example = literalExpression ''
{
homeassistant = {
@ -349,10 +349,6 @@ in {
'';
description = ''
The Home Assistant package to use.
Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies.
If you specify <option>config</option> and do not set <option>autoExtraComponents</option>
to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect.
Avoid <literal>home-assistant.overridePythonAttrs</literal> if you use <literal>autoExtraComponents</literal>.
'';
};

11
nixos/modules/services/security/step-ca.nix
View file

@ -106,6 +106,9 @@ in
ConditionFileNotEmpty = ""; # override upstream
};
serviceConfig = {
User = "step-ca";
Group = "step-ca";
UMask = "0077";
Environment = "HOME=%S/step-ca";
WorkingDirectory = ""; # override upstream
ReadWriteDirectories = ""; # override upstream
@ -127,6 +130,14 @@ in
};
};
users.users.step-ca = {
home = "/var/lib/step-ca";
group = "step-ca";
isSystemUser = true;
};
users.groups.step-ca = {};
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
};

2
nixos/modules/system/boot/modprobe.nix
View file

@ -72,6 +72,8 @@ with lib;
'';
environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf";
environment.systemPackages = [ pkgs.kmod ];
system.activationScripts.modprobe = stringAfter ["specialfs"]

10
nixos/tests/networking.nix
View file

@ -246,13 +246,13 @@ let
networking = {
useNetworkd = networkd;
useDHCP = false;
bonds.bond = {
bonds.bond0 = {
interfaces = [ "eth1" "eth2" ];
driverOptions.mode = "balance-rr";
driverOptions.mode = "802.3ad";
};
interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
interfaces.eth2.ipv4.addresses = mkOverride 0 [ ];
interfaces.bond.ipv4.addresses = mkOverride 0
interfaces.bond0.ipv4.addresses = mkOverride 0
[ { inherit address; prefixLength = 30; } ];
};
};
@ -274,6 +274,10 @@ let
client2.wait_until_succeeds("ping -c 2 192.168.1.1")
client2.wait_until_succeeds("ping -c 2 192.168.1.2")
with subtest("Verify bonding mode"):
for client in client1, client2:
client.succeed('grep -q "Bonding Mode: IEEE 802.3ad Dynamic link aggregation" /proc/net/bonding/bond0')
'';
};
bridge = let

3
pkgs/applications/audio/helvum/default.nix
View file

@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
rustPlatform.bindgenHook
];
buildInputs = [
@ -49,8 +50,6 @@ stdenv.mkDerivation rec {
pipewire
];
LIBCLANG_PATH = "${libclang.lib}/lib";
meta = with lib; {
description = "A GTK patchbay for pipewire";
homepage = "https://gitlab.freedesktop.org/pipewire/helvum";

4
pkgs/applications/blockchains/btcpayserver/default.nix
View file

@ -3,13 +3,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.4.4";
version = "1.4.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-PW5a1Bw21skpboWDtlZHGWtFwfImznD7nYI92RT7GGQ=";
sha256 = "sha256-G6/juGBdiOc8Gh9pKFQlBfUDJzDFMd9gMtILeoF8SMk=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

47
pkgs/applications/blockchains/btcpayserver/deps.nix generated
View file

@ -31,18 +31,18 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.All";
version = "1.2.19";
sha256 = "0g8wm7idxb3pksqn3kkv62k27r7rzxdjdg3drhfsfrlvi0fm2w9j";
version = "1.3.2";
sha256 = "0xcfba8n9zf5m1nb48ilggp03kpki4nv4kx7k7a5w1gxgm6k6j9z";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Charge";
version = "1.2.9";
sha256 = "0vplw03l0rldqrw98ybm1d8fcglj9zwhxw6j8blhh27x1wdp0x0c";
version = "1.3.1";
sha256 = "1xakwnb839dl0qnhqprsnfq8png31iyb0fsngljis5jc8yvb4353";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.CLightning";
version = "1.2.10";
sha256 = "12i5glirw23mw15hvnn6jr7wxv2jlg8x88s6izz5f1y81bxcmkk7";
version = "1.3.1";
sha256 = "0a79p6i3xiq6svv08c4hhihkvqa2ac7fphi3g9i0cwh47ak0k5h2";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Common";
@ -51,28 +51,23 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Common";
version = "1.2.8";
sha256 = "1zqbhz80q004py8qwd4ma0fm9yd0rkza5r2dap6sfwpvng2c82fj";
version = "1.3.1";
sha256 = "165p1246fn628hlwdrx7sanlxa6qqpn480rq1asn5r1602w21844";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Eclair";
version = "1.2.10";
sha256 = "1gqnsxbclvbkjhpwxdqpxcvjkzrardxzfkm6fadwa4jr2y5nhdkq";
version = "1.3.1";
sha256 = "1vlwm5mw8wffp00xhkx19yavk59b5x540sg81vis3q7hjvvgca5c";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LNBank";
version = "1.0.1";
sha256 = "0b3psykci3jjwx0gbw6zwzsviph40bn46xb21dnd64djbq2iaa6p";
version = "1.3.1";
sha256 = "0qga34vi4fzfr0g4qk0ad8xkqdig2ishmdj9i32s5yrrjrkx7c8d";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LND";
version = "1.2.14";
sha256 = "1lmlakpr67zgwx4qm86ylnivkxfyvq2ypjry17pfiwr11z8p5jih";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Ptarmigan";
version = "1.2.8";
sha256 = "1l68n5mk918mfmpr1dkq1m7ql4zc2c4y7vglghna5pfy6jq7ryni";
version = "1.3.1";
sha256 = "1b70jlyzy9xjvfywzi6i3l3sd4mkknxpni9akdi0phsfqysmy0wl";
})
(fetchNuGet {
pname = "BuildBundlerMinifier";
@ -839,11 +834,6 @@
version = "6.0.15";
sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain";
})
(fetchNuGet {
pname = "NBitcoin";
version = "6.0.19";
sha256 = "1vd9hcavqkh0yhzmwnyyk8yd4i205217k90m7w0lln5vqvmq14kk";
})
(fetchNuGet {
pname = "NBitcoin";
version = "6.0.3";
@ -854,6 +844,11 @@
version = "6.0.8";
sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5";
})
(fetchNuGet {
pname = "NBitcoin";
version = "7.0.1";
sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7";
})
(fetchNuGet {
pname = "NBitpayClient";
version = "1.0.0.39";
@ -1091,8 +1086,8 @@
})
(fetchNuGet {
pname = "Selenium.WebDriver.ChromeDriver";
version = "96.0.4664.4500";
sha256 = "1kfnrimy49mab6v4afkk290djjyldnn683wdj15dax2mv8yxbyxs";
version = "98.0.4758.10200";
sha256 = "10mc50gm78zbxrwvxlygzmj2a29liiacv8haax0534c26vj9dwkl";
})
(fetchNuGet {
pname = "Selenium.WebDriver";

4
pkgs/applications/graphics/pinta/default.nix
View file

@ -63,6 +63,10 @@ buildDotnetModule rec {
# Rename the binary
mv "$out/bin/Pinta" "$out/bin/pinta"
# Copy runtime icons
mkdir -p $out/share/icons/hicolor/16x16/
cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/
# Install
dotnet build installer/linux/install.proj \
-target:Install \

4
pkgs/applications/misc/bemenu/default.nix
View file

@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
version = "0.6.6";
version = "0.6.7";
src = fetchFromGitHub {
owner = "Cloudef";
repo = pname;
rev = version;
sha256 = "sha256-687/v3YvRXbop5EouXS5/aI5P+o0QgpWlUCVzDG8jzM=";
sha256 = "sha256-cUkSXEB92I0UYTobQzUb2so1MUXJkryAqrmASx9RMF0=";
};
nativeBuildInputs = [ pkg-config pcre ];

4
pkgs/applications/misc/cherrytree/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
version = "0.99.45";
version = "0.99.46";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
sha256 = "sha256-DGhzqv7huFVgCdXy3DuIBT+7s2q6FB7+gFPd4zEXi2M=";
sha256 = "sha256-yX9USGiiCwtBcg055D8xBHoiCafQWtQFqf5i5bsi13U=";
};
nativeBuildInputs = [

6
pkgs/applications/misc/mdzk/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdzk";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "mdzk-rs";
repo = "mdzk";
rev = version;
sha256 = "sha256-NkoKQKcww5ktEbxbOY6WP8OemCB+rvXbuN9oSPjLE3Y=";
sha256 = "sha256-UiJ28VI4qXo04WojNaExTVQ3aTIXCQrdMbNM0DDy8A4=";
};
cargoSha256 = "sha256-uJ00tGiKtcYghFUh0fcYg4nZc/o8yhvlVs+6/aRNY5s=";
cargoSha256 = "sha256-CiA8Z1+S6+Lwms70IiRvIN83gValHuy6kHOukR2O7/Q=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

4
pkgs/applications/misc/otpclient/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "otpclient";
version = "2.4.7";
version = "2.4.8";
src = fetchFromGitHub {
owner = "paolostivanin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UR7h+btmOSnpjkrQMiABcM1tOFjOhNVWuKYDF9qXfFo=";
sha256 = "sha256-2exqMYcxg0UxlH+ZANQv2MFii9dZ6nizB4vxGR9cAwk=";
};
buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ];

6
pkgs/applications/misc/ticker/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ticker";
version = "4.4.4";
version = "4.5.0";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8=";
sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es=";
};
vendorSha256 = "sha256-1FnewgsKlOnBAdm7vyBngrFsDHNCzpZA3IDccxALeJ8=";
vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw=";
ldflags = [
"-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}"

23
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -11,7 +11,7 @@
, hunspell, libevent, libstartup_notification
, libvpx
, icu70, libpng, glib, pciutils
, autoconf213, which, gnused, rustPackages
, autoconf213, which, gnused, rustPackages, rustPlatform
, rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4
, gtk3, wrapGAppsHook
@ -196,6 +196,7 @@ buildStdenv.mkDerivation ({
which
unzip
wrapGAppsHook
rustPlatform.bindgenHook
]
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
++ extraNativeBuildInputs;
@ -210,28 +211,8 @@ buildStdenv.mkDerivation ({
rm -f .mozconfig*
# this will run autoconf213
configureScript="$(realpath ./mach) configure"
export MOZCONFIG=$(pwd)/mozconfig
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
# Set C flags for Rust's bindgen program. Unlike ordinary C
# compilation, bindgen does not invoke $CC directly. Instead it
# uses LLVM's libclang. To make sure all necessary flags are
# included we need to look in a few places.
# TODO: generalize this process for other use-cases.
BINDGEN_CFLAGS="$(< ${buildStdenv.cc}/nix-support/libc-crt1-cflags) \
$(< ${buildStdenv.cc}/nix-support/libc-cflags) \
$(< ${buildStdenv.cc}/nix-support/cc-cflags) \
$(< ${buildStdenv.cc}/nix-support/libcxx-cxxflags) \
${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \
${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \
$NIX_CFLAGS_COMPILE"
${
# Bindgen doesn't like the flag added by `separateDebugInfo`.
lib.optionalString enableDebugSymbols ''
BINDGEN_CFLAGS="''${BINDGEN_CFLAGS/ -Wa,--compress-debug-sections/}"
''}
echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG
'' + (lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,

8
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.26.3";
sha256 = "0j6zvcjykk775nnj8s0n5154lqslgfpi8884gh6sv204z2drfjff";
manifestsSha256 = "1pfk0fj228zy0m1cz0400l4r41l7p0gsdq5lqnl3a8vgb4f6i41q";
version = "0.27.0";
sha256 = "12d5azl30071s31dqbvbi1c5a5746cb9y45g889hgcyl50yzm2dx";
manifestsSha256 = "0mhx9xgir9ych9p0j5yc4swf371njfbwyk3cqa1nmipgpxbfczc6";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-34hSbOB7n9OFpVqe8y1+jAC3j0HEBg9LhYOvVGH9kLY=";
vendorSha256 = "sha256-iyyGLHtJVXc7rdu2VkuGo+Y1tTS0krW7F/lD5TmjTQs=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

11
pkgs/applications/networking/cluster/openshift/default.nix
View file

@ -33,9 +33,16 @@ in buildGoPackage rec {
goPackagePath = "github.com/openshift/origin";
buildInputs = [ libkrb5 ncurses ];
buildInputs = [ libkrb5 ];
nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ];
nativeBuildInputs = [
clang
go-bindata
installShellFiles
ncurses
rsync
which
];
patchPhase = ''
patchShebangs ./hack

12
pkgs/applications/science/misc/bada-bib/default.nix
View file

@ -9,15 +9,15 @@
, glib
, gnome
, gobject-introspection
, gtk3
, gtk4
, libxml2
, pkg-config
, python3Packages
, wrapGAppsHook }:
, wrapGAppsHook4 }:
python3Packages.buildPythonApplication rec {
pname = "bada-bib";
version = "0.4.1";
version = "0.5.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
owner = "RogerCrocker";
repo = "BadaBib";
rev = "v${version}";
sha256 = "sha256-kub2lLauru2RrinzxMDyBVC0htPx0Niv/M6bbmTS7Hk=";
sha256 = "sha256-tb/720WPqcO4w1EMmidjtEidsjZ0dEhe+/vnJPM6kxo=";
};
nativeBuildInputs = [
@ -35,13 +35,13 @@ python3Packages.buildPythonApplication rec {
meson
ninja
pkg-config
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [
gdk-pixbuf
glib
gtk3
gtk4
];
checkInputs = [

43
pkgs/applications/version-management/commitizen/default.nix
View file

@ -1,33 +1,46 @@
{ buildPythonApplication
, lib
, fetchFromGitHub
, poetry
, termcolor
, questionary
, colorama
, decli
, tomlkit
, fetchFromGitHub
, git
, jinja2
, pyyaml
, argcomplete
, typing-extensions
, lib
, packaging
, pytestCheckHook
, poetry
, pytest-freezegun
, pytest-mock
, pytest-regressions
, git
, pytestCheckHook
, pyyaml
, questionary
, termcolor
, tomlkit
, typing-extensions
, argcomplete, fetchPypi
}:
let
# NOTE: Upstream requires argcomplete <2, so we make it here.
argcomplete_1 = argcomplete.overrideAttrs (old: rec {
version = "1.12.3";
src = fetchPypi {
inherit (old) pname;
inherit version;
sha256 = "sha256-LH2//YwEXqU0kh5jsL5v5l6IWZmQ2NxAisjFQrcqVEU=";
};
});
in
buildPythonApplication rec {
pname = "commitizen";
version = "2.20.4";
version = "2.21.2";
src = fetchFromGitHub {
owner = "commitizen-tools";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2DhWiUAkAkyNxYB1CGzUB2nGZeCWvFqSztrxasUPSXw=";
sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ=";
deepClone = true;
};
@ -43,7 +56,7 @@ buildPythonApplication rec {
tomlkit
jinja2
pyyaml
argcomplete
argcomplete_1
typing-extensions
packaging
];
@ -54,7 +67,7 @@ buildPythonApplication rec {
pytest-freezegun
pytest-mock
pytest-regressions
argcomplete
argcomplete_1
git
];

35
pkgs/applications/version-management/git-and-tools/git-gone/default.nix
View file

@ -1,36 +1,39 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }:
{ lib
, stdenv
, fetchFromGitea
, rustPlatform
, libiconv
, Security
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "git-gone";
version = "0.3.7";
version = "0.3.8";
src = fetchFromGitHub {
owner = "lunaryorn";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "flausch";
repo = pname;
rev = "v${version}";
sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8";
sha256 = "sha256-hKbq2rJwEZI3391RsZXsQSjjp7rSqglUckRDYAu42KE=";
};
cargoSha256 = "0mbc1742szpxnqqah6q0yhkn4fyyxqzg830bd1vzr07v273wr06r";
cargoSha256 = "sha256-gBQ4V8Bwx6Di8aVnOYwx0UZZIIOFxZAXT7Tl1Yli0Fk=";
nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
postInstall = ''
installManPage git-gone.1
'';
postFixup = ''
wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}"
'';
meta = with lib; {
description = "Cleanup stale Git branches of pull requests";
homepage = "https://github.com/lunaryorn/git-gone";
description = "Cleanup stale Git branches of merge requests";
homepage = "https://codeberg.org/flausch/git-gone";
changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
platforms = platforms.unix;
};
}

139
pkgs/applications/video/rtabmap/0001-remove-printer-support.patch Normal file
View file

@ -0,0 +1,139 @@
From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001
From: ckie <git-525ff67@ckie.dev>
Date: Tue, 8 Feb 2022 19:18:49 +0200
Subject: [PATCH] remove printer support
---
app/src/CMakeLists.txt | 4 ++--
guilib/src/CMakeLists.txt | 4 ++--
guilib/src/GraphViewer.cpp | 12 +-----------
guilib/src/ImageView.cpp | 16 ----------------
guilib/src/utilite/UPlot.cpp | 9 ---------
5 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
index b20a07d4..2cad8c1e 100644
--- a/app/src/CMakeLists.txt
+++ b/app/src/CMakeLists.txt
@@ -63,9 +63,9 @@ ENDIF()
TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES})
IF(Qt5_FOUND)
IF(Qt5Svg_FOUND)
- QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport)
+ QT5_USE_MODULES(rtabmap Widgets Core Gui Svg)
ELSE()
- QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport)
+ QT5_USE_MODULES(rtabmap Widgets Core Gui)
ENDIF()
ENDIF(Qt5_FOUND)
diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt
index 3711205b..a393aa25 100644
--- a/guilib/src/CMakeLists.txt
+++ b/guilib/src/CMakeLists.txt
@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES})
TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES})
IF(Qt5_FOUND)
IF(Qt5Svg_FOUND)
- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport)
+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg)
ELSE()
- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport)
+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui)
ENDIF()
ENDIF(Qt5_FOUND)
diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp
index 58907c34..7b41061f 100644
--- a/guilib/src/GraphViewer.cpp
+++ b/guilib/src/GraphViewer.cpp
@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QtGui/QDesktopServices>
#include <QtGui/QContextMenuEvent>
#include <QColorDialog>
-#include <QPrinter>
#include <QFileDialog>
#ifdef QT_SVG_LIB
#include <QtSvg/QSvgGenerator>
@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event)
this->scene()->setSceneRect(this->scene()->itemsBoundingRect()); // Re-shrink the scene to it's bounding contents
QSize sceneSize = this->scene()->sceneRect().size().toSize();
- if(QFileInfo(filePath).suffix().compare("pdf") == 0)
- {
- QPrinter printer(QPrinter::HighResolution);
- printer.setOrientation(QPrinter::Portrait);
- printer.setOutputFileName( filePath );
- QPainter p(&printer);
- scene()->render(&p);
- p.end();
- }
- else if(QFileInfo(filePath).suffix().compare("svg") == 0)
+ if(QFileInfo(filePath).suffix().compare("svg") == 0)
{
#ifdef QT_SVG_LIB
QSvgGenerator svgGen;
diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp
index 714f2d36..887e7bdc 100644
--- a/guilib/src/ImageView.cpp
+++ b/guilib/src/ImageView.cpp
@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QInputDialog>
#include <QVBoxLayout>
#include <QColorDialog>
-#include <QPrinter>
#include <QGraphicsRectItem>
#include "rtabmap/utilite/ULogger.h"
#include "rtabmap/gui/KeypointItem.h"
@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e)
}
_savedFileName = text;
- if(QFileInfo(text).suffix().compare("pdf") == 0)
- {
- QPrinter printer(QPrinter::HighResolution);
- printer.setOrientation(QPrinter::Portrait);
- printer.setOutputFileName( text );
- QPainter p(&printer);
- p.begin(&printer);
- double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width());
- double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height());
- double scale = qMin(xscale, yscale);
- p.scale(scale, scale);
- _graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect());
- p.end();
- }
- else
{
QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied);
QPainter p(&img);
diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp
index 1b11c65e..8bf94841 100644
--- a/guilib/src/utilite/UPlot.cpp
+++ b/guilib/src/utilite/UPlot.cpp
@@ -42,7 +42,6 @@
#include <QFileDialog>
#include <QtGui/QClipboard>
#include <QApplication>
-#include <QPrinter>
#include <QColorDialog>
#include <QToolTip>
#ifdef QT_SVG_LIB
@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event)
else
{
#endif
- if(QFileInfo(text).suffix().compare("pdf") == 0)
- {
- QPrinter printer;
- printer.setOutputFormat(QPrinter::PdfFormat);
- printer.setOutputFileName(text);
- this->render(&printer);
- }
- else
{
QPixmap figure = QPixmap::grabWidget(this);
figure.save(text);
--
2.34.1

59
pkgs/applications/video/rtabmap/default.nix Normal file
View file

@ -0,0 +1,59 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "rtabmap";
version = "unstable-2022-02-07";
src = fetchFromGitHub {
owner = "introlab";
repo = "rtabmap";
rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2";
sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40=";
};
patches = [
# Our Qt5 seems to be missing PrintSupport.. I think?
./0001-remove-printer-support.patch
];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ];
buildInputs = [
## Required
opencv
pcl
## Optional
libusb1
eigen
g2o
ceres-solver
# libpointmatcher - ABI mismatch
octomap
freenect
libdc1394
# librealsense - missing includedir
qtbase
libGL
libGLU
vtkWithQt5
];
# Disable warnings that are irrelevant to us as packagers
cmakeFlags = "-Wno-dev";
# We run one of the executables we build while the build is
# still running (and patchelf hasn't been invoked) which means
# the RPATH is not set correctly. This hacks around that error:
#
# build/bin/rtabmap-res_tool: error while loading shared libraries: librtabmap_utilite.so.0.20: cannot open shared object file: No such file or directory
LD_LIBRARY_PATH = "/build/source/build/bin";
meta = with lib; {
description = "Real-Time Appearance-Based 3D Mapping";
homepage = "https://introlab.github.io/rtabmap/";
license = licenses.bsd3;
maintainers = with maintainers; [ ckie ];
platforms = with platforms; linux;
};
}

8
pkgs/applications/window-managers/i3/status-rust.nix
View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.21.5";
version = "0.21.6";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0maPT1NdWFkSupU6CL2cFd6hlZ2BMxAOK6f3rQbfFA8=";
sha256 = "sha256-2PBGw5LHIOOPXBZ+12wL2ZGH+gfbkXNIItpE6SLT8so=";
};
cargoSha256 = "sha256-QUecTmw8pWqrTdcstbXoFf53dFfwFN51tQ7ngUzkyV0=";
cargoSha256 = "sha256-wtxfdQw5zKCxYu7N2BpcLVTlitQmwY7s8oO4dpK8MjE=";
nativeBuildInputs = [ pkg-config makeWrapper ];
@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Very resource-friendly and feature-rich replacement for i3status";
homepage = "https://github.com/greshake/i3status-rust";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ backuitist globin ma27 ];
platforms = platforms.linux;
};

10
pkgs/build-support/rust/hooks/default.nix
View file

@ -1,6 +1,7 @@
{ buildPackages
, callPackage
, cargo
, clang
, diffutils
, lib
, makeSetupHook
@ -92,4 +93,13 @@ in {
rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec;
};
} ./maturin-build-hook.sh) {};
bindgenHook = callPackage ({}: makeSetupHook {
name = "rust-bindgen-hook";
substitutions = {
libclang = clang.cc.lib;
inherit clang;
};
}
./rust-bindgen-hook.sh) {};
}

13
pkgs/build-support/rust/hooks/rust-bindgen-hook.sh Normal file
View file

@ -0,0 +1,13 @@
# populates LIBCLANG_PATH and BINDGEN_EXTRA_CLANG_ARGS for rust projects that
# depend on the bindgen crate
# if you modify this, you probably also need to modify the wrapper for the cli
# of bindgen in pkgs/development/tools/rust/bindgen/wrapper.sh
populateBindgenEnv () {
export LIBCLANG_PATH=@libclang@/lib
BINDGEN_EXTRA_CLANG_ARGS="$(< @clang@/nix-support/cc-cflags) $(< @clang@/nix-support/libc-cflags) $(< @clang@/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
export BINDGEN_EXTRA_CLANG_ARGS
}
postHook="${postHook:-}"$'\n'"populateBindgenEnv"$'\n'

4
pkgs/data/fonts/andika/default.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "6.001";
version = "6.101";
in
fetchzip rec {
name = "andika-${version}";
@ -14,7 +14,7 @@ in
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
'';
sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc=";
sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI=";
meta = with lib; {
homepage = "https://software.sil.org/andika";

4
pkgs/data/fonts/charis-sil/default.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "6.001";
version = "6.101";
in
fetchzip rec {
name = "charis-sil-${version}";
@ -14,7 +14,7 @@ in
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
'';
sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08=";
sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU=";
meta = with lib; {
homepage = "https://software.sil.org/charis";

4
pkgs/data/fonts/doulos-sil/default.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "6.001";
version = "6.101";
in
fetchzip rec {
name = "doulos-sil-${version}";
@ -14,7 +14,7 @@ in
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
'';
sha256 = "sha256-MkeLLT7EAeSuCMxVVxVfajHufxr+xMLIz2hf3wF3U4o=";
sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc=";
meta = with lib; {
homepage = "https://software.sil.org/doulos";

3
pkgs/development/compilers/elm/default.nix
View file

@ -7,7 +7,7 @@ let
fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
hsPkgs = self: pkgs.haskellPackages.override {
hsPkgs = self: pkgs.haskell.packages.ghc8107.override {
overrides = self: super: with pkgs.haskell.lib.compose; with lib;
let elmPkgs = rec {
elm = overrideCabal (drv: {
@ -200,4 +200,3 @@ in lib.makeScope pkgs.newScope (self: with self; {
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install;
})
)

4
pkgs/development/compilers/nim/default.nix
View file

@ -98,12 +98,12 @@ in {
nim-unwrapped = stdenv.mkDerivation rec {
pname = "nim-unwrapped";
version = "1.6.2";
version = "1.6.4";
strictDeps = true;
src = fetchurl {
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M=";
hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI=";
};
buildInputs = [ boehmgc openssl pcre readline sqlite ];

2
pkgs/development/compilers/rust/make-rust-platform.nix
View file

@ -31,5 +31,5 @@ rec {
# Hooks
inherit (callPackage ../../../build-support/rust/hooks {
inherit stdenv cargo rustc;
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook;
}

11
pkgs/development/compilers/vala/default.nix
View file

@ -18,8 +18,6 @@ let
{
"0.48" = ./disable-graphviz-0.46.1.patch;
"0.52" = ./disable-graphviz-0.46.1.patch;
"0.54" = ./disable-graphviz-0.46.1.patch;
}.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
@ -87,13 +85,8 @@ let
in rec {
vala_0_48 = generic {
version = "0.48.22";
sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os=";
};
vala_0_52 = generic {
version = "0.52.10";
sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg=";
version = "0.48.23";
sha256 = "sha256-3jzIWNmV4HR0IZ4lo+Hw7ZmAcNLiBtOjE9Q3ml93oGo=";
};
vala_0_54 = generic {

4
pkgs/development/libraries/drogon/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "drogon";
version = "1.7.4";
version = "1.7.5";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${version}";
sha256 = "02igryrv8782rwqb4w49frymlw9n7hv8fskqsw43rqly650vzakb";
sha256 = "sha256-DrpaXUaoO35DgmX8cYb3kbXfd6PlqI6pjEKnroiRxvg=";
fetchSubmodules = true;
};

4
pkgs/development/libraries/gvm-libs/default.nix
View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "21.4.3";
version = "21.4.4";
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1NVLGyUDUnOy3GYDtVyhGTvWOYoWp95EbkgTlFWuxE8=";
sha256 = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libtsm/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libtsm";
version = "4.0.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "Aetf";
repo = "libtsm";
rev = "v${version}";
sha256 = "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx";
sha256 = "sha256-BYMRPjGRVSnYzkdbxypkuE0YkeVLPJ32iGZ1b0R6wto=";
};
buildInputs = [ libxkbcommon ];

4
pkgs/development/libraries/mtxclient/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mtxclient";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "mtxclient";
rev = "v${version}";
sha256 = "sha256-hTB0a5KXcQb0MCEX9YonDJOGlTmRkrOIP9UFlwuJc6g=";
sha256 = "sha256-TsGoSVewQJlr0zj8qYEd+UU8DlncZDCqfrqTv89LEYU=";
};
postPatch = ''

4
pkgs/development/libraries/okapi/default.nix
View file

@ -2,11 +2,11 @@
rustPlatform.buildRustPackage rec {
pname = "okapi";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz";
sha256 = "sha256-1aADcwEEWMhoJjwc8wkEcmBYXz+5josOfI/KLaton2k=";
sha256 = "sha256-I3wTcT7vLgH+B8gNzl8Yr/qMIDkMJUrG++SOSS+FUmQ=";
};
cargoVendorDir = "vendor";

10
pkgs/development/libraries/vtk/generic.nix
View file

@ -90,6 +90,16 @@ in stdenv.mkDerivation rec {
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
'';
preFixup = ''
for lib in $out/lib/libvtk*.so; do
ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')"
done
mv $out/include/vtk-${majorVersion}/* $out/include
rmdir $out/include/vtk-${majorVersion}
ln -s $out/include $out/include/vtk-${majorVersion}
'';
meta = with lib; {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "https://www.vtk.org/";

33
pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix Normal file
View file

@ -0,0 +1,33 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "mmap";
version = "20201220-git";
description = "Portable mmap (file memory mapping) utility library.";
deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz";
sha256 = "147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij";
};
packageName = "mmap";
asdFilesToKeep = ["mmap.asd"];
overrides = x: x;
}
/* (SYSTEM mmap DESCRIPTION
Portable mmap (file memory mapping) utility library. SHA256
147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij URL
http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz MD5
e2dbeb48b59735bd2ed54ea7f9cdfe0f NAME mmap FILENAME mmap DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi)
(NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES
(alexandria babel cffi documentation-utils trivial-features trivial-indent)
VERSION 20201220-git SIBLINGS (mmap-test) PARASITES NIL) */

30
pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix Normal file
View file

@ -0,0 +1,30 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "slynk";
version = "sly-20210411-git";
parasites = [ "slynk/arglists" "slynk/fancy-inspector" "slynk/indentation" "slynk/mrepl" "slynk/package-fu" "slynk/profiler" "slynk/retro" "slynk/stickers" "slynk/trace-dialog" ];
description = "System lacks description";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz";
sha256 = "1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks";
};
packageName = "slynk";
asdFilesToKeep = ["slynk.asd"];
overrides = x: x;
}
/* (SYSTEM slynk DESCRIPTION System lacks description SHA256
1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks URL
http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz MD5
7f0ff6b8a07d23599c77cd33c6d59ea6 NAME slynk FILENAME slynk DEPS NIL
DEPENDENCIES NIL VERSION sly-20210411-git SIBLINGS NIL PARASITES
(slynk/arglists slynk/fancy-inspector slynk/indentation slynk/mrepl
slynk/package-fu slynk/profiler slynk/retro slynk/stickers
slynk/trace-dialog)) */

2
pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
View file

@ -178,6 +178,7 @@ mgl-pax
minheap
misc-extensions
mk-string-metrics
mmap
moptilities
more-conditions
mt19937
@ -207,6 +208,7 @@ salza2
serapeum
simple-date
simple-date-time
slynk
smart-buffer
smug
spinneret

22
pkgs/development/lisp-modules/quicklisp-to-nix.nix
View file

@ -2338,6 +2338,14 @@ let quicklisp-to-nix-packages = rec {
}));
"slynk" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."slynk" or (x: {}))
(import ./quicklisp-to-nix-output/slynk.nix {
inherit fetchurl;
}));
"simple-date-time" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."simple-date-time" or (x: {}))
@ -2702,6 +2710,20 @@ let quicklisp-to-nix-packages = rec {
}));
"mmap" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."mmap" or (x: {}))
(import ./quicklisp-to-nix-output/mmap.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"cffi" = quicklisp-to-nix-packages."cffi";
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
}));
"mk-string-metrics" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."mk-string-metrics" or (x: {}))

31
pkgs/development/ocaml-modules/gg/default.nix
View file

@ -1,31 +1,26 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }:
let
inherit (lib) getVersion versionAtLeast;
pname = "gg";
version = "0.9.1";
webpage = "https://erratique.ch/software/${pname}";
homepage = "https://erratique.ch/software/gg";
version = "1.0.0";
in
assert versionAtLeast (getVersion ocaml) "4.01.0";
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
"gg is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
pname = "ocaml${ocaml.version}-gg";
inherit version;
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2";
url = "${homepage}/releases/gg-${version}.tbz";
sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci";
};
buildInputs = [ ocaml findlib ocamlbuild opaline ];
buildInputs = [ ocaml findlib ocamlbuild topkg ];
createFindlibDestdir = true;
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
inherit (topkg) buildPhase installPhase;
meta = with lib; {
description = "Basic types for computer graphics in OCaml";
@ -35,8 +30,8 @@ stdenv.mkDerivation {
matrices, quaternions, axis aligned boxes, colors, color spaces, and
raster data.
'';
homepage = webpage;
platforms = ocaml.meta.platforms or [];
inherit homepage;
inherit (ocaml.meta) platforms;
license = licenses.bsd3;
maintainers = [ maintainers.jirkamarsik ];
};

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.19.6";
version = "3.20.0";
format = "setuptools";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-Y9g0A9pVjEVcITyaQsyAew6rraTPwZuevSsDD46c0DM=";
sha256 = "sha256-bbzEI/Ig7yQn4/fRmX8tIe6UL+J8iV1TbrCXBU+oLms=";
};
nativeBuildInputs = [

8
pkgs/development/python-modules/async-lru/default.nix
View file

@ -8,19 +8,19 @@
buildPythonPackage rec {
pname = "async-lru";
version = "unstable-2020-10-24";
version = "unstable-2022-02-03";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = "async-lru";
rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42";
sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc";
rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc";
hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU=";
};
postPatch = ''
sed -i '/^addopts/d' setup.cfg
sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg
'';
checkInputs = [

4
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "16.4.0";
version = "17.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "23a8047668ebd1fa7c3c2445eba4e69c07675306e2a94ae6a3e455df162bd008";
sha256 = "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/beartype/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "beartype";
version = "0.9.1";
version = "0.10.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "YjYw3CQ7DaWoTw+kFOaqryYT5WetGav+aoHBfqWrYvE=";
sha256 = "sha256-7yKOZpOLT0SH2LMGodGaCTi8TvJEthYjCfQjzMjO/HY=";
};
checkInputs = [

4
pkgs/development/python-modules/buildbot/default.nix
View file

@ -31,11 +31,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "3.4.0";
version = "3.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk=";
sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/buildbot/pkg.nix
View file

@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q=";
sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc=";
};
postPatch = ''

10
pkgs/development/python-modules/buildbot/plugins.nix
View file

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw=";
sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o=";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs=";
sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg=";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc=";
sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI=";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE=";
sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI=";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc=";
sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc=";
};
buildInputs = [ buildbot-pkg ];

2
pkgs/development/python-modules/buildbot/worker.nix
View file

@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU=";
sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg=";
};
propagatedBuildInputs = [ twisted future ];

4
pkgs/development/python-modules/cloudsmith-api/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "cloudsmith-api";
version = "1.8.2";
version = "1.30.0";
format = "wheel";
src = fetchPypi {
pname = "cloudsmith_api";
inherit format version;
sha256 = "f00410210f0efa1af7a2d344deafc12b946e3efc7d5c8374b27dc67ed8580183";
sha256 = "sha256-IKxeNAMJTMCpP/jz7lHuetHCpddypgYdCKQcI/9pIj8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/gdown/default.nix
View file

@ -11,12 +11,12 @@
buildPythonApplication rec {
pname = "gdown";
version = "4.3.0";
version = "4.3.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KswYue892Mlpa8wnPf9bt8MEJGtjGaMjlDt0TXGoEdE=";
sha256 = "sha256-ZFy1/3ZI+Zu/fZbOhswNoRlKFCUSXcPO/bJetSkiyHE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/hahomematic/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.35.0";
version = "0.35.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-VgtdnKj+TlAsFr1un6eMlYfumap4mwE8H4kkKAUrxfo=";
sha256 = "sha256-ZQwL++j7wIaBYkLDAxUH2jhzxvf40tjgUPTZR4kySNk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/imap-tools/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.51.0";
version = "0.51.1";
disabled = isPy27;
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
hash = "sha256-ZJen+hpNpeZjScD7aqdaW796KRlJ8K1JBXPOagpceXk=";
hash = "sha256-ppxQtFK7U006z7qonm3B5gN99CHB9mEX3l0XjrhZQo8=";
};
checkInputs = [

4
pkgs/development/python-modules/pex/default.nix
View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.66";
version = "2.1.67";
format = "flit";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FYDudoCgxk2wkjPVXTnzHzCQRwtHmgJS+2mwoKbj3Ms=";
sha256 = "sha256-rtxHRuZ30S81pdWUvQnSImcEX6/vCY/pvKFNY7sJaBw=";
};
nativeBuildInputs = [

2
pkgs/development/python-modules/pivy/default.nix
View file

@ -35,7 +35,7 @@ buildPythonPackage rec {
doCheck = false;
postPatch = ''
substituteInPlace CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \
substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \
\$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}'
'';

8
pkgs/development/python-modules/pyroute2-core/default.nix
View file

@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, pyroute2-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2-core";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyroute2.core";
inherit version;
sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI=";
hash = "sha256-N74cQcWx57lYIPiQTL+/Ec5Kf1rgdMrRkkYIdyaLjN4=";
};
# pyroute2 sub-modules have no tests

8
pkgs/development/python-modules/pyroute2-ethtool/default.nix
View file

@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, pyroute2-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2-ethtool";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyroute2.ethtool";
inherit version;
sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo=";
hash = "sha256-jwPg7xcmQU3F4cVrs2GVUxBXV6waMkrnmyZkHo2kLR0=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/pyroute2-ipdb/default.nix
View file

@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, pyroute2-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2-ipdb";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyroute2.ipdb";
inherit version;
sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc=";
hash = "sha256-uMEPUleEBIaIV4bCejTmeHYhKeaN9SNcUMzBAODNBEU=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/pyroute2-ipset/default.nix
View file

@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, pyroute2-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2-ipset";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyroute2.ipset";
inherit version;
sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50=";
hash = "sha256-roNLNXmnW27a+TgxtMi8HO5hF4agxdjQ0DMsYW6O44c=";
};
propagatedBuildInputs = [

12
pkgs/development/python-modules/pyroute2-ndb/default.nix
View file

@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, pyroute2-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2-ndb";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyroute2.ndb";
inherit version;
sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg=";
hash = "sha256-o/rmbOwfRUPw/g1Cc/5otqKvGe3Br3y4iSXad/PfTPw=";
};
propagatedBuildInputs = [
@ -21,7 +25,9 @@ buildPythonPackage rec {
# pyroute2 sub-modules have no tests
doCheck = false;
pythonImportsCheck = [ "pr2modules.ndb" ];
pythonImportsCheck = [
"pr2modules.ndb"
];
meta = with lib; {
description = "NDB module for pyroute2";

4
pkgs/development/python-modules/pyroute2-nftables/default.nix
View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-nftables";
version = "0.6.5";
version = "0.6.7";
src = fetchPypi {
pname = "pyroute2.nftables";
inherit version;
sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY=";
sha256 = "sha256-d9LdXxBQGa40MmGuK2cFOOEI7X4Y1pPv0ObW9n7ZUjo=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/pyroute2-nslink/default.nix
View file

@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, pyroute2-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2-nslink";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyroute2.nslink";
inherit version;
sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4=";
hash = "sha256-p+U3Y5vKCxuvMl/yNKlay57tlU4GKttCJrAwctKa5TY=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/pyroute2-protocols/default.nix
View file

@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, pyroute2-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2-protocols";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyroute2.protocols";
inherit version;
sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84=";
hash = "sha256-GdququbQcU+exzxifb8UGamkSUMhR94j+auF8I6e7/Q=";
};
propagatedBuildInputs = [

17
pkgs/development/python-modules/pyroute2/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, importlib-metadata
, mitogen
, pyroute2-core
, pyroute2-ethtool
@ -9,15 +10,19 @@
, pyroute2-ndb
, pyroute2-nftables
, pyroute2-nslink
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyroute2";
version = "0.6.5";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw=";
hash = "sha256-qBv9jshyg0S9IThdrXHTFcb2neQPDmURmtSbqYCKlWo=";
};
propagatedBuildInputs = [
@ -29,18 +34,22 @@ buildPythonPackage rec {
pyroute2-ndb
pyroute2-nftables
pyroute2-nslink
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
# Requires root privileges, https://github.com/svinota/pyroute2/issues/778
doCheck = false;
pythonImportsCheck = [ "pyroute2" ];
pythonImportsCheck = [
"pyroute2"
];
meta = with lib; {
description = "Python Netlink library";
homepage = "https://github.com/svinota/pyroute2";
license = licenses.asl20;
maintainers = with maintainers; [ mic92 ];
maintainers = with maintainers; [ fab mic92 ];
platforms = platforms.unix;
};
}

7
pkgs/development/python-modules/pyswitchbot/default.nix
View file

@ -2,18 +2,21 @@
, bluepy
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.13.2";
version = "0.13.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = version;
sha256 = "0pdmssd5dr364p3lrkxqryjc0rbaw6xp724zwqf3i87qs6ljs928";
hash = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow=";
};
propagatedBuildInputs = [

13
pkgs/development/python-modules/pytube/default.nix
View file

@ -7,21 +7,30 @@
buildPythonPackage rec {
pname = "pytube";
version = "11.0.2";
version = "12.0.0";
disabled = pythonOlder "3.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "pytube";
repo = "pytube";
rev = "v${version}";
hash = "sha256-3HrkhlwV8OLqbzC6QgddLB1fQxWbwCQ6STCgUXlr5So=";
hash = "sha256-1zoLd4J7aCR5omMpCZhlttWDu7mYyKCypH3JEB4VGXg=";
};
checkInputs = [
pytestCheckHook
];
disabledTestPaths = [
"tests/test_extract.py"
"tests/test_query.py"
"tests/test_streams.py"
"tests/test_main.py"
];
pythonImportsCheck = [ "pytube" ];
meta = with lib; {

4
pkgs/development/python-modules/rki-covid-parser/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "rki-covid-parser";
version = "1.3.2";
version = "1.3.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebino";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lJFeGg34L+hmH/ZhTx7FGir/9dK/rviaGveOl2HgNlM=";
sha256 = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/sphinxext-opengraph/default.nix
View file

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "sphinxext-opengraph";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "wpilibsuite";
repo = "sphinxext-opengraph";
rev = "v${version}";
sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc=";
sha256 = "sha256-FLou/Ag+uf6uTjzSAAAFbQScgRtHvMT21ZwlKBYNhlU=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/subarulink/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "subarulink";
version = "0.4.2";
version = "0.4.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "G-Two";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EI7m2SFa1eAtncMA0g1OmXumzub4UvE6ssGfUGtLO2Q=";
sha256 = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/types-requests/default.nix
View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.27.10";
version = "2.27.11";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XcsIj8qneO/u5rf8RpZwN+mD+/uf7AJZRXi9M/115VU=";
sha256 = "sha256-an7SSyF4CvSlteJMMQss2IX7YS31/ZVYTQPYfl8qGVo=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/uvloop/default.nix
View file

@ -53,6 +53,8 @@ buildPythonPackage rec {
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# Flaky test: https://github.com/MagicStack/uvloop/issues/412
"--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set"
# Broken: https://github.com/NixOS/nixpkgs/issues/160904
"--deselect" "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost"
];
disabledTestPaths = [

16
pkgs/development/python-modules/whitenoise/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, brotli
, buildPythonPackage
, django
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
@ -9,14 +10,16 @@
buildPythonPackage rec {
pname = "whitenoise";
version = "5.3.0";
disabled = pythonOlder "3.5";
version = "6.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "evansd";
repo = pname;
rev = "v${version}";
sha256 = "17j1rml1hb43c7fs7kf4ygkpmnjppzgsbnyw3plq9w3yh9w5hkhg";
rev = version;
hash = "sha256-mUjyX4eQOiMweje6UPyfyJsiHwzF5OQ93KuxFedWxbQ=";
};
propagatedBuildInputs = [
@ -24,6 +27,7 @@ buildPythonPackage rec {
];
checkInputs = [
django
pytestCheckHook
requests
];
@ -40,7 +44,9 @@ buildPythonPackage rec {
"test_modified"
];
pythonImportsCheck = [ "whitenoise" ];
pythonImportsCheck = [
"whitenoise"
];
meta = with lib; {
description = "Radically simplified static file serving for WSGI applications";

11
pkgs/development/tools/analysis/checkov/default.nix
View file

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.875";
version = "2.0.885";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-ZM554FZayuxxf9dgbGcvfPoXm5rWjjZoNySnKpxRO/w=";
hash = "sha256-jhZ2LdCb7+4SMXcoWw9hKT77Qdiw+HWff0jkkvaci28=";
};
nativeBuildInputs = with py.pkgs; [
@ -106,11 +106,12 @@ buildPythonApplication rec {
"TestSarifReport"
# Will probably be fixed in one of the next releases
"test_valid_cyclonedx_bom"
"test_record_relative_path_with_direct_oberlay"
"test_record_relative_path_with_direct_prod2_oberlay"
"test_record_relative_path_with"
"test_record_relative_path_with_relative_dir"
# Requires prettytable release which is only available in staging
"test_skipped_check_exists"
"test_record_relative_path_with_relative_dir"
# AssertionError: 0 not greater than 0
"test_skip_mapping_default"
];
disabledTestPaths = [

4
pkgs/development/tools/analysis/codeql/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.8.0";
version = "2.8.1";
dontConfigure = true;
dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-IcYD9o6rv1ti4IvTEEJ5iV1OdJP7cHN0vetrvabxeas=";
sha256 = "sha256-zZoK5x+nE8AVZWDSMmsVPFuXNnAHBPyu9+1GgSwN19c=";
};
nativeBuildInputs = [

6
pkgs/development/tools/ashpd-demo/default.nix
View file

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook4
rustPlatform.bindgenHook
desktop-file-utils
glib # for glib-compile-schemas
];
@ -63,11 +64,6 @@ stdenv.mkDerivation rec {
libshumate
];
# libspa-sys requires this for bindgen
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
# <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h>
BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include";
passthru = {
updateScript = nix-update-script {
attrPath = pname;

6
pkgs/development/tools/datree/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "datree";
version = "0.15.16";
version = "0.15.22";
src = fetchFromGitHub {
owner = "datreeio";
repo = "datree";
rev = version;
sha256 = "sha256-FIFsx6iSirUY14cn6E7CPhZQKtcgnyZ2fYghrMUx3Lw=";
hash = "sha256-g5u2QQtVmNp01KtUKwC8uoEIuoBDLHsOlRz1Mv0n/y8=";
};
vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o=";
vendorSha256 = "1cvlvlwdk41f145kzifg7rv7ymwhc9k0ck91bn106240rq1igcr0";
ldflags = [
"-s"

4
pkgs/development/tools/ddosify/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-urls47jS9Vu64PC/Ie+UTDfg17krs+UegqKub1QaYK4=";
sha256 = "sha256-LIk23TZiLP2FEeHVEtd3CCUgBJ9YijclpFLyDhv6zRA=";
};
vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";

6
pkgs/development/tools/go-task/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-task";
version = "3.10.0";
version = "3.11.0";
src = fetchFromGitHub {
owner = pname;
repo = "task";
rev = "v${version}";
sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA=";
sha256 = "sha256-KHeZ0UH7qa+fii+sT7q9ri3DpLOKqQZqCAKQYn4l5M8=";
};
vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs=";
vendorSha256 = "sha256-u+LeH9GijquBeYlA3f2GcyoSP/S7BtBqb8C9OgEA9fY=";
doCheck = false;

4
pkgs/development/tools/rust/bindgen/default.nix
View file

@ -34,7 +34,9 @@ let
touch $out
'';
};
} ''
}
# if you modify the logic to find the right clang flags, also modify rustPlatform.bindgenHook
''
mkdir -p $out/bin
export cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)"
export cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)"

4
pkgs/os-specific/linux/ryzenadj/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pciutils, cmake }:
stdenv.mkDerivation rec {
pname = "ryzenadj";
version = "0.8.3";
version = "0.9.0";
src = fetchFromGitHub {
owner = "FlyGoat";
repo = "RyzenAdj";
rev = "v${version}";
sha256 = "sha256-eb8DskF0SJtc0tDKJ1vU7dtuQmHO7RX8vm4DQki2ZEg=";
sha256 = "sha256-RoKRqqIVY9zjyXzGxHo+J4OV7cKc7CkqsdbpreB7EHc=";
};
nativeBuildInputs = [ pciutils cmake ];

10
pkgs/servers/headphones/default.nix
View file

@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "headphones";
version = "0.6.0-alpha.1";
version = "0.6.0-beta.5";
src = fetchFromGitHub {
owner = "rembo10";
repo = "headphones";
rev = "v${version}";
sha256 = "sha256-+mWtceQoHSMRkA8izZnKM0cgbt0P5Hr3arKOevpKvqc=";
sha256 = "1ddqk5ch1dlh895cm99li4gb4a596mvq3d0gah9vrbn6fyhp3b4v";
};
dontBuild = true;
@ -17,17 +17,21 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/opt/headphones
cp -R {data,headphones,lib,Headphones.py} $out/opt/headphones
echo v${version} > $out/opt/headphones/version.txt
makeWrapper $out/opt/headphones/Headphones.py $out/bin/headphones
runHook postInstall
'';
meta = with lib; {
description = "Automatic music downloader for SABnzbd";
license = licenses.gpl3;
license = licenses.gpl3Plus;
homepage = "https://github.com/rembo10/headphones";
maintainers = with lib.maintainers; [ rembo10 ];
};

6
pkgs/servers/imgproxy/default.nix
View file

@ -3,16 +3,16 @@
buildGoModule rec {
pname = "imgproxy";
version = "3.2.2";
version = "3.3.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
sha256 = "sha256-z1Vt6rTpQ9sSwT+hr4wGZmZl55MyDx1AIDqSWmCXbMc=";
sha256 = "sha256-8oUPqtoxdJ768CmDNBicBGCyejt2v9GIahVRL6pYDJ4=";
rev = "v${version}";
};
vendorSha256 = "sha256-MHcV6n6uZsjC85vQVl+o6JD+psvE2xuPr//3RueT8V0=";
vendorSha256 = "sha256-Dr5qCLVsv22BcISo2OyB+VEDncPwpcp323w9IfDTQv0=";
doCheck = false;

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

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.596";
version = "0.20.604";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "wIJSqsIb3/SOicjLgnv0Lt3Wv1qKPHslRcDlZCvckUs=";
sha256 = "a2hJOu/TvT+6mQEt+9JB4l/Niz2+r8JuxANv4JUSM6U=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

9
pkgs/servers/matrix-conduit/default.nix
View file

@ -14,21 +14,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-fpjzc2HiWP6nV8YZOwxsIOhy4ht/tQqcvCkcLMIFUaQ=";
nativeBuildInputs = with pkgs; [
clang
llvmPackages.libclang
rustPlatform.bindgenHook
];
buildInputs = with pkgs; [
pkg-config
clangStdenv
llvmPackages.libclang.lib
rocksdb
];
preBuild = with pkgs; ''
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
'';
cargoBuildFlags = "--bin conduit";
meta = with lib; {

6
pkgs/servers/mycorrhiza/default.nix
View file

@ -4,16 +4,16 @@
buildGoModule rec {
pname = "mycorrhiza";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "bouncepaw";
repo = "mycorrhiza";
rev = "v${version}";
sha256 = "sha256-81Ok/0cDkFqKEAwWtpxM3InMfu0R9rZJzQ41AhWuVuo=";
sha256 = "sha256-+8cW7xNr4gzNHQ/hBpASoe9g7W/QFQhtO/dZ9umgJec=";
};
vendorSha256 = "sha256-9FMxj3AkbKyUMZWj1S0myoKem4mupOHPIfxNHjYk8mU=";
vendorSha256 = "sha256-foAjMPvNJnjpxRAXEgNeYuvDAoBdMwiQc9BiNxifzUc=";
subPackages = [ "." ];

4
pkgs/servers/sql/dolt/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dolt";
version = "0.37.0";
version = "0.37.1";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-uAZlQpuNUpg2ZZJBU7A49fCm6GlrYaFyn6ZrmNBW1Y0=";
sha256 = "sha256-rLnjWJPIf2SzWpaQxt/4zACihKptly/OJ+w0/uJBacY=";
};
modRoot = "./go";

6
pkgs/servers/swego/default.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "swego";
version = "0.97";
version = "0.98";
src = fetchFromGitHub {
owner = "nodauf";
repo = "Swego";
rev = "v${version}";
sha256 = "sha256-T4xkjNdOSD0kHLVfwUz1PrFokLmnbzcj/pbV36W+2ZQ=";
sha256 = "sha256-fS1mrB4379hnnkLMkpKqV2QB680t5T0QEqsvqOp9pzY=";
};
vendorSha256 = "sha256-GiYJfykcBvIoJ0zvdtT3P+iHmBgBWIeOTaniFysAPHs=";
vendorSha256 = "sha256-N4HDngQFNCzQ74W52R0khetN6+J7npvBC/bYZBAgLB4=";
postInstall = ''
mv $out/bin/src $out/bin/$pname

4
pkgs/shells/zsh/spaceship-prompt/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spaceship-prompt";
version = "3.16.2";
version = "3.16.3";
src = fetchFromGitHub {
owner = "denysdovhan";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/b+ko4d4lbjWC2rIjFBPePyzhvfHk4xyg2s86GfFNd4=";
sha256 = "sha256-eIvNfs9c8Ftcnbtg7lNNc2d3OWWpse91yTzcLqoeFqI=";
};
dontBuild = true;

6
pkgs/tools/admin/stripe-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "stripe-cli";
version = "1.7.12";
version = "1.7.13";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xDhLd1tCw+W3xXxBgHDKZtMZszXsNelv2dMygHNVq64=";
sha256 = "sha256-XYhOBEpHVAJ/PHovMylme56le33IUM5C9HEZAm/gG3I=";
};
vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk=";
vendorSha256 = "sha256-OP39ZuWBz/lutuYGbYLVEtjIirXq89QTdltq2v0NWRE=";
subPackages = [
"cmd/stripe"

4
pkgs/tools/audio/abcmidi/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2022.01.28";
version = "2022.02.13";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
hash = "sha256-+g5oKUfm6vRuRQfOx0QDueYMabgScL8Mfw5GJcXQztg=";
hash = "sha256-iPeGcEDGvltXqJY50B+yDKYKRF4Oz9GQifn7Pqe8dG8=";
};
meta = with lib; {

6
pkgs/tools/audio/mpd-discord-rpc/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "mpd-discord-rpc";
version = "1.2.3";
version = "1.3.0";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY=";
sha256 = "sha256-b6V9puPFufQcTI5o88MbHf5+j+agJAr+DPYieVy+T6M=";
};
cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg=";
cargoSha256 = "sha256-U4wbKfRUC0sL9SistPNZjAGuXZB+XD1llAru33EAOHE=";
meta = with lib; {
description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence";

4
pkgs/tools/compression/dtrx/default.nix
View file

@ -21,13 +21,13 @@
python3Packages.buildPythonApplication rec {
pname = "dtrx";
version = "8.2.1";
version = "8.2.2";
src = fetchFromGitHub {
owner = "dtrx-py";
repo = "dtrx";
rev = version;
sha256 = "sha256-ayQ52teXWpw3ZvPhfqxFHxMZatQK9NKv/97ovANFZcE=";
sha256 = "sha256-thtBVGgKRYHOAFuxDvuFxcIHoyYAI58AiNCx4vuVXGs=";
};
postInstall =

6
pkgs/tools/graphics/resvg/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "resvg";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
sha256 = "sha256-I0I6gb2jG0ZeEp6WwDipe43wuek43CWm0zGBX2hAros=";
sha256 = "sha256-3WFzLyg6335twcAMIjzza9r45ljcFlAzvTqyqXOfs1A=";
};
cargoSha256 = "sha256-EdbyaVrHjjVUNmQM96VKCeU3ss1G/N4OZxFMLvFgRqY=";
cargoSha256 = "sha256-twKiuxRpsiJu+hHrg6kUclX9+BWPUop492C+CkwQF2k=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

25
pkgs/tools/misc/dotter/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ lib, fetchFromGitHub, rustPlatform, which }:
rustPlatform.buildRustPackage rec {
pname = "dotter";
version = "0.12.9";
src = fetchFromGitHub {
owner = "SuperCuber";
repo = "dotter";
rev = version;
sha256 = "0rxinrm110i5cbkl7c7vgk7dl0x79cg6g23bdjixsg7h0572c2gi";
};
cargoSha256 = "0fr2dvzbpwqvf98wwrxv76nwbrv4m9ppx7br4x78gm8dhf2nj4zx";
checkInputs = [ which ];
meta = with lib; {
description = "A dotfile manager and templater written in rust 🦀";
homepage = "https://github.com/SuperCuber/dotter";
license = licenses.unlicense;
maintainers = with maintainers; [ linsui ];
mainProgram = "dotter";
};
}

6
pkgs/tools/misc/fselect/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fselect";
version = "0.7.9";
version = "0.8.0";
src = fetchFromGitHub {
owner = "jhspetersson";
repo = "fselect";
rev = version;
sha256 = "sha256-Z1F63tMO3qzi/PrdVR0WCcPXx5E6PwjYPF99Bolnxc8=";
sha256 = "sha256-nFfzvTCiNlv+EzK51w04JHh8tfsim/8hFCxnZZue5No=";
};
cargoSha256 = "sha256-tGzfIQ4nAFA/mXPL6cOaz97W5tjtPGsmbTSkUDFSAzY=";
cargoSha256 = "sha256-B7uJ9hLN/WhLA/bqoO7WZ38tN0tDMZ2KW/vjfOgcQ3A=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin libiconv;

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