gador/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-07-07 00:15:12 +00:00
committed by GitHub
parent a49a073fc0 bdae2919d2
commit 5dcf079fac
165 changed files with 4299 additions and 5489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+1 -1
View File
@@ -11918,7 +11918,7 @@
name = "Spencer Whitt";
};
squalus = {
email = "squalus@tuta.io";
email = "squalus@squalus.net";
github = "squalus";
githubId = 36899624;
name = "squalus";
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+7
View File
@@ -285,6 +285,13 @@
<literal>hardware.saleae-logic.package</literal>.
</para>
</listitem>
<listitem>
<para>
The Redis module now disables RDB persistence when
<literal>services.redis.servers.&lt;name&gt;.save = []</literal>
instead of using the Redis default.
</para>
</listitem>
<listitem>
<para>
Matrix Synapse now requires entries in the
nixos/doc/manual/release-notes/rl-2211.section.md
+2
View File
@@ -110,6 +110,8 @@ Use `configure.packages` instead.
- A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
- The Redis module now disables RDB persistence when `services.redis.servers.<name>.save = []` instead of using the Redis default.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
nixos/modules/module-list.nix
-2
View File
@@ -1047,7 +1047,6 @@
./services/web-apps/code-server.nix
./services/web-apps/baget.nix
./services/web-apps/convos.nix
./services/web-apps/cryptpad.nix
./services/web-apps/dex.nix
./services/web-apps/discourse.nix
./services/web-apps/documize.nix
@@ -1275,7 +1274,6 @@
./virtualisation/parallels-guest.nix
./virtualisation/podman/default.nix
./virtualisation/qemu-guest-agent.nix
./virtualisation/railcar.nix
./virtualisation/spice-usb-redirection.nix
./virtualisation/virtualbox-guest.nix
./virtualisation/virtualbox-host.nix
nixos/modules/rename.nix
+2
View File
@@ -68,6 +68,7 @@ with lib;
prey-bash-client is deprecated upstream
'')
(mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs")
(mkRemovedOptionModule [ "services" "railcar" ] "the corresponding package has been removed from nixpkgs")
(mkRemovedOptionModule [ "services" "seeks" ] "")
(mkRemovedOptionModule [ "services" "ssmtp" ] ''
The ssmtp package and the corresponding module have been removed due to
@@ -98,6 +99,7 @@ with lib;
(mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.")
# Do NOT add any option renames here, see top of the file
];
nixos/modules/services/databases/redis.nix
+10 -2
View File
@@ -166,7 +166,11 @@ in {
save = mkOption {
type = with types; listOf (listOf int);
default = [ [900 1] [300 10] [60 10000] ];
description = "The schedule in which data is persisted to disk, represented as a list of lists where the first element represent the amount of seconds and the second the number of changes.";
description = mdDoc ''
The schedule in which data is persisted to disk, represented as a list of lists where the first element represent the amount of seconds and the second the number of changes.
If set to the empty list (`[]`) then RDB persistence will be disabled (useful if you are using AOF or don't want any persistence).
'';
};
slaveOf = mkOption {
@@ -268,7 +272,11 @@ in {
syslog-enabled = config.syslog;
databases = config.databases;
maxclients = config.maxclients;
save = map (d: "${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}") config.save;
save = if config.save == []
then ''""'' # Disable saving with `save = ""`
else map
(d: "${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}")
config.save;
dbfilename = "dump.rdb";
dir = "/var/lib/${redisName name}";
appendOnly = config.appendOnly;
nixos/modules/services/web-apps/cryptpad.nix
-54
View File
@@ -1,54 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.cryptpad;
in
{
options.services.cryptpad = {
enable = mkEnableOption "the Cryptpad service";
package = mkOption {
default = pkgs.cryptpad;
defaultText = literalExpression "pkgs.cryptpad";
type = types.package;
description = "
Cryptpad package to use.
";
};
configFile = mkOption {
type = types.path;
default = "${cfg.package}/lib/node_modules/cryptpad/config/config.example.js";
defaultText = literalExpression ''"''${package}/lib/node_modules/cryptpad/config/config.example.js"'';
description = ''
Path to the JavaScript configuration file.
See <link
xlink:href="https://github.com/xwiki-labs/cryptpad/blob/master/config/config.example.js"/>
for a configuration example.
'';
};
};
config = mkIf cfg.enable {
systemd.services.cryptpad = {
description = "Cryptpad Service";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
serviceConfig = {
DynamicUser = true;
Environment = [
"CRYPTPAD_CONFIG=${cfg.configFile}"
"HOME=%S/cryptpad"
];
ExecStart = "${cfg.package}/bin/cryptpad";
PrivateTmp = true;
Restart = "always";
StateDirectory = "cryptpad";
WorkingDirectory = "%S/cryptpad";
};
};
};
}
nixos/modules/virtualisation/railcar.nix
-124
View File
@@ -1,124 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.railcar;
generateUnit = name: containerConfig:
let
container = pkgs.ociTools.buildContainer {
args = [
(pkgs.writeShellScript "run.sh" containerConfig.cmd).outPath
];
};
in
nameValuePair "railcar-${name}" {
enable = true;
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/railcar -r ${cfg.stateDir} run ${name} -b ${container}
'';
Type = containerConfig.runType;
};
};
mount = with types; (submodule {
options = {
type = mkOption {
type = str;
default = "none";
description = ''
The type of the filesystem to be mounted.
Linux: filesystem types supported by the kernel as listed in
`/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs",
"reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts
(when options include either bind or rbind), the type is a dummy,
often "none" (not listed in /proc/filesystems).
'';
};
source = mkOption {
type = str;
description = "Source for the in-container mount";
};
options = mkOption {
type = listOf str;
default = [ "bind" ];
description = ''
Mount options of the filesystem to be used.
Support options are listed in the mount(8) man page. Note that
both filesystem-independent and filesystem-specific options
are listed.
'';
};
};
});
in
{
options.services.railcar = {
enable = mkEnableOption "railcar";
containers = mkOption {
default = {};
description = "Declarative container configuration";
type = with types; attrsOf (submodule ({ name, config, ... }: {
options = {
cmd = mkOption {
type = types.lines;
description = "Command or script to run inside the container";
};
mounts = mkOption {
type = with types; attrsOf mount;
default = {};
description = ''
A set of mounts inside the container.
The defaults have been chosen for simple bindmounts, meaning
that you only need to provide the "source" parameter.
'';
example = { "/data" = { source = "/var/lib/data"; }; };
};
runType = mkOption {
type = types.str;
default = "oneshot";
description = "The systemd service run type";
};
os = mkOption {
type = types.str;
default = "linux";
description = "OS type of the container";
};
arch = mkOption {
type = types.str;
default = "x86_64";
description = "Computer architecture type of the container";
};
};
}));
};
stateDir = mkOption {
type = types.path;
default = "/var/railcar";
description = "Railcar persistent state directory";
};
package = mkOption {
type = types.package;
default = pkgs.railcar;
defaultText = literalExpression "pkgs.railcar";
description = "Railcar package to use";
};
};
config = mkIf cfg.enable {
systemd.services = flip mapAttrs' cfg.containers (name: containerConfig:
generateUnit name containerConfig
);
};
}
nixos/tests/all-tests.nix
-1
View File
@@ -110,7 +110,6 @@ in {
cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
cryptpad = handleTest ./cryptpad.nix {};
deluge = handleTest ./deluge.nix {};
dendrite = handleTest ./matrix/dendrite.nix {};
dex-oidc = handleTest ./dex-oidc.nix {};
nixos/tests/cryptpad.nix
-18
View File
@@ -1,18 +0,0 @@
import ./make-test-python.nix ({ lib, ... }:
with lib;
{
name = "cryptpad";
meta.maintainers = with maintainers; [ davhau ];
nodes.machine =
{ pkgs, ... }:
{ services.cryptpad.enable = true; };
testScript = ''
machine.wait_for_unit("cryptpad.service")
machine.wait_for_open_port(3000)
machine.succeed("curl -L --fail http://localhost:3000/sheet")
'';
})
pkgs/applications/audio/cardinal/default.nix
+4 -8
View File
@@ -1,9 +1,7 @@
{
stdenv
, fetchFromGitHub
, fetchpatch
, fetchurl
, fetchzip
, freetype
, jansson
, lib
@@ -23,12 +21,12 @@
stdenv.mkDerivation rec {
pname = "cardinal";
version = "22.04";
version = "22.06";
src = fetchurl {
url =
"https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz";
sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE=";
"https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
sha256 = "sha256-h7pNoLpB7XkWHZUCQfvJsSnOn37DcP9xuH9kxtfmCos=";
};
prePatch = ''
@@ -55,6 +53,7 @@ stdenv.mkDerivation rec {
speexdsp
];
hardeningDisable = [ "format" ];
makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ];
meta = {
@@ -63,8 +62,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.all;
# ../../utils/CarlaPluginUI.cpp:31:10: fatal error: 'Cocoa/Cocoa.h' file not found
# # import <Cocoa/Cocoa.h>
broken = stdenv.isDarwin;
};
}
pkgs/applications/audio/furnace/default.nix
+9 -10
View File
@@ -7,8 +7,10 @@
, cmake
, pkg-config
, makeWrapper
, fftw
, fmt_8
, libsndfile
, rtmidi
, SDL2
, zlib
, withJACK ? stdenv.hostPlatform.isUnix
@@ -19,21 +21,16 @@
stdenv.mkDerivation rec {
pname = "furnace";
version = "0.5.8";
version = "0.6pre1";
src = fetchFromGitHub {
owner = "tildearrow";
repo = "furnace";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "103ymd3wa1sfsr6qg15vpcs53j350i7zidv3azlf7cynk6k28xim";
sha256 = "sha256-7MrzSC8PYQ4X8fyX1hB8mOoSCtLpY+o1x42v9HLdoao=";
};
postPatch = ''
# rtmidi is not used yet
sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt
'';
nativeBuildInputs = [
cmake
pkg-config
@@ -42,8 +39,10 @@ stdenv.mkDerivation rec {
];
buildInputs = [
fftw
fmt_8
libsndfile
rtmidi
SDL2
zlib
] ++ lib.optionals withJACK [
@@ -54,10 +53,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_GUI=${if withGUI then "ON" else "OFF"}"
"-DSYSTEM_FFTW=ON"
"-DSYSTEM_FMT=ON"
"-DSYSTEM_LIBSNDFILE=ON"
"-DSYSTEM_ZLIB=ON"
"-DSYSTEM_RTMIDI=ON"
"-DSYSTEM_SDL2=ON"
"-DSYSTEM_ZLIB=ON"
"-DWITH_JACK=${if withJACK then "ON" else "OFF"}"
"-DWARNINGS_ARE_ERRORS=ON"
];
@@ -85,8 +86,6 @@ stdenv.mkDerivation rec {
};
tests.version = testers.testVersion {
package = furnace;
# The command always exits with code 1
command = "(furnace --version || [ $? -eq 1 ])";
};
};
pkgs/applications/audio/musescore/darwin.nix
+4 -4
View File
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, undmg }:
let
versionComponents = [ "2" "1" ];
versionComponents = [ "3" "6" "2" "548020600" ];
appName = "MuseScore ${builtins.head versionComponents}";
in
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
sourceRoot = "${appName}.app";
src = fetchurl {
url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795";
url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0=";
};
buildInputs = [ undmg ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Music notation and composition software";
homepage = "https://musescore.org/";
license = licenses.gpl2;
license = licenses.gpl3Only;
platforms = platforms.darwin;
maintainers = [];
};
pkgs/applications/audio/puddletag/default.nix
+3 -3
View File
@@ -25,13 +25,13 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "puddletag";
version = "2.1.1";
version = "2.2.0";
src = fetchFromGitHub {
owner = "puddletag";
repo = "puddletag";
rev = version;
hash = "sha256-eilETaFvvPMopIbccV1uLbpD55kHX9KGTCcGVXaHPgM=";
rev = "refs/tags/${version}";
hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g=";
};
postPatch = ''
pkgs/applications/audio/sonic-pi/default.nix
+5 -9
View File
@@ -2,7 +2,6 @@
, lib
, qtbase
, fetchFromGitHub
, fftwSinglePrec
, ruby
, erlang
, aubio
@@ -14,14 +13,11 @@
, boost
, bash
, jack2
, supercollider
, supercollider-with-sc3-plugins
, qwt
}:
let
supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; };
pname = "sonic-pi";
version = "3.3.1";
src = fetchFromGitHub {
@@ -62,7 +58,7 @@ mkDerivation rec {
qwt
ruby
aubio
supercollider_single_prec
supercollider-with-sc3-plugins
boost
erlang
alsa-lib
@@ -122,18 +118,18 @@ mkDerivation rec {
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang] }
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang] }
makeWrapper \
$out/app/server/ruby/bin/sonic-pi-server.rb \
$out/bin/sonic-pi-server \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang ] }
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang ] }
'';
meta = {
homepage = "https://sonic-pi.net/";
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt ];
maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ];
platforms = lib.platforms.linux;
};
}
pkgs/applications/editors/vim/plugins/generated.nix
+432 -396
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/vim-plugin-names
+3
View File
@@ -581,6 +581,7 @@ https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/eigenfoo/stan-vim/,,
https://github.com/darfink/starsearch.vim/,,
https://github.com/teto/stylish.nvim/,HEAD,
https://github.com/kvrohit/substrata.nvim/,HEAD,
https://github.com/lambdalisue/suda.vim/,,
https://github.com/ervandew/supertab/,,
https://github.com/ur4ltz/surround.nvim/,,
@@ -916,6 +917,7 @@ https://github.com/jakwings/vim-pony/,,
https://github.com/haya14busa/vim-poweryank/,,
https://github.com/prettier/vim-prettier/,,
https://github.com/thinca/vim-prettyprint/,,
https://github.com/meain/vim-printer/,HEAD,
https://github.com/pantharshit00/vim-prisma/,,
https://github.com/tpope/vim-projectionist/,,
https://github.com/dhruvasagar/vim-prosession/,,
@@ -973,6 +975,7 @@ https://github.com/dstein64/vim-startuptime/,,
https://github.com/axelf4/vim-strip-trailing-whitespace/,,
https://github.com/nbouscal/vim-stylish-haskell/,,
https://github.com/alx741/vim-stylishask/,,
https://github.com/arzg/vim-substrata/,HEAD,
https://github.com/svermeulen/vim-subversive/,,
https://github.com/tpope/vim-surround/,,
https://github.com/evanleck/vim-svelte/,,
pkgs/applications/emulators/dolphin-emu/primehack.nix
+2 -2
View File
@@ -48,13 +48,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu-primehack";
version = "1.0.6";
version = "1.0.6a";
src = fetchFromGitHub {
owner = "shiiion";
repo = "dolphin";
rev = version;
sha256 = "sha256-ywCh6wiBjXY5baWfu7cBgwc8w8yJaLM3QQ0FATsrweQ=";
sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk=";
fetchSubmodules = true;
};
pkgs/applications/graphics/pineapple-pictures/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, qtsvg
, qttools
, exiv2
, wrapQtAppsHook
, cmake
}:
stdenv.mkDerivation rec {
pname = "pineapple-pictures";
version = "0.6.1";
src = fetchFromGitHub {
owner = "BLumia";
repo = "pineapple-pictures";
rev = version;
sha256 = "sha256-KTYwe6fS/rUHBbC2B9OdK95mFm3zvgDdGODkg7VQ27M=";
};
nativeBuildInputs = [
cmake
qttools
wrapQtAppsHook
];
buildInputs = [
qtsvg
exiv2.lib
];
meta = with lib; {
description = "Homebrew lightweight image viewer";
homepage = "https://github.com/BLumia/pineapple-pictures";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ rewine ];
};
}
pkgs/applications/misc/kiln/default.nix
+8 -9
View File
@@ -1,29 +1,28 @@
{ lib, buildGoModule, fetchFromSourcehut, scdoc }:
{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }:
buildGoModule rec {
pname = "kiln";
version = "0.3.0";
version = "0.3.2";
src = fetchFromSourcehut {
owner = "~adnano";
repo = pname;
rev = version;
hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA=";
hash = "sha256-PI80td/GV92Msdtive+f+H6FWo7wdaPmPCpwrX3iLlo=";
};
nativeBuildInputs = [ scdoc ];
nativeBuildInputs = [ scdoc installShellFiles ];
vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE=";
installPhase = ''
runHook preInstall
make PREFIX=$out install
runHook postInstall
postInstall = ''
scdoc < docs/kiln.1.scd > docs/kiln.1
installManPage docs/kiln.1
'';
meta = with lib; {
description = "A simple static site generator for Gemini";
homepage = "https://git.sr.ht/~adnano/kiln";
homepage = "https://kiln.adnano.co/";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
};
pkgs/applications/misc/mako/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "mako";
version = "1.6";
version = "1.7.1";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RcPwZ5NeO9vxwPWfgj5x3wVdCYGKumnYT3ngHEAWfW0=";
sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4=";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ];
pkgs/applications/misc/xmr-stak/default.nix
+3 -9
View File
@@ -1,16 +1,11 @@
{ stdenv, stdenvGcc6, lib
, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
, opencl-headers, ocl-icd, hwloc, cudatoolkit
, opencl-headers, ocl-icd, hwloc
, devDonationLevel ? "0.0"
, cudaSupport ? false
, openclSupport ? true
}:
let
stdenv' = if cudaSupport then stdenvGcc6 else stdenv;
in
stdenv'.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "xmr-stak";
version = "2.10.8";
@@ -23,12 +18,11 @@ stdenv'.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-O3";
cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF"
cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
nativeBuildInputs = [ cmake ];
buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
++ lib.optional cudaSupport cudatoolkit
++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
postPatch = ''
pkgs/applications/networking/browsers/vivaldi/default.nix
+2 -2
View File
@@ -20,11 +20,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "5.3.2679.61-1";
version = "5.3.2679.68-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "0cxsdcksv29dxync8rxrn30kr68qzf615085nhkk0ava7jdlvz9g";
sha256 = "0dfpxjr1sknkppazmw6dwrczv6gvh14nyc3la3q1y7cdzp95jpx3";
};
unpackPhase = ''
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+3 -3
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "chromium-codecs-ffmpeg-extra";
version = "102.0.5005.49";
version = "103.0.5060.53";
src = fetchurl {
url = "https://launchpadlibrarian.net/601067148/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-b0oTDOi9VY+8v4JUAGkqdcum4uis08/v+COTx8eHBXg=";
url = "https://launchpadlibrarian.net/607589056/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-Tsp5Y6sCn+mKrLGZSAWGFoSTHiyfANQ5VA7pesU1HyU=";
};
buildInputs = [ dpkg ];
pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
+1 -1
View File
@@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db
curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
node2nix \
--nodejs-12 \
--nodejs-16 \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input package.json \
pkgs/applications/networking/cluster/spacegun/node-composition.nix
+1 -1
View File
@@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
pkgs/applications/networking/cluster/terraform-providers/default.nix
-9
View File
@@ -60,15 +60,6 @@ let
special-providers =
{
brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; };
# remove with >= 1.6.0
# https://github.com/equinix/terraform-provider-equinix/commit/5b4d6415d23dc2ee56988c4b1458fbb51c8cc750
equinix = automated-providers.equinix.overrideAttrs (a: {
src = a.src.overrideAttrs (a: {
postFetch = (a.postFetch or "") + lib.optionalString (!stdenv.isDarwin) ''
rm $out/cmd/migration-tool/README.md
'';
});
});
# mkisofs needed to create ISOs holding cloud-init data,
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
pkgs/applications/networking/cluster/terraform-providers/providers.json
+8 -8
View File
@@ -367,10 +367,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/equinix",
"repo": "terraform-provider-equinix",
"rev": "v1.5.0",
"sha256": "sha256-+NrEP5x9/ymNb2qSdMyHNu7rjUtYxDT5Nv70vMxfTJw=",
"vendorSha256": "sha256-5MSZ4Mw6P5cI+COOq5SLTXqaVTr+zOix+w983rgcS+g=",
"version": "1.5.0"
"rev": "v1.6.0",
"sha256": "sha256-wvx0dZS38i5B7Jpaaa9iuv93PyzNAaKCxxU8OxklOhE=",
"vendorSha256": "sha256-tWMmwCFWwRvsFC/Bu4Eax+uopxN3ijRP9qr35bcg6qQ=",
"version": "1.6.0"
},
"exoscale": {
"owner": "exoscale",
@@ -738,10 +738,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
"rev": "v3.2.2",
"sha256": "sha256-sQMvTWGjj4UpmyvH1o+NjBHglKvpXPP7H8vfrNxJaKQ=",
"vendorSha256": null,
"version": "3.2.2"
"rev": "v3.3.0",
"sha256": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=",
"vendorSha256": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=",
"version": "3.3.0"
},
"minio": {
"owner": "aminueza",
pkgs/applications/networking/go-graft/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "go-graft";
version = "0.2.6";
src = fetchFromGitHub {
owner = "mzz2017";
repo = "gg";
rev = "v${version}";
sha256 = "sha256-nuRkQEqytMPxd2Wh5XeUwk4YzIxnnNEiVTxFY4GlD1E=";
};
CGO_ENABLED = 0;
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
vendorSha256 = "sha256-/ckudHo/ttNct+yrQYQEaC6hX+p+Q6M1I/cjJCgjYLk=";
subPackages = [ "." ];
meta = with lib; {
description = "A command-line tool for one-click proxy in your research and development without installing v2ray or anything else";
homepage = "https://github.com/mzz2017/gg";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ xyenon ];
mainProgram = "gg";
platforms = platforms.linux;
};
}
pkgs/applications/networking/mullvad-vpn/default.nix
+2 -2
View File
@@ -43,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2022.1";
version = "2022.2";
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i";
sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o=";
};
nativeBuildInputs = [
pkgs/applications/networking/mullvad/mullvad.nix
+5 -28
View File
@@ -13,29 +13,18 @@
, openvpn-mullvad
, shadowsocks-rust
}:
let
# result of running address_cache as of 02 Mar 2022
bootstrap-address-cache = writeText "api-ip-address.txt" ''
193.138.218.78:443
193.138.218.71:444
185.65.134.66:444
185.65.135.117:444
217.138.254.130:444
91.90.44.10:444
'';
in
rustPlatform.buildRustPackage rec {
pname = "mullvad";
version = "2022.1";
version = "2022.2";
src = fetchFromGitHub {
owner = "mullvad";
repo = "mullvadvpn-app";
rev = version;
hash = "sha256-bLwuM3Qy2iStbXIvDEWp31vuiihSQThOej297XKo5Xc=";
hash = "sha256-ZtQKzbFrkacrfPIkMz/UOfIwQBXQUoVVlFla//jmMwY=";
};
cargoHash = "sha256-CBbm8cJHTjyvvzCFQfKmsE5d9N7azEm8nI6KeWLVaa8=";
cargoHash = "sha256-J6h3KY1RDCnAc/tQHNGEyOlVQoQNhRqjWbmimPitydQ=";
nativeBuildInputs = [
pkg-config
@@ -59,26 +48,14 @@ rustPlatform.buildRustPackage rec {
postFixup =
# Place all binaries in the 'mullvad-' namespace, even though these
# specific binaries aren't used in the lifetime of the program.
# `address_cache` is used to generate the `api-ip-address.txt` file, which
# contains list of Mullvad API servers -- though we provide a "backup" of
# the output of this command, it could change at any time, so we want
# users to be able to regenerate the list at any time. (The daemon will
# refuse to start without this file.)
''
for bin in address_cache relay_list translations-converter; do
for bin in relay_list translations-converter; do
mv "$out/bin/$bin" "$out/bin/mullvad-$bin"
done
'' +
# Put distributed assets in-place -- specifically, the
# bootstrap-address-cache is necessary; otherwise, the user will have to run
# the `address_cache` binary and move the contents into place at
# `/var/cache/mullvad-vpn/api-ip-address.txt` manually.
''
mkdir -p $out/share/mullvad
ln -s ${bootstrap-address-cache} $out/share/mullvad/api-ip-address.txt
'' +
# Files necessary for OpenVPN tunnels to work.
''
mkdir -p $out/share/mullvad
cp dist-assets/ca.crt $out/share/mullvad
ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad
pkgs/applications/networking/n8n/node-packages.nix
Generated
+108 -68
View File
@@ -220,6 +220,15 @@ let
sha512 = "FBEPKGnvtQJS8V8Tg1P9obgmVD9AodrIfwtwhBpsjenClhFyugMp3HPJY0tF7rInUB/CivKBCbnQKrUnKxqxzw==";
};
};
"@babel/parser-7.18.6" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
version = "7.18.6";
src = fetchurl {
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz";
sha512 = "uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==";
};
};
"@babel/runtime-7.18.6" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
@@ -724,13 +733,13 @@ let
sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
};
};
"@types/node-18.0.0" = {
"@types/node-18.0.1" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "18.0.0";
version = "18.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz";
sha512 = "cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==";
url = "https://registry.npmjs.org/@types/node/-/node-18.0.1.tgz";
sha512 = "CmR8+Tsy95hhwtZBKJBs0/FFq4XX7sDZHlGGf+0q+BRZfMbOTkzkj0AFAuTyXbObDIoanaBBW0+KEW+m3N16Wg==";
};
};
"@types/node-fetch-2.6.2" = {
@@ -841,6 +850,15 @@ let
sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ==";
};
};
"@vue/compiler-sfc-2.7.2" = {
name = "_at_vue_slash_compiler-sfc";
packageName = "@vue/compiler-sfc";
version = "2.7.2";
src = fetchurl {
url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.2.tgz";
sha512 = "khG5m63A4DSeHEOe5yyjHQY2TAE0pUXqKqxgauNUcFaa8M4+J55OWhagy8Bk8O6cO4GhKbQf2NDYzceijmOy8A==";
};
};
"abbrev-1.1.1" = {
name = "abbrev";
packageName = "abbrev";
@@ -1201,13 +1219,13 @@ let
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
};
};
"aws-sdk-2.1164.0" = {
"aws-sdk-2.1167.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1164.0";
version = "2.1167.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1164.0.tgz";
sha512 = "q/M9E68WabF22G8d8lFgo3NH+9RooYswSY9VG6zqN16C19RRm2sGThp8Sxtz/WUK98BAsxSnkLW1ksmy3BsP7Q==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1167.0.tgz";
sha512 = "hUJzAqWVfNYpct1S+GjyPIc2s+GZcAhbWVqIG4qbLYZ3+sBTcjv3lLH5zx7K+qcTGINDU0g4EsMi6hIrAU+blg==";
};
};
"aws-sign2-0.7.0" = {
@@ -1246,13 +1264,13 @@ let
sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==";
};
};
"axios-retry-3.3.0" = {
"axios-retry-3.3.1" = {
name = "axios-retry";
packageName = "axios-retry";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.3.0.tgz";
sha512 = "lKAk/qIkpYxscEooNPB6Yip3aPNcNJ+cAiU1eiTo9vCh+gYPX482K4lfYubPXwbVvmNM4cakAsfN171nmSHkdg==";
url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.3.1.tgz";
sha512 = "RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q==";
};
};
"babel-helper-vue-jsx-merge-props-2.0.3" = {
@@ -2299,6 +2317,15 @@ let
sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==";
};
};
"csstype-3.1.0" = {
name = "csstype";
packageName = "csstype";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz";
sha512 = "uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==";
};
};
"dashdash-1.14.1" = {
name = "dashdash";
packageName = "dashdash";
@@ -4099,6 +4126,15 @@ let
sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==";
};
};
"js-md4-0.3.2" = {
name = "js-md4";
packageName = "js-md4";
version = "0.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/js-md4/-/js-md4-0.3.2.tgz";
sha512 = "/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA==";
};
};
"js-yaml-3.14.1" = {
name = "js-yaml";
packageName = "js-yaml";
@@ -5053,49 +5089,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.124.0" = {
"n8n-core-0.125.0" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.124.0";
version = "0.125.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.124.0.tgz";
sha512 = "rcOInEZLSxlOuCH2cMuyW+EO1/QUH4pJaDJlCmDUAJ2JdqyXMPVAiYBLX3SPRHy9cvfuE0oV/aSHh9VpiISCHg==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.125.0.tgz";
sha512 = "xywzkbtSkhxMzCQNZacklxdqAxl6sVgIJLJ8IUuHtfdcS7E6VJNJ5SIT/Ypl+E3UAsfH1kiHHdlkDgLGyB20tA==";
};
};
"n8n-design-system-0.24.0" = {
"n8n-design-system-0.25.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
version = "0.24.0";
version = "0.25.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.24.0.tgz";
sha512 = "/JPfW6wDdkrVonApyHOMsdRNDIy3ljQJ1PG7LqGFt7PB1Tgxz8X/y+rClegEm+miQN3i9egN2yq3TChvL/YDmw==";
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.25.0.tgz";
sha512 = "vS1dIW6n3/MxrKFJ8EpIt4oMNnvYmoweL2kncDja7CpvOO3Zqsa0ElqUvhbbxypk0DcfSQMonNWfSonGrNIgeg==";
};
};
"n8n-editor-ui-0.150.0" = {
"n8n-editor-ui-0.151.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.150.0";
version = "0.151.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.150.0.tgz";
sha512 = "HQ8tblXy9orfCMGcffD12yyHqKfd4kCwZDt7ckXzZpwqq4SUHYT1MQO/O1zXykpdLDY2ZKQ73+YV2kD3tMcLqg==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.151.0.tgz";
sha512 = "3VbZm2jfOC4BXUDzhdBvtx3L+XPnr2LdLVLQ2yrx6HvDFUpMExuxmoQ3I8/aDTo5asVDEHgi7TKkISqY8LKi8A==";
};
};
"n8n-nodes-base-0.182.0" = {
"n8n-nodes-base-0.183.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.182.0";
version = "0.183.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.182.0.tgz";
sha512 = "mC6SeDYmsiKLDSWAL1nDbLCGH+TgZq0HiLYBlTa+ttg/S7Yw1W8VmhFs0ZNVk6VQgACSGSvT9mA5/YTFIPqplA==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.183.0.tgz";
sha512 = "JH7FodkX+RtvmyqxMyro9hskhLNSigYUOcnX/6568dipH3ZiOgk+GDQD0VApBoOFpV1GHuWF85onkMoEiEJ3HA==";
};
};
"n8n-workflow-0.106.0" = {
"n8n-workflow-0.107.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.106.0";
version = "0.107.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.106.0.tgz";
sha512 = "vuVKjmK9ycZFYcEAb80JtDGV+/tLG6qVGQHy7qNA+kpVgQBYdsDJCVKEyPw6Bj0zHHW0ggEmL4VmoE35UPeRAw==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.107.0.tgz";
sha512 = "+SuZ+5aA+sEovnkkobdZNEGFW/0oCTItCpXaL2+umI0TFrqgL8NGGVKwYLIkX6YATa5W3LVgbEszKDECg2sPJA==";
};
};
"named-placeholders-1.1.2" = {
@@ -5269,13 +5305,13 @@ let
sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==";
};
};
"nodemailer-6.7.5" = {
"nodemailer-6.7.6" = {
name = "nodemailer";
packageName = "nodemailer";
version = "6.7.5";
version = "6.7.6";
src = fetchurl {
url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz";
sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg==";
url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.6.tgz";
sha512 = "/6KF/umU7r7X21Y648/yiRLrgkfz0dmpyuo4BfgYWIpnT/jCbkPTvegMfxCsDAu+O810p2L1BGXieMTPp3nJVA==";
};
};
"nopt-5.0.0" = {
@@ -6187,13 +6223,13 @@ let
sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
};
};
"psl-1.8.0" = {
"psl-1.9.0" = {
name = "psl";
packageName = "psl";
version = "1.8.0";
version = "1.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz";
sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==";
};
};
"pump-2.0.1" = {
@@ -7393,13 +7429,13 @@ let
sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==";
};
};
"tedious-14.6.1" = {
"tedious-14.7.0" = {
name = "tedious";
packageName = "tedious";
version = "14.6.1";
version = "14.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/tedious/-/tedious-14.6.1.tgz";
sha512 = "45Xsvsjm6j41JVXXwKAseAGM/jD6ty8CcSdcxPT4B2dqZ00tIkYsGlI7n8DU8xDoatnvyT4BIYKZZCe3eE16PA==";
url = "https://registry.npmjs.org/tedious/-/tedious-14.7.0.tgz";
sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w==";
};
};
"test-console-2.0.0" = {
@@ -7978,13 +8014,13 @@ let
sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==";
};
};
"vue-2.6.14" = {
"vue-2.7.2" = {
name = "vue";
packageName = "vue";
version = "2.6.14";
version = "2.7.2";
src = fetchurl {
url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz";
sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==";
url = "https://registry.npmjs.org/vue/-/vue-2.7.2.tgz";
sha512 = "fQPKEfdiUP4bDlrGEjI5MOTkC5s/XIbnfKAx0B3MxJHI4qwh8FPLSo8/9tFkgFiRH3HwvcHjZQ1tCTifOUH0tg==";
};
};
"vue-color-2.8.1" = {
@@ -8086,13 +8122,13 @@ let
sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
};
};
"winston-3.8.0" = {
"winston-3.8.1" = {
name = "winston";
packageName = "winston";
version = "3.8.0";
version = "3.8.1";
src = fetchurl {
url = "https://registry.npmjs.org/winston/-/winston-3.8.0.tgz";
sha512 = "Iix1w8rIq2kBDkGvclO0db2CVOHYVamCIkVWcUbs567G9i2pdB+gvqLgDgxx4B4HXHYD6U4Zybh6ojepUOqcFQ==";
url = "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz";
sha512 = "r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w==";
};
};
"winston-transport-4.5.0" = {
@@ -8389,10 +8425,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.184.0";
version = "0.185.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.184.0.tgz";
sha512 = "GBnRD/3/4SHxSm6soWFmcCp4X30HFrzo2uXLgr0qKYbunO7PIJL+hRr7JO4FVP557n5AQhcL9xTzYTNYt8YtHg==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.185.0.tgz";
sha512 = "S3NBZkON4drha+QMTSmRlFq81F5ENW4Swe6lIsosdTQJziSoHmXb2gKogLYfTYAXSq4BasfVmcgYHDFB/fGQMg==";
};
dependencies = [
sources."@apidevtools/json-schema-ref-parser-8.0.0"
@@ -8492,6 +8528,7 @@ in
sources."tslib-2.4.0"
];
})
sources."@babel/parser-7.18.6"
sources."@babel/runtime-7.18.6"
sources."@colors/colors-1.5.0"
(sources."@dabh/diagnostics-2.0.3" // {
@@ -8581,7 +8618,7 @@ in
sources."@types/mime-1.3.2"
sources."@types/minimatch-3.0.5"
sources."@types/multer-1.4.7"
sources."@types/node-18.0.0"
sources."@types/node-18.0.1"
(sources."@types/node-fetch-2.6.2" // {
dependencies = [
sources."form-data-3.0.1"
@@ -8598,6 +8635,7 @@ in
sources."@types/tough-cookie-2.3.8"
sources."@types/tunnel-0.0.3"
sources."@types/yamljs-0.2.31"
sources."@vue/compiler-sfc-2.7.2"
sources."abbrev-1.1.1"
sources."accepts-1.3.8"
sources."access-control-1.0.1"
@@ -8649,7 +8687,7 @@ in
];
})
sources."avsc-5.7.4"
(sources."aws-sdk-2.1164.0" // {
(sources."aws-sdk-2.1167.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -8663,7 +8701,7 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."axios-0.21.4"
sources."axios-retry-3.3.0"
sources."axios-retry-3.3.1"
sources."babel-helper-vue-jsx-merge-props-2.0.3"
(sources."babel-runtime-6.26.0" // {
dependencies = [
@@ -8838,6 +8876,7 @@ in
sources."css-select-4.3.0"
sources."css-what-6.1.0"
sources."cssfilter-0.0.10"
sources."csstype-3.1.0"
sources."dashdash-1.14.1"
sources."debug-4.3.4"
sources."debuglog-1.0.1"
@@ -9075,6 +9114,7 @@ in
sources."jake-10.8.5"
sources."jmespath-0.16.0"
sources."join-component-1.1.0"
sources."js-md4-0.3.2"
sources."js-yaml-3.14.1"
sources."jsbi-4.3.0"
sources."jsbn-0.1.1"
@@ -9237,15 +9277,15 @@ in
];
})
sources."mz-2.7.0"
sources."n8n-core-0.124.0"
sources."n8n-design-system-0.24.0"
sources."n8n-editor-ui-0.150.0"
(sources."n8n-nodes-base-0.182.0" // {
sources."n8n-core-0.125.0"
sources."n8n-design-system-0.25.0"
sources."n8n-editor-ui-0.151.0"
(sources."n8n-nodes-base-0.183.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."n8n-workflow-0.106.0"
sources."n8n-workflow-0.107.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@@ -9277,7 +9317,7 @@ in
sources."node-html-parser-5.3.3"
sources."node-ssh-12.0.4"
sources."nodeify-1.0.1"
sources."nodemailer-6.7.5"
sources."nodemailer-6.7.6"
sources."nopt-5.0.0"
sources."normalize-path-3.0.0"
sources."normalize-wheel-1.0.1"
@@ -9405,7 +9445,7 @@ in
sources."proxy-addr-2.0.7"
sources."proxy-from-env-1.1.0"
sources."pseudomap-1.0.2"
sources."psl-1.8.0"
sources."psl-1.9.0"
sources."pump-3.0.0"
(sources."pumpify-1.5.1" // {
dependencies = [
@@ -9601,7 +9641,7 @@ in
})
sources."tarn-3.0.2"
sources."tdigest-0.1.2"
(sources."tedious-14.6.1" // {
(sources."tedious-14.7.0" // {
dependencies = [
sources."bl-5.0.0"
sources."buffer-6.0.3"
@@ -9707,7 +9747,7 @@ in
];
})
sources."vm2-3.9.9"
sources."vue-2.6.14"
sources."vue-2.7.2"
sources."vue-color-2.8.1"
sources."vue-fragment-1.6.0"
sources."vue-i18n-8.27.2"
@@ -9719,7 +9759,7 @@ in
sources."which-module-2.0.0"
sources."wide-align-1.1.5"
sources."widest-line-3.1.0"
(sources."winston-3.8.0" // {
(sources."winston-3.8.1" // {
dependencies = [
sources."readable-stream-3.6.0"
];
pkgs/applications/office/onlyoffice-bin/default.nix
+2 -2
View File
@@ -73,11 +73,11 @@ let
in
stdenv.mkDerivation rec {
pname = "onlyoffice-desktopeditors";
version = "6.3.1";
version = "7.1.0";
minor = null;
src = fetchurl {
url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
sha256 = "sha256-WCjCljA7yB7Zm/I4rDZnfgaUQpDUKwbUvL7hkIG8cVM=";
sha256 = "sha256-40IUAmg7PnfYrdTj7TVbfvb9ey0/zzswu+sJllAIktg=";
};
nativeBuildInputs = [
pkgs/applications/office/tagainijisho/default.nix
+10 -7
View File
@@ -1,16 +1,19 @@
{ lib, stdenv, fetchurl, qt4, cmake, sqlite }:
stdenv.mkDerivation rec {
{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }:
mkDerivation rec {
pname = "tagainijisho";
version = "1.0.3";
version = "1.2.0";
src = fetchurl {
src = fetchzip {
url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz";
sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg";
hash = "sha256-fLq4Wfpa7Wr62KvHztgLiXE8eopCq+wipgabFm2bq6w=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 sqlite ];
buildInputs = [ qtbase qttools sqlite ];
cmakeFlags = [
"-DEMBED_SQLITE=OFF"
];
meta = with lib; {
description = "A free, open-source Japanese dictionary and kanji lookup tool";
pkgs/applications/science/math/R/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "R";
version = "4.2.0";
version = "4.2.1";
src = fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "sha256-OOq3cZt60JU4jwaqCQxaKyAnkZRd5g0+K7DqsfUJdIg=";
sha256 = "sha256-TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8=";
};
dontUseImakeConfigure = true;
pkgs/applications/version-management/cz-cli/node-composition.nix
+1 -1
View File
@@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ./node-env.nix {
pkgs/applications/version-management/git-and-tools/stgit/default.nix
-1
View File
@@ -66,7 +66,6 @@ python3Packages.buildPythonApplication rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "A patch manager implemented on top of Git";
homepage = "https://stacked-git.github.io/";
license = licenses.gpl2Only;
pkgs/applications/video/adl/default.nix
+43
View File
@@ -0,0 +1,43 @@
{ lib, stdenv, fetchFromGitHub, pkgs, makeWrapper, ... }:
stdenv.mkDerivation rec {
pname = "adl";
version = "3.0.1";
src = fetchFromGitHub {
owner = "RaitaroH";
repo = "adl";
rev = "65f68e1dcae4c0caa52668d3a854269e7d226f7c";
sha256 = "sha256-huGpDtkWrhZyKDNKXat8T3qtAyMjBaq8HFd1w1ThUVk=";
};
nativeBuildInputs = [ makeWrapper ];
# https://github.com/RaitaroH/adl#requirements
buildInputs = with pkgs; [
anime-downloader
frece
fzf
mpv
perl
trackma
ueberzug
];
dontBuild = true;
installPhase = ''
mkdir -p $out/bin
cp $src/adl $out/bin
wrapProgram $out/bin/adl \
--prefix PATH : ${lib.makeBinPath buildInputs}
'';
meta = with lib; {
homepage = "https://github.com/RaitaroH/adl";
description = "popcorn anime-downloader + trackma wrapper";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ WeebSorceress ];
};
}
pkgs/applications/virtualization/qemu/utils.nix
+3 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, installShellFiles, qemu }:
{ stdenv, installShellFiles, qemu, removeReferencesTo }:
stdenv.mkDerivation rec {
pname = "qemu-utils";
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ qemu ];
disallowedRequisites = [ qemu ];
unpackPhase = "true";
installPhase = ''
@@ -13,6 +14,7 @@ stdenv.mkDerivation rec {
cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img"
cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io"
cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd"
${removeReferencesTo}/bin/remove-references-to -t ${qemu} $out/bin/*
installManPage ${qemu}/share/man/man1/qemu-img.1.gz
installManPage ${qemu}/share/man/man8/qemu-nbd.8.gz
pkgs/applications/virtualization/railcar/cargo-lock.patch
-435
View File
@@ -1,435 +0,0 @@
From 97e1e2ca82c20317a6de1f345d2fb0adcde0b7fd Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Mon, 10 Dec 2018 17:42:58 +0100
Subject: [PATCH] Adding `Cargo.lock` for release `v1.0.4`
---
Cargo.lock | 416 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 416 insertions(+)
create mode 100644 Cargo.lock
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..bf6aa0e
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,416 @@
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bitflags"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bitflags"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "caps"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "clap"
+version = "2.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "custom_derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "dtoa"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "enum_derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "error-chain"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "error-chain"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "itoa"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "lazy_static"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "log"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "log"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "nix"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "nix"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "oci"
+version = "0.1.0"
+dependencies = [
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "prctl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "railcar"
+version = "1.0.4"
+dependencies = [
+ "caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "oci 0.1.0",
+ "prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_termios"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "scopeguard"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "seccomp-sys"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde_codegen_internals"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_json"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "strsim"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "syn"
+version = "0.11.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synom"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "termion"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
+"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
+"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c238ba41e8d1d354c8576228110585046ae379efd7af972932993d5c1d41c7d"
+"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
+"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
+"checksum enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "406ac2a8c9eedf8af9ee1489bee9e50029278a6456c740f7454cf8a158abc816"
+"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
+"checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "921f61dc817b379d0834e45d5ec45beaacfae97082090a49c2cf30dcbc30206f"
+"checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487"
+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
+"checksum prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
+"checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d"
+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
+"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+"checksum seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d4082b110d25cf281ddbf78dc56e1a65c929fd72ac6c2deb1a4c20a23999dfa"
+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
+"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400"
+"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba"
+"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--
2.17.2
pkgs/applications/virtualization/railcar/default.nix
-26
View File
@@ -1,26 +0,0 @@
{ lib, fetchFromGitHub, rustPlatform, libseccomp }:
rustPlatform.buildRustPackage rec {
pname = "railcar";
version = "1.0.4";
src = fetchFromGitHub {
owner = "oracle";
repo = "railcar";
rev = "v${version}";
sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
};
# Submitted upstream https://github.com/oracle/railcar/pull/44
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1zsch6gpbw96j5wa68ksbk4x6nbsl7dbvdhdprljpcyrwwkhz47x";
buildInputs = [ libseccomp ];
meta = with lib; {
description = "Rust implementation of the Open Containers Initiative oci-runtime";
homepage = "https://github.com/oracle/railcar";
license = with licenses; [ asl20 /* or */ upl ];
maintainers = [ maintainers.spacekookie ];
};
}
pkgs/data/icons/luna-icons/default.nix
+4 -4
View File
@@ -1,5 +1,5 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, gtk3
, breeze-icons
@@ -8,15 +8,15 @@
, gitUpdater
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "luna-icons";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "sha256-aNN7ZoD4hZTw39Rwef4HRHzNzCM6O8Ev+37jZOfzN7s=";
sha256 = "sha256-zxaay4hwKgb9WWhPNG/s9JekltAvRNYmObeoTJi6Po0=";
};
nativeBuildInputs = [
pkgs/data/icons/zafiro-icons/default.nix
+19 -5
View File
@@ -1,18 +1,19 @@
{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme, jdupes }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "zafiro-icons";
version = "1.1";
version = "1.2";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
rev = version;
sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv";
sha256 = "sha256-Awc5Sw4X25pXEd4Ob0u6A6Uu0e8FYfwp0fEl90vrsUE=";
};
nativeBuildInputs = [
gtk3
jdupes
];
propagatedBuildInputs = [
@@ -26,10 +27,23 @@ stdenv.mkDerivation rec {
dontDropIconThemeCache = true;
dontPatchELF = true;
dontRewriteSymlinks = true;
installPhase = ''
runHook preInstall
# remove copy file, as it is there clearly by mistake
rm "apps/scalable/android-sdk (copia 1).svg"
mkdir -p $out/share/icons/Zafiro-icons
cp -a * $out/share/icons/Zafiro-icons
gtk-update-icon-cache "$out"/share/icons/Zafiro-icons
gtk-update-icon-cache $out/share/icons/Zafiro-icons
jdupes --link-soft --recurse $out/share
runHook postInstall
'';
meta = with lib; {
pkgs/data/misc/osinfo-db/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20220214";
version = "20220516";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "sha256-E+bJAOuCAPFmD4oe13Xs7NWgH9skv7bu4c5l3XvP06k=";
sha256 = "sha256-1g9p2K/J3MU9dqL7aNVMJtH9w6giuVwYAd5Yw8Zs2m0=";
};
nativeBuildInputs = [
pkgs/development/compilers/elm/packages/node-composition.nix
+1 -1
View File
@@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../node-packages/node-env.nix {
pkgs/development/compilers/sbcl/2.2.6.nix
+4
View File
@@ -0,0 +1,4 @@
import ./common.nix {
version = "2.2.6";
sha256 = "sha256-PiMEjI+oJvuRMiC+sqw2l9vFwM3y6J/tjbOe0XEjBKA=";
}
pkgs/development/compilers/sbcl/common.nix
+13 -2
View File
@@ -1,6 +1,6 @@
{ version, sha256 }:
{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap, zstd
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
, threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
, linkableRuntime ? stdenv.hostPlatform.isx86
@@ -9,6 +9,7 @@
# Note that the created binaries still need `patchelf --set-interpreter ...`
# to get rid of ${glibc} dependency.
, purgeNixReferences ? false
, coreCompression ? lib.versionAtLeast version "2.2.6"
, texinfo
}:
@@ -21,7 +22,8 @@ stdenv.mkDerivation rec {
inherit sha256;
};
buildInputs = [texinfo];
nativeBuildInputs = [ texinfo ];
buildInputs = lib.optionals coreCompression [ zstd ];
patches = lib.optional
(lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8")
@@ -38,6 +40,14 @@ stdenv.mkDerivation rec {
url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch";
sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij";
})
] ++ lib.optionals (version == "2.2.6") [
# Take contrib blocklist into account for doc generation. This fixes sbcl
# build on aarch64, because the docs Makefile tries to require sb-simd,
# which is blocked in that platform.
(fetchpatch {
url = "https://github.com/sbcl/sbcl/commit/f88989694200a5192fb68047d43d0500b2165f7b.patch";
sha256 = "sha256-MXEsK46RARPmB2WBPcrmZk6ArliU8DgHw73x9+/QAmk=";
})
];
postPatch = ''
@@ -85,6 +95,7 @@ stdenv.mkDerivation rec {
enableFeatures = with lib;
optional threadSupport "sb-thread" ++
optional linkableRuntime "sb-linkable-runtime" ++
optional coreCompression "sb-core-compression" ++
optional stdenv.isAarch32 "arm";
disableFeatures = with lib;
pkgs/development/libraries/amdvlk/default.nix
+2 -2
View File
@@ -22,13 +22,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2022.Q2.3";
version = "2022.Q2.2";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "Yd2juNdSP8TdSX9j/iXsC2xrIRzDEuXJbms91AqwjEc=";
sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA=";
};
buildInputs = [
pkgs/development/libraries/libschrift/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libschrift";
version = "0.10.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "tomolt";
repo = pname;
rev = "v" + version;
sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv";
sha256 = "01hgvkcb46kr9jzc4ah0js0jy9kr0ll18j2k0c5zil55l3a9rqw1";
};
postPatch = ''
pkgs/development/libraries/libvirt/default.nix
+2 -2
View File
@@ -113,13 +113,13 @@ stdenv.mkDerivation rec {
# NOTE: You must also bump:
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
version = "8.4.0";
version = "8.5.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-7E4YChbPc2X83+iNPB1A3BD+g9dXG7UqGzFiuRMSrmI=";
sha256 = "sha256-x6TnMFYjcUSdQZd9ctN2hITCAl9TGVb7/qAObGb9xMk=";
fetchSubmodules = true;
};
pkgs/development/libraries/libwebsockets/default.nix
+43 -62
View File
@@ -5,73 +5,54 @@
, openssl
, zlib
, libuv
, fetchpatch
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:
let
generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec {
pname = "libwebsockets";
inherit version;
stdenv.mkDerivation rec {
pname = "libwebsockets";
version = "4.3.2";
src = fetchFromGitHub {
owner = "warmcat";
repo = "libwebsockets";
rev = "v${version}";
inherit sha256;
};
inherit patches;
buildInputs = [ openssl zlib libuv ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DLWS_WITH_PLUGINS=ON"
"-DLWS_WITH_IPV6=ON"
"-DLWS_WITH_SOCKS5=ON"
"-DDISABLE_WERROR=ON"
# Required since v4.2.0
"-DLWS_BUILD_HASH=no_hash"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
postInstall = ''
rm -r ${placeholder "out"}/share/libwebsockets-test-server
'';
# $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
disallowedReferences = [ stdenv.cc.cc ];
meta = with lib; {
description = "Light, portable C library for websockets";
longDescription = ''
Libwebsockets is a lightweight pure C library built to
use minimal CPU and memory resources, and provide fast
throughput in both directions.
'';
homepage = "https://libwebsockets.org/";
# Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
# is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
license = with licenses; [ mit publicDomain bsd3 asl20 ];
maintainers = with maintainers; [ mindavi ];
platforms = platforms.all;
};
src = fetchFromGitHub {
owner = "warmcat";
repo = "libwebsockets";
rev = "v${version}";
hash = "sha256-why8LAcc4XN0JdTJ1JoNWijKENL5mOHBsi9K4wpYr2c=";
};
in {
libwebsockets_4_3 = generic {
version = "4.3.1";
sha256 = "sha256-lB3JHh058cQc5rycLnHk3JAOgtku0nRCixN5U6lPKq8=";
patches = [
# fixes the propagated cmake files, fixing the build of ttyd
# see also https://github.com/tsl0922/ttyd/issues/918
(fetchpatch {
url = "https://github.com/warmcat/libwebsockets/commit/99a8b9c4422bed45c8b7412a1e121056f2a6132a.patch";
hash = "sha256-zHBo2ZEayvibM+jzeVaZqySxghaOLUglpSFwuGhl6HM=";
})
];
buildInputs = [ openssl zlib libuv ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DLWS_WITH_PLUGINS=ON"
"-DLWS_WITH_IPV6=ON"
"-DLWS_WITH_SOCKS5=ON"
"-DDISABLE_WERROR=ON"
"-DLWS_BUILD_HASH=no_hash"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
postInstall = ''
rm -r ${placeholder "out"}/share/libwebsockets-test-server
'';
# $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
disallowedReferences = [ stdenv.cc.cc ];
meta = with lib; {
description = "Light, portable C library for websockets";
longDescription = ''
Libwebsockets is a lightweight pure C library built to
use minimal CPU and memory resources, and provide fast
throughput in both directions.
'';
homepage = "https://libwebsockets.org/";
# Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
# is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
license = with licenses; [ mit publicDomain bsd3 asl20 ];
maintainers = with maintainers; [ mindavi ];
platforms = platforms.all;
};
}
pkgs/development/libraries/phonon/backends/gstreamer.nix
+12 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config
{ stdenv, lib, fetchurl, fetchpatch, cmake, gst_all_1, phonon, pkg-config
, extra-cmake-modules, qttools, qtbase, qtx11extras
, debug ? false
}:
@@ -22,9 +22,17 @@ stdenv.mkDerivation rec {
sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5";
};
# Hardcode paths to useful plugins so the backend doesn't depend
# on system paths being set.
patches = [ ./gst-plugin-paths.patch ];
patches = [
# Hardcode paths to useful plugins so the backend doesn't depend
# on system paths being set.
./gst-plugin-paths.patch
# Work around https://bugs.kde.org/show_bug.cgi?id=445196 until a new release.
(fetchpatch {
url = "https://invent.kde.org/libraries/phonon-gstreamer/-/commit/bbbb160f30a394655cff9398d17961142388b0f2.patch";
sha256 = "sha256-tNBqVt67LNb9SQogS9ol8/xYIZvVSoVUgXQahMfkFh8=";
})
];
dontWrapQtApps = true;
pkgs/development/libraries/vxl/default.nix
+4 -16
View File
@@ -1,30 +1,18 @@
{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "vxl";
version = "1.17.0-nix1";
version = "3.3.2";
src = fetchFromGitHub {
owner = "vxl";
repo = "vxl";
rev = "777c0beb7c8b30117400f6fc9a6d63bf8cb7c67a";
sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8";
rev = "v${version}";
sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr";
};
nativeBuildInputs = [ cmake unzip ];
buildInputs = [ libtiff expat zlib libpng libjpeg ];
cmakeFlags = [
# BUILD_OUL wants old linux headers for videodev.h, not available
# in stdenv linux headers
"-DBUILD_OUL=OFF"
# BUILD_BRL fails to find open()
"-DBUILD_BRL=OFF"
"-DBUILD_CONTRIB=OFF"
] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
"-DCMAKE_CXX_FLAGS=-fPIC"
"-DCMAKE_C_FLAGS=-fPIC"
];
meta = {
description = "C++ Libraries for Computer Vision Research and Implementation";
homepage = "http://vxl.sourceforge.net/";
pkgs/development/libraries/webkitgtk/default.nix
+2 -2
View File
@@ -67,7 +67,7 @@
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.36.3";
version = "2.36.4";
outputs = [ "out" "dev" ];
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-cy/PjE7GRLjtKLRuu9fB66udngr+qb315dEnhq/EeNE=";
sha256 = "sha256-tr6+H4WkedlowZ5EpHBGIu+M72FjatGyQGt30Wri4qg=";
};
patches = lib.optionals stdenv.isLinux [
pkgs/development/node-packages/node-packages.json
+1
View File
@@ -203,6 +203,7 @@
, "livedown"
, "lodash"
, "lua-fmt"
, "lv_font_conv"
, "madoko"
, "manta"
, "markdownlint-cli"
pkgs/development/node-packages/node-packages.nix
Generated
+482 -510
View File
File diff suppressed because it is too large Load Diff
pkgs/development/ocaml-modules/chacha/default.nix
+14 -7
View File
@@ -1,6 +1,7 @@
{ lib
, buildDunePackage
, fetchurl
, fetchFromGitHub
, fetchpatch
, ocaml
, alcotest
@@ -10,16 +11,22 @@
buildDunePackage rec {
pname = "chacha";
version = "1.0.0";
version = "1.1.0";
src = fetchurl {
url = "https://github.com/abeaumont/ocaml-chacha/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "sha256-t8dOMQQDpje0QbuOhjSIa3xnXuXcxMVTLENa/rwdgA4=";
src = fetchFromGitHub {
owner = "abeaumont";
repo = "ocaml-chacha";
rev = version;
sha256 = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k=";
};
useDune2 = true;
# Ensure compatibility with cstruct ≥ 6.1.0
patches = [ (fetchpatch {
url = "https://github.com/abeaumont/ocaml-chacha/commit/fbe4a0a808226229728a68f278adf370251196fd.patch";
sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc=";
})];
minimumOCamlVersion = "4.02";
minimalOCamlVersion = "4.02";
propagatedBuildInputs = [ cstruct mirage-crypto ];
pkgs/development/ocaml-modules/hxd/default.nix
+6 -13
View File
@@ -1,26 +1,19 @@
{ lib, buildDunePackage, fetchurl
, ocaml, dune-configurator, cmdliner
, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
, dune-configurator, cmdliner
, lwt, withLwt ? true
}:
buildDunePackage rec {
pname = "hxd";
version = "0.3.1";
version = "0.3.2";
useDune2 = true;
minimumOCamlVersion = "4.06";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc";
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-${version}.tbz";
sha256 = "a00290abb8538e79b32ddc22ed9b301b9806bc4c03eb1e5105b14af47dabec9f";
};
# ignore yes stderr output due to trapped SIGPIPE
postPatch = ''
sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t
'';
propagatedBuildInputs = lib.optional withLwt lwt;
buildInputs = [
pkgs/development/ocaml-modules/mirage-net-xen/default.nix
-2
View File
@@ -17,8 +17,6 @@ buildDunePackage {
inherit (netchannel)
src
version
useDune2
minimumOCamlVersion
meta
;
pkgs/development/ocaml-modules/mirage-xen/default.nix
+4 -32
View File
@@ -1,7 +1,6 @@
{ lib
, buildDunePackage
, fetchurl
, pkg-config
, cstruct
, lwt
, shared-memory-ring-lwt
@@ -11,7 +10,6 @@
, mirage-runtime
, logs
, fmt
, ocaml-freestanding
, bheap
, duration
, io-page
@@ -19,32 +17,14 @@
buildDunePackage rec {
pname = "mirage-xen";
version = "6.0.0";
useDune2 = true;
version = "7.2.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-v${version}.tbz";
sha256 = "f991e972059b27993c287ad010d9281fee061efaa1dd475d0955179f93710fbd";
url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz";
sha256 = "sha256-5ZdzourQshHGtYPPdJtJLpH8P6ZLNbjQWy7TDxcY3OA=";
};
patches = [
./makefile-no-opam.patch
./pkg-config.patch
];
# can't handle OCAMLFIND_DESTDIR with substituteAll
postPatch = ''
substituteInPlace lib/bindings/mirage-xen.pc \
--replace "@out@" "$out" \
--replace "@OCAMLFIND_DESTDIR@" "$OCAMLFIND_DESTDIR"
'';
minimumOCamlVersion = "4.08";
nativeBuildInputs = [
pkg-config
];
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
cstruct
@@ -59,16 +39,8 @@ buildDunePackage rec {
fmt
bheap
duration
(ocaml-freestanding.override { target = "xen"; })
];
# Move pkg-config files into their well-known location.
# This saves us an extra setup hook and causes no issues
# since we patch all relative paths out of the .pc file.
postInstall = ''
mv $OCAMLFIND_DESTDIR/pkgconfig $out/lib/pkgconfig
'';
meta = with lib; {
description = "Xen core platform libraries for MirageOS";
license = licenses.isc;
pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/lib/bindings/Makefile b/lib/bindings/Makefile
index 4e413c0..67c7bdc 100644
--- a/lib/bindings/Makefile
+++ b/lib/bindings/Makefile
@@ -1,4 +1,6 @@
-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+ifneq (, $(shell command -v opam))
+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig
+endif
CC ?= cc
FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/lib/bindings/mirage-xen.pc b/lib/bindings/mirage-xen.pc
index a03a217..8499aa4 100644
--- a/lib/bindings/mirage-xen.pc
+++ b/lib/bindings/mirage-xen.pc
@@ -1,6 +1,6 @@
-prefix=${pcfiledir}/../..
+prefix=@out@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@OCAMLFIND_DESTDIR@
Name: mirage-xen
Version: 6.0.0
pkgs/development/ocaml-modules/netchannel/default.nix
+10 -8
View File
@@ -12,20 +12,20 @@
, shared-memory-ring
, sexplib
, logs
, rresult
, macaddr
, lwt-dllist
, result
}:
buildDunePackage rec {
pname = "netchannel";
version = "2.0.0";
version = "2.1.1";
useDune2 = true;
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-v${version}.tbz";
sha256 = "ec3906ef1804ef6a9e36b91f4ae73ce4849e9e0d1d36a80fe66b5f905fab93ad";
url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz";
sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs=";
};
nativeBuildInputs = [
@@ -43,7 +43,9 @@ buildDunePackage rec {
shared-memory-ring
sexplib
logs
rresult
macaddr
lwt-dllist
result
];
meta = with lib; {
pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
+3 -5
View File
@@ -4,15 +4,13 @@
buildDunePackage rec {
pname = "ppx_deriving_yaml";
version = "0.1.0";
useDune2 = true;
version = "0.1.1";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-v${version}.tbz";
sha256 = "kdonUD4Y8QhVSAFAafIpXBFPkS4pSScYwJbaWMn/6pA=";
url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz";
sha256 = "sha256-nR3568ULM6jaGG4H4+lLBTEJqh/ALHPiJxve40jPUxw=";
};
propagatedBuildInputs = [ ppxlib ppx_deriving yaml ];
pkgs/development/ocaml-modules/xmlm/default.nix
+4 -4
View File
@@ -4,17 +4,17 @@ let
webpage = "https://erratique.ch/software/${pname}";
in
if lib.versionOlder ocaml.version "4.02"
if lib.versionOlder ocaml.version "4.05"
then throw "xmlm is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "1.3.0";
version = "1.4.0";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n";
sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An OCaml streaming codec to decode and encode the XML data format";
homepage = webpage;
license = licenses.bsd3;
license = licenses.isc;
maintainers = [ maintainers.vbgl ];
mainProgram = "xmltrip";
inherit (ocaml.meta) platforms;
pkgs/development/ocaml-modules/yaml/default.nix
+10 -10
View File
@@ -1,24 +1,24 @@
{ lib, fetchurl, buildDunePackage, ocaml
{ lib, fetchurl, buildDunePackage
, dune-configurator
, bos, ctypes, fmt, logs, rresult
, bos, ctypes, fmt, logs
, mdx, alcotest, crowbar, junit_alcotest, ezjsonm
}:
buildDunePackage rec {
pname = "yaml";
version = "3.0.0";
useDune2 = true;
version = "3.1.0";
src = fetchurl {
url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz";
sha256 = "1iws6lbnrrd5hhmm7lczfvqp0aidx5xn7jlqk2s5rjfmj9qf4j2c";
url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz";
sha256 = "sha256-0KngriGEpp5tcgK/43B9EEOdMacSQYYCNLGfAgRS7Mc=";
};
minimalOCamlVersion = "4.13";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ bos ctypes rresult ];
# crowbar is not available for OCaml < 4.08
doCheck = lib.versionAtLeast ocaml.version "4.08";
propagatedBuildInputs = [ bos ctypes ];
doCheck = true;
checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ];
meta = {
pkgs/development/ocaml-modules/yaml/yaml-sexp.nix
+1 -1
View File
@@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "yaml-sexp";
inherit (yaml) version src useDune2;
inherit (yaml) version src;
propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ];
pkgs/development/python-modules/aesara/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "aesara";
version = "2.7.4";
version = "2.7.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "aesara-devs";
repo = "aesara";
rev = "refs/tags/rel-${version}";
hash = "sha256-gLIBO1AzU8OTCPcZQN1A7vGi3L9fqzCXQsPek/+dsQc=";
hash = "sha256-wx0F7GHfIS2OTnOIlhQAsUAZHm9PncoIG+bn3dsIWrU=";
};
nativeBuildInputs = [
pkgs/development/python-modules/ailment/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.8";
version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-eZNIRUbwJf58DUm/D4Gtkl++z42wjY3m/4K05s2+Z9E=";
hash = "sha256-NvSbv/lMWEWZDHqo/peND8YsaZBKMm2SandDozyDoNs=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/aioconsole/default.nix
+3 -3
View File
@@ -16,7 +16,7 @@
# wrapped to be able to find aioconsole and any other packages.
buildPythonPackage rec {
pname = "aioconsole";
version = "0.4.1";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "vxgmichel";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OCsao4oerHGpzsoqPP3EXJVs6NZeLNsoaC83k7oX688=";
rev = "refs/tags/v${version}";
sha256 = "sha256-/20FR7yc2aMA9cL3l7XAL/kak3cBBTniAICLC/TOI+U=";
};
checkInputs = [
pkgs/development/python-modules/aioslimproto/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioslimproto";
version = "2.0.1";
version = "2.1.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";
rev = "refs/tags/${version}";
hash = "sha256-Er7UsJDBDXD8CQSkUIOeO78HQaCsrRycU18LOjBpv/w=";
};
checkInputs = [
pkgs/development/python-modules/angr/default.nix
+2 -2
View File
@@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.2.8";
version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-H2+2OS06oeW14Zzd7Twi13XVNaE6O0TJqTnZxxCNW+U=";
hash = "sha256-8tIqAs3TPoc4G6h91Y7tQVy4KowmyJA5HwFbFwQTgjc=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/archinfo/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.8";
version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-glfvSaXlT+PuF8ztA5A6+HG9FQ6CsrOn8ZAir8+db7c=";
hash = "sha256-TEW5aoBMBZCoW4nMFOVkg3xlHIM8TsKhdmijCoIOFoM=";
};
checkInputs = [
pkgs/development/python-modules/azure-eventgrid/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "azure-eventgrid";
version = "4.8.0";
version = "4.9.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-8jEtTQTUJLSa2iuA/Sgirgcm8kbwWOT11O1n46CLouw=";
hash = "sha256-ueuOxhNATK6o/Vue+x5vtP0ac3CQellkuyQmSrq7tqQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/browser-cookie3/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.15.0";
version = "0.16.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AfRL2u1wMXXCCfKyrD0F96hXap88TQx7D1fjFWGKDy4=";
hash = "sha256-2JXs7KGS6XyhRwsoWlt+4gL40t1JNWbRO8n84zX5Cf4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/claripy/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.8";
version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-ScJoe0YFM5mipVt+7/hy7BI1qytrpO+qcYjY8roBMfc=";
hash = "sha256-8uavNI/Zhvt7jf8+bOvnExp7Jx/By+rgIc5MbNtrSdY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/cle/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.8";
version = "9.2.9";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-VwZSGWJ3XT34kkpXOiUfObGRK28nb54XZ4iskg7xetk=";
hash = "sha256-TnDJFBCejMyV6UdgvuywxXeE/OKe4XCE1+lIGl6YEjc=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/dvc-objects/default.nix
+3 -3
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "0.0.18";
version = "0.0.19";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-mkL+E+PQqm+L7ejccJ0FFpXmIsi26KzfBnzlSuaC3ds=";
rev = "refs/tags/${version}";
hash = "sha256-nuGsFNWJBsdL0QdnhYYz6rR6a9aNxCFnun7Xb2eZO3U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/goodwe/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.17";
version = "0.2.18";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "marcelblijleven";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Lx7jvL7Fyq8fqJQq8ZgEG/V20+tHxw3yl3s7scAwwjA=";
rev = "refs/tags/v${version}";
sha256 = "sha256-2AbEX/dYwcMIlp27umBcSGgPboGu5y0mmndefXCjkJg=";
};
checkInputs = [
pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+18 -4
View File
@@ -5,22 +5,36 @@
, google-api-core
, libcst
, mock
, protobuf
, proto-plus
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
version = "1.7.2";
version = "1.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JDuMhyk1018pMYNOhRVmP7XyF2wsK5temDTP5033Dxk=";
hash = "sha256-rp/clC5lN3+fc3bz3Qb+oqHyVMS+jLX9gxxB0zOCxfM=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
propagatedBuildInputs = [
google-api-core
libcst
protobuf
proto-plus
];
checkInputs = [ mock pytest-asyncio pytestCheckHook ];
checkInputs = [
mock
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"google.cloud.websecurityscanner_v1alpha"
pkgs/development/python-modules/gradient/default.nix
+2 -2
View File
@@ -23,12 +23,12 @@
buildPythonPackage rec {
pname = "gradient";
version = "2.0.4";
version = "2.0.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-s80e15u2j7t/FVKcaKGTloN3dwfJuF7XgqIj4XpKHYU=";
hash = "sha256-D0JX6tk6SY5seH9m21hwMZ2TnaAG6OrHo+ucJEredd0=";
};
postPatch = ''
pkgs/development/python-modules/ics/default.nix
+3 -3
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "ics";
version = "0.7";
version = "0.7.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ics-py";
repo = "ics-py";
rev = "v${version}";
sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn";
rev = "refs/tags/v${version}";
sha256 = "sha256-scT8TKZb88HYFN8Y1rGgoJLfSxD0jjbvZYpXsCXw9uo=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/islpy/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "islpy";
version = "2022.1.2";
version = "2022.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Z0LXmbQeCyBPP0mtnt+UFyi08tcfP9XLZUS8jzkrADo=";
sha256 = "sha256-a6fnFBt//yrkQkLoVBnxr7OkJTG7PJalz/CF7lhxVA8=";
};
postConfigure = ''
pkgs/development/python-modules/jarowinkler/default.nix
+6 -7
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "jarowinkler";
version = "1.0.5";
version = "1.1.0";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "JaroWinkler";
rev = "v${version}";
hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA=";
hash = "sha256-ilkslDrTOaq6mgg+nYMMqxrjvZHXMIcipu25wvV3+Mk=";
};
nativeBuildInputs = [
@@ -41,6 +41,10 @@ buildPythonPackage rec {
jarowinkler-cpp
];
preBuild = ''
export JAROWINKLER_BUILD_EXTENSION=1
'';
dontUseCmakeConfigure = true;
checkInputs = [
@@ -48,11 +52,6 @@ buildPythonPackage rec {
pytestCheckHook
];
preCheck = ''
# import from $out
rm -r jarowinkler
'';
pythonImportsCheck = [ "jarowinkler" ];
meta = with lib; {
pkgs/development/python-modules/jc/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.20.1";
version = "1.20.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xsPz7v5+rIO88F1Y/inBSUwVnI7uKZrV2nzVvJ9L02A=";
sha256 = "sha256-ZhDk6JxgRASSezRkQ5KnRHKhQBykeZUpGCLW5zzLBSM=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
pkgs/development/python-modules/ldap/0001-Check-whether-libldap-is-threadsafe-on-startup.patch
-94
View File
@@ -1,94 +0,0 @@
From 3593e2c299c0ac0402f23d44cdbe8e6ff3687b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@mistotebe.net>
Date: Thu, 27 Jan 2022 10:35:56 +0000
Subject: [PATCH] Check whether libldap is threadsafe on startup.
Closes #432
---
Lib/ldap/constants.py | 2 --
Modules/constants.c | 10 ++++++++++
setup.cfg | 6 ++++--
setup.py | 1 -
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Lib/ldap/constants.py b/Lib/ldap/constants.py
index 1c1d76a..f76609b 100644
--- a/Lib/ldap/constants.py
+++ b/Lib/ldap/constants.py
@@ -341,9 +341,7 @@ CONSTANTS = (
# XXX - these should be errors
Int('URL_ERR_BADSCOPE'),
Int('URL_ERR_MEM'),
- # Int('LIBLDAP_R'),
- Feature('LIBLDAP_R', 'HAVE_LIBLDAP_R'),
Feature('SASL_AVAIL', 'HAVE_SASL'),
Feature('TLS_AVAIL', 'HAVE_TLS'),
Feature('INIT_FD_AVAIL', 'HAVE_LDAP_INIT_FD'),
diff --git a/Modules/constants.c b/Modules/constants.c
index 07d6065..8d6f63b 100644
--- a/Modules/constants.c
+++ b/Modules/constants.c
@@ -197,6 +197,8 @@ int
LDAPinit_constants(PyObject *m)
{
PyObject *exc, *nobj;
+ struct ldap_apifeature_info info = { 1, "X_OPENLDAP_THREAD_SAFE", 0 };
+ int thread_safe = 0;
/* simple constants */
@@ -221,6 +223,14 @@ LDAPinit_constants(PyObject *m)
return -1;
Py_INCREF(LDAPexception_class);
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+ if (ldap_get_option(NULL, LDAP_OPT_API_FEATURE_INFO, &info) == LDAP_SUCCESS) {
+ thread_safe = (info.ldapaif_version == 1);
+ }
+#endif
+ if (PyModule_AddIntConstant(m, "LIBLDAP_R", thread_safe) != 0)
+ return -1;
+
/* Generated constants -- see Lib/ldap/constants.py */
#define add_err(n) do { \
diff --git a/setup.cfg b/setup.cfg
index 2e372ba..a75f186 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,9 @@ license_file = LICENCE
defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
extra_compile_args =
extra_objects =
-libs = ldap_r lber
+# Uncomment this if your libldap is not thread-safe and you need libldap_r
+# instead
+#libs = ldap_r lber
[install]
compile = 1
@@ -13,7 +15,7 @@ optimize = 1
[bdist_rpm]
provides = python-ldap
-requires = python libldap-2_4
+requires = python libldap-2
vendor = python-ldap project
packager = python-ldap team
distribution_name = openSUSE 11.x
diff --git a/setup.py b/setup.py
index 119b571..b193957 100644
--- a/setup.py
+++ b/setup.py
@@ -132,7 +132,6 @@ setup(
extra_objects = LDAP_CLASS.extra_objects,
runtime_library_dirs = (not sys.platform.startswith("win"))*LDAP_CLASS.library_dirs,
define_macros = LDAP_CLASS.defines + \
- ('ldap_r' in LDAP_CLASS.libs or 'oldap_r' in LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
('sasl' in LDAP_CLASS.libs or 'sasl2' in LDAP_CLASS.libs or 'libsasl' in LDAP_CLASS.libs)*[('HAVE_SASL',None)] + \
('ssl' in LDAP_CLASS.libs and 'crypto' in LDAP_CLASS.libs)*[('HAVE_TLS',None)] + \
[
--
2.36.0
pkgs/development/python-modules/ldap/default.nix
+2 -6
View File
@@ -5,17 +5,13 @@
buildPythonPackage rec {
pname = "python-ldap";
version = "3.4.0";
version = "3.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "60464c8fc25e71e0fd40449a24eae482dcd0fb7fcf823e7de627a6525b3e0d12";
sha256 = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc=";
};
patches = [
./0001-Check-whether-libldap-is-threadsafe-on-startup.patch
];
propagatedBuildInputs = [ pyasn1 pyasn1-modules ];
checkInputs = [ pytestCheckHook ];
pkgs/development/python-modules/levenshtein/default.nix
+7 -4
View File
@@ -6,12 +6,13 @@
, cython
, pytestCheckHook
, rapidfuzz
, rapidfuzz-cpp
, scikit-build
}:
buildPythonPackage rec {
pname = "levenshtein";
version = "0.18.1";
version = "0.18.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -20,9 +21,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "Levenshtein";
rev = "v${version}";
# https://github.com/maxbachmann/Levenshtein/issues/22
fetchSubmodules = true;
sha256 = "sha256-WREYdD5MFOpCzH4BSceRpzQZdpi3Xxxn0DpMvDsNlGo=";
hash = "sha256-FmEB0i235rzK6S1MV189iDNB+CYpcBvcdVE+kdclwmE=";
};
nativeBuildInputs = [
@@ -33,6 +32,10 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true;
buildInputs = [
rapidfuzz-cpp
];
propagatedBuildInputs = [
rapidfuzz
];
pkgs/development/python-modules/libvirt/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "libvirt";
version = "8.4.0";
version = "8.5.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
sha256 = "sha256-hJc3jHhiZ85ys0uyN4tlNJvJGvnek49AcAp8o6NU6Qc=";
sha256 = "sha256-/OS+qBo0h9jshKDuxKX++cRPAjegImQROb7Uh+imOUA=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/development/python-modules/lsassy/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "lsassy";
version = "3.1.2";
version = "3.1.3";
src = fetchFromGitHub {
owner = "Hackndo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FnqWDPcWgRQpX1k/Sf2NQKpuu6srh6xWdNKtHzXZTtk=";
sha256 = "sha256-h99wqgRNy2GkiertDddFJQN4hv2R26bo72zNwLPR3mk=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/nomadnet/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "nomadnet";
version = "0.1.9";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "NomadNet";
rev = version;
hash = "sha256-GZsARzqnLyZZU900ONv1/sejsEGMTFNIhOS+SESFBqg=";
hash = "sha256-1Ur8iLzOIc1l5bFo8LDY2awHYJ97V9ih4aep6/wt4ns=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/plugwise/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.20.0";
version = "0.20.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-2ESoMJtoh0f7E427q7IFZZJW2ZcwgnjFDasKbHyF844=";
sha256 = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pontos/default.nix
+5 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "22.5.0";
version = "22.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
hash = "sha256-WTIuK5kPPqft4u44dN5NDJJKxIPrZGCJjZ5pR6HgOxw=";
hash = "sha256-QkDHVIAVdd3OcKeh4G5ucO7UROYOOGYjgc+/00DgXFc=";
};
nativeBuildInputs = [
@@ -54,6 +54,9 @@ buildPythonPackage rec {
# CLI test fails
"test_missing_cmd"
"test_update_file_changed"
# Network access
"test_fail_sign_on_upload_fail"
"test_successfully_sign"
];
pythonImportsCheck = [
pkgs/development/python-modules/pygmt/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pygmt";
version = "0.6.1";
version = "0.7.0";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "GenericMappingTools";
repo = "pygmt";
rev = "refs/tags/v${version}";
sha256 = "sha256-/hZUDvMhF/ojTXBcap5lL6X2bYu+opf+TwYNjANgtiw=";
sha256 = "sha256-Z38fZvmeWDLZEIyH+UG6Nb6KNnjEuXIn3RRH4CPWz9A=";
};
postPatch = ''
pkgs/development/python-modules/pytest-test-utils/default.nix
+3 -3
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pytest-test-utils";
version = "0.0.6";
version = "0.0.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-0lShdMNP2suN+JO0uKWwjsGQxFCRnCZEQp2h9hQNrrA=";
rev = "refs/tags/${version}";
hash = "sha256-z5kCFJ8jDzEIUWDjru5vKlZErUvK1iy0WokrCKsvVQo=";
};
buildInputs = [
pkgs/development/python-modules/pyvex/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.8";
version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-GHVY+V18OwlNI1aQAQCLmeh5Z9fbT5cm+bh9KAY/gkE=";
hash = "sha256-QlgfiKQv1kMgGhtasOvuRFrciyFH7rsehbhOUxXSABk=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/rapidfuzz/default.nix
+6 -7
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "2.1.0";
version = "2.1.2";
disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "v${version}";
hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ=";
hash = "sha256-7BP22Fon+7a3ZxTCS838uoLXABYdEexMEH2vZ0/KoRQ=";
};
nativeBuildInputs = [
@@ -50,6 +50,10 @@ buildPythonPackage rec {
taskflow
];
preBuild = ''
export RAPIDFUZZ_BUILD_EXTENSION=1
'';
propagatedBuildInputs = [
jarowinkler
numpy
@@ -61,11 +65,6 @@ buildPythonPackage rec {
pytestCheckHook
];
preCheck = ''
# import from $out
rm -r rapidfuzz
'';
pythonImportsCheck = [
"rapidfuzz.fuzz"
"rapidfuzz.string_metric"
pkgs/development/python-modules/sagemaker/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.97.0";
version = "2.98.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-iHh6WOefWmoLDzZYk1p2TtR0CAudP+paQOOj3RVFlRE=";
hash = "sha256-mNCThiZvmKvbYQEMOPkr3MHOI/oFMGCLpWw5zJz16dQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/skodaconnect/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "skodaconnect";
version = "1.1.20";
version = "1.1.21";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "lendy007";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-VFbU4KbF/Z8/EiRYZIBXSIfByY5nc84y6YBSOuknqyg=";
hash = "sha256-4VM1bOiSkmzlDegtIRUh1O9FG2DPyK77MIQgQcGQ+ZM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/spacy-transformers/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "spacy-transformers";
version = "1.1.6";
version = "1.1.7";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-egWhcrfR8B6l7ji0KOzuMz18YZepNb/ZQz5S0REo9Hc=";
hash = "sha256-lrC1JEQu3/YX4o5azs4UDTsrtfim3IJyD6plCbx5G3E=";
};
propagatedBuildInputs = [

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