From 9c6b0372706be6fe29704cd948fee7ba60a9685a Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 4 May 2021 21:34:10 +0200 Subject: [PATCH 01/62] xdg-desktop-portal-wlr: add slurp to the environment fixes #121678 --- pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 59816a4ef6f..3739284d70a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper , meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, systemd, libdrm, iniparser, scdoc, grim }: +, pipewire, wayland, systemd, libdrm, iniparser, scdoc, grim, slurp }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim ]} + wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim slurp ]} ''; meta = with lib; { From 6ba5ac89d255c4e67b0941d0746dbd04e2e5da09 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Tue, 4 May 2021 18:24:12 -0700 Subject: [PATCH 02/62] gfortran11, gnat11: init at 11.1.0 I forgot to add it in #121115. --- pkgs/top-level/all-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99b3c2098c2..14f358b200b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10605,6 +10605,14 @@ in profiledCompiler = false; }); + gfortran11 = wrapCC (gcc11.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; @@ -10656,6 +10664,15 @@ in gnatboot = gnat6; }); + gnat11 = wrapCC (gcc11.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; From 8cf144d1392e8187ee5c29d1688c38ea8ba7745c Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Tue, 4 May 2021 20:14:01 -0700 Subject: [PATCH 03/62] gnat11: extract gnat-cflags-11.patch from gnat-cflags.patch --- pkgs/development/compilers/gcc/11/default.nix | 2 +- .../compilers/gcc/gnat-cflags-11.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gcc/gnat-cflags-11.patch diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 3a9f50be3e7..73f3d7b2a97 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -68,7 +68,7 @@ let majorVersion = "11"; url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ - ++ optional langAda ../gnat-cflags.patch + ++ optional langAda ../gnat-cflags-11.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch diff --git a/pkgs/development/compilers/gcc/gnat-cflags-11.patch b/pkgs/development/compilers/gcc/gnat-cflags-11.patch new file mode 100644 index 00000000000..03ef2866452 --- /dev/null +++ b/pkgs/development/compilers/gcc/gnat-cflags-11.patch @@ -0,0 +1,35 @@ +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index 4e74252bd74..0d848b5b4e3 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -111,7 +111,7 @@ NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer + NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls + NO_REORDER_ADAFLAGS = -fno-toplevel-reorder + GNATLIBFLAGS = -W -Wall -gnatg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) + # Link flags used to build gnat tools. By default we prefer to statically + # link with libgcc to avoid a dependency on shared libgcc (which is tricky + # to deal with as it may conflict with the libgcc provided by the system). +-GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc ++GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc $(CFLAGS_FOR_TARGET) + + # End of variables for you to override. + +diff --git a/libada/Makefile.in b/libada/Makefile.in +index 522b9207326..ca866c74471 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -59,7 +59,7 @@ LDFLAGS= + CFLAGS=-g + PICFLAG = @PICFLAG@ + GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \ + -fexceptions -DIN_RTS @have_getipinfo@ @have_capability@ + From 6cb46a389741f7916d2c5746d655c76f9333b148 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 5 May 2021 15:06:20 -0400 Subject: [PATCH 04/62] sd_image_raspberrypi4: Remove, as planned initially The replacement is the generic AArch64 image. From there, you can customize an image that works better for your needs, if need be. --- .../installer/cd-dvd/sd-image-raspberrypi4.nix | 14 -------------- .../sd-card/sd-image-raspberrypi4-installer.nix | 10 ---------- .../installer/sd-card/sd-image-raspberrypi4.nix | 8 -------- nixos/release.nix | 5 ----- 4 files changed, 37 deletions(-) delete mode 100644 nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix delete mode 100644 nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix delete mode 100644 nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix deleted file mode 100644 index 79db1fa29bc..00000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-raspberrypi4-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix deleted file mode 100644 index 59423e40b64..00000000000 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ../../profiles/installation-device.nix - ./sd-image-raspberrypi4.nix - ]; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; -} diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix deleted file mode 100644 index 35a12c5382f..00000000000 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix +++ /dev/null @@ -1,8 +0,0 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - -{ - imports = [ ./sd-image-aarch64.nix ]; - boot.kernelPackages = pkgs.linuxPackages_rpi4; -} diff --git a/nixos/release.nix b/nixos/release.nix index 327a259de7f..510cd8f82a1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -186,11 +186,6 @@ in rec { inherit system; }); - sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { - module = ./modules/installer/sd-card/sd-image-raspberrypi4-installer.nix; - inherit system; - }); - # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forMatchingSystems [ "x86_64-linux" ] (system: From 4af225856f2e62811b45f9c193e22450decf2341 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 May 2021 00:11:23 +0200 Subject: [PATCH 05/62] python3Packages.pykoplenti: init at 1.0.0 --- .../python-modules/pykoplenti/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pykoplenti/default.nix diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix new file mode 100644 index 00000000000..98182ddf68c --- /dev/null +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, prompt_toolkit +, pycryptodome +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pykoplenti"; + version = "1.0.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stegm"; + repo = pname; + rev = "v${version}"; + sha256 = "12nsyz8a49vhby1jp991vaky82fm93jrgcsjzwa2rixwg1zql4sw"; + }; + + propagatedBuildInputs = [ + aiohttp + click + prompt_toolkit + pycryptodome + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pykoplenti" ]; + + meta = with lib; { + description = "Python REST client API for Kostal Plenticore Inverters"; + homepage = "https://github.com/stegm/pykoplenti/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19d2a40dce6..59a9221d2de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5665,6 +5665,8 @@ in { pykodi = callPackage ../development/python-modules/pykodi { }; + pykoplenti = callPackage ../development/python-modules/pykoplenti { }; + pykwalify = callPackage ../development/python-modules/pykwalify { }; pylacrosse = callPackage ../development/python-modules/pylacrosse { }; From 2c28e09c610f02f85d975a35232b07ea29befe5a Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Thu, 6 May 2021 12:14:26 +0000 Subject: [PATCH 06/62] vscode: 1.55.2 -> 1.56.0 --- pkgs/applications/editors/vscode/vscode.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index f517f95a812..e15585d7bcf 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "08151qdhf4chg9gfbs0dl0v0k5vla2gz5dfy439jzdg1d022d5rw"; - x86_64-darwin = "1vlxxkv3wvds3xl3ir93l5q5yq2d7mcragsicfayj9x9r49ilqn3"; - aarch64-linux = "0rxw1wsi555z41ak817sxqyyan0rm7hma640zsh8dz0yvhzdv1h8"; - armv7l-linux = "1ijvd7r2fxxlw4zv3zx5h70b3d0b4gcq3aljsi02v1lr2zm8f8gb"; + x86_64-linux = "0v1g7j5q2j86c3r7jib8xs1sf2h3xvwv1s0xsqbig480fchlshjg"; + x86_64-darwin = "109529acrvyassq00mbhnwbxq7rfq9n69rgcw4n0rysgp8n58386"; + aarch64-linux = "0p6pz9apbfmr4pf7fikp2rmvk5gr87md1zrhr6hhd1qwgpc9kl07"; + armv7l-linux = "1qrp75nbzgqp7mv42m6wbj000l33rhfv7cnxdv6lp6cy05381aq6"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.55.2"; + version = "1.56.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From a6252afa36d613228430008b07372237b39164c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 May 2021 20:10:32 +0200 Subject: [PATCH 07/62] python3Packages.pymeteireann: init at 0.2 --- .../python-modules/pymeteireann/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pymeteireann/default.nix diff --git a/pkgs/development/python-modules/pymeteireann/default.nix b/pkgs/development/python-modules/pymeteireann/default.nix new file mode 100644 index 00000000000..7e48a4089a1 --- /dev/null +++ b/pkgs/development/python-modules/pymeteireann/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytz +, xmltodict +}: + +buildPythonPackage rec { + pname = "pymeteireann"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "DylanGore"; + repo = "PyMetEireann"; + rev = version; + sha256 = "1904f8mvv4ghzbniswmdwyj5v71m6y3yn1b4grjvfds05skalm67"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + pytz + xmltodict + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "meteireann" ]; + + meta = with lib; { + description = "Python module to communicate with the Met Éireann Public Weather Forecast API"; + homepage = "https://github.com/DylanGore/PyMetEireann/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33559777930..9e162f131ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5769,6 +5769,8 @@ in { pymetar = callPackage ../development/python-modules/pymetar { }; + pymeteireann = callPackage ../development/python-modules/pymeteireann { }; + pymetno = callPackage ../development/python-modules/pymetno { }; pymitv = callPackage ../development/python-modules/pymitv { }; From 29b2ee5b07afb5da4e571b5b95c6591d3d86c4e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 May 2021 20:11:17 +0200 Subject: [PATCH 08/62] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 28b7aed5f39..bf1aa9d76c7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -495,7 +495,7 @@ "meraki" = ps: with ps; [ aiohttp-cors ]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird "met" = ps: with ps; [ pymetno ]; - "met_eireann" = ps: with ps; [ ]; # missing inputs: pyMetEireann + "met_eireann" = ps: with ps; [ pymeteireann ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint From d79f71927c692dfa1970e8d7caad117c49e578b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 May 2021 20:11:52 +0200 Subject: [PATCH 09/62] home-assistant: enable met_eireann tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4df380e2b5a..310deda06ce 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -291,6 +291,7 @@ in with py.pkgs; buildPythonApplication rec { "media_player" "media_source" "met" + "met_eireann" "minecraft_server" "mobile_app" "modbus" From 847937c11d48215c6e2b9a2f87925ad43ee0151f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 May 2021 23:10:44 +0200 Subject: [PATCH 10/62] python3Packages.mutesync: init at 0.0.1 --- .../python-modules/mutesync/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/mutesync/default.nix diff --git a/pkgs/development/python-modules/mutesync/default.nix b/pkgs/development/python-modules/mutesync/default.nix new file mode 100644 index 00000000000..98bf6ce0745 --- /dev/null +++ b/pkgs/development/python-modules/mutesync/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchpatch +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mutesync"; + version = "0.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "05r8maq59glwgysg98y1vrysfb1mkh9jpbag3ixl13n8jw8clp85"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + patches = [ + # Don't parse requirements.txt, https://github.com/currentoor/pymutesync/pull/1 + (fetchpatch { + name = "add-requirements.patch"; + url = "https://github.com/currentoor/pymutesync/commit/d66910fc83b1ae3060cdb3fe22a6f91fb70a67f0.patch"; + sha256 = "0axhgriyyv31b1r1yidxcrv0nyrqbb63xw5qrmv2iy2h0v96ijsk"; + }) + ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "mutesync" ]; + + meta = with lib; { + description = "Python module for interacting with mutesync buttons"; + homepage = "https://github.com/currentoor/pymutesync"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37ae756d9da..8111a5110c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4317,6 +4317,8 @@ in { mutatormath = callPackage ../development/python-modules/mutatormath { }; + mutesync = callPackage ../development/python-modules/mutesync { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; From ba7d8bdb9fc06ad6a1e7beaa75c4ecd89df8d8cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 May 2021 21:08:44 +0200 Subject: [PATCH 11/62] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 28b7aed5f39..82e585f19c3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -531,7 +531,7 @@ "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "msteams" = ps: with ps; [ pymsteams ]; "mullvad" = ps: with ps; [ mullvad-api ]; - "mutesync" = ps: with ps; [ ]; # missing inputs: mutesync + "mutesync" = ps: with ps; [ mutesync ]; "mvglive" = ps: with ps; [ PyMVGLive ]; "my" = ps: with ps; [ aiohttp-cors pillow ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy From 382a580b18e3132de280f2ac0d99c9ef3718e560 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 May 2021 21:09:31 +0200 Subject: [PATCH 12/62] home-assistant: enable mutesync tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4df380e2b5a..b04d07457f8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -301,6 +301,7 @@ in with py.pkgs; buildPythonApplication rec { "mqtt_room" "mqtt_statestream" "mullvad" + "mutesync" "nexia" "notify" "notion" From b99ef3d4d81c452ae0bc835ae42f4f00d181d330 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 7 May 2021 07:40:42 +0800 Subject: [PATCH 13/62] hilbish: init at 0.4.0 --- pkgs/shells/hilbish/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/hilbish/default.nix diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix new file mode 100644 index 00000000000..e0449ce24c2 --- /dev/null +++ b/pkgs/shells/hilbish/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub, readline }: + +buildGoModule rec { + pname = "hilbish"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Hilbis"; + repo = "Hilbish"; + rev = "v${version}"; + sha256 = "sha256-7YJkjkA6lGyO4PwJcdeUzqQvFsslDfIqAH6vlBtyYz8="; + }; + + vendorSha256 = "sha256-9FftzTn5nxjfsHStcnrn9a+sECmcHRBUEtFjsMp8/ks="; + + buildInputs = [ readline ]; + + meta = with lib; { + description = "An interactive Unix-like shell written in Go"; + changelog = "https://github.com/Hilbis/Hilbish/releases/tag/v${version}"; + homepage = "https://github.com/Hilbis/Hilbish"; + maintainers = with maintainers; [ fortuneteller2k ]; + license = licenses.mit; + platforms = platforms.linux; # only officially supported on Linux + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8e77bcf6d4..7447386099d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1477,6 +1477,8 @@ in harvid = callPackage ../tools/video/harvid { }; + hilbish = callPackage ../shells/hilbish { }; + hime = callPackage ../tools/inputmethods/hime {}; hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; From 9f050c691c0e3f7473b1525f4725e48d97b27211 Mon Sep 17 00:00:00 2001 From: Andreas Schmid Date: Fri, 7 May 2021 19:57:50 +0200 Subject: [PATCH 14/62] bat-extras: fix build on Darwin (#119987) introduced by #119689 Signed-off-by: Andreas Schmid --- pkgs/tools/misc/bat-extras/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 4fb09f4d8dc..cb483567f21 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat # batdiff, batgrep, and batwatch , coreutils +, getconf , less # batgrep , ripgrep @@ -48,6 +49,7 @@ let # Run the library tests as they don't have external dependencies doCheck = true; + checkInputs = lib.optionals stdenv.isDarwin [ getconf ]; checkPhase = '' runHook preCheck # test list repeats suites. Unique them @@ -104,6 +106,7 @@ let dontBuild = true; # we've already built doCheck = true; + checkInputs = lib.optionals stdenv.isDarwin [ getconf ]; checkPhase = '' runHook preCheck bash ./test.sh --compiled --suite ${name} From 86ac115276c4294f8fea995e76efdb29fb31c00e Mon Sep 17 00:00:00 2001 From: xfnw Date: Sat, 8 May 2021 04:13:44 +0000 Subject: [PATCH 15/62] xcd: init at 1.2 --- pkgs/tools/misc/xcd/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/xcd/default.nix diff --git a/pkgs/tools/misc/xcd/default.nix b/pkgs/tools/misc/xcd/default.nix new file mode 100644 index 00000000000..c379ed21c19 --- /dev/null +++ b/pkgs/tools/misc/xcd/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "xcd"; + version = "1.2"; + + src = fetchurl { + url = "https://www.muppetlabs.com/~breadbox/pub/software/${pname}-${version}.tar.gz"; + sha256 = "1cgwspy08q05rhxbp7m1yrrix252i9jzfcfbzmhdvlgf5bfpl25g"; + }; + + buildInputs = [ ncurses ]; + installPhase = '' + runHook preInstall + install -D $pname $out/bin/$pname + runHook postInstall + ''; + + meta = with lib; { + description = "Colorized hexdump tool"; + homepage = "https://www.muppetlabs.com/~breadbox/software/xcd.html"; + maintainers = [ maintainers.xfnw ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b0e720e750..e6a2d8ecc9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,6 +808,8 @@ in tfk8s = callPackage ../tools/misc/tfk8s { }; + xcd = callPackage ../tools/misc/xcd { }; + xtrt = callPackage ../tools/archivers/xtrt { }; yabridge = callPackage ../tools/audio/yabridge { From 5390d4b9468f2027660e48a694d593a948be308f Mon Sep 17 00:00:00 2001 From: paumr Date: Sat, 8 May 2021 23:13:58 +0200 Subject: [PATCH 16/62] nixos/bind: formatted with nixpkgs-fmt --- nixos/modules/services/networking/bind.nix | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index b73b2b62685..20eef2c3455 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -32,7 +32,7 @@ let slaves = mkOption { type = types.listOf types.str; description = "Addresses who may request zone transfers."; - default = []; + default = [ ]; }; extraConfig = mkOption { type = types.str; @@ -105,7 +105,7 @@ in enable = mkEnableOption "BIND domain name server"; cacheNetworks = mkOption { - default = ["127.0.0.0/24"]; + default = [ "127.0.0.0/24" ]; type = types.listOf types.str; description = " What networks are allowed to use us as a resolver. Note @@ -117,7 +117,7 @@ in }; blockedNetworks = mkOption { - default = []; + default = [ ]; type = types.listOf types.str; description = " What networks are just blocked. @@ -141,7 +141,7 @@ in }; listenOn = mkOption { - default = ["any"]; + default = [ "any" ]; type = types.listOf types.str; description = " Interfaces to listen on. @@ -149,7 +149,7 @@ in }; listenOnIpv6 = mkOption { - default = ["any"]; + default = [ "any" ]; type = types.listOf types.str; description = " Ipv6 interfaces to listen on. @@ -157,7 +157,7 @@ in }; zones = mkOption { - default = []; + default = [ ]; type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions)); description = " List of zones we claim authority over. @@ -166,8 +166,8 @@ in "example.com" = { master = false; file = "/var/dns/example.com"; - masters = ["192.168.0.1"]; - slaves = []; + masters = [ "192.168.0.1" ]; + slaves = [ ]; extraConfig = ""; }; }; @@ -212,7 +212,8 @@ in networking.resolvconf.useLocalResolver = mkDefault true; users.users.${bindUser} = - { uid = config.ids.uids.bind; + { + uid = config.ids.uids.bind; description = "BIND daemon user"; }; @@ -232,9 +233,9 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload"; - ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; + ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; }; unitConfig.Documentation = "man:named(8)"; From 5d54dd8e3e581ab952c9557dfaa48086423b924d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 9 May 2021 01:32:36 +0200 Subject: [PATCH 17/62] gnomeExtensions.appindicator: 36 -> 37 --- pkgs/desktops/gnome/extensions/appindicator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix index 0906d762956..65576d292a8 100644 --- a/pkgs/desktops/gnome/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "36"; + version = "37"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "1nx1lgrrp3w5z5hymb91frjdvdkk7x677my5v4jjd330ihqa02dq"; + sha256 = "1yss91n94laakzhym409iyjs5gwhln2pkq0zrdrsxc3z70zlslxl"; }; # This package has a Makefile, but it's used for building a zip for From 25cb63fed65f88a484cf0d4c52388b03ef5d89e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 9 May 2021 01:39:07 +0200 Subject: [PATCH 18/62] gnomeExtensions.arcmenu: 5 -> 10 Supports GNOME 40 --- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 851a816c61c..8fa29126a30 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-arcmenu"; - version = "5"; + version = "10"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3"; + sha256 = "04kn3gnjz1wakp0pyiwm0alf0pwsralhis36miif9i6l5iv6a394"; }; patches = [ From 73c19f66827577683dd07644aeb76a6dd2947bc0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 8 May 2021 21:08:41 -0300 Subject: [PATCH 19/62] babashka: 0.3.5 -> 0.4.0 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 774bcbe11b2..233a4282a5a 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.3.5"; + version = "0.4.0"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-tOLT5W5kK38fb9XL9jOQpw0LjHPjbn+BarckbCuwQAc="; + sha256 = "sha256-NY78gkKJd9ATdu7Ja1AvWkaPv0PuDIKWDZBeYGMJufU="; }; dontUnpack = true; From 8f4ba475d9d922a903ed96a2f8280e4480ae0fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 8 May 2021 22:04:30 -0300 Subject: [PATCH 20/62] xfce.thunar: 4.16.6 -> 4.16.8 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index e220e29f3ed..4e6072c7112 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -20,9 +20,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.6"; + version = "4.16.8"; - sha256 = "12zqwazsqdmghy4h2c4fwxha069l07d46i512395y22h7n6655rn"; + sha256 = "1r7qkd6l0mgf97m1xnnizm7fkvl4a52r3hsds5z68y6myvb78p18"; nativeBuildInputs = [ docbook_xsl From 61901ffd0b7dfe1ee3ec5b7817cc1e86f993e54c Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 8 May 2021 19:04:48 -0700 Subject: [PATCH 21/62] rtl8812au: remove myself from maintainers --- pkgs/os-specific/linux/rtl8812au/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 0ed6b443e04..d0ec97b7c9a 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ danielfullmer ]; + maintainers = with maintainers; [ ]; broken = kernel.kernelOlder "4.10" || kernel.isHardened; }; } From 2d0fb67feabb5ffb3973bd96e9802df0f7ee0e85 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 9 May 2021 08:28:58 +0200 Subject: [PATCH 22/62] nzbhydra2: 3.13.2 -> 3.14.1 --- pkgs/servers/nzbhydra2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix index 3aef89ecd8f..b1d3b4970d6 100644 --- a/pkgs/servers/nzbhydra2/default.nix +++ b/pkgs/servers/nzbhydra2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "3.13.2"; + version = "3.14.1"; src = fetchzip { url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip"; - sha512 = "2pi91y966qnq6q9qqnhglmbj4610jxyyqxiwa8zfmb8r48mzwzy3q5ga00h9qbhi6a8ghrfh1yvj4h9m17gk7l3rc5fw0r3mrk437nj"; + sha512 = "2mfrqqwrfjvr48vm4r0spda3vlg1h511r6hrlv7k9233ps97bjjir6hms82lgqnlirsixayxs47cldjy8amdn3vc6kxsifmbd6a924p"; stripRoot = false; }; From f810b49906ce0d271de99cb99211be3449b2c105 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 9 May 2021 11:40:01 +0200 Subject: [PATCH 23/62] lmdbxx: update homepage to the fork --- pkgs/development/libraries/lmdbxx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 2d037afbe21..4fc1573eea1 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = "https://github.com/drycpp/lmdbxx#readme"; + homepage = "https://github.com/hoytech/lmdbxx#readme"; description = "C++11 wrapper for the LMDB embedded B+ tree database library"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fgaz ]; From d6f915eb0ec2cbe40e595d9b69dafb0276b81d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 May 2021 15:27:55 +0200 Subject: [PATCH 24/62] surf: 2019-02-08 -> 2.1 --- pkgs/applications/networking/browsers/surf/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 26cbc92adac..7bf3ee9e75b 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -7,12 +7,13 @@ stdenv.mkDerivation rec { pname = "surf"; - version = "unstable-2019-02-08"; + version = "2.1"; + # tarball is missing file common.h src = fetchgit { url = "git://git.suckless.org/surf"; - rev = "d068a3878b6b9f2841a49cd7948cdf9d62b55585"; - sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m"; + rev = version; + sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z"; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From d7e62a766cf68e952c6be9e6c7c8d1a6b9027d0a Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sat, 8 May 2021 17:23:37 +0800 Subject: [PATCH 25/62] timew-sync-server: init at 1.0.0 --- .../misc/timew-sync-server/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/misc/timew-sync-server/default.nix diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/applications/misc/timew-sync-server/default.nix new file mode 100644 index 00000000000..86a428df38f --- /dev/null +++ b/pkgs/applications/misc/timew-sync-server/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "timew-sync-server"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "timewarrior-synchronize"; + repo = pname; + rev = "v${version}"; + sha256 = "041j618c2bcryhgi2j2w5zlfcxcklgbir2xj3px4w7jxbbg6p68n"; + }; + + vendorSha256 = "0wbd4cpswgbr839sk8qwly8gjq4lqmq448m624akll192mzm9wj7"; + + meta = with lib; { + homepage = "https://github.com/timewarrior-synchronize/timew-sync-server"; + description = "Server component of timewarrior synchronization application"; + license = licenses.mit; + maintainers = [ maintainers.joachimschmidt557 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 544d2f71825..94e6c0c2efd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26409,6 +26409,8 @@ in timewarrior = callPackage ../applications/misc/timewarrior { }; + timew-sync-server = callPackage ../applications/misc/timew-sync-server { }; + timg = callPackage ../tools/graphics/timg { }; timidity = callPackage ../tools/misc/timidity { }; From 36f44dc6ab74794d213675900e33c30b88d5d4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 9 May 2021 11:06:26 -0300 Subject: [PATCH 26/62] marwaita-manjaro: 1.8 -> 2.0 --- pkgs/data/themes/marwaita-manjaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/data/themes/marwaita-manjaro/default.nix index 4189f0ed48d..d467526582c 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/data/themes/marwaita-manjaro/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "1.8"; + version = "2.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0zxj20inwdfxhsc7cq6b3ijkxmrhnrwvbmyb1lw4vfjs4p4wrws0"; + sha256 = "1si0gaa1njyf4194i6rbx4qjp31sw238svvb2x8r8cfhm8mkhm8d"; }; buildInputs = [ From 10854c5a4dc3e79a273fd80ccbe78e2655708dd6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 9 May 2021 17:14:07 +0200 Subject: [PATCH 27/62] stumpwm: redirect to lispPackages.stumpwm; stumpwm-git: drop --- .../window-managers/stumpwm/default.nix | 103 ------------------ .../stumpwm/fix-module-path.patch | 16 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 9 +- 4 files changed, 2 insertions(+), 127 deletions(-) delete mode 100644 pkgs/applications/window-managers/stumpwm/default.nix delete mode 100644 pkgs/applications/window-managers/stumpwm/fix-module-path.patch diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix deleted file mode 100644 index 0f8d933a06d..00000000000 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 -, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop -, extraModulePaths ? [] -, version }: - -let - contrib = (fetchgit { - url = "https://github.com/stumpwm/stumpwm-contrib.git"; - rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f"; - sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; - }); - versionSpec = { - latest = { - name = "1.0.0"; - rev = "refs/tags/1.0.0"; - sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb"; - patches = []; - }; - "0.9.9" = { - name = "0.9.9"; - rev = "refs/tags/0.9.9"; - sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; - patches = [ ./fix-module-path.patch ]; - }; - git = { - name = "git-20170203"; - rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; - sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; - patches = []; - }; - }.${version}; -in -stdenv.mkDerivation { - name = "stumpwm-${versionSpec.name}"; - - src = fetchgit { - url = "https://github.com/stumpwm/stumpwm"; - rev = versionSpec.rev; - sha256 = versionSpec.sha256; - }; - - # NOTE: The patch needs an update for the next release. - # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it. - patches = versionSpec.patches; - - buildInputs = [ - texinfo4 makeWrapper autoconf - sbcl - lispPackages.clx - lispPackages.cl-ppcre - lispPackages.alexandria - xdpyinfo - ]; - - - # Stripping destroys the generated SBCL image - dontStrip = true; - - configurePhase = '' - ./autogen.sh - ./configure --prefix=$out --with-module-dir=$out/share/stumpwm/modules - ''; - - preBuild = '' - cp -r --no-preserve=mode ${contrib} modules - substituteInPlace head.lisp \ - --replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo' - ''; - - installPhase = '' - mkdir -pv $out/bin - make install - - mkdir -p $out/share/stumpwm/modules - cp -r modules/* $out/share/stumpwm/modules/ - for d in ${lib.concatStringsSep " " extraModulePaths}; do - cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/ - done - - # Copy stumpish; - cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/ - chmod +x $out/bin/stumpish - wrapProgram $out/bin/stumpish \ - --prefix PATH ":" "${lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" - - # Paths in the compressed image $out/bin/stumpwm are not - # recognized by Nix. Add explicit reference here. - mkdir $out/nix-support - echo ${xdpyinfo} > $out/nix-support/xdpyinfo - ''; - - passthru = { - inherit sbcl lispPackages contrib; - }; - - meta = with lib; { - description = "A tiling window manager for X11"; - homepage = "https://github.com/stumpwm/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - broken = true; # 2018-04-11 - }; -} diff --git a/pkgs/applications/window-managers/stumpwm/fix-module-path.patch b/pkgs/applications/window-managers/stumpwm/fix-module-path.patch deleted file mode 100644 index 79bfaad3dec..00000000000 --- a/pkgs/applications/window-managers/stumpwm/fix-module-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/make-image.lisp.in b/make-image.lisp.in -index 121e9d6..2210242 100644 ---- a/make-image.lisp.in -+++ b/make-image.lisp.in -@@ -2,7 +2,10 @@ - - (load "load-stumpwm.lisp") - --#-ecl (stumpwm:set-module-dir "@CONTRIB_DIR@") -+(setf asdf::*immutable-systems* -+ (uiop:list-to-hash-set (asdf:already-loaded-systems))) -+ -+#-ecl (stumpwm:set-module-dir "@MODULE_DIR@") - - #+sbcl - (sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda () diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 44460e8f911..b8a804f9aaa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -759,6 +759,7 @@ mapAliases ({ squid4 = squid; # added 2019-08-22 sshfsFuse = sshfs-fuse; # added 2016-09 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 + stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fd58e1adac..d7ca36707b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26192,14 +26192,7 @@ in stumpish = callPackage ../applications/window-managers/stumpish {}; - stumpwm = callPackage ../applications/window-managers/stumpwm { - version = "latest"; - }; - - stumpwm-git = stumpwm.override { - version = "git"; - inherit sbcl lispPackages; - }; + stumpwm = lispPackages.stumpwm; sublime = callPackage ../applications/editors/sublime/2 { }; From 54a69f5a7cd2c50c157a7eed6a1bebd92c0d1300 Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Sun, 9 May 2021 15:02:28 +0300 Subject: [PATCH 28/62] python3Packages.pipx: 0.16.1.0 -> 0.16.2.1 --- pkgs/development/python-modules/pipx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 34a7bc6b31a..e6f9242dde6 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.16.1.0"; + version = "0.16.2.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "081raqsaq7i2x4yxhxppv930jhajdwmngin5wazy7vqhiy3xc669"; + sha256 = "1agdp8j4lw6z0lk2vv1m8d49r5vwfkpal3hdgq67vnjyp9904pf6"; }; propagatedBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { "suffix" "legacy_venv" "determination" + "json" ]; meta = with lib; { From e4f1d9592cb9a39cec5612425132f1c237ce29ff Mon Sep 17 00:00:00 2001 From: branwright1 Date: Sun, 9 May 2021 17:32:05 +0100 Subject: [PATCH 29/62] river: unstable-2021-04-27 > unstable-2021-05-07 --- .../window-managers/river/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 9b40d34b6f2..e82f290169c 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -6,37 +6,41 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-04-27"; + version = "unstable-2021-05-07"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "0c8e718d95a6a621b9cba0caa9158915e567b076"; - sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk"; + rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d"; + sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j"; fetchSubmodules = true; }; - buildInputs = [ xwayland wayland-protocols wlroots pixman + buildInputs = [ wayland-protocols wlroots pixman libxkbcommon pixman udev libevdev libX11 libGL ]; + dontConfigure = true; + preBuild = '' export HOME=$TMPDIR ''; installPhase = '' + runHook preInstall zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install + runHook postInstall ''; - nativeBuildInputs = [ zig wayland scdoc pkg-config ]; + nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ]; + # Builder patch install dir into river to get default config + # When installFlags is removed, river becomes half broken + # see https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - description = "A dynamic tiling wayland compositor"; - longDescription = '' - river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm. - ''; homepage = "https://github.com/ifreund/river"; + description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ branwright1 ]; From 4ff0c782a386084c1befd5d1882fa3a2bffb673e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 20:32:06 +0000 Subject: [PATCH 30/62] jmol: 14.31.36 -> 14.31.38 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 2da5a070ee8..d8f7bd5eb55 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.36"; + version = "14.31.38"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-YwXgRRUZ75l1ZptscsZae2mwkRkYXJeWSrPvw+R6TkI="; + sha256 = "sha256-yXJ1KtTH3bi24GFiVXu8zzQkreDkqbCxgm7fVoSJepg="; }; patchPhase = '' From 2fcba3a99958855371e3d4c09b0f8ff2c32ceb19 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 5 May 2021 17:42:05 +0200 Subject: [PATCH 31/62] peek: use ffmpeg 4 See migrate away from ffmpeg_3 #120705. --- pkgs/applications/video/peek/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index d4e8f9d21b2..edeb848867f 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -16,7 +16,7 @@ , glib , cairo , keybinder3 -, ffmpeg_3 +, ffmpeg , python3 , libxml2 , gst_all_1 @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg_3 gifski ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg gifski ]}) ''; passthru = { @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ puffnfresh ]; platforms = platforms.linux; }; From 521763440f0cd750565b39c9a7227085ee4b1795 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 May 2021 22:58:29 +0200 Subject: [PATCH 32/62] python3Packages.androidtv: 0.0.58 -> 0.0.59 --- pkgs/development/python-modules/androidtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 98ab09fd8e6..02edcea42ef 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.58"; + version = "0.0.59"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-/5sYiYRFa8XJJ4QSxLzJBHaKfAKsGETiVDHerNQ79U8="; + sha256 = "sha256-QuKWOo+QMBpVJglwvaSMbKKYMN/MW31E7BgIMchESG8="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] From 4ee3a9c0430da0ba7db6d43aefdae90692a78453 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 May 2021 23:01:02 +0200 Subject: [PATCH 33/62] home-assistant: enable androidtv tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f535477827c..e19f53fcbbb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -193,6 +193,7 @@ in with py.pkgs; buildPythonApplication rec { "accuweather" "airly" "analytics" + "androidtv" "alert" "api" "auth" From 86632357e6e18173fe0d7924150bacba646bf3f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 May 2021 23:33:02 +0200 Subject: [PATCH 34/62] python3Packages.async-upnp-client: 0.16.2 -> 0.17.0 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 2fa186a07d1..cc0e0513ed1 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.16.2"; + version = "0.17.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "0raq3jgh2aqllycvvi0x2j5f602vv8ggmyd3879jzqbz2znngsgb"; + sha256 = "sha256-k71fpwL999Qz/vOsmpxykMVKgASzHis/exY/8aDoAkg="; }; propagatedBuildInputs = [ From 6b60709aa51a45a7f83b7c5716d677c0a98c8fe8 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 10 May 2021 00:44:53 +0200 Subject: [PATCH 35/62] perlPackages.PDFBuilder: 3.021 -> 3.022 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 10a6de27deb..539a06bf4a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16705,10 +16705,10 @@ let PDFBuilder = buildPerlPackage { pname = "PDF-Builder"; - version = "3.021"; + version = "3.022"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.021.tar.gz"; - sha256 = "1hc22s5gdspr5nyfmix3cwdzcw7z66pcqxy422ksmbninbzv4z93"; + url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz"; + sha256 = "0cfafyci5xar567z82w0vcjrwa6inf1a9ydszgkz51bi1ilj8as8"; }; checkInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; From 13b226745a14abfc5dbf44dcee620d6d0f6fc58c Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 10 May 2021 00:45:11 +0200 Subject: [PATCH 36/62] gscan2pdf: 2.11.1 -> 2.12.1 --- pkgs/applications/graphics/gscan2pdf/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 67f624ce9c9..a44d4f6408c 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.11.1"; + version = "2.12.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0aigngfi5dbjihn43c6sg865i1ybfzj0w81zclzy8r9nqiqq0wma"; + sha256 = "0x20wpqqw6534rn73660zdfy4c3jpg2n31py566k0x2nd6g0mhg5"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -112,6 +112,12 @@ perlPackages.buildPerlPackage rec { # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t + # Disable a test which passes but reports an incorrect status + # t/0601_Dialog_Scan.t .......................... All 14 subtests passed + # t/0601_Dialog_Scan.t (Wstat: 139 Tests: 14 Failed: 0) + # Non-zero wait status: 139 + rm t/0601_Dialog_Scan.t + xvfb-run -s '-screen 0 800x600x24' \ make test ''; From 5bd24c378318e54ac9a698e8f93b3066ff9e82cf Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Mon, 10 May 2021 00:22:37 +0000 Subject: [PATCH 37/62] vscodium: 1.55.2 -> 1.56.0 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 4850a9cd7dd..9bd8e0f245b 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "12mdila9gspj6b9s6488j0ba264vm4a46546kplma7s6gkkpz4zx"; - x86_64-darwin = "15wdznihc2ra2fjy9p4j898vazjr4h5yighaxh7jk9kcvarg1658"; - aarch64-linux = "0plw1an1z3v333irbc53skrmq2klas21srriiqkvmkgkfvpx1rq2"; - armv7l-linux = "1ys82pa18qshpinaqqrskxvljzap20xwj5ncffn031yacg1y2qx2"; + x86_64-linux = "01bg6bjjbbdywd7r13safa5nxx1y9a8zia7q6z5anc60hfylvhd2"; + x86_64-darwin = "0xkzxlp45f9vl9yrrk8fynwpsv85yjmsp6ylm2fbmfddf9bqkjsb"; + aarch64-linux = "028g359jrbs1hbxwq4gqq1s08vv38i3x52vjalqrpc6b0wc5cc2w"; + armv7l-linux = "06w5h7q799b9kwagi6w3320yjdp66cwr6d0dd7sl4sirqnrap0i4"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.55.2"; + version = "1.56.0"; pname = "vscodium"; executableName = "codium"; From 062526f732d3ddd45bf9df0682ca1cf54d31c8f0 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Sun, 9 May 2021 22:54:40 -0400 Subject: [PATCH 38/62] bottom: 0.5.7 -> 0.6.0 --- pkgs/tools/system/bottom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index d96573325b8..1c097297041 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-9L7FtYIaWSOwNQ8zOLvxjt51o8A5MqqfF/iIyJs2TJA="; + sha256 = "sha256-z0WLD6XOlsM5UL9/nUU5Jk1F+UFLm4N42zAlgY3zEbM="; }; prePatch = '' @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "sha256-4oH1A88Qn0c6hkE/1b6mTrEIph8xT98j+DkP9/5JALs="; + cargoSha256 = "sha256-m2UVpsVTEmf6fgE1CFRE6+3097bKnkrMKtY3fAOjS2E="; doCheck = false; From b56bd9afccf63152eb59f891863458049aa4a8e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 May 2021 08:13:19 +0200 Subject: [PATCH 39/62] python3Packages.pyjwt: disable failing test for 1.7.1 --- pkgs/development/python-modules/pyjwt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 4617869988f..104dadbd396 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (lib.versionOlder version "2.0") [ + # ecdsa changed internal behavior, required if one does 1.7.1 overriding + "ec_verify_should_return_false_if_signature_invalid" + ]; + pythonImportsCheck = [ "jwt" ]; meta = with lib; { From cca0bdf46a7801fe294be11412970e058403d9c2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 10 May 2021 10:06:42 +0200 Subject: [PATCH 40/62] gir-rs: 2019-10-16 -> 2021-05-05 --- pkgs/development/tools/gir/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index c88ffef4df1..856cd44e26c 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "gir"; - version = "2019-10-16"; + version = "unstable-2021-05-05"; src = fetchFromGitHub { owner = "gtk-rs"; repo = "gir"; - rev = "241d790085a712db7436c5c25b210ccb7d1a08d5"; - sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr"; + rev = "c148542ce89b0bf7cbb9f5ef4179c96a45d022df"; + sha256 = "0vy366ipwnn0cpp14l1v5g3dpnsr3hd8mjp3333lp0946igfqsy5"; + leaveDotGit = true; # required for build.rs }; - cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1"; + cargoSha256 = "11as1v88zf0f7l2ngllg5zqycvd05nb4vrsyl1dlarjvbq7fhvv8"; meta = with lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; From 18a8eb9e41a65d52804c932aa572a81352a7cc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 May 2021 10:46:46 +0200 Subject: [PATCH 41/62] kdeltachat: enable WebP support See https://git.sr.ht/~link2xt/kdeltachat/commit/d0a05f9ca3e1db51aed0285cbf4fcc5d64d05833. --- .../networking/instant-messengers/kdeltachat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 84b6f7ecb37..ae567daec36 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -6,6 +6,7 @@ , pkg-config , kirigami2 , libdeltachat +, qtimageformats , qtmultimedia }: @@ -29,6 +30,7 @@ mkDerivation rec { buildInputs = [ kirigami2 libdeltachat + qtimageformats qtmultimedia ]; From edec49cbb3fc37b8f1ece44d0ec7d8a30b9d9a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 10 May 2021 11:32:38 +0200 Subject: [PATCH 42/62] calibre: 5.16.1 -> 5.17.0 --- pkgs/applications/misc/calibre/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index de90e9d670c..aff203cce61 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -25,11 +25,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.16.1"; + version = "5.17.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-lTXCW0MGNOezecaGO9c2JGU4ylwpPmBaMXTY3nLNcrE="; + hash = "sha256-rdiBL3Y3q/0wFfWGE4jGkWakgV8hA9HjDcKXso6tVrs="; }; patches = [ @@ -114,7 +114,6 @@ mkDerivation rec { export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo.dev}/include/podofo export PODOFO_LIB_DIR=${podofo.lib}/lib - export SIP_BIN=${python3Packages.sip}/bin/sip export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" From b6980c13491276822be1cef06357603c2cc20f9b Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Mon, 10 May 2021 12:20:00 +0300 Subject: [PATCH 43/62] chamber: 2.9.0 -> 2.10.0 --- pkgs/tools/admin/chamber/default.nix | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index c2126181f36..8396540cd27 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -1,30 +1,21 @@ -{ buildGoModule, lib, fetchFromGitHub, fetchpatch }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "chamber"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "eOMY9P/fCYvnl6KGNb6wohykLA0Sj9Ti0L18gx5dqUk="; + sha256 = "4G/QGoztpcLIspHxD5G+obG5h05SZek4keOJ5qS3/zg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/segmentio/chamber/commit/3aeb416cdf4c232552b653262e37047fc13b1f02.patch"; - sha256 = "cyxNF9ZP4oG+1sfX9yWZCyntpAvwYUh5BzTirZQGejc="; - }) - ]; + CGO_ENABLED = 0; - vendorSha256 = null; + vendorSha256 = "XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; - # set the version. see: chamber's Makefile - buildFlagsArray = '' - -ldflags= - -X main.Version=v${version} - ''; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; meta = with lib; { description = From 91be397a437fe84832330f94e916cf81656c171c Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 10 May 2021 16:04:03 +0300 Subject: [PATCH 44/62] sofia_sip: fix darwin build --- pkgs/development/libraries/sofia-sip/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 593bd87a982..c9db54fd59c 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook, SystemConfiguration }: stdenv.mkDerivation rec { pname = "sofia-sip"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas="; }; - buildInputs = [ glib openssl ]; + buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; homepage = "https://github.com/freeswitch/sofia-sip"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl2; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8e77bcf6d4..989efa60160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17593,7 +17593,9 @@ in socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; - sofia_sip = callPackage ../development/libraries/sofia-sip { }; + sofia_sip = callPackage ../development/libraries/sofia-sip { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; soil = callPackage ../development/libraries/soil { inherit (darwin.apple_sdk.frameworks) Carbon; From 0aa521e3a00e6954f6b66ad1ace829691efd5164 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Mon, 10 May 2021 15:30:05 +0200 Subject: [PATCH 45/62] coqPackages.mathcomp-zify: init at 1.0.0+1.12+8.13 --- .../coq-modules/mathcomp-zify/default.nix | 22 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/coq-modules/mathcomp-zify/default.nix diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix new file mode 100644 index 00000000000..65af999d08f --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -0,0 +1,22 @@ +{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: + +with lib; mkCoqDerivation rec { + pname = "mathcomp-zify"; + repo = "mczify"; + owner = "math-comp"; + inherit version; + + defaultVersion = with versions; + switch [ coq.coq-version mathcomp-algebra.version ] [ + { cases = [ (isEq "8.13") (isEq "1.12") ]; out = "1.0.0+1.12+8.13"; } + ] null; + + release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; + + propagatedBuildInputs = [ mathcomp-algebra ]; + + meta = { + description = "Micromega tactics for Mathematical Components"; + maintainers = with maintainers; [ cohencyril ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 9884553c9e0..2efd2c1849b 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -60,6 +60,7 @@ let mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; + mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {}; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; odd-order = callPackage ../development/coq-modules/odd-order { }; From 021813a495894c4b560251791ec675e94b600036 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 10 May 2021 22:01:49 +0800 Subject: [PATCH 46/62] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 62 +++++++++++++++++------------ 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 8e327273502..62307010d61 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -461,12 +461,12 @@ let coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; - version = "2021-03-04"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "vn-ki"; repo = "coc-clap"; - rev = "57116d2f999dfa025fac579835fd23e1a6341fa2"; - sha256 = "0m2khf11krkqmbykfx21yq9ydglz6dldw4xml5nkyqm93n37xn1s"; + rev = "8622be2674f3197bec8a0c4cfd177eb8455f45e6"; + sha256 = "063azqsibg25iv2c9smn4k6933frrwarqz640b14c041sgi6h8cx"; }; meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; @@ -537,8 +537,8 @@ let src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a3966628cb090ed9a102e7b9c78f9fb90abffd21"; - sha256 = "1pa28arwyfgvf6c1vbcqnlwiz54lqlw8lqv89nz8880wpmwr3njk"; + rev = "6cc7432fa00d8a7351cee54f7b800e992057315a"; + sha256 = "048mvb82ni7m3ch5i32q54qnsh3rl28yw1q7fcsapklnknaaq3qh"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1172,12 +1172,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-05-02"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "9d8f0dfc9e0a2f60b42e9d7b96eb485087c0178d"; - sha256 = "17nq09731rcgccasximg3qknvfzi0ca9lsrwvhjbzc5wagwrribq"; + rev = "4e7a08aaa7827184bd492f19aa38fc67aac0f0c8"; + sha256 = "00b0v1wk4wccd4c5xkqn0yvilp3z14r66983kyblpivqfdwy9gs5"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1775,12 +1775,12 @@ let gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-05-05"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "9e0e0a00360c87c76d293464430662dbdf298d99"; - sha256 = "0d0yrqh4rw1ijslvip2h3c6kmpzfza9iw3dizgjl2kbl8jx958a1"; + rev = "c26c456a6b36cac79e01f6cf7eebb8cc9231ab16"; + sha256 = "0kpgkdwkz27xl56yicf8b8zhqg84657s14xl0blh802cm275hz92"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -1845,6 +1845,18 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + hologram-nvim = buildVimPluginFrom2Nix { + pname = "hologram-nvim"; + version = "2021-05-01"; + src = fetchFromGitHub { + owner = "edluffy"; + repo = "hologram.nvim"; + rev = "31108af1a9a4fc842656c6a319ce3decc3baf8e8"; + sha256 = "0kgbcggx5kr0h95f2gwpfr1h3wbv73pis8dkmjgmr6gpj70zsk7v"; + }; + meta.homepage = "https://github.com/edluffy/hologram.nvim/"; + }; + hoon-vim = buildVimPluginFrom2Nix { pname = "hoon-vim"; version = "2020-11-09"; @@ -2208,12 +2220,12 @@ let lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-03-25"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "fb5ab7d26ac414a7e7bfff6b89f69e2dd2fd3884"; - sha256 = "1nn6zhjqfk88jmavl9y8li4y08v3wb2m2kskq9yf36hadw29im30"; + rev = "acc383d1eab516318816f43e3e380fead8249acb"; + sha256 = "0w777was4z7yk3z6fn55phqzxmsbzbz0v4959h52yi91pdbb4qfc"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -3160,8 +3172,8 @@ let src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "ac3b0f70843840918389191f575f2404cad3304f"; - sha256 = "0jxj9v8sxnmvvirwzj171dd43w2kg6g3dri1pya20x8plka8rgs6"; + rev = "ffbad27affde968cff2db0af9654431377fee8c7"; + sha256 = "0vlismqzm24h24shc0m49qvxyv03mnd68ahzlwa314ybvs2s10wj"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4021,12 +4033,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-05-06"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "2e615d4a039d2fc580479a5e512330527d151d3f"; - sha256 = "0hc0iv5p3ys98w8sv4569jh5x20vqqyysgff5nrgysl0amw6rgwd"; + rev = "2de94fc88d6382e5f0b61f1c619c8919fd45aea3"; + sha256 = "14fg0qs1y2xszpdsnp8gcynqj9fx5c47ckbpgr48hv5df8xncasf"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -6292,12 +6304,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2020-07-12"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e9004ce564891412cfe433cfbb97295cccd06b39"; - sha256 = "1cs72x3wv4i11x7ch3gna1sxqn5zj3bd34smchfd00g4mf201lhs"; + rev = "b80004c050501122d58f82712b21d0b7c8dfc019"; + sha256 = "049552dvsk14hx4h9rp9g65xkf13n42z304lzxca69j5q6k1qrdl"; }; meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; @@ -9081,12 +9093,12 @@ let wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire-vim"; - version = "2021-05-09"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "gcmt"; repo = "wildfire.vim"; - rev = "2f6b7d7861cc4c9ff95338f150159e1ccee64d82"; - sha256 = "1ppc7pqy7wbaac0cd9ng5hil1f7argsd5dvg3896z5iqpf5xhmrl"; + rev = "fa91b732fd1c5acd23b7b32d5fbbc884eedafc8d"; + sha256 = "15gikqmpaf5c6687kgc5ib57pw7gyvxaihdv5549s7p2xkkbcl24"; }; meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; From 21cc6fe587827ec499f128c992ffda393dc07b50 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 10 May 2021 22:09:25 +0800 Subject: [PATCH 47/62] vimPlugins.hologram-nvim: init at 2021-05-01 --- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c1a880959a7..1b172a92f34 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -106,6 +106,7 @@ eagletmt/ghcmod-vim eagletmt/neco-ghc easymotion/vim-easymotion editorconfig/editorconfig-vim +edluffy/hologram.nvim@main edwinb/idris2-vim ehamberg/vim-cute-python eigenfoo/stan-vim From 9bf3ecbe66d1dd15c1afb3313436944f63a916e4 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 10 May 2021 22:11:05 +0800 Subject: [PATCH 48/62] vimPlugins.specs-nvim: init at 2021-05-05 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 62307010d61..b3805d4cfc8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4283,6 +4283,18 @@ let meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; + specs-nvim = buildVimPluginFrom2Nix { + pname = "specs-nvim"; + version = "2021-05-05"; + src = fetchFromGitHub { + owner = "edluffy"; + repo = "specs.nvim"; + rev = "a62319a224b73b70af47a48ba076d7ec67b08526"; + sha256 = "1hs7qp3fr451ziddv08nyygnxx1n6y32fr0y97s9zjc7j13d3nc3"; + }; + meta.homepage = "https://github.com/edluffy/specs.nvim/"; + }; + splice-vim = buildVimPluginFrom2Nix { pname = "splice-vim"; version = "2020-01-15"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1b172a92f34..c647a6bfd5c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -107,6 +107,7 @@ eagletmt/neco-ghc easymotion/vim-easymotion editorconfig/editorconfig-vim edluffy/hologram.nvim@main +edluffy/specs.nvim@main edwinb/idris2-vim ehamberg/vim-cute-python eigenfoo/stan-vim From 0cfa5cc54f43ccec1a6e62865c7f429b9a0f6374 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 10 May 2021 14:49:33 +0000 Subject: [PATCH 49/62] pdfpc: fix build by using older vala (#122372) --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59e1caeee3..63ed9cf041b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25427,6 +25427,8 @@ in pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { + # https://github.com/pdfpc/pdfpc/issues/594 + vala = vala_0_50; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; From d515fcf049c00b51bb181a7058b4cb63636469a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 May 2021 17:37:30 +0200 Subject: [PATCH 50/62] Revert "python3Packages.pyjwt: disable failing test for 1.7.1" This reverts commit b56bd9afccf63152eb59f891863458049aa4a8e3. --- pkgs/development/python-modules/pyjwt/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 104dadbd396..4617869988f 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -29,11 +29,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (lib.versionOlder version "2.0") [ - # ecdsa changed internal behavior, required if one does 1.7.1 overriding - "ec_verify_should_return_false_if_signature_invalid" - ]; - pythonImportsCheck = [ "jwt" ]; meta = with lib; { From b70ae7c2788b5816f516c6515792d5767046ac52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 May 2021 17:50:08 +0200 Subject: [PATCH 51/62] home-assistant: fix build by disabling test in pyjwt override FAILED tests/contrib/test_algorithms.py::TestEcdsaAlgorithms::test_ec_verify_should_return_false_if_signature_invalid --- pkgs/servers/home-assistant/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f535477827c..22b61c09334 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -38,8 +38,17 @@ let }) # Pinned due to API changes in pyjwt>=2.0 - (mkOverride "pyjwt" "1.7.1" - "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd") + (self: super: { + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.7.1"; + src = oldAttrs.src.override { + sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; + }; + disabledTests = [ + "test_ec_verify_should_return_false_if_signature_invalid" + ]; + }); + }) # Pinned due to bug in ring-doorbell 0.7.0 # https://github.com/tchellomello/python-ring-doorbell/issues/240 From 8f7b450a0de635e58b976169e1b0a524fc8c4faf Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 10 May 2021 17:53:19 +0200 Subject: [PATCH 52/62] perlPackages.MojoliciousPluginSyslog: init at 0.04 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 10a6de27deb..3c9a2791770 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13769,6 +13769,22 @@ let }; }; + MojoliciousPluginSyslog = buildPerlPackage { + pname = "Mojolicious-Plugin-Syslog"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Syslog-0.04.tar.gz"; + sha256 = "807d06b88304675a2bb9181bab123a0e16d3cf2f6a5753a168090ed88085a492"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog"; + description = "A plugin for enabling a Mojolicious app to log to syslog"; + license = lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoliciousPluginTextExceptions = buildPerlPackage { pname = "Mojolicious-Plugin-TextExceptions"; version = "0.02"; From 3fde66cd0cccfcd02ca6a9d205477ec3bf4da32e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 10 May 2021 18:10:49 +0200 Subject: [PATCH 53/62] lispPackages.quicklisp: distinfo 2021-02-28 -> 2021-04-11, quicklispPackages: regenerate, lispPackages.nyxt: 2021-03-27 -> 2021-05-06, use upstream Makefile --- .../lisp-modules/lisp-packages.nix | 22 +++++++++---- .../_3bmd-ext-code-blocks.nix | 14 ++++---- .../quicklisp-to-nix-output/_3bmd.nix | 14 ++++---- .../quicklisp-to-nix-output/alexandria.nix | 14 ++++---- .../quicklisp-to-nix-output/cffi-grovel.nix | 14 ++++---- .../cffi-toolchain.nix | 14 ++++---- .../cffi-uffi-compat.nix | 14 ++++---- .../quicklisp-to-nix-output/cffi.nix | 14 ++++---- .../quicklisp-to-nix-output/chanl.nix | 14 ++++---- .../cl-change-case.nix | 14 ++++---- .../quicklisp-to-nix-output/cl-colors2.nix | 14 ++++---- .../cl-gobject-introspection.nix | 32 +++++++++++++++++++ .../quicklisp-to-nix-output/cl-postgres.nix | 14 ++++---- .../cl-typesetting.nix | 14 ++++---- .../quicklisp-to-nix-output/cl-webkit2.nix | 14 ++++---- .../quicklisp-to-nix-output/cl_plus_ssl.nix | 14 ++++---- .../clack-handler-hunchentoot.nix | 14 ++++---- .../quicklisp-to-nix-output/clack-socket.nix | 14 ++++---- .../quicklisp-to-nix-output/clack-test.nix | 14 ++++---- .../clack-v1-compat.nix | 14 ++++---- .../quicklisp-to-nix-output/clack.nix | 22 +++++++------ .../quicklisp-to-nix-output/closer-mop.nix | 14 ++++---- .../quicklisp-to-nix-output/dexador.nix | 14 ++++---- .../file-attributes.nix | 14 ++++---- .../quicklisp-to-nix-output/ironclad.nix | 14 ++++---- .../quicklisp-to-nix-output/marshal.nix | 14 ++++---- .../quicklisp-to-nix-output/mgl-pax.nix | 14 ++++---- .../quicklisp-to-nix-output/plump.nix | 14 ++++---- .../quicklisp-to-nix-output/postmodern.nix | 14 ++++---- .../quicklisp-to-nix-output/quri.nix | 14 ++++---- .../quicklisp-to-nix-output/s-sql.nix | 14 ++++---- .../quicklisp-to-nix-output/serapeum.nix | 14 ++++---- .../quicklisp-to-nix-output/simple-date.nix | 14 ++++---- .../quicklisp-to-nix-output/str.nix | 14 ++++---- .../quicklisp-to-nix-output/stumpwm.nix | 14 ++++---- .../quicklisp-to-nix-output/trivia.nix | 14 ++++---- .../trivia_dot_balland2006.nix | 14 ++++---- .../trivia_dot_level0.nix | 14 ++++---- .../trivia_dot_level1.nix | 14 ++++---- .../trivia_dot_level2.nix | 14 ++++---- .../trivia_dot_quasiquote.nix | 14 ++++---- .../trivia_dot_trivial.nix | 14 ++++---- .../trivial-features.nix | 14 ++++---- .../utilities_dot_print-items.nix | 14 ++++---- .../quicklisp-to-nix-overrides.nix | 1 + .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 16 ++++++++++ pkgs/development/lisp-modules/shell.nix | 2 +- 48 files changed, 366 insertions(+), 304 deletions(-) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 927254f52ae..82a86404ca5 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "https://beta.quicklisp.org/dist/quicklisp/2021-02-28/distinfo.txt"; - sha256 = "sha256:1apc0s07fmm386rj866dbrhrkq3lrbgbd79kwcyp91ix7sza8z3z"; + url = "https://beta.quicklisp.org/dist/quicklisp/2021-04-11/distinfo.txt"; + sha256 = "sha256:1z7a7m9cm7iv4m9ajvyqphsw30s3qwb0l8g8ayfmkvmvhlj79g86"; }; buildPhase = "true; "; postInstall = '' @@ -124,7 +124,7 @@ let lispPackages = rec { }; nyxt = pkgs.lispPackages.buildLispPackage rec { baseName = "nyxt"; - version = "2021-03-27"; + version = "2021-05-06"; description = "Browser"; @@ -132,6 +132,14 @@ let lispPackages = rec { overrides = x: { postInstall = '' echo "Building nyxt binary" + ( + source "$out/lib/common-lisp-settings"/*-shell-config.sh + cd "$out/lib/common-lisp"/*/ + makeFlags="''${makeFlags:-}" + make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags all + make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags install + cp nyxt "$out/bin/nyxt" + ) NIX_LISP_PRELAUNCH_HOOK=' nix_lisp_build_system nyxt/gtk-application \ "(asdf/system:component-entry-point (asdf:find-system :nyxt/gtk-application))" \ @@ -181,13 +189,15 @@ let lispPackages = rec { fset cl-cffi-gtk cl-webkit2 + cl-gobject-introspection ]; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "8ef171fd1eb62d168defe4a2d7115393230314d1"; - sha256 = "sha256:1dz55mdmj68kmllih7ab70nmp0mwzqp9lh3im7kcjfmc1r64irdv"; - # date = 2021-03-27T09:10:00+00:00; + rev = "940a5f9a19770771cf29f8fa7505e99c3a242b67"; + sha256 = "sha256:0d5mawka26gwi9nb45x1n33vgskwyn46jrvfz7nzmm2jfaq4ipn6"; + # Version 2 pre-release 7 + # date = "2021-05-06T11:30:27Z"; }; packageName = "nyxt"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix index 4fb5488b7a8..c8855a7f24b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "_3bmd-ext-code-blocks"; - version = "3bmd-20201220-git"; + version = "3bmd-20210411-git"; description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma"; deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" args."trivial-with-current-source-form" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz"; - sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71"; + url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz"; + sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp"; }; packageName = "3bmd-ext-code-blocks"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM 3bmd-ext-code-blocks DESCRIPTION extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma - SHA256 0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL - http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5 - 67b6e5fa51d18817e7110e4fef6517ac NAME 3bmd-ext-code-blocks FILENAME + SHA256 1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL + http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5 + 09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd-ext-code-blocks FILENAME _3bmd-ext-code-blocks DEPS ((NAME 3bmd FILENAME _3bmd) (NAME alexandria FILENAME alexandria) (NAME colorize FILENAME colorize) (NAME esrap FILENAME esrap) @@ -33,7 +33,7 @@ rec { DEPENDENCIES (3bmd alexandria colorize esrap html-encode split-sequence trivial-with-current-source-form) - VERSION 3bmd-20201220-git SIBLINGS + VERSION 3bmd-20210411-git SIBLINGS (3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index 8d8299a7030..630316bc857 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "_3bmd"; - version = "20201220-git"; + version = "20210411-git"; description = "markdown processor in CL using esrap parser."; deps = [ args."alexandria" args."esrap" args."split-sequence" args."trivial-with-current-source-form" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz"; - sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71"; + url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz"; + sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp"; }; packageName = "3bmd"; @@ -19,16 +19,16 @@ rec { overrides = x: x; } /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 - 0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL - http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5 - 67b6e5fa51d18817e7110e4fef6517ac NAME 3bmd FILENAME _3bmd DEPS + 1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL + http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5 + 09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd FILENAME _3bmd DEPS ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) (NAME split-sequence FILENAME split-sequence) (NAME trivial-with-current-source-form FILENAME trivial-with-current-source-form)) DEPENDENCIES (alexandria esrap split-sequence trivial-with-current-source-form) VERSION - 20201220-git SIBLINGS + 20210411-git SIBLINGS (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index f58416bffee..324831796ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "alexandria"; - version = "20200925-git"; + version = "20210411-git"; description = "Alexandria is a collection of portable public domain utilities."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz"; - sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl"; + url = "http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz"; + sha256 = "0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh"; }; packageName = "alexandria"; @@ -20,8 +20,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl URL - http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz - MD5 59c8237a854de6f4f93328cd5747cd14 NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS (alexandria-tests) + 0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh URL + http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz + MD5 415c43451862b490577b20ee4fb8e8d7 NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS (alexandria-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index f65c68e0d7f..b33f95934f8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cffi-grovel"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi-grovel"; @@ -19,13 +19,13 @@ rec { overrides = x: x; } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi-grovel FILENAME cffi-grovel DEPS + 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.23.0 SIBLINGS + VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index af7c96639d6..b326d625f4d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cffi-toolchain"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; description = "The CFFI toolchain"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi-toolchain"; @@ -19,14 +19,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi-toolchain FILENAME + 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.23.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix index ec452750457..822b7a81166 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cffi-uffi-compat"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; description = "UFFI Compatibility Layer for CFFI"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi-uffi-compat"; @@ -19,14 +19,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-uffi-compat DESCRIPTION UFFI Compatibility Layer for CFFI - SHA256 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi-uffi-compat FILENAME + SHA256 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-uffi-compat FILENAME cffi-uffi-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.23.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 103f233fa41..0738ea5909f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cffi"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi"; @@ -21,15 +21,15 @@ rec { overrides = x: x; } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi FILENAME cffi DEPS + 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) (NAME trivial-features FILENAME trivial-features) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.23.0 SIBLINGS + VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat) PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix index b6940af5986..8e32a0b1abf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "chanl"; - version = "20210124-git"; + version = "20210411-git"; parasites = [ "chanl/examples" "chanl/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz"; - sha256 = "1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc"; + url = "http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz"; + sha256 = "1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi"; }; packageName = "chanl"; @@ -22,11 +22,11 @@ rec { } /* (SYSTEM chanl DESCRIPTION Communicating Sequential Process support for Common Lisp SHA256 - 1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc URL - http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz - MD5 2f9e2d16caa2febff4f5beb6226b7ccf NAME chanl FILENAME chanl DEPS + 1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi URL + http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz + MD5 efaa5705b5feaa718290d25a95e2a684 NAME chanl FILENAME chanl DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210124-git + DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210411-git SIBLINGS NIL PARASITES (chanl/examples chanl/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix index eb967399371..99ff56f9b15 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cl-change-case"; - version = "20210228-git"; + version = "20210411-git"; parasites = [ "cl-change-case/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."fiveam" args."flexi-streams" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz"; - sha256 = "15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi"; + url = "http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz"; + sha256 = "14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj"; }; packageName = "cl-change-case"; @@ -22,13 +22,13 @@ rec { } /* (SYSTEM cl-change-case DESCRIPTION Convert strings between camelCase, param-case, PascalCase and more SHA256 - 15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi URL - http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz - MD5 8fec07f0634a739134dc4fcec807fe16 NAME cl-change-case FILENAME + 14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj URL + http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz + MD5 df72a3d71a6c65e149704688aec859b9 NAME cl-change-case FILENAME cl-change-case DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode) (NAME cl-unicode FILENAME cl-unicode) (NAME fiveam FILENAME fiveam) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-unicode cl-unicode fiveam flexi-streams) - VERSION 20210228-git SIBLINGS NIL PARASITES (cl-change-case/test)) */ + VERSION 20210411-git SIBLINGS NIL PARASITES (cl-change-case/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix index 5a8bea30a59..5fac77896b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cl-colors2"; - version = "20200218-git"; + version = "20210411-git"; parasites = [ "cl-colors2/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz"; - sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29"; + url = "http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz"; + sha256 = "14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk"; }; packageName = "cl-colors2"; @@ -21,11 +21,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-colors2 DESCRIPTION Simple color library for Common Lisp SHA256 - 0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29 URL - http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz - MD5 054283564f17af46a09e259ff509b656 NAME cl-colors2 FILENAME cl-colors2 + 14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk URL + http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz + MD5 e6b54e76e7d1cfcff45955dbd4752f1d NAME cl-colors2 FILENAME cl-colors2 DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clunit2 FILENAME clunit2)) - DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20200218-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20210411-git SIBLINGS NIL PARASITES (cl-colors2/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix new file mode 100644 index 00000000000..15b16ef84c1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix @@ -0,0 +1,32 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "cl-gobject-introspection"; + version = "20210124-git"; + + description = "Binding to GObjectIntrospection"; + + deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz"; + sha256 = "1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0"; + }; + + packageName = "cl-gobject-introspection"; + + asdFilesToKeep = ["cl-gobject-introspection.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-gobject-introspection DESCRIPTION Binding to GObjectIntrospection + SHA256 1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0 URL + http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz + MD5 ad760b820c86142c0a1309af29541680 NAME cl-gobject-introspection FILENAME + cl-gobject-introspection DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel cffi iterate trivial-features trivial-garbage) VERSION + 20210124-git SIBLINGS (cl-gobject-introspection-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 95f5d037381..5e78f8e98c4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cl-postgres"; - version = "postmodern-20210124-git"; + version = "postmodern-20210411-git"; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "cl-postgres"; @@ -21,9 +21,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME cl-postgres FILENAME cl-postgres + SHA256 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME cl-postgres FILENAME cl-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -36,5 +36,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-base64 cl-ppcre fiveam ironclad md5 simple-date simple-date/postgres-glue split-sequence uax-15 usocket) - VERSION postmodern-20210124-git SIBLINGS (postmodern s-sql simple-date) + VERSION postmodern-20210411-git SIBLINGS (postmodern s-sql simple-date) PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 82beff70579..0284b2dfd22 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cl-typesetting"; - version = "20210228-git"; + version = "20210411-git"; description = "Common Lisp Typesetting system"; deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz"; - sha256 = "13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp"; + url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-04-11/cl-typesetting-20210411-git.tgz"; + sha256 = "1102n049hhg0kqnfvdfcisjq5l9yfvbw090nq0q8vd2bc688ng41"; }; packageName = "cl-typesetting"; @@ -19,11 +19,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256 - 13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp URL - http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz - MD5 949e7de37838d63f4c6b6e7dd88befeb NAME cl-typesetting FILENAME + 1102n049hhg0kqnfvdfcisjq5l9yfvbw090nq0q8vd2bc688ng41 URL + http://beta.quicklisp.org/archive/cl-typesetting/2021-04-11/cl-typesetting-20210411-git.tgz + MD5 f3fc7a47efb99cf849cb5eeede96dbaf NAME cl-typesetting FILENAME cl-typesetting DEPS ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate) (NAME zpb-ttf FILENAME zpb-ttf)) - DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210228-git SIBLINGS + DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210411-git SIBLINGS (xml-render cl-pdf-doc) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix index 56275d72740..84005b13b20 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cl-webkit2"; - version = "cl-webkit-20210228-git"; + version = "cl-webkit-20210411-git"; description = "An FFI binding to WebKit2GTK+"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz"; - sha256 = "1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1"; + url = "http://beta.quicklisp.org/archive/cl-webkit/2021-04-11/cl-webkit-20210411-git.tgz"; + sha256 = "10cky5v67s9mx2j96k0z01qbqfyc8w6a8byaamm7al5qkw997brh"; }; packageName = "cl-webkit2"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-webkit2 DESCRIPTION An FFI binding to WebKit2GTK+ SHA256 - 1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1 URL - http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz - MD5 49f38c18ac292122628356762270e5ff NAME cl-webkit2 FILENAME cl-webkit2 + 10cky5v67s9mx2j96k0z01qbqfyc8w6a8byaamm7al5qkw997brh URL + http://beta.quicklisp.org/archive/cl-webkit/2021-04-11/cl-webkit-20210411-git.tgz + MD5 01b52f031fd8742ac9d422e4fcd2a225 NAME cl-webkit2 FILENAME cl-webkit2 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -41,4 +41,4 @@ rec { cl-cffi-gtk-gdk cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features trivial-garbage) - VERSION cl-webkit-20210228-git SIBLINGS NIL PARASITES NIL) */ + VERSION cl-webkit-20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 6811c62ad2e..55eb8934945 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cl_plus_ssl"; - version = "cl+ssl-20210228-git"; + version = "cl+ssl-20210411-git"; description = "Common Lisp interface to OpenSSL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz"; - sha256 = "1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll"; + url = "http://beta.quicklisp.org/archive/cl+ssl/2021-04-11/cl+ssl-20210411-git.tgz"; + sha256 = "1rc13lc5wwzlkn7yhl3bwl6cmxxldmbfnz52nz5b83v4wlw2zbcw"; }; packageName = "cl+ssl"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll URL - http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz - MD5 01b61fd8ee6ad8d3c1c695ba56d510b6 NAME cl+ssl FILENAME cl_plus_ssl DEPS + 1rc13lc5wwzlkn7yhl3bwl6cmxxldmbfnz52nz5b83v4wlw2zbcw URL + http://beta.quicklisp.org/archive/cl+ssl/2021-04-11/cl+ssl-20210411-git.tgz + MD5 9ef5b60ac4c8ad4f435a3ef6234897d0 NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,4 +33,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams split-sequence trivial-features trivial-garbage trivial-gray-streams uiop usocket) - VERSION cl+ssl-20210228-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ + VERSION cl+ssl-20210411-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index ff3679a2639..3c18fd91195 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-handler-hunchentoot"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "Clack handler for Hunchentoot."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-handler-hunchentoot"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot. - SHA256 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-handler-hunchentoot + SHA256 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -43,7 +43,7 @@ rec { cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION clack-20191007-git SIBLINGS + VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index e597bb66d60..2fe47652ebb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-socket"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "System lacks description"; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-socket"; @@ -19,10 +19,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20191007-git SIBLINGS + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index d014ccc2111..ab2794fbdd1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-test"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "Testing Clack Applications."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-test"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-test FILENAME clack-test + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-test FILENAME clack-test DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -68,7 +68,7 @@ rec { proc-parse quri rfc2388 rove smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20191007-git SIBLINGS + VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 6d90a5ef1f0..f93b8e1c9d6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-v1-compat"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "System lacks description"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-v1-compat"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-v1-compat FILENAME + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-v1-compat FILENAME clack-v1-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -73,7 +73,7 @@ rec { split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop usocket xsubseq) - VERSION clack-20191007-git SIBLINGS + VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 78ffa543ece..95447ca8ad7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack"; - version = "20191007-git"; + version = "20210411-git"; description = "Web application environment for Common Lisp"; - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."split-sequence" args."uiop" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack"; @@ -19,19 +19,21 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack FILENAME clack DEPS + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack FILENAME clack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) (NAME lack-component FILENAME lack-component) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) - (NAME lack-util FILENAME lack-util) (NAME uiop FILENAME uiop)) + (NAME lack-util FILENAME lack-util) + (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop) + (NAME usocket FILENAME usocket)) DEPENDENCIES (alexandria bordeaux-threads ironclad lack lack-component - lack-middleware-backtrace lack-util uiop) - VERSION 20191007-git SIBLINGS + lack-middleware-backtrace lack-util split-sequence uiop usocket) + VERSION 20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ff8e7cc953c..876681846c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "closer-mop"; - version = "20210228-git"; + version = "20210411-git"; description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz"; - sha256 = "0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i"; + url = "http://beta.quicklisp.org/archive/closer-mop/2021-04-11/closer-mop-20210411-git.tgz"; + sha256 = "0pynql962m2z7wqnmd51a2xm3wsqvgfxcq9maw2br0zs0icys236"; }; packageName = "closer-mop"; @@ -20,7 +20,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i URL - http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz - MD5 49c0004ff21157bc99f227cecf7b6025 NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20210228-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0pynql962m2z7wqnmd51a2xm3wsqvgfxcq9maw2br0zs0icys236 URL + http://beta.quicklisp.org/archive/closer-mop/2021-04-11/closer-mop-20210411-git.tgz + MD5 05b05d98ad294f8bd6f9779d04cc848a NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index b7b7cf0eadc..b035477eda4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "dexador"; - version = "20210228-git"; + version = "20210411-git"; description = "Yet another HTTP client for Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz"; - sha256 = "0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7"; + url = "http://beta.quicklisp.org/archive/dexador/2021-04-11/dexador-20210411-git.tgz"; + sha256 = "1px4llzb6x930cq3dmrkzidydqqc8rd2y4s3nlwpsrv4874cxwx1"; }; packageName = "dexador"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7 URL - http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz - MD5 e3b69c8ceb78d99351e574c40dfd0e12 NAME dexador FILENAME dexador DEPS + 1px4llzb6x930cq3dmrkzidydqqc8rd2y4s3nlwpsrv4874cxwx1 URL + http://beta.quicklisp.org/archive/dexador/2021-04-11/dexador-20210411-git.tgz + MD5 10d59691af3e25e590a2dfff29c91292 NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -48,4 +48,4 @@ rec { fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20210228-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20210411-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix index c6bb4c1baaf..6af2f0f24fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "file-attributes"; - version = "20200925-git"; + version = "20210411-git"; description = "Access to file attributes (uid, gid, atime, mtime, mod)"; deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz"; - sha256 = "0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7"; + url = "http://beta.quicklisp.org/archive/file-attributes/2021-04-11/file-attributes-20210411-git.tgz"; + sha256 = "0zsqimyzfivr08d6pdg6xxw6cj7q9pjh2wi9c460nh85z7a51yc9"; }; packageName = "file-attributes"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM file-attributes DESCRIPTION Access to file attributes (uid, gid, atime, mtime, mod) SHA256 - 0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7 URL - http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz - MD5 368468453cf57ecc29fa75f2a030a738 NAME file-attributes FILENAME + 0zsqimyzfivr08d6pdg6xxw6cj7q9pjh2wi9c460nh85z7a51yc9 URL + http://beta.quicklisp.org/archive/file-attributes/2021-04-11/file-attributes-20210411-git.tgz + MD5 75e0f0e2c280c97fe496545e7105fa01 NAME file-attributes FILENAME file-attributes DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) @@ -31,4 +31,4 @@ rec { (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (alexandria babel cffi documentation-utils trivial-features trivial-indent) - VERSION 20200925-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index c511435ac9c..b6f602387e1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "ironclad"; - version = "v0.54"; + version = "v0.55"; parasites = [ "ironclad/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."rt" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz"; - sha256 = "01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2"; + url = "http://beta.quicklisp.org/archive/ironclad/2021-04-11/ironclad-v0.55.tgz"; + sha256 = "0vdqaad9i3dkz6z2y1iqmh6m77kc9jy49xh9bysgywl0gfdyhnq6"; }; packageName = "ironclad"; @@ -22,10 +22,10 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2 URL - http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz - MD5 f99610509e4603aac66d9aa03ede2770 NAME ironclad FILENAME ironclad DEPS + 0vdqaad9i3dkz6z2y1iqmh6m77kc9jy49xh9bysgywl0gfdyhnq6 URL + http://beta.quicklisp.org/archive/ironclad/2021-04-11/ironclad-v0.55.tgz + MD5 c3c4a88e71ef37c9604662071069afcc NAME ironclad FILENAME ironclad DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME rt FILENAME rt)) - DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.54 SIBLINGS + DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.55 SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index e9e5ed5f1d1..e935d2b3d99 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "marshal"; - version = "cl-20201016-git"; + version = "cl-20210411-git"; description = "marshal: Simple (de)serialization of Lisp datastructures."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz"; - sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz"; + url = "http://beta.quicklisp.org/archive/cl-marshal/2021-04-11/cl-marshal-20210411-git.tgz"; + sha256 = "0wi4csgl5qxgl0si5mcg19xx4qlmw125qn0w1i2f3dvvrzp20qrp"; }; packageName = "marshal"; @@ -20,8 +20,8 @@ rec { } /* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 - 03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz URL - http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz - MD5 243a2c3a5f1243ffb1639bca32a0aff0 NAME marshal FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20201016-git SIBLINGS (marshal-tests) PARASITES + 0wi4csgl5qxgl0si5mcg19xx4qlmw125qn0w1i2f3dvvrzp20qrp URL + http://beta.quicklisp.org/archive/cl-marshal/2021-04-11/cl-marshal-20210411-git.tgz + MD5 2463314a6bcd1a18bea2690deb6bce55 NAME marshal FILENAME marshal DEPS NIL + DEPENDENCIES NIL VERSION cl-20210411-git SIBLINGS (marshal-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix index 53896192b52..c22acbce4f0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "mgl-pax"; - version = "20210228-git"; + version = "20210411-git"; parasites = [ "mgl-pax/test" ]; @@ -12,8 +12,8 @@ rec { deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" args."trivial-with-current-source-form" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz"; - sha256 = "1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2021-04-11/mgl-pax-20210411-git.tgz"; + sha256 = "0dq5jkb6li0s1gqj6hfhifs6cd4kypavv2kjqg5zgs6zfs82sxh3"; }; packageName = "mgl-pax"; @@ -23,9 +23,9 @@ rec { } /* (SYSTEM mgl-pax DESCRIPTION Exploratory programming tool and documentation generator. - SHA256 1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw URL - http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz - MD5 a256ce4ee76d669d233ee09830ef7968 NAME mgl-pax FILENAME mgl-pax DEPS + SHA256 0dq5jkb6li0s1gqj6hfhifs6cd4kypavv2kjqg5zgs6zfs82sxh3 URL + http://beta.quicklisp.org/archive/mgl-pax/2021-04-11/mgl-pax-20210411-git.tgz + MD5 44cf1bd71e6c40c256a43a87efa2c2a1 NAME mgl-pax FILENAME mgl-pax DEPS ((NAME 3bmd FILENAME _3bmd) (NAME 3bmd-ext-code-blocks FILENAME _3bmd-ext-code-blocks) (NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) @@ -44,4 +44,4 @@ rec { colorize esrap html-encode ironclad named-readtables pythonic-string-reader split-sequence swank trivial-features trivial-with-current-source-form) - VERSION 20210228-git SIBLINGS NIL PARASITES (mgl-pax/test)) */ + VERSION 20210411-git SIBLINGS NIL PARASITES (mgl-pax/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index ef0817fbe7c..fa7d1e047d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "plump"; - version = "20210124-git"; + version = "20210411-git"; description = "An XML / XHTML / HTML parser that aims to be as lenient as possible."; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz"; - sha256 = "0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm"; + url = "http://beta.quicklisp.org/archive/plump/2021-04-11/plump-20210411-git.tgz"; + sha256 = "05zs9blznfhapz5yiy08968hw64rzdgqgvfgc9r9da45b45pl6dp"; }; packageName = "plump"; @@ -20,11 +20,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm URL - http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz - MD5 44a5d371dd1c3d4afc6b8801926b059a NAME plump FILENAME plump DEPS + 05zs9blznfhapz5yiy08968hw64rzdgqgvfgc9r9da45b45pl6dp URL + http://beta.quicklisp.org/archive/plump/2021-04-11/plump-20210411-git.tgz + MD5 055e30ed07ae793426a48b55c947f9bb NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20210124-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20210411-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index f530d71eb68..245cb109a32 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "postmodern"; - version = "20210124-git"; + version = "20210411-git"; parasites = [ "postmodern/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_plus_local-time" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."local-time" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "postmodern"; @@ -21,9 +21,9 @@ rec { overrides = x: x; } /* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 - 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME postmodern FILENAME postmodern + 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME postmodern FILENAME postmodern DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -46,5 +46,5 @@ rec { cl-postgres/tests cl-ppcre cl-unicode closer-mop fiveam flexi-streams global-vars ironclad local-time md5 s-sql s-sql/tests simple-date simple-date/postgres-glue split-sequence uax-15 usocket) - VERSION 20210124-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES + VERSION 20210411-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES (postmodern/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 12ea17a3491..48d98ca2395 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "quri"; - version = "20210228-git"; + version = "20210411-git"; description = "Yet another URI library for Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz"; - sha256 = "03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g"; + url = "http://beta.quicklisp.org/archive/quri/2021-04-11/quri-20210411-git.tgz"; + sha256 = "1j4al77bl8awj7755g8zvgvfskdh6gcl3gygbz2fi6lrrk9125d7"; }; packageName = "quri"; @@ -19,13 +19,13 @@ rec { overrides = x: x; } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g URL - http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz MD5 - 67eac028850cc2539c076d31b049f7bd NAME quri FILENAME quri DEPS + 1j4al77bl8awj7755g8zvgvfskdh6gcl3gygbz2fi6lrrk9125d7 URL + http://beta.quicklisp.org/archive/quri/2021-04-11/quri-20210411-git.tgz MD5 + 2727c706f51bef480171c59f6134bba5 NAME quri FILENAME quri DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20210228-git SIBLINGS (quri-test) PARASITES NIL) */ + 20210411-git SIBLINGS (quri-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index d6ac95810a4..d91ab87d822 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "s-sql"; - version = "postmodern-20210124-git"; + version = "postmodern-20210411-git"; parasites = [ "s-sql/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "s-sql"; @@ -21,9 +21,9 @@ rec { overrides = x: x; } /* (SYSTEM s-sql DESCRIPTION Lispy DSL for SQL SHA256 - 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME s-sql FILENAME s-sql DEPS + 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME s-sql FILENAME s-sql DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-base64 FILENAME cl-base64) @@ -39,5 +39,5 @@ rec { (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests cl-ppcre cl-unicode closer-mop fiveam global-vars ironclad md5 postmodern split-sequence uax-15 usocket) - VERSION postmodern-20210124-git SIBLINGS + VERSION postmodern-20210411-git SIBLINGS (cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix index cab4e8c1494..e97a639814e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "serapeum"; - version = "20210228-git"; + version = "20210411-git"; description = "Utilities beyond Alexandria."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-features" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz"; - sha256 = "1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x"; + url = "http://beta.quicklisp.org/archive/serapeum/2021-04-11/serapeum-20210411-git.tgz"; + sha256 = "1zz0sjp2dwy7qg7a3h1asvflkl9z2ajwk9zqfqylm0mhl0mv2c01"; }; packageName = "serapeum"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256 - 1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x URL - http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz - MD5 25502093ea13851021422000686a54b7 NAME serapeum FILENAME serapeum DEPS + 1zz0sjp2dwy7qg7a3h1asvflkl9z2ajwk9zqfqylm0mhl0mv2c01 URL + http://beta.quicklisp.org/archive/serapeum/2021-04-11/serapeum-20210411-git.tgz + MD5 091a7c572d48164ba8499bb44a37a85f NAME serapeum FILENAME serapeum DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME closer-mop FILENAME closer-mop) @@ -60,4 +60,4 @@ rec { trivia.level2 trivia.quasiquote trivia.trivial trivial-cltl2 trivial-features trivial-file-size trivial-garbage trivial-macroexpand-all type-i uiop) - VERSION 20210228-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index d861d72cccd..efe7f6a9eee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "simple-date"; - version = "postmodern-20210124-git"; + version = "postmodern-20210411-git"; parasites = [ "simple-date/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "simple-date"; @@ -22,9 +22,9 @@ rec { } /* (SYSTEM simple-date DESCRIPTION Simple date library that can be used with postmodern SHA256 - 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME simple-date FILENAME simple-date + 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME simple-date FILENAME simple-date DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION - postmodern-20210124-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + postmodern-20210411-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES (simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix index b352c476e08..11ddf729c3a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "str"; - version = "cl-20210124-git"; + version = "cl-20210411-git"; description = "Modern, consistent and terse Common Lisp string manipulation library."; deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz"; - sha256 = "07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc"; + url = "http://beta.quicklisp.org/archive/cl-str/2021-04-11/cl-str-20210411-git.tgz"; + sha256 = "0xyazb3j4j0wsq443fpavv4hxnizkcvhkgz709lnp7cxygpdnl7m"; }; packageName = "str"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM str DESCRIPTION Modern, consistent and terse Common Lisp string manipulation library. - SHA256 07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc URL - http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz - MD5 afd5d3e1078bef872b0507215855397e NAME str FILENAME str DEPS + SHA256 0xyazb3j4j0wsq443fpavv4hxnizkcvhkgz709lnp7cxygpdnl7m URL + http://beta.quicklisp.org/archive/cl-str/2021-04-11/cl-str-20210411-git.tgz + MD5 6c6b4de0886d448155a5cca0dd38a189 NAME str FILENAME str DEPS ((NAME cl-change-case FILENAME cl-change-case) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode) @@ -30,4 +30,4 @@ rec { (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-change-case cl-ppcre cl-ppcre-unicode cl-unicode flexi-streams) VERSION - cl-20210124-git SIBLINGS (str.test) PARASITES NIL) */ + cl-20210411-git SIBLINGS (str.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index f59a9d34e3d..13b025ea5be 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "stumpwm"; - version = "20210228-git"; + version = "20210411-git"; description = "A tiling, keyboard driven window manager"; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz"; - sha256 = "0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8"; + url = "http://beta.quicklisp.org/archive/stumpwm/2021-04-11/stumpwm-20210411-git.tgz"; + sha256 = "0rrhmryfgbjrl04ww107pvm4lzm620xp7a5kwhqbh5d7hpbdk49j"; }; packageName = "stumpwm"; @@ -19,10 +19,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8 URL - http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz - MD5 0506bcd0951463ea45cebfdb5ce76511 NAME stumpwm FILENAME stumpwm DEPS + 0rrhmryfgbjrl04ww107pvm4lzm620xp7a5kwhqbh5d7hpbdk49j URL + http://beta.quicklisp.org/archive/stumpwm/2021-04-11/stumpwm-20210411-git.tgz + MD5 4497670e2aac3038ed5fb87121ff1b7a NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20210228-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20210411-git SIBLINGS (stumpwm-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix index b8c330cc2fd..7f1077ed0cd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia"; - version = "20210228-git"; + version = "20210411-git"; description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM trivia DESCRIPTION NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia FILENAME trivia DEPS + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia FILENAME trivia DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) (NAME introspect-environment FILENAME introspect-environment) @@ -38,7 +38,7 @@ rec { (alexandria closer-mop introspect-environment iterate lisp-namespace trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) - VERSION 20210228-git SIBLINGS + VERSION 20210411-git SIBLINGS (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix index 801781dd5a5..ce47f1d3df2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_balland2006"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Optimizer for Trivia based on (Balland 2006)"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.balland2006"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM trivia.balland2006 DESCRIPTION Optimizer for Trivia based on (Balland 2006) SHA256 - 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.balland2006 FILENAME + 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.balland2006 FILENAME trivia_dot_balland2006 DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -38,7 +38,7 @@ rec { (alexandria closer-mop introspect-environment iterate lisp-namespace trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix index 327ac0cdf1c..cfa992935f9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_level0"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Bootstrapping Pattern Matching Library for implementing Trivia"; deps = [ args."alexandria" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.level0"; @@ -20,11 +20,11 @@ rec { } /* (SYSTEM trivia.level0 DESCRIPTION Bootstrapping Pattern Matching Library for implementing Trivia SHA256 - 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.level0 FILENAME + 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.level0 FILENAME trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION trivia-20210228-git SIBLINGS + (alexandria) VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix index eecb4c17eac..5cadfcf5723 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_level1"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Core patterns of Trivia"; deps = [ args."alexandria" args."trivia_dot_level0" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.level1"; @@ -19,13 +19,13 @@ rec { overrides = x: x; } /* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256 - 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.level1 FILENAME + 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.level1 FILENAME trivia_dot_level1 DEPS ((NAME alexandria FILENAME alexandria) (NAME trivia.level0 FILENAME trivia_dot_level0)) - DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20210228-git + DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix index ec0d99e06be..9e8ceca1eeb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_level2"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.level2"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM trivia.level2 DESCRIPTION NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.level2 FILENAME + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.level2 FILENAME trivia_dot_level2 DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -33,7 +33,7 @@ rec { DEPENDENCIES (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 trivial-cltl2) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix index 420e4ae3058..bf6b1fb3548 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_quasiquote"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "fare-quasiquote extension for trivia"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.quasiquote"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.quasiquote FILENAME + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.quasiquote FILENAME trivia_dot_quasiquote DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -39,7 +39,7 @@ rec { (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix index 1173a24c8c6..3fe1ddbd06c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_trivial"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.trivial"; @@ -24,9 +24,9 @@ rec { Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, in order to avoid the circular dependency. - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.trivial FILENAME + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.trivial FILENAME trivia_dot_trivial DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -38,7 +38,7 @@ rec { DEPENDENCIES (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 trivia.level2 trivial-cltl2) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 272361dadc0..e762613bf08 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivial-features"; - version = "20210228-git"; + version = "20210411-git"; description = "Ensures consistent *FEATURES* across multiple CLs."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz"; - sha256 = "1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj"; + url = "http://beta.quicklisp.org/archive/trivial-features/2021-04-11/trivial-features-20210411-git.tgz"; + sha256 = "0z6nzql8z7bz8kzd08mh36h0r54vqx7pwigy8r617jhvb0r0n0n4"; }; packageName = "trivial-features"; @@ -20,8 +20,8 @@ rec { } /* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 - 1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj URL - http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz - MD5 6d628c0c941346773751a684213a52d7 NAME trivial-features FILENAME - trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20210228-git SIBLINGS + 0z6nzql8z7bz8kzd08mh36h0r54vqx7pwigy8r617jhvb0r0n0n4 URL + http://beta.quicklisp.org/archive/trivial-features/2021-04-11/trivial-features-20210411-git.tgz + MD5 5ec554fff48d38af5023604a1ae42d3a NAME trivial-features FILENAME + trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS (trivial-features-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix index bbaf2de554f..1e9decab327 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "utilities_dot_print-items"; - version = "20190813-git"; + version = "20210411-git"; parasites = [ "utilities.print-items/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz"; - sha256 = "12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2"; + url = "http://beta.quicklisp.org/archive/utilities.print-items/2021-04-11/utilities.print-items-20210411-git.tgz"; + sha256 = "0da2m4b993w31wph2ybdmdd6rycadrp44ccjdba5pygpkf3x00gx"; }; packageName = "utilities.print-items"; @@ -22,10 +22,10 @@ rec { } /* (SYSTEM utilities.print-items DESCRIPTION A protocol for flexible and composable printing. SHA256 - 12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2 URL - http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz - MD5 0f26580bb5d3587ed1815f70976b2a0a NAME utilities.print-items FILENAME + 0da2m4b993w31wph2ybdmdd6rycadrp44ccjdba5pygpkf3x00gx URL + http://beta.quicklisp.org/archive/utilities.print-items/2021-04-11/utilities.print-items-20210411-git.tgz + MD5 35be0e5ee4c957699082fb6ae8f14ef2 NAME utilities.print-items FILENAME utilities_dot_print-items DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20190813-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20210411-git SIBLINGS NIL PARASITES (utilities.print-items/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 628001000e8..ee2c4dbe0c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -276,4 +276,5 @@ $out/lib/common-lisp/query-fs" (extraLispDeps (with quicklisp-to-nix-packages; [cl-syslog])); md5 = ifLispNotIn ["sbcl" "ccl" "gcl"] (extraLispDeps (with quicklisp-to-nix-packages; [flexi-streams])); + cl-gobject-introspection = addNativeLibs (with pkgs; [glib gobject-introspection]); } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 27eb3c90edd..93ca6916842 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -41,6 +41,7 @@ cl-emb cl-fad cl-fuse cl-fuse-meta-fs +cl-gobject-introspection cl-hooks cl-html-diff cl-html5-parser diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 1e0952aabaf..e8a5e5f026f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -3520,6 +3520,20 @@ let quicklisp-to-nix-packages = rec { })); + "cl-gobject-introspection" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-gobject-introspection" or (x: {})) + (import ./quicklisp-to-nix-output/cl-gobject-introspection.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + "cl-fuse-meta-fs" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-fuse-meta-fs" or (x: {})) @@ -3879,7 +3893,9 @@ let quicklisp-to-nix-packages = rec { "lack-component" = quicklisp-to-nix-packages."lack-component"; "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; "lack-util" = quicklisp-to-nix-packages."lack-util"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index a8ed246e6f8..bd6eea65f6f 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -11,6 +11,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib:${gobject-introspection}/lib"; }; in stdenv.mkDerivation self From 45a122eee57e517454911b41d6cb5a0d446f6a55 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 10 May 2021 11:21:33 -0400 Subject: [PATCH 54/62] nix-direnv: 1.2.4 -> 1.2.5 --- pkgs/tools/misc/nix-direnv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 39fd7d3e5f0..dd2ce37b439 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nix, nixFlakes }: +{ lib, stdenv, fetchFromGitHub, gnugrep, nixFlakes }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-87x+MRQ1SjtN+wNCy42VJwlRwgQzHjNEK3J1bkvo7eQ="; + sha256 = "sha256-sqEodshg6nm3O4RK63ht8u6FU98bF/1i6frS50oyZY8="; }; # Substitute instead of wrapping because the resulting file is From f4a1f8e4610db7d623801c0cb789b3ac3a56c658 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 10 May 2021 18:57:50 +0200 Subject: [PATCH 55/62] qrcp: 0.8.1 -> 0.8.4 --- pkgs/tools/networking/qrcp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index fd6b79ecb21..f417bb496f4 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "001w15hj5xb7p9gpvw1216lp26g5018qdi8mq6i84akb7zfd2q01"; + sha256 = "1m1xbb3x526j2v8m5m46km9zzj3dk9fvm5wckyqb8kxm4md12y50"; }; vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; From 67dfd53485b93995048dfe5e1f32b8b57a77005a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 May 2021 08:38:41 +0200 Subject: [PATCH 56/62] coqPackages.coqprime: enable for Coq 8.13 --- pkgs/development/coq-modules/coqprime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 79db1461075..d738041d5d2 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,7 +6,7 @@ with lib; mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = "8.12"; out = "8.12"; } + { case = range "8.12" "8.13"; out = "8.12"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } { case = "8.7"; out = "8.7.2"; } From bcbf6aafbd02538567f818649b0897b03784ed0c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 May 2021 08:38:46 +0200 Subject: [PATCH 57/62] coqPackages.metalib: enable for Coq 8.13 --- pkgs/development/coq-modules/metalib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 3ce3c625d26..14f1bab574a 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -4,7 +4,7 @@ with lib; mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = if versions.range "8.10" "8.12" coq.coq-version then "20200527" else null; + defaultVersion = if versions.range "8.10" "8.13" coq.coq-version then "20200527" else null; release."20200527".rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; From 5f00e1484249726ad9bf8fb2fc108078e265365f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 May 2021 08:39:29 +0200 Subject: [PATCH 58/62] coq: default to version 8.13 --- pkgs/top-level/coq-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 2efd2c1849b..6027cd92d44 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -128,7 +128,7 @@ in rec { coqPackages_8_11 = mkCoqPackages coq_8_11; coqPackages_8_12 = mkCoqPackages coq_8_12; coqPackages_8_13 = mkCoqPackages coq_8_13; - coqPackages = recurseIntoAttrs coqPackages_8_11; + coqPackages = recurseIntoAttrs coqPackages_8_13; coq = coqPackages.coq; } From 0ffab925ca40082fcaeab5984b759cf028a2819f Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Wed, 29 Apr 2020 13:41:09 +0200 Subject: [PATCH 59/62] fish: make python an optional dependency Python is still used for tests, but does not become part of the closure. In addition, nowadays fish only ever uses Python via __fish_anypython, so using sed or propagating python isn't necessary anymore. --- pkgs/shells/fish/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 61b2fe3032b..a5754290426 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -19,6 +19,9 @@ , fishPlugins , procps +# used to generate autocompletions from manpages and for configuration editing in the browser +, usePython ? true + , runCommand , writeText , nixosTests @@ -200,12 +203,10 @@ let ''; # Required binaries during execution - # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ coreutils gnugrep gnused - python3 groff gettext ] ++ lib.optional (!stdenv.isDarwin) man-db; @@ -237,14 +238,13 @@ let "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ -i "$out/share/fish/functions/fish_default_key_bindings.fish" - sed -e "s|python3|${getBin python3}/bin/python3|" \ - -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} sed -e "s| awk | ${gawk}/bin/awk |" \ -i $out/share/fish/functions/{__fish_print_packages.fish,__fish_print_addresses.fish,__fish_describe_command.fish,__fish_complete_man.fish,__fish_complete_convert_options.fish} \ $out/share/fish/completions/{cwebp,adb,ezjail-admin,grunt,helm,heroku,lsusb,make,p4,psql,rmmod,vim-addons}.fish + '' + optionalString usePython '' cat > $out/share/fish/functions/__fish_anypython.fish < Date: Mon, 10 May 2021 19:22:46 +0200 Subject: [PATCH 60/62] cargo-insta: 0.16.0 -> 1.7.1 (#122321) --- .../tools/rust/cargo-insta/cargo-lock.patch | 780 ------------------ .../tools/rust/cargo-insta/default.nix | 15 +- .../cargo-insta/ignore-rustfmt-test.patch | 10 - 3 files changed, 6 insertions(+), 799 deletions(-) delete mode 100644 pkgs/development/tools/rust/cargo-insta/cargo-lock.patch delete mode 100644 pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch diff --git a/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch b/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch deleted file mode 100644 index 96f7d9ffb66..00000000000 --- a/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch +++ /dev/null @@ -1,780 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -0,0 +1,777 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "addr2line" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler32" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.49" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" -+dependencies = [ -+ "addr2line", -+ "cfg-if", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "base64" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+dependencies = [ -+ "byteorder", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "block-buffer" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -+dependencies = [ -+ "block-padding", -+ "byte-tools", -+ "byteorder", -+ "generic-array", -+] -+ -+[[package]] -+name = "block-padding" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -+dependencies = [ -+ "byte-tools", -+] -+ -+[[package]] -+name = "bstr" -+version = "0.2.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "byte-tools" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -+ -+[[package]] -+name = "byteorder" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -+ -+[[package]] -+name = "cargo-insta" -+version = "0.16.0" -+dependencies = [ -+ "clap", -+ "console", -+ "difference", -+ "glob", -+ "insta", -+ "proc-macro2", -+ "serde", -+ "serde_json", -+ "structopt", -+ "syn", -+ "walkdir", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "clap" -+version = "2.33.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "clicolors-control" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" -+dependencies = [ -+ "atty", -+ "lazy_static", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "console" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2586208b33573b7f76ccfbe5adb076394c88deaf81b84d7213969805b0a952a7" -+dependencies = [ -+ "clicolors-control", -+ "encode_unicode", -+ "lazy_static", -+ "libc", -+ "regex", -+ "terminal_size", -+ "termios", -+ "unicode-width", -+ "winapi", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -+dependencies = [ -+ "autocfg", -+ "cfg-if", -+ "lazy_static", -+] -+ -+[[package]] -+name = "difference" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -+ -+[[package]] -+name = "digest" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "dtoa" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" -+ -+[[package]] -+name = "encode_unicode" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -+ -+[[package]] -+name = "fake-simd" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "generic-array" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -+dependencies = [ -+ "typenum", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.21.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "globset" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" -+dependencies = [ -+ "aho-corasick", -+ "bstr", -+ "fnv", -+ "log", -+ "regex", -+] -+ -+[[package]] -+name = "globwalk" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "178270263374052c40502e9f607134947de75302c1348d1a0e31db67c1691446" -+dependencies = [ -+ "bitflags", -+ "ignore", -+ "walkdir", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "ignore" -+version = "0.4.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72" -+dependencies = [ -+ "crossbeam-utils", -+ "globset", -+ "lazy_static", -+ "log", -+ "memchr", -+ "regex", -+ "same-file", -+ "thread_local", -+ "walkdir", -+ "winapi-util", -+] -+ -+[[package]] -+name = "insta" -+version = "0.16.0" -+dependencies = [ -+ "backtrace", -+ "console", -+ "difference", -+ "globwalk", -+ "lazy_static", -+ "pest", -+ "pest_derive", -+ "ron", -+ "serde", -+ "serde_json", -+ "serde_yaml", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "libc" -+version = "0.2.71" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" -+ -+[[package]] -+name = "linked-hash-map" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "maplit" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -+ -+[[package]] -+name = "memchr" -+version = "2.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -+dependencies = [ -+ "adler32", -+] -+ -+[[package]] -+name = "object" -+version = "0.20.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -+ -+[[package]] -+name = "pest" -+version = "2.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -+dependencies = [ -+ "ucd-trie", -+] -+ -+[[package]] -+name = "pest_derive" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -+dependencies = [ -+ "pest", -+ "pest_generator", -+] -+ -+[[package]] -+name = "pest_generator" -+version = "2.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -+dependencies = [ -+ "pest", -+ "pest_meta", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pest_meta" -+version = "2.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -+dependencies = [ -+ "maplit", -+ "pest", -+ "sha-1", -+] -+ -+[[package]] -+name = "proc-macro-error" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" -+dependencies = [ -+ "proc-macro-error-attr", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro-error-attr" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "syn-mid", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "regex" -+version = "1.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+ "thread_local", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" -+ -+[[package]] -+name = "ron" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5" -+dependencies = [ -+ "base64", -+ "bitflags", -+ "serde", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+ -+[[package]] -+name = "ryu" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+ -+[[package]] -+name = "same-file" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "serde" -+version = "1.0.112" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.112" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.55" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "serde_yaml" -+version = "0.8.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" -+dependencies = [ -+ "dtoa", -+ "linked-hash-map", -+ "serde", -+ "yaml-rust", -+] -+ -+[[package]] -+name = "sha-1" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -+dependencies = [ -+ "block-buffer", -+ "digest", -+ "fake-simd", -+ "opaque-debug", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "structopt" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" -+dependencies = [ -+ "clap", -+ "lazy_static", -+ "structopt-derive", -+] -+ -+[[package]] -+name = "structopt-derive" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "syn-mid" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "terminal_size" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "termios" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thread_local" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -+ -+[[package]] -+name = "ucd-trie" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+ -+[[package]] -+name = "version_check" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" -+ -+[[package]] -+name = "walkdir" -+version = "2.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -+dependencies = [ -+ "same-file", -+ "winapi", -+ "winapi-util", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "yaml-rust" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" -+dependencies = [ -+ "linked-hash-map", -+] diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index e621fa9b972..0c377393354 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -1,22 +1,19 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, libiconv, stdenv }: rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "0.16.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "1lcbdzh139lhmpz3pyik8nbgrbfc42z9ydz2hkg2lzjdpfdsz3ag"; + sha256 = "1qzzkhailxjqwp3rmdcpp112wn3x0gfi788vwj77pfdyclhpj0a7"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0qjzbcaznnmb0p0r23s82jjbfs5mhhkacg26lf8fq4vvlkr1hsqf"; - - patches = [ ./ignore-rustfmt-test.patch ]; - - cargoBuildFlags = [ "-p cargo-insta" ]; + sourceRoot = "source/cargo-insta"; + cargoSha256 = "01fj2j7ibrk5dyrfkmc610lh1p6f6bgzbgivq3dsd64vslhqmabw"; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "A Cargo subcommand for snapshot testing"; diff --git a/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch b/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch deleted file mode 100644 index 6c38158d596..00000000000 --- a/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/runtime.rs -+++ b/src/runtime.rs -@@ -85,6 +85,7 @@ fn format_rust_expression(value: &str) -> Cow<'_, str> { - } - - #[test] -+#[ignore] - fn test_format_rust_expression() { - use crate::assert_snapshot; - assert_snapshot!(format_rust_expression("vec![1,2,3]"), @"vec![1, 2, 3]"); From a3969f7909ac423f52af23282402bc415ee778fb Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Mon, 10 May 2021 13:27:23 -0400 Subject: [PATCH 61/62] wayst: unstable-2020-10-12 -> unstable-2021-04-05 (#122098) --- pkgs/applications/terminal-emulators/wayst/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index dc79e48b24f..c6f39effed6 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "wayst"; - version = "unstable-2020-10-12"; + version = "unstable-2021-04-05"; src = fetchFromGitHub { owner = "91861"; repo = pname; - rev = "b8c7ca00a785a748026ed1ba08bf3d19916ced18"; - hash = "sha256-wHAU1yxukxApzhLLLctZ/AYqF7t21HQc5omPBZyxra0="; + rev = "e72ca78ef72c7b1e92473a98d435a3c85d7eab98"; + hash = "sha256-UXAVSfVpk/8KSg4oMw2tVWImD6HqJ7gEioR2MqhUUoQ="; }; makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple terminal emulator"; + mainProgram = "wayst"; homepage = "https://github.com/91861/wayst"; license = licenses.mit; platforms = platforms.linux; From 8fe0744dd152b74e8ad95736166c19e980647ed2 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 10 May 2021 16:00:06 +0200 Subject: [PATCH 62/62] bochs: Fix compilation with GCC 10 ZHF: #122042 --- .../bochs_fix_narrowing_conv_warning.patch | 29 +++++++++++++++++++ .../virtualization/bochs/default.nix | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch diff --git a/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch b/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch new file mode 100644 index 00000000000..167dd65d05b --- /dev/null +++ b/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch @@ -0,0 +1,29 @@ +------------------------------------------------------------------------ +r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines + +Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion). + + +Index: iodev/display/voodoo_data.h +=================================================================== +--- a/iodev/display/voodoo_data.h (revision 13881) ++++ b/iodev/display/voodoo_data.h (revision 13882) +@@ -1837,11 +1837,11 @@ + + /* fifo content defines */ + #define FIFO_TYPES (7 << 29) +-#define FIFO_WR_REG (1 << 29) +-#define FIFO_WR_TEX (2 << 29) +-#define FIFO_WR_FBI_32 (3 << 29) +-#define FIFO_WR_FBI_16L (4 << 29) +-#define FIFO_WR_FBI_16H (5 << 29) ++#define FIFO_WR_REG (1U << 29) ++#define FIFO_WR_TEX (2U << 29) ++#define FIFO_WR_FBI_32 (3U << 29) ++#define FIFO_WR_FBI_16L (4U << 29) ++#define FIFO_WR_FBI_16H (5U << 29) + + BX_CPP_INLINE void fifo_reset(fifo_state *f) + { + +------------------------------------------------------------------------ diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index f2418d80d2e..3a8e9dc0bee 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3"; }; - patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ]; + patches = [ + ./bochs-2.6.11-glibc-2.26.patch + ./fix-build-smp.patch + ./bochs_fix_narrowing_conv_warning.patch + ]; buildInputs = [ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]