From 24b40a255c6adc6ab32c69737e8b4cfc50d8c8b4 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 18 Apr 2022 00:06:44 +0200 Subject: umoria: init at 5.7.15 --- pkgs/games/umoria/default.nix | 80 +++++++++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/games/umoria/default.nix (limited to 'pkgs') diff --git a/pkgs/games/umoria/default.nix b/pkgs/games/umoria/default.nix new file mode 100644 index 00000000000..1114d47b7be --- /dev/null +++ b/pkgs/games/umoria/default.nix @@ -0,0 +1,80 @@ +{ lib +, gcc9Stdenv +, fetchFromGitHub +, autoreconfHook +, cmake +, ncurses6 +, runtimeShell +}: + +let + savesDir = "~/.umoria/"; +in +gcc9Stdenv.mkDerivation rec { + pname = "umoria"; + version = "5.7.15"; + + src = fetchFromGitHub { + owner = "dungeons-of-moria"; + repo = "umoria"; + rev = "v${version}"; + sha256 = "sha256-1j4QkE33UcTzM06qAjk1/PyK5uNA7E/kyDe3bZcFKUM="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses6 ]; + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/data $out/bin + cp -r umoria/data/* $out/data + cp umoria/umoria $out/.umoria-unwrapped + + mkdir -p $out/bin + cat <$out/bin/umoria + #! ${runtimeShell} -e + + RUNDIR=\$(mktemp -d) + + cleanup() { + rm -rf \$RUNDIR + } + + trap cleanup EXIT + + cd \$RUNDIR + mkdir data + + for i in $out/data/*; do + ln -s \$i "data/\$(basename \$i)" + done + + mkdir -p ${savesDir} + [[ ! -f ${savesDir}/scores.dat ]] && touch ${savesDir}/scores.dat + ln -s ${savesDir}/scores.dat scores.dat + + $out/.umoria-unwrapped + EOF + + chmod +x $out/bin/umoria + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://umoria.org/"; + description = "The Dungeons of Moria - the original roguelike"; + longDescription = '' + The Dungeons of Moria is a single player dungeon simulation originally written + by Robert Alan Koeneke, with its first public release in 1983. + The game was originally developed using VMS Pascal before being ported to the C + language by James E. Wilson in 1988, and released a Umoria. + ''; + platforms = platforms.unix; + badPlatforms = [ "aarch64-darwin" ]; + maintainers = [ maintainers.aciceri ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3d71538c8..d495531155e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31910,6 +31910,8 @@ with pkgs; ultrastardx = callPackage ../games/ultrastardx { }; + umoria = callPackage ../games/umoria { }; + unciv = callPackage ../games/unciv { }; unnethack = callPackage ../games/unnethack { }; -- cgit 1.4.1 From 8f482ad98f6c25954afb4ddeee81b0f7f520a0b1 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Mon, 6 Jun 2022 22:02:08 +0200 Subject: plocate: 1.1.15 -> 1.1.16 --- pkgs/tools/misc/plocate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix index f4504a73637..468b2ca7842 100644 --- a/pkgs/tools/misc/plocate/default.nix +++ b/pkgs/tools/misc/plocate/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "plocate"; - version = "1.1.15"; + version = "1.1.16"; src = fetchgit { url = "https://git.sesse.net/plocate"; rev = version; - sha256 = "sha256-r8/LivQhJkMTE8ejznr+eGplXFrQl4xwCgXOwbR4wlw="; + sha256 = "sha256-rwvzDr3leve8BQ30+c3l1+q/7+u7FhPQ7iFcvbx/HjM="; }; postPatch = '' -- cgit 1.4.1 From 4c33f198e31bd6c95ae7b063bda6a0d6c233946e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Jun 2022 08:32:27 +0100 Subject: fped: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: postscript.o:postscript.h:29: multiple definition of `postscript_params'; fped.o:postscript.h:29: first defined here --- pkgs/applications/science/electronics/fped/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index f1c458f40d9..b1244b79a89 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation { sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7"; }; + # Workaround build failure on -fno-common toolchains: + # ld: postscript.o:postscript.h:29: multiple definition of + # `postscript_params'; fped.o:postscript.h:29: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + # This uses '/bin/bash', '/usr/local' and 'lex' by default makeFlags = [ "PREFIX=${placeholder "out"}" -- cgit 1.4.1 From 47728bdeb050bd558f697be1b0dd8ee71031dc15 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Jun 2022 09:09:40 +0100 Subject: klystrack: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: libengine_gui.a(gui_menu.o):(.bss+0x0): multiple definition of `menu_t'; objs.release/action.o:(.bss+0x20): first defined here --- pkgs/applications/audio/klystrack/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index 5d26397efdb..362c76a0d4d 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { }) ]; + # Workaround build failure on -fno-common toolchains: + # ld: libengine_gui.a(gui_menu.o):(.bss+0x0): multiple definition of + # `menu_t'; objs.release/action.o:(.bss+0x20): first defined here + # TODO: remove it for 1.7.7+ release as it was fixed upstream. + NIX_CFLAGS_COMPILE = "-fcommon"; + buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ]; installPhase = '' -- cgit 1.4.1 From 27d3d3bb04718ba356e758a4329774f1df237594 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Jun 2022 19:47:06 +0100 Subject: megaglest: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: liblibmegaglest.a(ftpLib.c.o):(.bss+0x28): multiple definition of `VERBOSE_MODE_ENABLED'; liblibmegaglest.a(miniftpserver.cpp.o):(.bss+0x30): first defined here --- pkgs/games/megaglest/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 30383e5f406..6a21a74f70b 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib -, fetchFromGitHub +, fetchFromGitHub, fetchpatch }: let version = "3.13.0"; @@ -28,6 +28,15 @@ stdenv.mkDerivation { sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/MegaGlest/megaglest-source/commit/5a3520540276a6fd06f7c88e571b6462978e3eab.patch"; + sha256 = "0y554kjw56dikq87vs709pmq97hdx9hvqsk27f81v4g90m3b3qhi"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; -- cgit 1.4.1 From 7593e005e12013734a6db87b38bafa5aedcfbc56 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 Jun 2022 09:33:38 +0100 Subject: vinagre: pull fix pending upstream inclusiong for -fno-common toolchain support Without the change build fails on upstream gcc-10 as: ld: plugins/vnc/vinagre_vinagre-vinagre-vnc-tab.o:plugins/vnc/vinagre-vnc-connection.h:29: multiple definition of `scaling_command_line'; vinagre/vinagre_vinagre-vinagre-reverse-vnc-listener.o:plugins/vnc/vinagre-vnc-connection.h:29: first defined here --- pkgs/desktops/gnome/apps/vinagre/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index 31e198783e0..9445a5683da 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchain support: + # https://gitlab.gnome.org/GNOME/vinagre/-/merge_requests/8 + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitlab.gnome.org/GNOME/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff"; + sha256 = "0zn8cd93hjdz6rw2d7gfl1ghzkc9h0x40k9l0jx3n5qfwdq4sir8"; + }) + ]; + nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; buildInputs = [ gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg -- cgit 1.4.1 From 8fc1c4255f383937ef60c06a3365b2bce427befe Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 Jun 2022 22:00:20 +0100 Subject: garden-of-coloured-lights: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: main.o:src/main.c:58: multiple definition of `eclass'; eclass.o:src/eclass.c:21: first defined here --- pkgs/games/garden-of-coloured-lights/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 9e842acfa9a..9f9e85905a0 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s"; }; + # Workaround build failure on -fno-common toolchains: + # ld: main.o:src/main.c:58: multiple definition of + # `eclass'; eclass.o:src/eclass.c:21: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = with lib; { description = "Old-school vertical shoot-em-up / bullet hell"; homepage = "http://garden.sourceforge.net/drupal/"; -- cgit 1.4.1 From ae2d8278061209e7fa14fe8767c9e9a99927b22b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 Jun 2022 22:50:11 +0100 Subject: spaceFM: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: spacefm-item-prop.o:src/settings.h:123: multiple definition of `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here --- pkgs/applications/misc/spacefm/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 3d9f7204875..433109cd86a 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { ./x11-only.patch ]; + # Workaround build failure on -fno-common toolchains: + # ld: spacefm-item-prop.o:src/settings.h:123: multiple definition of + # `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here + # TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772 + # or equivalent is merged upstream. + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" ]; -- cgit 1.4.1 From aa0956415eec884de67f76c34e4048691e9734dc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Jun 2022 14:38:33 +0100 Subject: fpm2: 0.79 -> 0.90 Among other things switched from gtk2 to gtk3 and fixed build failure against upstream gcc-10: ld: sha256.o:src/fpm.h:187: multiple definition of `ini'; main.o:src/fpm.h:187: first defined here changelog: https://als.regnet.cz/fpm2/changelog --- pkgs/tools/security/fpm2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 0ca45957d69..cddae6aca23 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gnupg, gtk2 -, libxml2, intltool +{ lib, stdenv, fetchurl, pkg-config, gnupg, gtk3 +, libxml2, intltool, nettle }: with lib; stdenv.mkDerivation rec { pname = "fpm2"; - version = "0.79"; + version = "0.90"; src = fetchurl { - url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; - sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; + url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.xz"; + sha256 = "1lfzja3vzd6l6hfvw8gvg4qkl5iy6gra5pa8gjlps9l63k2bjfhz"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnupg gtk2 libxml2 intltool ]; + buildInputs = [ gnupg gtk3 libxml2 intltool nettle ]; meta = { description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; -- cgit 1.4.1 From a0c9b8b4fae3e56c1ed7ae6a45d5a3979aca763b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Jun 2022 14:45:53 +0100 Subject: gnome.nautilus-python: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: nautilus-python-object.o:src/nautilus-python.h:61: multiple definition of `_PyNautilusMenu_Type'; nautilus-python.o:src/nautilus-python.h:61: first defined here --- pkgs/desktops/gnome/misc/nautilus-python/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix index ed1fd365ebc..c1d58e2dbda 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { gtk3 # required by libnautilus-extension ]; + # Workaround build failure on -fno-common toolchains: + # ld: nautilus-python-object.o:src/nautilus-python.h:61: multiple definition of + # `_PyNautilusMenu_Type'; nautilus-python.o:src/nautilus-python.h:61: first defined here + # TODO: remove it once upstream fixes and releases: + # https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7 + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "PYTHON_LIB_LOC=${python3}/lib" ]; -- cgit 1.4.1 From 80798d3a6d0ca9b4105ba43e9a92c6de599199c9 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Sat, 11 Jun 2022 22:05:41 +0200 Subject: certbot: 1.24.0 -> 1.28.0 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 72a5d8db39d..094729d704c 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.24.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-XIKFEPQKIV5s6sZ7LRnlTvsb3cF4KIaiVZ36cAN1AwA="; + sha256 = "sha256-KwjxLNbRL8aOMXmCOg9wwveRVZsSr+PlkJkFmY/yRBs="; }; sourceRoot = "source/${pname}"; -- cgit 1.4.1 From 088aa5b021ce36bbeeecfbf18e9834c9b5319448 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 14 Jun 2022 19:26:25 +0000 Subject: authenticator: 4.1.4 -> 4.1.6 --- pkgs/applications/misc/authenticator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index 755b89e03b6..d41685821cd 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -25,20 +25,20 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.1.4"; + version = "4.1.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - hash = "sha256-606uMEbJd60ehoEEV0w2vz33poR1/18HcsvBMszMZrc="; + hash = "sha256-fv7Np3haRCJABlJocKuu+1jevHYrdo+VyiQBpRmHs2g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-D2kT4IBKxbrL17S+kPyofu1sLPHMuyez6jTiA6kVohs="; + hash = "sha256-8GddlDM1lU365GXdrKNhO331/y1p3Om5uZfVLy8TBGI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 2457c2ab9a725ee319317b434ea2d3449f8c6e08 Mon Sep 17 00:00:00 2001 From: Átila Saraiva Date: Wed, 15 Jun 2022 11:57:30 -0300 Subject: linuxPackages.rtw88: 2022-05-08 to 2022-06-03 --- pkgs/os-specific/linux/rtw88/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 06fd2786c7c..bbff4f6e4a7 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "unstable-2022-05-08"; + version = "unstable-2022-06-03"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "dbcc43c31a4576f90e1e468d3a85c2dfdb25ec42"; - hash = "sha256-IDHolspYtwjV5r5WArWl1g4zgKLvPd4ydKKH/aE5NSg="; + rev = "03da251c76ea1005b42625825c39181e12d75693"; + sha256 = "0l5ysp4x5wzrn48sfjv3rciqhq5ldcmk86b9x6j9775zjj7yw8hw"; }; nativeBuildInputs = kernel.moduleBuildDependencies; -- cgit 1.4.1 From 58b2655b4c2dfe990aa8147e247e617ad5dae085 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Thu, 16 Jun 2022 00:24:43 +0000 Subject: vscode: 1.68.0 -> 1.68.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 912af05e6d3..9f85c9f9a15 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1kvb92ygsvzi06nqwd6d9dlqbz44dxcjm0iq1rvvxnr7x33l8218"; - x86_64-darwin = "0jz0nik6wkqhgmfnhiwsq510hxbc9jw0z7s84154p2lhwcmpsbjp"; - aarch64-linux = "16jzpzxxmcq690d3w0ph0cnzhpyvjpk8ih48pyzzf25bgp94yi33"; - aarch64-darwin = "00xw4xml4zijpqj8305gdgn15shllpkv9ld1yh1aqrz11v522w3h"; - armv7l-linux = "0fzzdh9gkw51djrdwhzi3fbjxkm2l78v72gc0233xm8riq0gczsv"; + x86_64-linux = "0rq0bc99hsji4ni5mqw1rhzn2rng9rldm4xbdxlkrjyprc6qvffz"; + x86_64-darwin = "1yjcb65w0anxyjc1nd9kbwr4hwnrlk9c6kp1a2ncy1g181klzarl"; + aarch64-linux = "1fk7887clz9sd7fmz7lkxql7bnsvnbjd9fjixym2746x9if5ds42"; + aarch64-darwin = "1bfgsjnm5r1wpss69ncx310j23mbwhixdxmg07m3kpcfqrmznvgc"; + armv7l-linux = "0131i5cx2737wmngybvlw7d9c4gnilmla33nlrhf74ihic98jwlc"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.68.0"; + version = "1.68.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; -- cgit 1.4.1 From 8f138ea937396a4ece4ae2cb977c06e50502eff9 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Thu, 16 Jun 2022 03:24:16 +0200 Subject: dagger: 0.2.18 -> 0.2.19 Signed-off-by: Mark Sagi-Kazar --- pkgs/development/tools/continuous-integration/dagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 79538e4be2c..3e4ad1f2e43 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-nxBevv7COhywEYeRq1gXAuLswxe2WgHI0Pm78IvzapM="; + sha256 = "sha256-ZhMvVTfzqXr6miOrqYqMzH4suY2+RIYCH3fK08dsUmA="; }; - vendorSha256 = "sha256-27cXvgpw4Te0w/rMk6g5jF3UY6N8saArUwfbVO6xpes="; + vendorSha256 = "sha256-pE6g5z4rOQlqmI9LZQXoI6fRmSTXDv5H8Y+pNXVIcOU="; subPackages = [ "cmd/dagger" -- cgit 1.4.1 From bdf134d02e5d1ebb9d04b42712c86c106f262d29 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Thu, 16 Jun 2022 12:16:06 +0800 Subject: gotktrix: add desktop file --- .../applications/networking/instant-messengers/gotktrix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index 9cab98156c8..bd0da749e09 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -32,6 +32,12 @@ buildGoModule rec { # Checking requires a working display doCheck = false; + postInstall = '' + echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop + install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/ + install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png + ''; + meta = with lib; { description = "Matrix client written in Go using GTK4"; homepage = "https://github.com/diamondburned/gotktrix"; -- cgit 1.4.1 From a07a6083423962a27c936940e6f6c75be9fac469 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 16 Jun 2022 07:17:33 +0300 Subject: pythonPackages.pychm,python3Packages.pychm: init at 0.8.6 --- pkgs/development/python-modules/pychm/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pychm/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pychm/default.nix b/pkgs/development/python-modules/pychm/default.nix new file mode 100644 index 00000000000..e9cc2c319ff --- /dev/null +++ b/pkgs/development/python-modules/pychm/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, chmlib +}: + +buildPythonPackage rec { + pname = "pychm"; + version = "0.8.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wpn9ijlsmrpyiwg3drmgz4dms1i1i347adgqw37bkrh3vn6yq16"; + }; + + buildInputs = [ chmlib ]; + + pythonImportsCheck = [ "chm" ]; + + meta = with lib; { + description = "Library to manipulate Microsoft HTML Help (CHM) files"; + homepage = "https://github.com/dottedmag/pychm"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ alexshpilkin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e4ab0660af..d6108a7ffa2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7084,6 +7084,8 @@ in { pychef = callPackage ../development/python-modules/pychef { }; + pychm = callPackage ../development/python-modules/pychm { }; + PyChromecast = callPackage ../development/python-modules/pychromecast { }; pyclimacell = callPackage ../development/python-modules/pyclimacell { }; -- cgit 1.4.1 From 7d883da22ad7c804fbc138652f868abfe60b0300 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 16 Jun 2022 07:19:21 +0300 Subject: calibre: fix chm processing dependency --- pkgs/applications/misc/calibre/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 753be1eb88c..d25998cb17b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,6 @@ , hunspell , hyphen , unrarSupport ? false -, chmlib , python3Packages , libusb1 , libmtp @@ -66,7 +65,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ - chmlib fontconfig hunspell hyphen @@ -102,6 +100,7 @@ mkDerivation rec { msgpack netifaces pillow + pychm pyqt-builder pyqt5 python -- cgit 1.4.1 From 0157a871033eb0227ac1ef6803f3ae99a5bdef0d Mon Sep 17 00:00:00 2001 From: takagiy Date: Thu, 16 Jun 2022 16:20:14 +0900 Subject: plasma-overdose-kde-theme: init at unstable-2022-05-30 --- .../themes/plasma-overdose-kde-theme/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/themes/plasma-overdose-kde-theme/default.nix (limited to 'pkgs') diff --git a/pkgs/data/themes/plasma-overdose-kde-theme/default.nix b/pkgs/data/themes/plasma-overdose-kde-theme/default.nix new file mode 100644 index 00000000000..dc80c669804 --- /dev/null +++ b/pkgs/data/themes/plasma-overdose-kde-theme/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "plasma-overdose-kde-theme"; + version = "unstable-2022-05-30"; + + src = fetchFromGitHub { + owner = "Notify-ctrl"; + repo = "Plasma-Overdose"; + rev = "d8bf078b4819885d590db27cd1d25d8f4f08fe4c"; + sha256 = "187f6rlvb2wf5sj3mgr69mfwh9fpqchw4yg6nzv54l98msmxc4h0"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv colorschemes $out/share/color-schemes + mv plasma $out/share/plasma + + mkdir -p $out/share/aurorae + mv aurorae $out/share/aurorae/themes + + mkdir -p $out/share/icons/Plasma-Overdose + mv cursors/index.theme $out/share/icons/Plasma-Overdose/cursor.theme + mv cursors/cursors $out/share/icons/Plasma-Overdose/cursors + + runHook postInstall + ''; + + meta = with lib; { + description = "Cute KDE theme inspired by the game Needy Girl Overdose"; + homepage = "https://github.com/Notify-ctrl/Plasma-Overdose"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ takagiy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f605f09da9..c1313c9810e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24793,6 +24793,8 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; + plasma-overdose-kde-theme = callPackage ../data/themes/plasma-overdose-kde-theme { }; + papis = with python3Packages; toPythonApplication papis; paperlike-go = callPackage ../tools/misc/paperlike-go { }; -- cgit 1.4.1 From 715166e09d02f53d89acdaa5bb4ebcc945436b44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jun 2022 10:29:18 +0000 Subject: python310Packages.azure-mgmt-netapp: 7.0.0 -> 8.0.0 --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8c2ec661f8c..f798ac2f8ab 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "7.0.0"; + version = "8.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ziaddG+6MoPG18OYZyQ9HRx8nfGsz2UbWPC1pWacKto="; + hash = "sha256-S0miYNV+mr3IiT5aLlDhiSpwpPMyWQ5m6/ZUrVfCNRM="; extension = "zip"; }; -- cgit 1.4.1 From d1daa6417e201747b25354a4cb10ee22f57d7a37 Mon Sep 17 00:00:00 2001 From: Mihai-Drosi Câju Date: Sat, 4 Jun 2022 18:58:02 +0300 Subject: waydroid: 1.2.0 -> 1.2.1 --- pkgs/os-specific/linux/waydroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index 1390077a60d..0a0a4019e98 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "03d87sh443kn0j2mpih1g909khkx3wgb04h605f9jhd0znskkbmw"; + sha256 = "sha256-Sf1rl8GCSTuneuYroGqsm9Aq2rBurpyswOrfCq2mWOs="; }; propagatedBuildInputs = with python3Packages; [ -- cgit 1.4.1 From 95961f8927ba83bcba907b0fc1b59ffad879f2ee Mon Sep 17 00:00:00 2001 From: kraem Date: Thu, 16 Jun 2022 20:50:54 +0200 Subject: rivercarro: 0.1.2 -> 0.1.4 --- pkgs/applications/misc/rivercarro/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index 3d7720d2596..0074a923f41 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -5,25 +5,23 @@ , river , wayland , pkg-config -, scdoc }: stdenv.mkDerivation rec { pname = "rivercarro"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromSourcehut { owner = "~novakane"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "07md837ki0yln464w8vgwyl3yjrvkz1p8alxlmwqfn4w45nqhw77"; + sha256 = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4="; }; nativeBuildInputs = [ pkg-config river - scdoc wayland zig ]; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dcpu=baseline -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline --prefix $out install runHook postInstall ''; -- cgit 1.4.1 From 6d1ce6d1fdc5390a92d93d79e1bd0a15a6bb3c9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Jun 2022 20:58:45 +0200 Subject: adenum: init at unstable-2022-04-01 --- pkgs/tools/security/adenum/default.nix | 48 ++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/security/adenum/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/tools/security/adenum/default.nix new file mode 100644 index 00000000000..8bcac264d95 --- /dev/null +++ b/pkgs/tools/security/adenum/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, john +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "adenum"; + version = "unstable-2022-04-01"; + format = "other"; + + src = fetchFromGitHub { + owner = "SecuProject"; + repo = "ADenum"; + rev = "0e3576eca1d987d3ef22d53fc725189bb301e804"; + hash = "sha256-8s4Kmt4ZjYbQGGVDWKfuRZ6kthcL8FiQytoq9Koy7Kc="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + pwntools + ldap + ] ++ [ + john + ]; + + installPhase = '' + runHook preInstall + + # Add shebang so we can patch it + sed -i -e '1i#!/usr/bin/python' ADenum.py + patchShebangs ADenum.py + install -vD ADenum.py $out/bin/adenum + + runHook postInstall + ''; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Tool to find misconfiguration through LDAP"; + homepage = "https://github.com/SecuProject/ADenum"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1271dded51a..a65172c77f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1001,6 +1001,8 @@ with pkgs; addlicense = callPackage ../tools/misc/addlicense { }; + adenum = callPackage ../tools/security/adenum { }; + adlplug = callPackage ../applications/audio/adlplug { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit; jack = libjack2; -- cgit 1.4.1 From 1ec563dd0a9daa2731d5daf5685ccb0e685420a4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 16 Jun 2022 21:46:51 +0300 Subject: monocypher: init at 3.1.3 --- pkgs/development/libraries/monocypher/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/monocypher/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/development/libraries/monocypher/default.nix new file mode 100644 index 00000000000..7ce84cbba83 --- /dev/null +++ b/pkgs/development/libraries/monocypher/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "monocypher"; + version = "3.1.3"; + + src = fetchurl { + url = "https://monocypher.org/download/monocypher-${version}.tar.gz"; + hash = "sha256-tEK1d98o+MNsqgHZrpARtd2ccX2UvlIBaKBONtf1AW4="; + }; + + patches = [ + # Fix cross-compilation + (fetchpatch { + url = "https://github.com/LoupVaillant/Monocypher/commit/376715e1c0ebb375e50dfa757bc89486c9a7b404.patch"; + hash = "sha256-tuwSUaU4w+jkaj10ChMgUmOQmoKYnv5JgJ1og8EXxFk="; + }) + ]; + + makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; + + doCheck = true; + + meta = with lib; { + description = "Boring crypto that simply works"; + homepage = "https://monocypher.org"; + license = with licenses; [ bsd2 cc0 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae72b3c5d7b..9cf47750d16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28315,6 +28315,8 @@ with pkgs; mopidy-youtube mopidy-ytmusic; + monocypher = callPackage ../development/libraries/monocypher { }; + motif = callPackage ../development/libraries/motif { }; mousai = callPackage ../applications/audio/mousai { }; -- cgit 1.4.1 From 3e4d46ba0abbfeed91f0aa8478ec480cafe1e758 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Jun 2022 18:57:04 -0400 Subject: dawn: init at 3.91a --- pkgs/applications/science/physics/dawn/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/physics/dawn/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/science/physics/dawn/default.nix b/pkgs/applications/science/physics/dawn/default.nix new file mode 100644 index 00000000000..609a0e1c4cd --- /dev/null +++ b/pkgs/applications/science/physics/dawn/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "dawn"; + version = "3.91a"; + + src = fetchurl { + url = "https://geant4.kek.jp/~tanaka/src/dawn_${builtins.replaceStrings ["."] ["_"] version}.tgz"; + hash = "sha256-gdhV6tERdoGxiCQt0L46JOAF2b1AY/0r2pp6eU689fQ="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'CC =' 'CC = $(CXX) #' \ + --replace 'INSTALL_DIR =' "INSTALL_DIR = $out/bin#" + ''; + + dontConfigure = true; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = with lib; { + description = "A vectorized 3D PostScript processor with analytical hidden line/surface removal"; + license = licenses.unfree; + homepage = "https://geant4.kek.jp/~tanaka/DAWN/About_DAWN.html"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09faa28ac73..fca699a6360 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33287,6 +33287,8 @@ with pkgs; ### SCIENCE/PHYSICS + dawn = callPackage ../applications/science/physics/dawn {}; + elmerfem = callPackage ../applications/science/physics/elmerfem {}; mcfm = callPackage ../applications/science/physics/MCFM { -- cgit 1.4.1 From 1a0d8eebd7d0322343985768e8526513e883e8ea Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 17 Jun 2022 00:21:05 +0000 Subject: vscodium: 1.68.0 -> 1.68.1 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index a014c2d037a..721cfbabf82 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -14,11 +14,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0k3m6gdmcv5blfczb7wnvsslq9sx07rbmzbs1q1yf9mb5q916dcf"; - x86_64-darwin = "0074vrjvv52gss0cibgkfkkf6g5fjcwjhz8bpl4b42j07qryh642"; - aarch64-linux = "1ps8ql740832gdjx7kwsi8akbdgk7lx1l85hg1aa5qwgm65xcb0g"; - aarch64-darwin = "1gqzwy5fkmbw2zmcgiakczr51zv9rlkhp7aq182p43jrsk6lqqnn"; - armv7l-linux = "0km1vjd2jnl9kxfxz52fkf2jkqhx121jngxjcy581fhnipp268zb"; + x86_64-linux = "1gx64ff9sgjqn8vw2hjpn3qlfpfyyhc5ivzc52vqyczaj1fcny65"; + x86_64-darwin = "0sv0iyqfw24k14r28qzvlpdb81b7fqhbgb1lqzb75adhdfpjwz31"; + aarch64-linux = "13mg7nn43k4bs1gl8cx1kly90yxz7iial6a1fpy4grxsk8mna1rj"; + aarch64-darwin = "0mnj3lckpqwb3kmg7x7r34idaxyhy55gpiiyj0gmpqp8hp0ai5sc"; + armv7l-linux = "0cvvigzmqp21jxwdfpkspdj7sva9bj977f9689qgb012kqvy41b2"; }.${system}; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -28,7 +28,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.68.0"; + version = "1.68.1"; pname = "vscodium"; executableName = "codium"; -- cgit 1.4.1 From 089d7e3941cb7baccfb3f1c9cd6ec8fd8f703d14 Mon Sep 17 00:00:00 2001 From: InternetUnexplorer Date: Thu, 16 Jun 2022 17:36:57 -0700 Subject: linux_zen: 5.18.1-zen1 -> 5.18.5-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 0e9a632ddb5..504cb126742 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.18.1-zen1"; + modDirVersion = "5.18.5-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -20,7 +20,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; inherit rev; - sha256 = "sha256-LCLfLE85NifuskYl2dxLOJEsUNHLegF8ecYyU4xOCtY="; + sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4="; }; structuredExtraConfig = with lib.kernel; { -- cgit 1.4.1 From eb7461286a3c9b28f3d969e3f87c5a3ae8c29eae Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 16 Jun 2022 19:00:56 -0700 Subject: saleae-logic-2: 2.3.53 -> 2.3.55 --- pkgs/development/tools/misc/saleae-logic-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 04526f59bd4..f606bc60971 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.3.53"; + version = "2.3.55"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-RZrOyL0tb1nH5SX7P6d4TFkxSwDZiJUpu1eZaXqX3ew="; + sha256 = "sha256-fL72KZzOh9pWrjSaXDCMz0ijqRj1Vc5Ym37onv4E7aI="; }; desktopItem = makeDesktopItem { inherit name; -- cgit 1.4.1 From a77271aae717e8813097e1c5469ee2de1d96a083 Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 17 Jun 2022 06:40:49 +0800 Subject: swayidle: fix the path to `sh` The execvp to the bare `sh` would fail when PATH is cleared, eg. in a systemd unit. --- pkgs/applications/window-managers/sway/idle.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 4b2909eac21..97e3febc7b9 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols +, wayland, wayland-protocols, runtimeShell , systemdSupport ? stdenv.isLinux, systemd }: @@ -22,7 +22,13 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; - postPatch = "substituteInPlace main.c --replace '%lu' '%zu'"; + # Remove the `%zu` patch for the next release after 1.7.1. + # https://github.com/swaywm/swayidle/commit/e81d40fca7533f73319e76e42fa9694b21cc9e6e + postPatch = '' + substituteInPlace main.c \ + --replace '%lu' '%zu' \ + --replace '"sh"' '"${runtimeShell}"' + ''; meta = with lib; { description = "Idle management daemon for Wayland"; -- cgit 1.4.1 From 902603d50f45e2ba1f96b90bb9f6eae9d339a7be Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 17 Jun 2022 01:18:42 -0300 Subject: mongodb-tools: 100.5.2 -> 100.5.3 --- pkgs/tools/misc/mongodb-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index b59a466e3d1..4ede64b83aa 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -17,7 +17,7 @@ let "mongofiles" "mongotop" ]; - version = "100.5.2"; + version = "100.5.3"; in buildGoPackage { pname = "mongo-tools"; @@ -30,7 +30,7 @@ in buildGoPackage { rev = version; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "sha256-qYTfC7+5XWDCyQQFKmuPmDmwsekDdY6OAerxZgzf8D0="; + sha256 = "sha256-8RkpBCFVxKVsu4h2z+rhlwvYfbSDHZUg8erO4+2GRbw="; }; nativeBuildInputs = [ pkg-config ]; -- cgit 1.4.1 From 72d13e648d37ef23e3855daa49bd53304cef26e0 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 17 Jun 2022 08:51:40 +0200 Subject: image_optim: 0.26.3 -> 0.31.1 --- .../applications/graphics/image_optim/Gemfile.lock | 16 +++++----- pkgs/applications/graphics/image_optim/gemset.nix | 36 ++++++++++++++-------- 2 files changed, 32 insertions(+), 20 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/image_optim/Gemfile.lock b/pkgs/applications/graphics/image_optim/Gemfile.lock index 3ffadb5acbe..db55fa8be3e 100644 --- a/pkgs/applications/graphics/image_optim/Gemfile.lock +++ b/pkgs/applications/graphics/image_optim/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - exifr (1.3.6) - fspath (3.1.0) - image_optim (0.26.3) + exifr (1.3.9) + fspath (3.1.2) + image_optim (0.31.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) - image_size (>= 1.5, < 3) + image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (2.0.0) - in_threads (1.5.1) - progress (3.5.0) + image_size (3.0.2) + in_threads (1.6.0) + progress (3.6.0) PLATFORMS ruby @@ -20,4 +20,4 @@ DEPENDENCIES image_optim BUNDLED WITH - 2.1.4 + 2.3.9 diff --git a/pkgs/applications/graphics/image_optim/gemset.nix b/pkgs/applications/graphics/image_optim/gemset.nix index 08e7f5c78ef..b9ea65e5522 100644 --- a/pkgs/applications/graphics/image_optim/gemset.nix +++ b/pkgs/applications/graphics/image_optim/gemset.nix @@ -1,51 +1,63 @@ { exifr = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q2abhiyvgfv23i0izbskjxcqaxiw9bfg6s57qgn4li4yxqpwpfg"; + sha256 = "0mylhwmh6n4xihxr9s3zj0lc286f5maxbqd4dgk3paqnd7afz88s"; type = "gem"; }; - version = "1.3.6"; + version = "1.3.9"; }; fspath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vjn9sy4hklr2d5wxmj5x1ry31dfq3sjp779wyprb3nbbdmra1sc"; + sha256 = "0xcxikkrjv8ws328nn5ax5pyfjs8pn7djg1hks7qyb3yp6prpb5m"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.2"; }; image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "082w9qcyy9j6m6s2pknfdcik7l2qch4j48axs13m06l4s1hz0dmg"; + sha256 = "1l3n59w1cbvfg2srfa14g3jdqwbkf7l86g4qrgfz3qps7zi0drg7"; type = "gem"; }; - version = "0.26.3"; + version = "0.31.1"; }; image_size = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcn7nc6qix3w4sf7xd557lnsgjniqa7qvz7nnznx70m8qfbc7ig"; + sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.2"; }; in_threads = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14hqm59sgqi91ag187zwpgwi58xckjkk58m031ghkp0csl8l9mkx"; + sha256 = "0j9132d4g8prjafgdh4pw948j527kr09m2lvylrcd797il9yd9wi"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; progress = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yrzq4v5sp7cg4nbgqh11k3d1czcllfz98dcdrxrsjxwq5ziiw0p"; + sha256 = "0wymdk40cwrqn32gwg1kw94s5p1n0z3n7ma7x1s62gd4vw3d63in"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; } -- cgit 1.4.1 From f318e8f0746f1a875445fa7f9a008c1eb74b76d8 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 17 Jun 2022 05:46:43 -0300 Subject: linkerd: 2.11.1 -> 2.11.2 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index f0c9ada6ca8..fed35f12bed 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.11.1"; - sha256 = "09zwxcaqn537ls737js7rcsqarapw5k25gv41d844k73yvxm882c"; - vendorSha256 = "sha256-RayboJdjkmCiUsUBab9ntIH+koOCgp3gmVqXZEUWK88="; + version = "2.11.2"; + sha256 = "sha256-6FlOHnOmqZ2jqx9qFMPA5jkxBaNqzeCwsepwXR1Imss="; + vendorSha256 = "sha256-wM5qIjabg9ICJcLi8QV9P4G4E7Rn3ctVCqdm2GO8RyU="; } -- cgit 1.4.1 From d88758ce702e5f32107a28d4d3f18dc6ab1de0e4 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 17 Jun 2022 05:47:19 -0300 Subject: linkerd_edge: 22.2.4 -> 22.6.1 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 74b5578d023..4d3c30e3337 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "22.2.4"; - sha256 = "1s53zlb7f0xp2vqa5fnsjdhjq203bsksrmdbrxkkm1yi3nc3p369"; - vendorSha256 = "sha256-cN19kKa4Ieweta95/4bKlAYn/Bq8j27H408za3OoJoI="; + version = "22.6.1"; + sha256 = "sha256-YM6d2bWcjoNMEbgXVR79tcklTRqAhzm6SzJU2k+7BNU="; + vendorSha256 = "sha256-i+AbrzN9d9CGZcGj/D4xnYlamp0iOlq2xcax14/GqEE="; } -- cgit 1.4.1 From bed5ba3529343adf26f510afceb50beefa50c818 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Fri, 17 Jun 2022 10:35:17 +0000 Subject: gollum: 5.2.3 → 5.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gollum/Gemfile.lock | 23 +++++++---- pkgs/applications/misc/gollum/gemset.nix | 65 +++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 18 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 49c723efe98..6a88aa6acb0 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -13,13 +13,15 @@ GEM gemojione (4.3.3) json github-markup (4.0.1) - gollum (5.2.3) + gollum (5.3.0) gemojione (~> 4.1) gollum-lib (~> 5.1) + i18n (~> 1.8) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1.0) - mustache-sinatra (~> 1.0) + mustache-sinatra (>= 1.0.1, < 2) octicons (~> 12.0) + rdoc (~> 6) rss (~> 0.2.9) sass (~> 3.5) sinatra (~> 2.0) @@ -30,7 +32,7 @@ GEM uglifier (~> 4.2) useragent (~> 0.16.2) webrick (~> 1.7) - gollum-lib (5.1.3) + gollum-lib (5.2) gemojione (~> 4.1) github-markup (~> 4.0) gollum-rugged_adapter (~> 1.0) @@ -43,6 +45,8 @@ GEM mime-types (~> 1.15) rugged (~> 1.1.0) htmlentities (4.3.4) + i18n (1.10.0) + concurrent-ruby (~> 1.0) json (2.6.2) kramdown (2.4.0) rexml @@ -66,15 +70,19 @@ GEM nokogiri (>= 1.6.3.1) org-ruby (0.9.12) rubypants (~> 0.2) + psych (4.0.4) + stringio racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-protection (2.2.0) rack rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.4.0) + psych (>= 4.0.0) rexml (3.2.5) - rouge (3.28.0) + rouge (3.29.0) rss (0.2.9) rexml ruby2_keywords (0.0.5) @@ -101,6 +109,7 @@ GEM rack (> 1, < 3) sprockets-helpers (1.4.0) sprockets (>= 2.2) + stringio (3.0.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) @@ -111,7 +120,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) useragent (0.16.10) webrick (1.7.0) wikicloth (0.8.3) @@ -133,4 +142,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.2.33 + 2.3.9 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index fba88415874..3817782a6f6 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -101,15 +101,15 @@ version = "4.0.1"; }; gollum = { - dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"]; + dependencies = ["gemojione" "gollum-lib" "i18n" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rdoc" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zdpl8rj6r2psigcjavwi57ljriyakh0ydfai9c3q85jzc005bax"; + sha256 = "1xz7d3xfc536njk0fg4inmzzy350c5bjp237vghrcky8azc6xl7k"; type = "gem"; }; - version = "5.2.3"; + version = "5.3.0"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -117,10 +117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1samwcxjr1z0sy8a87xvp0z4qx0fc2irzx568s6q1yxcba9nqqv2"; + sha256 = "1acxi4zjdmxlj7hzv9fjqilqngcwjvzhk3khnykdfvnb0l6l4xbs"; type = "gem"; }; - version = "5.1.3"; + version = "5.2"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -143,6 +143,17 @@ }; version = "4.3.4"; }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + type = "gem"; + }; + version = "1.10.0"; + }; json = { groups = ["default"]; platforms = []; @@ -281,6 +292,17 @@ }; version = "0.9.12"; }; + psych = { + dependencies = ["stringio"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2lz03mkn43rf2a2xiy8vqgir1dvds0a0fpx7m7my6a21ygryw2"; + type = "gem"; + }; + version = "4.0.4"; + }; racc = { groups = ["default"]; platforms = []; @@ -296,10 +318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-protection = { dependencies = ["rack"]; @@ -333,6 +355,17 @@ }; version = "0.10.1"; }; + rdoc = { + dependencies = ["psych"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxzcvxvrmb1ngxz0bgz1va4q9c4w8m6gc8lmdhi6gnvaaf98gsy"; + type = "gem"; + }; + version = "6.4.0"; + }; RedCloth = { groups = ["default"]; platforms = []; @@ -358,10 +391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; + sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r"; type = "gem"; }; - version = "3.28.0"; + version = "3.29.0"; }; rss = { dependencies = ["rexml"]; @@ -470,6 +503,16 @@ }; version = "1.4.0"; }; + stringio = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jns0x5lbafyqyx7pgzfs6i4ykc7p6zg7gxa6hd82w40n6z9rdvi"; + type = "gem"; + }; + version = "3.0.2"; + }; therubyrhino = { dependencies = ["therubyrhino_jar"]; groups = ["default"]; @@ -539,10 +582,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; useragent = { groups = ["default"]; -- cgit 1.4.1 From d0af7c06ac557e3bd12bc9b73ea8ed68f65b1da2 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Fri, 17 Jun 2022 13:43:03 +0200 Subject: gollum: fix shebang in bin/gollum In the v5.3.0 release of gollum, the shebang in `bin/gollum` changed, breaking the package build: https://github.com/gollum/gollum/compare/v5.2.3..v5.3.0#diff-0108eafd2bcdf5151e078efec0119e63431569fca19b46660c9b8d9b7cdd6cf5R1 --- pkgs/development/ruby-modules/gem-config/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 47e70aaa8f0..6f9da13f503 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -294,6 +294,14 @@ in propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; }; + gollum = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace bin/gollum \ + --replace "/usr/bin/env -S ruby" "${ruby}/bin/ruby" + ''; + }; + grpc = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin libtool; buildInputs = [ openssl ]; -- cgit 1.4.1 From e768893052bcba2f85c41f30cfbdbd647f76b590 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Jun 2022 15:53:40 +0200 Subject: mailmanPackages.hyperkitty: fix build Closes #177470 --- pkgs/servers/mail/mailman/hyperkitty.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs') diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index c10f2c1ba75..2b8959a8f37 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -24,6 +24,12 @@ buildPythonPackage rec { sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk="; includes = [ "hyperkitty/*" ]; }) + + # Fix for Python >=3.9.13 + (fetchpatch { + url = "https://gitlab.com/mailman/hyperkitty/-/commit/3efe7507944dbdbfcfa4c182d332528712476b28.patch"; + sha256 = "sha256-yXuhTbmfDiYEXEsnz+zp+xLHRqI4GtkOhGHN+37W0iQ="; + }) ]; postPatch = '' -- cgit 1.4.1 From b9360e09aa110e0d5b566e64dc68e4d99c1d5fc2 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 17 Jun 2022 13:59:19 +0000 Subject: n8n: 0.181.2 → 0.182.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/n8n/node-packages.nix | 284 ++++++++++++++------- 1 file changed, 192 insertions(+), 92 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 1f38f4854d2..e561f872dbb 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -490,13 +490,13 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.28" = { + "@types/express-serve-static-core-4.17.29" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.28"; + version = "4.17.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; - sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz"; + sha512 = "uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q=="; }; }; "@types/express-unless-0.5.3" = { @@ -526,6 +526,15 @@ let sha512 = "WRT/9taXh9XJRA9yvrbC02IqGZhK9GbFE/vuP2LeSLrqmDzz5wdXsH0Ige/F+3+rbbZfwH3LEazDsU0JiSV3vA=="; }; }; + "@types/glob-7.2.0" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; + }; + }; "@types/json-diff-0.5.2" = { name = "_at_types_slash_json-diff"; packageName = "@types/json-diff"; @@ -580,6 +589,15 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; + "@types/minimatch-3.0.5" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; + }; + }; "@types/multer-1.4.7" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; @@ -598,22 +616,22 @@ let sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="; }; }; - "@types/node-17.0.41" = { + "@types/node-18.0.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.41"; + version = "18.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.41.tgz"; - sha512 = "xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz"; + sha512 = "cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA=="; }; }; - "@types/node-fetch-2.6.1" = { + "@types/node-fetch-2.6.2" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz"; - sha512 = "oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz"; + sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; "@types/promise-ftp-1.3.4" = { @@ -670,6 +688,15 @@ let sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; + "@types/shelljs-0.8.11" = { + name = "_at_types_slash_shelljs"; + packageName = "@types/shelljs"; + version = "0.8.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.11.tgz"; + sha512 = "x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw=="; + }; + }; "@types/snowflake-sdk-1.6.7" = { name = "_at_types_slash_snowflake-sdk"; packageName = "@types/snowflake-sdk"; @@ -1102,13 +1129,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1152.0" = { + "aws-sdk-2.1156.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1152.0"; + version = "2.1156.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1152.0.tgz"; - sha512 = "Lqwk0bDhm3vzpYb3AAM9VgGHeDpbB8+o7UJnP9R+CO23kJfi/XRpKihAcbyKDD/AUQ+O1LJaUVpvaJYLS9Am7w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1156.0.tgz"; + sha512 = "XLMsSOW6ZyBj6mRgACt1EiUdvd+q0Da5fTjbsEgi1KOENQ0met0CSqgBcpg2EMWgBBV9E2L7uUd98O1uBbGc7g=="; }; }; "aws-sign2-0.7.0" = { @@ -2047,13 +2074,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.22.8" = { + "core-js-3.23.1" = { name = "core-js"; packageName = "core-js"; - version = "3.22.8"; + version = "3.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.22.8.tgz"; - sha512 = "UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.23.1.tgz"; + sha512 = "wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w=="; }; }; "core-util-is-1.0.2" = { @@ -3523,6 +3550,15 @@ let sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; }; + "interpret-1.4.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; + sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; + }; + }; "ioredis-4.28.5" = { name = "ioredis"; packageName = "ioredis"; @@ -3613,6 +3649,15 @@ let sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; + "is-core-module-2.9.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; + }; + }; "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; @@ -3883,13 +3928,13 @@ let sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; - "iso-639-1-2.1.14" = { + "iso-639-1-2.1.15" = { name = "iso-639-1"; packageName = "iso-639-1"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.14.tgz"; - sha512 = "nekI+mmtSpYySPXIXJtWhv/s+06nAU9wQzq4QPu3YSEMmjnkOoippPY+MEdqDP0Pie8/LsOFEuPbUHslLanDag=="; + url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz"; + sha512 = "7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg=="; }; }; "isstream-0.1.2" = { @@ -4504,13 +4549,13 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.39.0" = { + "mappersmith-2.39.1" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.39.0"; + version = "2.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.39.0.tgz"; - sha512 = "udHrBOOLU3nI2FK4hlnhoZDOT/UzntUJYWTnlJSgBs8GRNsf10Fyk/M6qAfX9Wn6NfZH/KSO5gZ+xHSPTu0gPA=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.39.1.tgz"; + sha512 = "f0QbIwG7CrwhIu7CZts2BsXyMhhZvmEeEtlHC+At23h4//mFVk0cRNZI+v21lzvvWAIBeE55AwEER7koi8iz/A=="; }; }; "material-colors-1.2.6" = { @@ -4657,13 +4702,13 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "minipass-3.2.0" = { + "minipass-3.2.1" = { name = "minipass"; packageName = "minipass"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.2.0.tgz"; - sha512 = "rosVvUUjMkTW1UoqXVHzNw937MAKv1ewomUBIqYk0IXPYk+LpVCOV1+kBpzAiQrKGjG3Ta81ZNzk/EcL28zABw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.2.1.tgz"; + sha512 = "v5cqJP4WxUVXYXhOOdPiOZEDoF7omSpLivw2GMCL1v/j+xh886bPXKh6SzyA6sa45e4NRQ46IRBEkAazvb6I6A=="; }; }; "minizlib-2.1.2" = { @@ -4837,13 +4882,13 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.121.3" = { + "n8n-core-0.122.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.121.3"; + version = "0.122.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.121.3.tgz"; - sha512 = "Jg48X3j6MK0OmfNDeo4Ph1RLpdWjxr36aRAJobZHEaf+tT4iQgFNBcC9OChj/IVYG4lVINTIiPstHWJMyNsF0A=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.122.1.tgz"; + sha512 = "e2MvpQBfV9y/3A7RE7tAseppKARF1yaoCc8a7OyF8zXHj2w2Qy7i+1YJuDUsqN4X9aMMXwVJiEZbelXtNjJiVQ=="; }; }; "n8n-design-system-0.23.0" = { @@ -4855,31 +4900,31 @@ let sha512 = "3VD+YUPWJ9andodTS3hqxBzLAvr289JDhX5fcS8F0SZD9PU01coUrfl/H5QZwwW9djVvDVdovGweOviAT6w15A=="; }; }; - "n8n-editor-ui-0.147.0" = { + "n8n-editor-ui-0.148.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.147.0"; + version = "0.148.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.147.0.tgz"; - sha512 = "yjyDFue+ObPDTqp0x5iaAo2vi7nSDqD9ts9DHSUzZgmryMuwdWsukb5YJL7JkoFv8qjtsCp3+fhuD37t7/XymA=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.148.0.tgz"; + sha512 = "q6I6OYGKPAo7Lb3Or1WjVWNOwD7Y3Vsk6ABM8aEuAR4gjQTJkA3yCI2ZLaBm3F05Str6z3CI9nLB2pMP/50H9A=="; }; }; - "n8n-nodes-base-0.179.0" = { + "n8n-nodes-base-0.180.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.179.0"; + version = "0.180.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.179.0.tgz"; - sha512 = "UM9O5O9i4N/kf0bXIxEAJgNxFxPCym/63MfXPUFy96OzGbNNfreMg2gNFbyTnJuAAEXSjSu3+tCqBfY1Q472bg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.180.0.tgz"; + sha512 = "ZDjdth9oJM6p9Ogb/l6l1/bp/ckhMh/Y3H+RKAvWd3htUeBJ3f4oLsPHIXOTq1xFhsoovrgvGceE9hZXM1Tt2g=="; }; }; - "n8n-workflow-0.103.0" = { + "n8n-workflow-0.104.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.103.0"; + version = "0.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.103.0.tgz"; - sha512 = "DNt9CzF50zlcSWE4h/ZFolIRJS5jAIAFUeJdgsmAsVMB0vwg1PA01sX3mWJwcRTdhfLKj03tp/C7El6zpF7mvw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.104.0.tgz"; + sha512 = "uoglwlCO5Z6moNcBi+t8TXzm1NAVy7a0oeWzq5OK/0k2N0HDBDqn04A5a1gHGAPeCJVS1dDOhXwq69HJ/IjoZg=="; }; }; "named-placeholders-1.1.2" = { @@ -5512,6 +5557,15 @@ let sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; + "path-parse-1.0.7" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -6124,6 +6178,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw=="; + }; + }; "redis-3.1.2" = { name = "redis"; packageName = "redis"; @@ -6304,6 +6367,15 @@ let sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; }; }; + "resolve-1.22.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; + }; + }; "restore-cursor-3.1.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -6637,6 +6709,15 @@ let sha512 = "uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw=="; }; }; + "shelljs-0.8.5" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz"; + sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="; + }; + }; "showdown-2.1.0" = { name = "showdown"; packageName = "showdown"; @@ -6817,13 +6898,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.10.0" = { + "ssh2-1.11.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.10.0.tgz"; - sha512 = "OnKAAmf4j8wCRrXXZv3Tp5lCZkLJZtgZbn45ELiShCg27djDQ3XFGvIzuGsIsf4hdHslP+VdhA9BhUQdTdfd9w=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz"; + sha512 = "nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw=="; }; }; "ssh2-sftp-client-7.2.3" = { @@ -6997,6 +7078,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; "swagger-ui-dist-4.12.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; @@ -7192,7 +7282,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; - sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; + sha512 = "rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA=="; }; }; "to-regex-range-5.0.1" = { @@ -7228,7 +7318,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; - sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; + sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="; }; }; "tough-cookie-2.5.0" = { @@ -7264,7 +7354,7 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; }; }; "triple-beam-1.3.0" = { @@ -7327,7 +7417,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; }; }; "tweetnacl-0.14.5" = { @@ -7336,7 +7426,7 @@ let version = "0.14.5"; src = fetchurl { url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; "type-fest-0.21.3" = { @@ -7363,7 +7453,7 @@ let version = "0.0.6"; src = fetchurl { url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; "typedarray-to-buffer-3.1.5" = { @@ -7417,7 +7507,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; }; "underscore-1.13.4" = { @@ -7453,7 +7543,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; }; "upper-case-2.0.2" = { @@ -7489,7 +7579,7 @@ let version = "0.10.3"; src = fetchurl { url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; - sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + sha512 = "hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="; }; }; "url-parse-1.5.10" = { @@ -7507,7 +7597,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; - sha1 = "955f490aae653ba220b9456a0a8776c199360991"; + sha512 = "qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw=="; }; }; "utf8-2.1.2" = { @@ -7516,7 +7606,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz"; - sha1 = "1fa0d9270e9be850d9b05027f63519bf46457d96"; + sha512 = "QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg=="; }; }; "util-deprecate-1.0.2" = { @@ -7525,7 +7615,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; "util.promisify-1.1.1" = { @@ -7543,7 +7633,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; }; }; "uuencode-0.0.4" = { @@ -7552,7 +7642,7 @@ let version = "0.0.4"; src = fetchurl { url = "https://registry.npmjs.org/uuencode/-/uuencode-0.0.4.tgz"; - sha1 = "c8d50370885663879385ab37e333c7e8e3b0218c"; + sha512 = "yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA=="; }; }; "uuid-3.4.0" = { @@ -7606,7 +7696,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; }; "verror-1.10.0" = { @@ -7615,7 +7705,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; "vm2-3.9.9" = { @@ -7678,7 +7768,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; }; }; "whatwg-url-5.0.0" = { @@ -7687,7 +7777,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; }; }; "which-1.3.1" = { @@ -7714,7 +7804,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; }; }; "wide-align-1.1.5" = { @@ -7777,7 +7867,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; }; "wrap-ansi-6.2.0" = { @@ -7804,7 +7894,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; "ws-7.5.8" = { @@ -7858,7 +7948,7 @@ let version = "9.0.7"; src = fetchurl { url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; }; }; "xpath.js-1.1.0" = { @@ -7876,7 +7966,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; - sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; + sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; }; }; "xss-1.0.13" = { @@ -7921,7 +8011,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; "yallist-4.0.0" = { @@ -8020,10 +8110,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.181.2"; + version = "0.182.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.181.2.tgz"; - sha512 = "ntxmXyiPpRNvvIEG9n9MsMt1WC5ZlP4sLY7W1Ta5oBP66Wacslt2eajL6OiO2yFoJseCkhVRcHR2TwIDk4HeYQ=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.182.1.tgz"; + sha512 = "XwKz/v251gnzexpe80BFLxLAN34IDZI5oCbvtgpp9n9dx0BG9D9jjDY+rvSL8SbNjRrm87bm0RTPLUgKurj2Iw=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-8.0.0" @@ -8152,19 +8242,21 @@ in sources."@types/connect-3.4.35" sources."@types/express-4.17.13" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.28" + sources."@types/express-serve-static-core-4.17.29" sources."@types/express-unless-0.5.3" sources."@types/ftp-0.3.33" sources."@types/generic-pool-3.1.10" + sources."@types/glob-7.2.0" sources."@types/json-diff-0.5.2" sources."@types/json-schema-7.0.11" sources."@types/jsonwebtoken-8.5.8" sources."@types/lodash-4.14.182" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" + sources."@types/minimatch-3.0.5" sources."@types/multer-1.4.7" - sources."@types/node-17.0.41" - (sources."@types/node-fetch-2.6.1" // { + sources."@types/node-18.0.0" + (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -8175,6 +8267,7 @@ in sources."@types/range-parser-1.2.4" sources."@types/readable-stream-2.3.13" sources."@types/serve-static-1.13.10" + sources."@types/shelljs-0.8.11" sources."@types/snowflake-sdk-1.6.7" sources."@types/swagger-ui-express-4.1.3" sources."@types/tough-cookie-2.3.8" @@ -8236,7 +8329,7 @@ in ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1152.0" // { + (sources."aws-sdk-2.1156.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -8401,7 +8494,7 @@ in sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.22.8" + sources."core-js-3.23.1" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -8608,6 +8701,7 @@ in ]; }) sources."internal-slot-1.0.3" + sources."interpret-1.4.0" sources."ioredis-4.28.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" @@ -8618,6 +8712,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" + sources."is-core-module-2.9.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -8646,7 +8741,7 @@ in sources."isarray-1.0.0" sources."isbot-3.5.0" sources."isexe-2.0.0" - sources."iso-639-1-2.1.14" + sources."iso-639-1-2.1.15" sources."isstream-0.1.2" sources."jmespath-0.16.0" sources."join-component-1.1.0" @@ -8752,7 +8847,7 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.39.0" + sources."mappersmith-2.39.1" sources."material-colors-1.2.6" sources."md5-2.3.0" sources."media-typer-0.3.0" @@ -8768,7 +8863,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.2.0" + sources."minipass-3.2.1" sources."minizlib-2.1.2" sources."mkdirp-0.5.6" (sources."mock-require-3.0.3" // { @@ -8805,15 +8900,15 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.121.3" + sources."n8n-core-0.122.1" sources."n8n-design-system-0.23.0" - sources."n8n-editor-ui-0.147.0" - (sources."n8n-nodes-base-0.179.0" // { + sources."n8n-editor-ui-0.148.0" + (sources."n8n-nodes-base-0.180.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.103.0" + sources."n8n-workflow-0.104.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8905,6 +9000,7 @@ in sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pause-0.0.1" @@ -8990,6 +9086,7 @@ in }) sources."readable-web-to-node-stream-2.0.0" sources."readdirp-3.6.0" + sources."rechoir-0.6.2" sources."redis-3.1.2" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" @@ -9020,6 +9117,7 @@ in sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.22.0" sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."retry-0.12.0" @@ -9073,6 +9171,7 @@ in sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shell-escape-0.2.0" + sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ sources."commander-9.3.0" @@ -9111,7 +9210,7 @@ in sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.10.0" + sources."ssh2-1.11.0" (sources."ssh2-sftp-client-7.2.3" // { dependencies = [ sources."concat-stream-2.0.0" @@ -9137,6 +9236,7 @@ in sources."strip-ansi-6.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."swagger-ui-dist-4.12.0" sources."swagger-ui-express-4.4.0" (sources."tar-6.1.11" // { -- cgit 1.4.1 From 9426ebcb82817975c49d97b5508a69a5bdef3459 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 17 Jun 2022 16:25:00 +0200 Subject: intel-media-driver: 22.4.2 -> 22.4.3 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index bac5512aed6..a386f4d878b 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.4.2"; + version = "22.4.3"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-wJiXtRPv9t34GujUhkhDKmIblMMR8yx8Fe1Xony6QVY="; + sha256 = "sha256-NcbtgJjDAHRv7Qs6fPRwScMBPLXci6e2oLxm8DC2nnw="; }; patches = [ -- cgit 1.4.1 From 3b11bd8857a639372ca34d0a13f6b5145e024e09 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 30 May 2022 08:43:56 +0000 Subject: awless: remove awless is lack of maintenance from upstream since 2018. --- pkgs/tools/virtualization/awless/default.nix | 26 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/tools/virtualization/awless/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix deleted file mode 100644 index 97b3fbd1b7a..00000000000 --- a/pkgs/tools/virtualization/awless/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "awless"; - version = "0.1.11"; - - goPackagePath = "github.com/wallix/awless"; - - src = fetchFromGitHub { - owner = "wallix"; - repo = "awless"; - rev = "v${version}"; - sha256 = "187i21yrm10r3f5naj3jl0rmydr5dkhmdhxs90hhf8hjp59a89kg"; - }; - - meta = with lib; { - homepage = "https://github.com/wallix/awless/"; - description = "A Mighty CLI for AWS"; - platforms = with platforms; linux ++ darwin; - license = licenses.asl20; - maintainers = with maintainers; [ pradeepchhetri swdunlop ]; - # asm: InitTextSym double init for "".Syscall - # panic: invalid use of LSym - NewFuncInfo with Extra of type *obj.FuncInfo - broken = (stdenv.isLinux && stdenv.isAarch64); - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 174360e648e..a6b0008f8ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -94,6 +94,7 @@ mapAliases ({ avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 + awless = throw "awless has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-05-30 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 azure-vhd-utils = throw "azure-vhd-utils has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc852da8304..6d82a6e53b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1929,8 +1929,6 @@ with pkgs; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; - awless = callPackage ../tools/virtualization/awless { }; - bashblog = callPackage ../tools/text/bashblog { }; berglas = callPackage ../tools/admin/berglas { }; -- cgit 1.4.1 From 4f04c969ace9c235f972ad6877019aa407973c64 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 17 Jun 2022 16:03:36 +0100 Subject: kubescape: 2.0.156 -> 2.0.158 --- pkgs/tools/security/kubescape/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index e1d05a632dc..a4a6969b34a 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.156"; + version = "2.0.158"; src = fetchFromGitHub { owner = "armosec"; -- cgit 1.4.1 From 0659ae1113cea87fd0fe652afe17469e29c1f0ab Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Fri, 17 Jun 2022 17:23:10 +0200 Subject: ntfy-sh: 1.25.2 -> 1.26.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 29e09c25b43..fe5c8f56168 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.25.2"; + version = "1.26.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-xf0hk2GpBbjovZ1DIG6unnKQ297p8fjKZmgk/23IKdY="; + sha256 = "sha256-LR3orzh/xwmxt5RhmjOacFs8NUp6tKPUwYDdzVFhx4k="; }; - vendorSha256 = "sha256-ZZdGve6+g0bhE+iqemWl9XtLRfUn4V3hbdVz/UhrxCA="; + vendorSha256 = "sha256-16S3Up1D4PycBY2Wk11cm0F4z5PkQL2reXj1mGpsOv4="; doCheck = false; -- cgit 1.4.1 From 12c0242db8dacceb05061dd83a67d77104e1c402 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Jun 2022 17:27:50 +0200 Subject: sublime-merge: 2071 → 2074 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 6526fdb2d1b..146367970a6 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,8 +4,8 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2071"; - sha256 = "xYVk5Fx6VdoHzf0cbmhwKyEr5HDEZgPgDoBWQg/tS0U="; + buildVersion = "2074"; + sha256 = "REo59Lpi0fmAOp0XJa4Iln3VKxR5kRiMpz2zfqz1MQs="; } {}; sublime-merge-dev = common { -- cgit 1.4.1 From 47fa54a96ce321dc53cba99ed5dfbb4880a097d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Jun 2022 17:29:25 +0200 Subject: sublime-merge-dev: 2070 → 2073 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 146367970a6..faf4ef77379 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2070"; - sha256 = "2AA2HBF19g34ov6ytjL2caqS7Ro4eyj18vzwINm0CTw="; + buildVersion = "2073"; + sha256 = "AQ0ESdi45LHndRNJnkYS+o9L+dlRJkw3nzBfJo8FYPc="; dev = true; } {}; } -- cgit 1.4.1 From bce0ac2d35868933232196308e5d5425672dfbb9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Jun 2022 14:46:32 -0400 Subject: linuxPackages.system76-io: 1.0.1 -> 1.0.2 --- pkgs/os-specific/linux/system76-io/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index ab8c422d2da..54af222bc7d 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, kernel, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, kernel }: let - version = "1.0.1"; - sha256 = "0qkgkkjy1isv6ws6hrcal75dxjz98rpnvqbm7agdcc6yv0c17wwh"; + version = "1.0.2"; + sha256 = "sha256-DWUjQmoojkzFv1p4Xyt0kOwwqQ216ocO5yR/ujhhMPA="; in stdenv.mkDerivation { name = "system76-io-module-${version}-${kernel.version}"; @@ -15,19 +15,6 @@ stdenv.mkDerivation { inherit sha256; }; - patches = [ - (fetchpatch { - name = "Fix_GCC_declaration-after-statement_error.patch"; - url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/5.patch"; - sha256 = "sha256-G8SM5tdNbeLuwigmo1HKLN9o16WPpowLXxfM7Xi4aRI="; - }) - (fetchpatch { - name = "Fix_GCC_unused-function_error.patch"; - url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/6.patch"; - sha256 = "sha256-vCXEzszmXa+wmI84oR8WduN4WnLTZA3M4GX+Jc4p/5o="; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; -- cgit 1.4.1 From 391a92291002228396cea579524d2fe30b96c63d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jun 2022 17:52:54 +0000 Subject: python310Packages.google-cloud-spanner: 3.14.1 -> 3.15.0 --- pkgs/development/python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index fa7a2a2310d..b7074e65aa1 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.14.1"; + version = "3.15.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d1d81cUtQu6DqKopv082HlmgSYOAWUdaBYBLjzFyC2M="; + sha256 = "sha256-NiHLaxYV3+40Dbs8miru6qG5vYlTToGTi8QRdLy5rZs="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From add5c4f47032737a8c9c5bbbb36722b004826e7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jun 2022 18:02:30 +0000 Subject: python310Packages.xhtml2pdf: 0.2.7 -> 0.2.8 --- pkgs/development/python-modules/xhtml2pdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 230e57a0643..31ae00ec781 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.7"; + version = "0.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { owner = pname; repo = pname; # Currently it is not possible to fetch from version as there is a branch with the same name - rev = "afa72cdbbdaf7d459261c1605263101ffcd999af"; - sha256 = "sha256-plyIM7Ohnp5UBWz/UDTJa1UeWK9yckSZR16wxmLrpnc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zWzg/r18wjzxWyD5QJ7l4pY+4bJTvHjrD11FRuuy8H8="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 34c91d44c8acc52a6b0eefbf378df48250590494 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 17 Jun 2022 20:14:55 +0100 Subject: kdigger: init at 1.2.0 --- pkgs/tools/security/kdigger/default.nix | 82 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 86 insertions(+) create mode 100644 pkgs/tools/security/kdigger/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/tools/security/kdigger/default.nix new file mode 100644 index 00000000000..5067d400327 --- /dev/null +++ b/pkgs/tools/security/kdigger/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +, fetchpatch +}: + +buildGoModule rec { + pname = "kdigger"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "quarkslab"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-j4HIwfRIUpV25DmbQ+9go8aJMEYaFDPxrdr/zGWBeVU="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + vendorSha256 = "sha256-3vn3MsE/4lBw89wgYgzm0RuJJ5RQTkgS6O74PpfFcUk="; + + patches = [ + (fetchpatch { + name = "simplify-ldflags.patch"; + url = "https://github.com/quarkslab/kdigger/pull/2.patch"; + sha256 = "sha256-d/NdoAdnheVgdqr2EF2rNn3gJvbjRZtOKFw2DqWR8TY="; + }) + ]; + + nativeBuildInputs = [ installShellFiles ]; + + CGO_ENABLED = 0; + ldflags = [ + "-s" + "-w" + "-X github.com/quarkslab/kdigger/commands.VERSION=v${version}" + "-X github.com/quarkslab/kdigger/commands.BUILDERARCH=${stdenv.hostPlatform.linuxArch}" + ]; + + preBuild = '' + ldflags+=" -X github.com/quarkslab/kdigger/commands.GITCOMMIT=$(cat COMMIT)" + ''; + + postInstall = '' + installShellCompletion --cmd kdigger \ + --bash <($out/bin/kdigger completion bash) \ + --fish <($out/bin/kdigger completion fish) \ + --zsh <($out/bin/kdigger completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/kdigger --help + + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/quarkslab/kdigger"; + changelog = "https://github.com/quarkslab/kdigger/releases/tag/v${version}"; + description = "An in-pod context discovery tool for Kubernetes penetration testing"; + longDescription = '' + kdigger, short for "Kubernetes digger", is a context discovery tool for + Kubernetes penetration testing. This tool is a compilation of various + plugins called buckets to facilitate pentesting Kubernetes from inside a + pod. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + # aarch64-linux support progress - https://github.com/quarkslab/kdigger/issues/3 + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f605f09da9..68024e4fa8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7469,6 +7469,10 @@ with pkgs; kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; + kdigger = callPackage ../tools/security/kdigger { + buildGoModule = buildGo118Module; + }; + keepalived = callPackage ../tools/networking/keepalived { }; kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; -- cgit 1.4.1 From f597e7e9fcf37d8ed14a12835ede0a7d362314bd Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Fri, 17 Jun 2022 22:10:30 +0200 Subject: alarm-clock-applet: remove (#177921) Co-authored-by: Sandro --- pkgs/tools/misc/alarm-clock-applet/default.nix | 77 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 pkgs/tools/misc/alarm-clock-applet/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix deleted file mode 100644 index 7bf58bb2ff3..00000000000 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, pkg-config -, autoconf -, automake111x -, libtool - -, glib -, gtk2 -, gst_all_1 -, gnome2 -, gnome-icon-theme -, libnotify -, libxml2 -, libunique -, intltool -, gst_plugins ? with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ] -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - version = "0.3.4"; - pname = "alarm-clock-applet"; - - src = fetchFromGitHub { - owner = "joh"; - repo = "alarm-clock"; - rev = version; - sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn"; - }; - - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchain support: - # https://github.com/joh/alarm-clock/pull/209 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/joh/alarm-clock/commit/969e7ba8225610cce55b14fcb599bc6f7771bd9a.patch"; - sha256 = "0ajhir22b5ww9pkmzy9mlc9f2lr1q6wgvm9iqzjf4xsg4gm4jy1k"; - }) - ]; - - nativeBuildInputs = [ - pkg-config - intltool - automake111x - autoconf - libtool - - gnome2.gnome-common - - wrapGAppsHook - ]; - - preConfigure = "./autogen.sh"; - - buildInputs = [ - glib - gtk2 - gst_all_1.gstreamer - gnome2.GConf - gnome-icon-theme - libnotify - libxml2 - libunique - ] ++ gst_plugins; - - propagatedUserEnvPkgs = [ gnome2.GConf.out ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://alarm-clock.pseudoberries.com/"; - description = "A fully-featured alarm clock for your GNOME panel or equivalent"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.rasendubi ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a6b0008f8ef..d9014d8384f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19 + alarm-clock-applet = throw "'alarm-clock-applet' has been abandoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-16 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30 alsaLib = alsa-lib; # Added 2021-06-09 alsaOss = alsa-oss; # Added 2021-06-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 630c6f6e00d..270a981fa19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9926,8 +9926,6 @@ with pkgs; relic = callPackage ../development/tools/relic { }; - alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { }; - remind = callPackage ../tools/misc/remind { }; remmina = callPackage ../applications/networking/remote/remmina { }; -- cgit 1.4.1 From d82e1663c7e4d3beea77d3d98ba8defa2f937caa Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 17 Jun 2022 21:31:55 +0100 Subject: fpm2: push 'with lib' down from top level to 'meta' definition --- pkgs/tools/security/fpm2/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index cddae6aca23..15d5a5adcff 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -2,8 +2,6 @@ , libxml2, intltool, nettle }: -with lib; - stdenv.mkDerivation rec { pname = "fpm2"; version = "0.90"; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnupg gtk3 libxml2 intltool nettle ]; - meta = { + meta = with lib; { description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; homepage = "https://als.regnet.cz/fpm2/"; license = licenses.gpl2; -- cgit 1.4.1 From a6037ef47dd0945f066a2e12d59cda329fca133d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jun 2022 23:01:51 +0100 Subject: openiscsi: 2.1.4 -> 2.1.7 changelog: https://github.com/open-iscsi/open-iscsi/blob/master/Changelog --- pkgs/os-specific/linux/open-iscsi/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index a4f6565f0c7..ebeb3516f24 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.4"; + version = "2.1.7"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "sha256-HnvLLwxOnu7Oiige6A6zk9NmAI2ImcILp9eCfbdGiyI="; + sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw="; }; DESTDIR = "$(out)"; @@ -23,8 +23,17 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's|/usr|/|' Makefile + + # Remove blanket -Werror. Fails for minor error on gcc-11. + substituteInPlace usr/Makefile --replace ' -Werror ' ' ' ''; + # avoid /usr/bin/install + makeFlags = [ + "INSTALL=install" + "SED=sed" + ]; + installFlags = [ "install" "install_systemd" -- cgit 1.4.1 From e449ba23baeb934a645fa1b791e704c0db0fc9db Mon Sep 17 00:00:00 2001 From: jacobtolar Date: Fri, 17 Jun 2022 16:32:30 -0500 Subject: groovy: 3.0.7 -> 3.0.11 --- pkgs/development/interpreters/groovy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 9d2b9a8f038..e4c8c607544 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.7"; + version = "3.0.11"; src = fetchurl { - url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr"; + url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; + sha256 = "85abb44e81f94d794230cf5c2c7f1003e598a5f8a6ae04322f28c6f9efe395f6"; }; nativeBuildInputs = [ makeWrapper unzip ]; -- cgit 1.4.1 From eb6cce7d6f0e981a9b6187fc8ff07a43e0770307 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 17 Jun 2022 22:55:24 +0100 Subject: treewide/misc: add sourceType binaryNativeCode for more packages --- pkgs/misc/cups/drivers/brgenml1lpr/default.nix | 1 + pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix | 2 ++ pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix | 2 ++ pkgs/misc/cups/drivers/canon/default.nix | 1 + pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix | 4 ++++ pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix | 4 ++++ pkgs/misc/cups/drivers/fxlinuxprint/default.nix | 1 + pkgs/misc/cups/drivers/hl1110/default.nix | 1 + pkgs/misc/cups/drivers/hl1210w/default.nix | 1 + pkgs/misc/cups/drivers/hl3140cw/default.nix | 1 + pkgs/misc/cups/drivers/hll2340dw/default.nix | 1 + pkgs/misc/cups/drivers/hll2350dw/default.nix | 1 + pkgs/misc/cups/drivers/hll2390dw-cups/default.nix | 1 + pkgs/misc/cups/drivers/kyocera/default.nix | 1 + pkgs/misc/cups/drivers/kyodialog3/default.nix | 1 + pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix | 1 + pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix | 1 + pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix | 1 + pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix | 1 + pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix | 1 + pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix | 1 + pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix | 1 + pkgs/misc/cups/drivers/mfcl2750dw/default.nix | 1 + pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix | 1 + pkgs/misc/cups/drivers/samsung/1.00.36/default.nix | 1 + pkgs/misc/cups/drivers/samsung/1.00.37.nix | 1 + pkgs/misc/cups/drivers/samsung/4.01.17.nix | 1 + pkgs/misc/drivers/epson-alc1100/default.nix | 1 + pkgs/misc/drivers/pantum-driver/default.nix | 1 + pkgs/misc/drivers/pentablet-driver/default.nix | 1 + pkgs/misc/drivers/sundtek/default.nix | 1 + 31 files changed, 39 insertions(+) (limited to 'pkgs') diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 4fb2995ee3b..1e838db9326 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 LPR driver"; homepage = "http://www.brother.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.linux; license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix b/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix index 0ecbbd8b55e..ddae34eaec8 100644 --- a/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix @@ -58,6 +58,7 @@ rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother ${model} printer driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_eu&os=128"; @@ -90,6 +91,7 @@ rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother ${model} printer CUPS wrapper driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_eu&os=128"; diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index 10ed4368ce2..828b4bb831b 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -48,6 +48,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.steveej ]; @@ -80,6 +81,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.steveej ]; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index e313b3a6ec2..f20f3104911 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -209,6 +209,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CUPS Linux drivers for Canon printers"; homepage = "http://www.canon.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ # please consider maintaining if you are updating this package diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index d5ccc857e8d..2b7e416eafe 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -103,6 +103,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)"; homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ jerith666 ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 2bd79691461..d632ed12d89 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -145,6 +145,10 @@ in stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series"; homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ chpatrick ]; diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index 36134780e9b..a5091c525d4 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { DocuPrint 3205 d/3208 d/3505 d/3508 d/4405 d/4408 d ''; homepage = "https://onlinesupport.fujixerox.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 75bf9236505..07143b0991f 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.brother.com/"; description = "Brother HL1110 printer driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1"; diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix index abdc5b061ac..c8cd6e95651 100644 --- a/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.brother.com/"; description = "Brother HL1210W printer driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = lib.platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128"; diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix index 2f90f83da1f..2eceb64d366 100644 --- a/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.brother.com/"; description = "Brother hl3140cw printer driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = lib.platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128"; diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index 5704cb6ccda..74f3c3819ae 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother hl-l2340dw printer driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=es&prod=hll2340dw_us_eu_as&os=128&flang=English"; diff --git a/pkgs/misc/cups/drivers/hll2350dw/default.nix b/pkgs/misc/cups/drivers/hll2350dw/default.nix index 3fd0c0fbac0..f018c8b6454 100644 --- a/pkgs/misc/cups/drivers/hll2350dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2350dw/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother HL-L2350DW printer driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.map (arch: "${arch}-linux") arches; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2350dw_us_eu_as&os=128"; diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 04087c765e6..bd9974d5b64 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother HL-L2390DW combined print driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128"; diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index cd4c049e67f..28b2a128176 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation { meta = with lib; { description = "CUPS drivers for several Kyocera FS-{1020,1025,1040,1060,1120,1125} printers"; homepage = "https://www.kyoceradocumentsolutions.ru/index/service_support/download_center.false.driver.FS1040._.EN.html#"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.vanzef ]; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix index 5a17f88a725..7eeae6daa53 100644 --- a/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CUPS drivers for several Kyocera printers"; homepage = "https://www.kyoceradocumentsolutions.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.steveej ]; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix index 0542b2ab303..c38b5261865 100644 --- a/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Brother MFC-9140CDN CUPS wrapper driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix b/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix index 4128123d643..ab20016c7ff 100644 --- a/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Brother MFC-9140CDN LPR printer driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ hexa ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index fdc88a36d29..28be1b580a4 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW LPR driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 741abc74f26..0af79443ef6 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { description = "Brother MFC-J6510DW LPR driver"; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; homepage = "http://www.brother.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; unfree; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 4b60f548aad..7e0c95582f5 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN LPR driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.tv ]; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index fabcee4dc02..36600a4505a 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW lpr driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.xeji ]; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index dc25dbb5a25..9c4dfa2f997 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW lpr driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.Enzime ]; diff --git a/pkgs/misc/cups/drivers/mfcl2750dw/default.nix b/pkgs/misc/cups/drivers/mfcl2750dw/default.nix index f51a5e74666..73753b0dea0 100644 --- a/pkgs/misc/cups/drivers/mfcl2750dw/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2750dw/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother MFC-L2750DW printer driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.map (arch: "${arch}-linux") arches; maintainers = [ maintainers.lovesegfault ]; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index ee9e8a07baa..4bb07cbfcad 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW LPR printer driver"; homepage = "http://www.brother.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.fuzzy-id ]; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 2ea0e253853..564a590e0e0 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -106,6 +106,7 @@ in stdenv.mkDerivation rec { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 9fb26f62d76..0aab52eac5d 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -89,6 +89,7 @@ in stdenv.mkDerivation rec { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 2591cf73566..12cfcde82f7 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -75,6 +75,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ joko ]; diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index 641d68d3947..f39fb0ad170 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -63,6 +63,7 @@ in }; ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ mit eapl ]; maintainers = [ maintainers.eperuffo ]; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/pantum-driver/default.nix b/pkgs/misc/drivers/pantum-driver/default.nix index 1677dbca6fa..fdb54c53fdf 100644 --- a/pkgs/misc/drivers/pantum-driver/default.nix +++ b/pkgs/misc/drivers/pantum-driver/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Pantum universal driver"; homepage = "https://global.pantum.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix index 91564f2db89..a06ae85fb3b 100644 --- a/pkgs/misc/drivers/pentablet-driver/default.nix +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -31,6 +31,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.xp-pen.com/download-46.html"; description = "Driver for XP-PEN Pentablet drawing tablets"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ivar ]; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index d81a278ec13..da2852e70d5 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -45,6 +45,7 @@ in meta = { description = "Sundtek MediaTV driver"; maintainers = [ maintainers.simonvandel ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = platforms.unix; license = licenses.unfree; homepage = "https://support.sundtek.com/index.php/topic,1573.0.html"; -- cgit 1.4.1 From 6e73e6e66883bd9dbb22d0829881c4eeb72e48d0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 17 Jun 2022 19:44:04 -0300 Subject: tinyalsa: init at 2.0.0 --- pkgs/os-specific/linux/tinyalsa/default.nix | 37 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/os-specific/linux/tinyalsa/default.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/tinyalsa/default.nix b/pkgs/os-specific/linux/tinyalsa/default.nix new file mode 100644 index 00000000000..789bf5b5235 --- /dev/null +++ b/pkgs/os-specific/linux/tinyalsa/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tinyalsa"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "tinyalsa"; + repo = "tinyalsa"; + rev = "v${version}"; + hash = "sha256-WFJbew6ApB9InKN1SyRkbVoFlBCFm5uYzazdtsaHM90="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DTINYALSA_USES_PLUGINS=ON" + ]; + + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=stringop-truncation" + ]; + + meta = with lib; { + homepage = "https://github.com/tinyalsa/tinyalsa"; + description = "Tiny library to interface with ALSA in the Linux kernel"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dba7006d611..76d16b9519d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22916,6 +22916,8 @@ with pkgs; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; + tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; -- cgit 1.4.1 From 8d07ad4db407536532e6d30936a20125e0eb5a9d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 17 Jun 2022 22:29:11 -0300 Subject: tinyalsa: 2.0.0 -> unstable-2022-06-05 --- pkgs/os-specific/linux/tinyalsa/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/tinyalsa/default.nix b/pkgs/os-specific/linux/tinyalsa/default.nix index 789bf5b5235..45d9191eea0 100644 --- a/pkgs/os-specific/linux/tinyalsa/default.nix +++ b/pkgs/os-specific/linux/tinyalsa/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tinyalsa"; - version = "2.0.0"; + version = "unstable-2022-06-05"; src = fetchFromGitHub { owner = "tinyalsa"; repo = "tinyalsa"; - rev = "v${version}"; - hash = "sha256-WFJbew6ApB9InKN1SyRkbVoFlBCFm5uYzazdtsaHM90="; + rev = "3d70d227e7dfd1be6f8f420a5aae164a2b4126e0"; + hash = "sha256-RHeF3VShy+LYFtJK+AEU7swIr5/rnpg2fdllnH9cFCk="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=stringop-truncation" + "-Wno-error=sign-compare" ]; meta = with lib; { -- cgit 1.4.1 From 64e09fac3d6b74da210f6b09aeb947f9ba2e8f16 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 1 Jun 2022 22:06:26 +0200 Subject: ruby: enable O3 optimization --- pkgs/development/interpreters/ruby/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d30a2d2073e..e8545478560 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -137,6 +137,10 @@ let (lib.enableFeature docSupport "install-doc") (lib.withFeature jemallocSupport "jemalloc") (lib.withFeatureAs docSupport "ridir" "${placeholder "devdoc"}/share/ri") + # ruby enables -O3 for gcc, however our compiler hardening wrapper + # overrides that by enabling `-O2` which is the minimum optimization + # needed for `_FORTIFY_SOURCE`. + ] ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3" ++ [ ] ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed -- cgit 1.4.1 From 4f16be72cb1ba70c4fbabdc70167e44c8e9920b8 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sat, 18 Jun 2022 07:16:34 +0200 Subject: Revert "ruby: enable O3 optimization" This reverts commit 64e09fac3d6b74da210f6b09aeb947f9ba2e8f16. This commit should go to staging first. --- pkgs/development/interpreters/ruby/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4381e6b6ddd..07349cf4f91 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -137,10 +137,6 @@ let (lib.enableFeature docSupport "install-doc") (lib.withFeature jemallocSupport "jemalloc") (lib.withFeatureAs docSupport "ridir" "${placeholder "devdoc"}/share/ri") - # ruby enables -O3 for gcc, however our compiler hardening wrapper - # overrides that by enabling `-O2` which is the minimum optimization - # needed for `_FORTIFY_SOURCE`. - ] ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3" ++ [ ] ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed -- cgit 1.4.1