diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-29 06:01:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-29 06:01:19 +0000 |
commit | 142c7437748feff1d4d0217a17f6273c3b162fef (patch) | |
tree | ff78cbc99e2bf1c2d106466c4b93b215771f0834 /pkgs | |
parent | fd1a75abbf76dc192c23c30ecc3de66c1bb84cec (diff) | |
parent | 222f94ac3f062308f9b508be6eaa3f6fc36b200b (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs')
52 files changed, 544 insertions, 274 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index dd3ba17e63340..178b637978353 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -93,6 +93,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ebruck/radiotray-ng"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e2ff4cc727088..ccadd0e182bf1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -350,6 +350,28 @@ let }; }; + dart-code.flutter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "flutter"; + publisher = "dart-code"; + version = "3.50.0"; + sha256 = "sha256-2Mi0BWXfO73BBIZIRJMaQyml+jXBI9d7By+vx9Rg+pE="; + }; + + meta.license = lib.licenses.mit; + }; + + dart-code.dart-code = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dart-code"; + publisher = "dart-code"; + version = "3.50.0"; + sha256 = "sha256-vdECvW4BfuT3H6GD2cH7lVW0f5591pKjXsWyJzzpHYA="; + }; + + meta.license = lib.licenses.mit; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; @@ -2152,6 +2174,17 @@ let }; }; + rebornix.ruby = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ruby"; + publisher = "rebornix"; + version = "0.28.1"; + sha256 = "sha256-HAUdv+2T+neJ5aCGiQ37pCO6x6r57HIUnLm4apg9L50="; + }; + + meta.license = lib.licenses.mit; + }; + richie5um2.snake-trail = buildVscodeMarketplaceExtension { mktplcRef = { name = "snake-trail"; @@ -2876,6 +2909,17 @@ let WakaTime.vscode-wakatime = callPackage ./wakatime { }; + wingrunr21.vscode-ruby = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-ruby"; + publisher = "wingrunr21"; + version = "0.28.0"; + sha256 = "sha256-H3f1+c31x+lgCzhgTb0uLg9Bdn3pZyJGPPwfpCYrS70="; + }; + + meta.license = lib.licenses.mit; + }; + wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { name = "jinja"; diff --git a/pkgs/applications/emulators/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix index 8b7cc9fad0674..3bfbf08c185cf 100644 --- a/pkgs/applications/emulators/bochs/default.nix +++ b/pkgs/applications/emulators/bochs/default.nix @@ -1,21 +1,26 @@ { lib , stdenv , fetchurl -, SDL2 -, curl , docbook_xml_dtd_45 , docbook_xsl -, gtk2 +, libtool +, pkg-config +, curl +, readline +, wget +, libobjc +, enableX11 ? !stdenv.isDarwin , libGL , libGLU , libX11 , libXpm -, libtool +, enableSdl2 ? true +, SDL2 +, enableTerm ? true , ncurses -, pkg-config -, readline -, wget +, enableWx ? !stdenv.isDarwin , wxGTK +, gtk3 }: stdenv.mkDerivation (finalAttrs: { @@ -35,23 +40,26 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - SDL2 curl - gtk2 + readline + wget + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ] ++ lib.optionals enableX11 [ libGL libGLU libX11 libXpm + ] ++ lib.optionals enableSdl2 [ + SDL2 + ] ++ lib.optionals enableTerm [ ncurses - readline - wget + ] ++ lib.optionals enableWx [ wxGTK + gtk3 ]; configureFlags = [ - "--with-x=yes" - "--with-x11=yes" - "--with-rfb=no" "--with-vncsrv=no" "--with-nogui" @@ -84,8 +92,6 @@ stdenv.mkDerivation (finalAttrs: { "--enable-cpu-level=6" # from 3 to 6 "--enable-debugger" #conflicts with gdb-stub option "--enable-debugger-gui" - "--enable-e1000" - "--enable-es1370" "--enable-evex" "--enable-fpu" "--enable-gdb-stub=no" # conflicts with debugger option @@ -94,12 +100,8 @@ stdenv.mkDerivation (finalAttrs: { "--enable-iodebug" "--enable-large-ramfile" "--enable-largefile" - "--enable-ne2000" "--enable-pci" - "--enable-plugins=yes" - "--enable-pnic" "--enable-repeat-speedups" - "--enable-sb16" "--enable-show-ips" "--enable-smp" "--enable-vmx=2" @@ -112,11 +114,23 @@ stdenv.mkDerivation (finalAttrs: { "--enable-voodoo" "--enable-x86-64" "--enable-x86-debugger" - ] - # Boolean flags - ++ lib.optionals (SDL2 != null) [ "--with-sdl2" ] - ++ lib.optionals (ncurses != null) [ "--with-term" ] - ++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ + "--enable-e1000" + "--enable-es1370" + "--enable-ne2000" + "--enable-plugins" + "--enable-pnic" + "--enable-sb16" + ] ++ lib.optionals enableX11 [ + "--with-x" + "--with-x11" + ] ++ lib.optionals enableSdl2 [ + "--with-sdl2" + ] ++ lib.optionals enableTerm [ + "--with-term" + ] ++ lib.optionals enableWx [ + "--with-wx" + ]; enableParallelBuilding = true; @@ -131,7 +145,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; }) # TODO: a better way to organize the options diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index ee6403271ce5c..ca1639f811edd 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "batik"; - version = "1.15"; + version = "1.16"; src = fetchurl { url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; - sha256 = "sha256-NYo7+8DikUmDsioM1Q1YW1s3KwsQeTnwIKDr+RHxxyo="; + sha256 = "sha256-Y4bJ6X46sKx1+fmNkOS2RU7gn7n0fKDnkOYMq0S8fYM="; }; meta = with lib; { diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 39c1aba35627c..b92110f99d98f 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.20.1"; + version = "1.21.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-CA0C3yERT6r33GdtCZ7UZheEhDL4uzjAvcuhZeZQLvg="; + sha256 = "sha256-TahXPbZy7eoSJ/U2wL6GaMM8F6zypf7EU91JVWlevQg="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index d57f2270daf18..2340f6a5f4f5c 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.104.3"; + version = "0.105.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bGyU0i/wwFprAoLENrmBY2IxLjwyX4pQ9z4LFIUguI4="; + sha256 = "sha256-qKcybKgdNkn3AhDVwl1vCYt0HoQimz8qi+O95jKaW8Q="; }; - vendorSha256 = "sha256-is1dQJwvhygn95rbeHeGI97vDXo8ftnNqug4eERN3gI="; + vendorSha256 = "sha256-M74pfS7bmSrXhUvQ3hDokBPNLYxJslc9UGR3Bhp2BBQ="; doCheck = false; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index e9ba7b2a8f31e..3682325cafff6 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -1,24 +1,68 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, which +, zip +, wxGTK +, gtk3 +, sfml +, fluidsynth +, curl +, freeimage +, ftgl +, glew +, lua +, mpg123 +}: stdenv.mkDerivation rec { pname = "slade"; - version = "3.1.1.5"; + version = "3.2.1"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6"; + sha256 = "sha256-KFRX3sfI//Op/h/EfEuAZOY22RO5qNXmvhSksC0aS4U="; }; - nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' + sed -i '/-msse/d' src/CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + which + zip + ]; + + buildInputs = [ + wxGTK + gtk3 + sfml + fluidsynth + curl + freeimage + ftgl + glew + lua + mpg123 + ]; + + cmakeFlags = [ + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + ]; + + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; - license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 124ae206c8ce6..d336d460d7c57 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -3,43 +3,66 @@ , fetchFromGitHub , cmake , pkg-config +, which +, zip , wxGTK +, gtk3 , sfml , fluidsynth , curl , freeimage , ftgl , glew -, zip , lua -, fmt , mpg123 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "slade"; - version = "unstable-2021-05-13"; + version = "unstable-2022-08-15"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "d2e249c89062a44c912a9b86951526edc8735ba0"; - sha256 = "08dsvx7m7c97jm8fxzivmi1fr47hj53y0lv57clqc35bh2gi62dg"; + rev = "1a0d25eec54f9ca2eb3667676d93fb0b6b6aea26"; + sha256 = "sha256-mtaJr4HJbp2UnzwaLq12V69DqPYDmSNqMGiuPpMlznI="; }; + postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' + sed -i '/-msse/d' src/CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + which + zip + ]; + + buildInputs = [ + wxGTK + gtk3 + sfml + fluidsynth + curl + freeimage + ftgl + glew + lua + mpg123 + ]; + cmakeFlags = [ - "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" - "-DWX_GTK3=OFF" - "-DNO_WEBVIEW=1" + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" ]; - nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ]; + + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ ertes ]; }; } diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 4c8fab8582ed8..587b61d3af939 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iaaf5ZHaHSEkQdxqZtsc6K/3+x6gAfvgQoWWYWcFeV4="; + sha256 = "sha256-262tnSKX6M9ggm4JIs0pANeq2JSNYzKkTN8awpqLyMM="; }; - vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; + vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4="; ldflags = [ "-s -w" diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 2473129bc6dc2..0b76fb278d98b 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -1,13 +1,24 @@ -{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: - +{ stdenv +, lib +, fetchFromSourcehut +, pkg-config +, meson +, ninja +, wayland +, gtk3 +, wrapGAppsHook +, installShellFiles +}: stdenv.mkDerivation rec { pname = "wofi"; version = "1.3"; - src = fetchhg { - url = "https://hg.sr.ht/~scoopta/wofi"; + src = fetchFromSourcehut { + repo = pname; + owner = "~scoopta"; rev = "v${version}"; sha256 = "sha256-GxMjEXBPQniD+Yc9QZjd8TH4ILJAX5dNzrjxDawhy8w="; + vc = "hg"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index d092a910912a3..a7a8e1321ca40 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,29 +1,84 @@ -{ lib, stdenv, fetchFromGitHub, wrapGAppsHook -, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkg-config -, libICE, libSM, libXScrnSaver, libXtst, cheetah -, gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo -, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base -, gst-plugins-good, libsigcxx }: +{ lib +, stdenv +, fetchFromGitHub +, wrapGAppsHook +, autoconf +, autoconf-archive +, automake +, gettext +, intltool +, libtool +, pkg-config +, libICE +, libSM +, libXScrnSaver +, libXtst +, gobject-introspection +, glib +, glibmm +, gtkmm3 +, atk +, pango +, pangomm +, cairo +, cairomm +, dbus +, dbus-glib +, gdome2 +, gstreamer +, gst-plugins-base +, gst-plugins-good +, libsigcxx +, boost +, jinja2 +}: stdenv.mkDerivation rec { pname = "workrave"; - version = "1.10.31"; + version = "1.10.50"; src = fetchFromGitHub { - sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p"; - rev = with lib; - "v" + concatStringsSep "_" (splitVersion version); repo = "workrave"; owner = "rcaelers"; + rev = with lib; + "v" + concatStringsSep "_" (splitVersion version); + sha256 = "sha256-fSUfgk0PmiteVQis+0NmMMZXBe/377X2k9oS2yp2Qzo="; }; nativeBuildInputs = [ - autoconf autoconf-archive automake gettext intltool libtool pkg-config wrapGAppsHook + autoconf + autoconf-archive + automake + gettext + intltool + libtool + pkg-config + wrapGAppsHook + jinja2 ]; + buildInputs = [ - libICE libSM libXScrnSaver libXtst cheetah - gobject-introspection glib glibmm gtkmm3 atk pango pangomm cairo cairomm - dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx + libICE + libSM + libXScrnSaver + libXtst + gobject-introspection + glib + glibmm + gtkmm3 + atk + pango + pangomm + cairo + cairomm + dbus + dbus-glib + gdome2 + gstreamer + gst-plugins-base + gst-plugins-good + libsigcxx + boost ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index b60a88da5c23e..204465bba08db 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.47"; + version = "0.8.48"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-vKP/bexxXbhyJEa6ojLFw7ebDS+NYsZgq2jKtimbE3A="; + sha256 = "sha256-3yYbuVx2dZsMefFFNVGivAR4wwXJwsr9XqGiyUKNAMo="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-TUaCqHbPEwhB2xS8RSoF7RCSkKFJzQKbuV1PbxApyMQ="; + vendorSha256 = "sha256-Kr6m1qhVTiXllm5xaxXKsWAtWbnsDwbwWH0iqc0sKfM="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index d7d439da73362..7b04b085a20d7 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kluctl"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-NwjPClD3P9EP7gKPPgKXI3h+kLeGPd7Gf6gZXMCCLHk="; + hash = "sha256-rcwtVhtLc49rD6J3AZFumLQrZuTveE7OY+agufe/4MQ="; }; vendorHash = "sha256-IC+sjctDqd0lQD5labl+UYWsRiptQKSjSHYf2SGkp14="; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 14b97a0b7adbf..53d4dc4261ef7 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -1,33 +1,73 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gettext +, git +, makeWrapper +, lsb-release +, pkg-config +, wrapGAppsHook +, curl +, sqlite +, wxGTK +, gtk3 +, libobjc +}: stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.3.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ="; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-ADhTz6OMntgDg3TcAlf3lGBFb+fdZ0Lw7+UYYY1RD8M="; }; + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace src/platfdep_mac.mm \ + --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" + ''; + nativeBuildInputs = [ + cmake + gettext + git + makeWrapper + pkg-config wrapGAppsHook + ] ++ lib.optionals stdenv.isLinux [ + lsb-release ]; buildInputs = [ - gettext + curl sqlite - wxGTK30 - wxGTK30.gtk + wxGTK + gtk3 + ] ++ lib.optionals stdenv.isDarwin [ + libobjc ]; + NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-old-style-cast" + ]); + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/mmex.app $out/Applications + makeWrapper $out/{Applications/mmex.app/Contents/MacOS,bin}/mmex + ''; + meta = { description = "Easy-to-use personal finance software"; homepage = "https://www.moneymanagerex.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; - broken = true; # at 2022-11-23 + maintainers = with lib.maintainers; [ viric ]; + platforms = with lib.platforms; unix; + mainProgram = "mmex"; }; } diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/applications/virtualization/flintlock/default.nix index 6c44b019a1c9d..982530dad7496 100644 --- a/pkgs/applications/virtualization/flintlock/default.nix +++ b/pkgs/applications/virtualization/flintlock/default.nix @@ -10,16 +10,16 @@ buildGoModule rec{ pname = "flintlock"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flintlock"; rev = "v${version}"; - sha256 = "sha256-zVsI8443/4joOhhuqhrUGsIW6iFvetW9BhHqASL+XUk="; + sha256 = "sha256-kHrVpQ4E8b1YV+ofZwd4iGJ9ucVUUam6rxdpOGmvRR4="; }; - vendorSha256 = "sha256-PPda8/9WSiWQYyJJQhWo94g8LqGEEwx2u2j2wfqpOv0="; + vendorSha256 = "sha256-A3LrikB2KrnSI+OREiLmlkTFpRKQWRB8w4OJ6ApX7oY="; subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; @@ -41,7 +41,7 @@ buildGoModule rec{ meta = with lib; { description = "Create and manage the lifecycle of MicroVMs backed by containerd"; - homepage = "https://github.com/weaveworks/flintlock"; + homepage = "https://github.com/weaveworks-liquidmetal/flintlock"; license = licenses.mpl20; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ techknowlogick ]; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 79a642c3ccf78..51733a08f4de8 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.10.5"; + version = "0.11.5"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z1xmBoRdOTMB9NHGWKQyweT0/PyjGHiK+yj5uKjZPtE="; + sha256 = "sha256-QLF49k8f8YYwPl26pyz9/bbO4IO0KqSlgTFNjbvPf7k="; }; - cargoSha256 = "sha256-jLO1UPfu0vN2NCvvGBnUY1UPV1F+0fYlrtsM/AE39tU="; + cargoSha256 = "sha256-u0L3NJ4ku5ETBx6PKgVStrcSCX4I7E6GNtW+iv3yy2g="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index ed17dfc9054c8..91ecfd2910014 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,11 +1,11 @@ { lib, fetchgit }: let - version = "2017-03-30"; + version = "2.010"; in (fetchgit { name = "go-font-${version}"; url = "https://go.googlesource.com/image"; - rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc"; + rev = "41969df76e82aeec85fa3821b1e24955ea993001"; postFetch = '' mv $out/* . @@ -15,11 +15,12 @@ in (fetchgit { mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE ''; - sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz"; + sha256 = "dteUL/4ZUq3ybL6HaLYqu2Tslx3q8VvELIY3tVC+ODo="; }) // { meta = with lib; { homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; + changelog = "https://go.googlesource.com/image/+log/refs/heads/master/font/gofont"; license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; platforms = lib.platforms.all; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 0fb18de59f232..388059f2fc40a 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,37 +1,30 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch -, testers -}: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, testers, go-jsonnet }: -let self = buildGoModule rec { +buildGoModule rec { pname = "go-jsonnet"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU="; + hash = "sha256-FgQYnas0qkIedRAA8ApZXLzEylg6PS6+8zzl7j+yOeI="; }; + vendorSha256 = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; + patches = [ + # See https://github.com/google/go-jsonnet/issues/653. (fetchpatch { - name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch"; - url = "https://github.com/google/go-jsonnet/commit/7032dd729f7e684dcfb2574f4fe99499165ef9cb.patch"; - hash = "sha256-emUcuE9Q4qkXFXLyLvLHjzrKAaQhjcSWLNafABvHxhM="; + url = "https://github.com/google/go-jsonnet/commit/5712f2ed2c8dfa685e4f1234eefc7690a580af6f.patch"; + hash = "sha256-/+6BlAaul4FoD7pq7yAy1xG78apEBuH2LC4fsfbugFQ="; }) ]; - vendorHash = "sha256-H4vLVXpuPkECB15LHoS9N9IwUD7Fzccshwbo5hjeXXc="; - - doCheck = false; - subPackages = [ "cmd/jsonnet*" ]; passthru.tests.version = testers.testVersion { - package = self; + package = go-jsonnet; version = "v${version}"; }; @@ -42,5 +35,4 @@ let self = buildGoModule rec { maintainers = with maintainers; [ nshalman aaronjheng ]; mainProgram = "jsonnet"; }; -}; -in self +} diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index bb7d7a7a131c8..7f413877a5935 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -23,13 +23,13 @@ let # Uses scheme to bootstrap the build of idris2 in stdenv.mkDerivation rec { pname = "idris2"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "sha256-6CTn8o5geWSesXO7vTrrV/2EOQ3f+nPQ2M5cem13ZSY="; + sha256 = "sha256-80MAGM1IEtI09h5aCYfDL4PRrjGq2gT8OUEibOVk8H4="; }; strictDeps = true; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index fecd61bb6e51c..7ae728d90552c 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; + postPatch = '' + sed -i '/WX_CLEAR_ARRAY/s/$/;/' src/{createtable,sqlite3table}.cpp + ''; + buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa; makeFlags = [ @@ -22,7 +26,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.0.0" else "gtk2u_wxsqlite3-3.0"} |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile ''; installPhase = '' @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple SQLite database browser built with wxWidgets"; homepage = "https://github.com/guanlisheng/wxsqliteplus"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; }; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 4e4956bf8c8df..6fe65c907e50f 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.139"; + version = "0.6.146"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yqyqlH2aYtVBFa5sFUTh6Ra0l5bOYpHjx/c7wlyxQfg="; + sha256 = "sha256-XEWh74WQIHXrndUe8OfYub8foXDp7bMF4qKly6+/6yU="; }; vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw="; diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index 113bfeb514d28..e93b7251a25c0 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-re2"; - version = "0.2.20220601"; + version = "1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zBCYPcqgsyYKTNHAfHrcH6aWfbz6zJwajxHkwRjHeQU="; + hash = "sha256-IcitwpY2DeH/QmuqOMcS6tpiLChY0ZXrSH5BXZQZTpE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index e25cc3c85658a..4bc5acb5cc423 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.4.8"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-H6+4tlcAXZFgPzw639bZ6OrzP9xgFTf+8JKDMy7+Z8s="; + sha256 = "sha256-4CVWyOobOGljxLRk5GGK7hU8VBawerSBQlyBegMzI6I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index fa44939164109..4d26c2ebf3918 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pylhc"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-l9j+YJ5VNMzL6JW59kq0hQS7XIj53UxW5bNnfdURz/o="; + hash = "sha256-lb4awMQ7GE7m2N2yiCpJ976I2j8hE98/93zCX7Rp4qU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index 0a09bba986d78..d0c27c6385893 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -58,6 +58,7 @@ gem 'ffi-rzmq-core' gem 'fog-dnsimple' gem 'gdk_pixbuf2' gem 'gio2' +gem 'git' gem 'github-pages' gem 'gitlab-markup' gem 'glib2' diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 1341017df0564..6a1bd5396fdcd 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,31 +1,43 @@ -{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake -, pytest-runner, pytest, six, pyparsing, asn1ate }: +{ lib +, buildPythonApplication +, fetchFromGitLab +, makeWrapper +, cmake +, six +, pyparsing +, asn1ate +, colored +}: buildPythonApplication rec { pname = "asn2quickder"; - version = "1.3.0"; + version = "1.7.1"; - src = fetchFromGitHub { - sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr"; - rev = "version-${version}"; - owner = "vanrein"; + src = fetchFromGitLab { + owner = "arpa2"; repo = "quick-der"; + rev = "v${version}"; + sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; }; postPatch = '' patchShebangs ./python/scripts/* + + # Unpin pyparsing 3.0.0. Issue resolved in latest version. + substituteInPlace setup.py --replace 'pyparsing==3.0.0' 'pyparsing' ''; dontUseCmakeConfigure = true; nativeBuildInputs = [ makeWrapper cmake ]; - checkInputs = [ pytest-runner pytest ]; - propagatedBuildInputs = [ pyparsing asn1ate six ]; + propagatedBuildInputs = [ pyparsing asn1ate six colored ]; + + doCheck = false; # Flaky tests meta = with lib; { description = "An ASN.1 compiler with a backend for Quick DER"; - homepage = "https://github.com/vanrein/asn2quickder"; + homepage = "https://gitlab.com/arpa2/quick-der"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/development/tools/codeowners/default.nix index ad75aa888b5c5..2b17f00863b02 100644 --- a/pkgs/development/tools/codeowners/default.nix +++ b/pkgs/development/tools/codeowners/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "codeowners"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "hmarr"; repo = pname; rev = "v${version}"; - hash = "sha256-ttJLJtuZrY71eKcjoSLypGTUeXd2lAJlM10Ft9YEEKc="; + hash = "sha256-lklKZCDX/e3MZ0ix3A4AIEICPoufBq7SAIULqDXOYDI="; }; - vendorSha256 = "sha256-UMLM9grPSmx3nAh1/y7YhMWk12/JcT75/LQvjnLfCyE="; + vendorSha256 = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; meta = with lib; { description = "A CLI and Go library for Github's CODEOWNERS file"; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 6816ee3931a66..b120df52f590f 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-8G7Xy4bKBybw5waL/AqqYZ6FKBlnzp7b6PAwixydTEg="; + sha256 = "sha256-2Yu0EFMuAlG6/3YuDKQpiZU5/fBexWJtsrU1MNABSyA="; }; - vendorSha256 = "sha256-6/wbxQ+Cv0lOlBqi8NUQQ8Z21w27betfeX/NiNDpOjA="; + vendorSha256 = "sha256-ijUHMAcSDnZnhlzaYeD411L3ybRc08ac9jbvDDc2D4M="; tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 07191d0260842..5b08cafa308bb 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.8.0"; + version = "12.9.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TgfKsgRiSlPF3c2tdgr/1RTMZmN+9ME0BBdDrs0mPzo="; + sha256 = "sha256-bjmYGQBJ4YdeQR+rlnXxE5Z6QRoF2EONciLz2ka29ys="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 1291b5bb0aa6b..f7be92c2c6121 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.86"; + version = "0.0.88"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6PcP4QzHmsuV73i3ptO/sIhsa1+/NgSBd/WCOgOx5Uw="; + sha256 = "sha256-0G+a0sSWApTacX+cVEFDOvL9CUsT+q0rlnkvn0FrnTg="; }; - cargoSha256 = "sha256-owjGCZUduL7yAXE8BUD1Y4DdhQWsc8BwLa/rY8+VRuE="; + cargoSha256 = "sha256-dNiWxw+enwV1tlct75MSF/MmAPr1+HUNEO2Fxhqmgig="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index d6e006c0f377c..333a75fde2576 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-n+ZX/Qs5HUvwdFOZ15ziKkvHQN+CR2DwpK8F8ZApcmA="; + sha256 = "sha256-5/8ydKsYRsst4pwZgt7ST6Kzt+IeWnp46QNmh9jKwMI="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-YaI57BDQCUWYVuXfKaUgn3BCbADVa+NO16c53xLWPWQ="; + cargoSha256 = "sha256-DTNKQICmt8MufHg/kN1uuWTfKi0/GPrwUWQWyZD5kPM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 10a499da08310..55b5f0dda210b 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.2.1"; + version = "0.2.2"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "n1uucciInOrvdJfXwbkq820SmnCrDEZJzOgTtZ5StWc="; + sha256 = "IIy5ZEx/+StAhtRcGqM3uvvEqu4wGzGUls0K/ot4jRI="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "Of6UPU1xORGuUxd7tFgi1k+bT5uAHoO0CyB/AkLfUOY="; + sha256 = "5cScLXujNm14+SCr8OcO93RDL3EfAjsuAzfcwj+EMKs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "iXYwkjkmD4CJN3mAz5OZ6ZpuNS8ih4tZ/JgE56i5i3s="; + sha256 = "3PdLVz4qTJQHmM9laL413xnZaSuD6xlaSy8cuJ9M8us="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "vhpYilnl+7l/3YtRQQLU21EzCZIRpznwQH6kfjENjo0="; + sha256 = "eVEopSvyjzY8J3q52wowTlSVHZ4s1lIc8/yU6Ya+0QU="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index f1e1e2eeecb25..2901a70f28335 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.421"; + version = "0.0.424"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-5J+L4X/QbEQzVT3586Syxi8IsdC5zU3UHfhmMz74/mw="; + sha256 = "sha256-VipCiWSuC1SSJPWk9WXgcMd0G0C2TsUSQgW2GM9yAII="; }; vendorSha256 = "sha256-a0ZnZlKB/Uotrm4npXB1dd1+oWHRhJVW7ofMSKlqcvM="; diff --git a/pkgs/servers/atlassian/bamboo.nix b/pkgs/servers/atlassian/bamboo.nix index de474492229c1..ee87b9e644a8c 100644 --- a/pkgs/servers/atlassian/bamboo.nix +++ b/pkgs/servers/atlassian/bamboo.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "atlassian-bamboo"; - version = "8.1.4"; + version = "8.2.6"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-${version}.tar.gz"; - sha256 = "sha256-v30Q3yGKkpHQFitOcH764SE6KuCdUJWn50buY7pb/Ng="; + sha256 = "sha256-9TYTXSdGQ7qSqvF25Bn1l5N8NbKndcO8HiJSc4NUois="; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 8ea89293a3481..b52b0fb0220e3 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -15,11 +15,11 @@ in optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!" (stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.18.1"; + version = "7.19.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-MEq1ASnJUYWPvt7Z30+fUTv+QrDI+Xsb5e9K0c8ZtdQ="; + sha256 = "sha256-icfyxuS6chh3ibXZ0V9YYB0oCDd9o5rmcDC5Rbr0tOQ="; }; buildPhase = '' diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 3a499716a882a..0c2b44c63a90f 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mimir"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-2Gg2SYH2cqSKXePEfUAwW4AXpiMGso3FeGTmHRNxtaU="; + sha256 = "sha256-OpQxVp4Q2+r3Tqrqw3SrBsJDU5KJqChxsuYneT0PvYQ="; }; vendorSha256 = null; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 9280bfe566935..032d38843d4d0 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-epu/LV9sXF8P+W8suo9wccZ7zr/O6jK6US6RviEULYQ="; + sha256 = "sha256-yO6WaNZ1XUmCepNE/7USrJVCZ5i+a10WVOmQbAucBg8="; }; - vendorSha256 = "sha256-yVTAgG3j2zrPEFGAcV4LSihws9XUoYrZ81fp/MYv8Eo="; + vendorSha256 = "sha256-ASLy0rPuCSYGyy5Pw9fj559nxO4vPPagDKAe8wM29lo="; doCheck = false; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 678540c4195ce..fabbac5e7f5c6 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -2,11 +2,11 @@ , dataPath ? "/var/lib/snappymail" }: stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.19.2"; + version = "2.19.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-nIv70cS+7euRvtarI6DeXNst8a0rLVClYQ7CJubQUBU="; + sha256 = "sha256-XjnNBK/w9aPfG11fVcESIMy1UFAI1j/iAKz1GvZzfq4="; }; sourceRoot = "snappymail"; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index fa4ec15b81606..6dbd8606485a7 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libX11 }: -stdenv.mkDerivation { - version = "2019-05-09"; +stdenv.mkDerivation rec { + version = "1.0"; pname = "xcwd"; src = fetchFromGitHub { owner = "schischi"; repo = "xcwd"; - rev = "99738e1176acf3f39c2e709236c3fd87b806f2ed"; - sha256 = "1wvhj5x8ysi1q73f9cw1f6znvp2zivd8pp6z1p3znw732h4zlv6v"; + rev = "v${version}"; + sha256 = "sha256-M6/1H6hI50Cvx40RTKzZXoUui0FGZfwe1IwdaxMJIQo="; }; buildInputs = [ libX11 ]; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index db6740838484a..4360a3c012665 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-ki00uIGStRRGEG2cEGPJWgt4Vc3pEIpCr37g0SMPc9o="; + sha256 = "sha256-6SUlkjFc8SakphN6iz+yoFVXqCisfBonlKuot7E2p3E="; }; vendorSha256 = "sha256-ObS/100Tfq4rhOrwU+PPBzDwY3tKwH+Z0wm0bX0W8cE="; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 80947ee06ae1a..5c0059881763e 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.9.4"; + version = "0.10.1"; src = fetchCrate { inherit pname version; - sha256 = "0yvjzmz2vqc63l8911jflqf5aww7wxsav2yal5wg9ci9hzq6dl7j"; + sha256 = "sha256-gC4/oQpK9m6/p1DY2Kabk5l7vsS9iafW3E5dgO723B8="; }; outputs = [ "out" "vim" ]; - cargoSha256 = "1jk2vcm2z6r1xd6md98jzpcy7kdwp5p2fzxvvaz9qscyfnx28x17"; + cargoSha256 = "sha256-aNEfKHpNWDHebioUkEq6D0aL3Jf9NQXBuoWvpB7uO5U="; postPatch = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 682cb3a554077..fc5e675ec9aa4 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DH+MOMsDdW+GGrxhkXhC+5D+2IsAZwByd0FjNT+i+og="; + sha256 = "sha256-ybcc1k0XSX+ZiG7Z1Bwai1RCypZfrHqhi3uJNhJYILo="; }; - vendorSha256 = "sha256-5ljUbEvynNo1AxGpJq9B0bTFgzVfgVZbsqXcPBERLMI="; + vendorSha256 = "sha256-ZwBSptOsFcxz+xBpjrsvnLvky8kSN4uFx1fXcdDwAmk="; doCheck = false; diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/tools/security/kdigger/default.nix index 1b97147f7ce2d..13bef69e6d33f 100644 --- a/pkgs/tools/security/kdigger/default.nix +++ b/pkgs/tools/security/kdigger/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kdigger"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "quarkslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/KkqwjFxTipa5dCVRFlrKzl+PB4QB4aY0wjlsi1Phug="; + sha256 = "sha256-/F1wmP1hfhrAmx2jJtAn02LkTabi0RJu36T/oW3tyZw="; # 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; diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix index 9a3e2df02b1de..27c1b7fd063cd 100644 --- a/pkgs/tools/security/kubesec/default.nix +++ b/pkgs/tools/security/kubesec/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "kubesec"; - version = "2.11.5"; + version = "2.12.0"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SxXYtIoyKe9/M3Ct1qy2QC6pYpt9GOefGsC5nUCoTEA="; + sha256 = "sha256-0irZ3mCpXDWc/RovTK9d7AT/Gfbyt1R4WjCJFZ5RFdg="; }; - vendorSha256 = "sha256-pq4s/Rqu1I1nrTxy5Cn1rt5HO6z7ziKz/9LLpXLYpPc="; + vendorSha256 = "sha256-sRIGehDuAjtpOAYYtqANua8LSzl/+WolZimMxlkG5X8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index b52836806a7fa..f1cd325ad15a3 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.23" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.24" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index a17363ce395f2..301c3acbb90d1 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 98564a6c45884e021349c5c6dc235c7ba0ba6f44 - ref: refs/tags/6.2.23 + revision: 1c805324f10bafa3a99fcd0315cc99ef83430b23 + ref: refs/tags/6.2.24 specs: - metasploit-framework (6.2.23) + metasploit-framework (6.2.24) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -129,23 +129,23 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.649.0) - aws-sdk-core (3.164.0) + aws-partitions (1.652.0) + aws-sdk-core (3.166.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.341.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-ec2 (1.343.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.71.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-iam (1.73.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.58.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.59.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.116.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.117.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.5.2) @@ -280,7 +280,7 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.1) - pdf-reader (2.10.0) + pdf-reader (2.11.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -436,4 +436,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.3.22 + 2.3.23 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 7f19e6d85943c..2ff0eb70831da 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.23"; + version = "6.2.24"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-DSLcGBKfw2/pSAV/6jF6xZlyIhPf7FDo14nz659F+qs="; + sha256 = "sha256-BU6R4/wCgXjxLcWrIGo5MSRD71SV3kEHWil8HIeHK0k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index bcfa86bf4a172..78630b3a15b36 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,60 +104,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00gd6ad006wm6aqpb9hql86cnggaiqkm8mhk6053w6vrszmlhi65"; + sha256 = "0jxv2az9l3q1nk4bif07yr7kc0wi9znihgdph6cf8z74lbbpl7kv"; type = "gem"; }; - version = "1.649.0"; + version = "1.652.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdla6mwsli6w09z85abkhdxhmjmjawmb3c71rqfgqnffqdl351w"; + sha256 = "1yj5975raq5abh6jfn66l1pkpb8rj2a032777jypy00k3yiq4yw2"; type = "gem"; }; - version = "3.164.0"; + version = "3.166.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198w8vxwqmrc1mqyklvfmz4yqwfp4f4v227vin70jq8pxqi0cyc6"; + sha256 = "0crzfd4g0ym8gnn989cbv6xdwzkkp8fdqn4y7aqahyh4vixq0zki"; type = "gem"; }; - version = "1.341.0"; + version = "1.343.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "109qqrxhwpjvv1gf94cf4dphbh38n91kq8l5xkcz058gkgfn5nlx"; + sha256 = "1lkjrgmk56p5aymkh4y070jxzgfnc3jz95fxxkcflhy7wkkkkza0"; type = "gem"; }; - version = "1.71.0"; + version = "1.73.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p2dbmb1vl8vk2xchrrsp2sxa95ya5w7ll1jlw89yyhls3l2l1ag"; + sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c"; type = "gem"; }; - version = "1.58.0"; + version = "1.59.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wm4k4i1rplddrm4pnr39biv1fikc5jg8l48z84knh05bxp8wvln"; + sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn"; type = "gem"; }; - version = "1.116.0"; + version = "1.117.1"; }; aws-sigv4 = { groups = ["default"]; @@ -604,12 +604,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "98564a6c45884e021349c5c6dc235c7ba0ba6f44"; - sha256 = "1azs8ngypww9szl51v6z2ci756f5g8qylzq593lnzhwz28cdq8hd"; + rev = "1c805324f10bafa3a99fcd0315cc99ef83430b23"; + sha256 = "0j9bhy3iqz19b83l3plmakpl691i75m21ay55pqpi082zkir2kh5"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.23"; + version = "6.2.24"; }; metasploit-model = { groups = ["default"]; @@ -897,10 +897,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07chhyxf3qlr65jngns3z5187ibfibf5h2q59505vx45dfr3lvwz"; + sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.0"; }; pg = { groups = ["default"]; diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix index bd547aa70b880..6af7e76dfd2af 100644 --- a/pkgs/tools/system/runitor/default.nix +++ b/pkgs/tools/system/runitor/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "runitor"; - version = "0.10.1"; + version = "1.0.0"; vendorSha256 = null; src = fetchFromGitHub { owner = "bdd"; repo = "runitor"; rev = "v${version}"; - sha256 = "sha256-qqfaA1WAHkuiyzyQbrSvnmwuRXElArErJ6PtLPOxzsg="; + sha256 = "sha256-6+U6Mh1XMdGaAmOrqUlVBX9d/GfOgXE22GwcLl0EfIU="; }; ldflags = [ diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index 32bce2d857e68..0f42441b7cd05 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "guest-agent"; - version = "20221018.00"; + version = "20221025.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-FIyMFf5ZwSo7qjCrRu5ZwA7I0eoozyglVXttaeBMhUY="; + sha256 = "sha256-LbpSRQgxAfgaO7UPJD5j/wrMjR383qjD5SD1cVTzWLs="; }; vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51ba03eec3ba2..0b7fe5628887e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1487,7 +1487,8 @@ with pkgs; basiliskii = callPackage ../applications/emulators/basiliskii { }; bochs = callPackage ../applications/emulators/bochs { - wxGTK = wxGTK30; + inherit (darwin) libobjc; + wxGTK = wxGTK32; }; box64 = callPackage ../applications/emulators/box64 { }; @@ -5933,11 +5934,15 @@ with pkgs; sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; slade = callPackage ../applications/misc/slade { - wxGTK = wxGTK30; + wxGTK = wxGTK32.override { + withWebKit = true; + }; }; sladeUnstable = callPackage ../applications/misc/slade/git.nix { - wxGTK = wxGTK30; + wxGTK = wxGTK32.override { + withWebKit = true; + }; }; drive = callPackage ../applications/networking/drive { }; @@ -12758,7 +12763,7 @@ with pkgs; hitch = callPackage ../servers/hitch { }; veracrypt = callPackage ../applications/misc/veracrypt { - wxGTK = wxGTK30; + wxGTK = wxGTK32; }; vlan = callPackage ../tools/networking/vlan { }; @@ -16118,7 +16123,7 @@ with pkgs; arpa2common = callPackage ../development/libraries/arpa2common { }; - asn2quickder = python2Packages.callPackage ../development/tools/asn2quickder {}; + asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder {}; astyle = callPackage ../development/tools/misc/astyle { }; @@ -16343,7 +16348,7 @@ with pkgs; bloop = callPackage ../development/tools/build-managers/bloop { }; bossa = callPackage ../development/embedded/bossa { - wxGTK = wxGTK30; + wxGTK = wxGTK30-gtk3; }; bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { }; @@ -29030,7 +29035,7 @@ with pkgs; inherit (nodePackages) hueadm; hugin = callPackage ../applications/graphics/hugin { - wxGTK = wxGTK30; + wxGTK = wxGTK32; }; haunt = callPackage ../applications/misc/haunt { }; @@ -30155,9 +30160,9 @@ with pkgs; MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { - wxGTK30 = wxGTK30.override { + inherit (darwin) libobjc; + wxGTK = wxGTK32.override { withWebKit = true; - withGtk2 = false; }; }; @@ -31400,7 +31405,7 @@ with pkgs; radioboat = callPackage ../applications/audio/radioboat { }; radiotray-ng = callPackage ../applications/audio/radiotray-ng { - wxGTK = wxGTK30; + wxGTK = wxGTK30-gtk3; }; raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; @@ -32784,7 +32789,7 @@ with pkgs; wordgrinder = callPackage ../applications/office/wordgrinder { }; workrave = callPackage ../applications/misc/workrave { - inherit (python27Packages) cheetah; + inherit (python3Packages) jinja2; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; @@ -35903,7 +35908,9 @@ with pkgs; inherit (linuxPackages) nvidia_x11; }; - wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; + wxmaxima = callPackage ../applications/science/math/wxmaxima { + wxGTK = wxGTK32; + }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; @@ -35989,7 +35996,9 @@ with pkgs; gravit = callPackage ../applications/science/astronomy/gravit { }; - golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; }; + golly = callPackage ../applications/science/misc/golly { + wxGTK = wxGTK32; + }; megam = callPackage ../applications/science/misc/megam { inherit (ocaml-ng.ocamlPackages_4_07) ocaml; @@ -37332,7 +37341,7 @@ with pkgs; }; wxsqliteplus = callPackage ../development/libraries/wxsqliteplus { - wxGTK = wxGTK30; + wxGTK = wxGTK32; inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.stubs) setfile; }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index ec444cce32ffa..d8d4320f0c0b0 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -824,10 +824,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b3rfqy87yiv9xmh260nyddxxjqj0vy32xvajvyn5jnjx96jwa24"; + sha256 = "1v71iii13cnlkck20xv0yrbz0g60qn88f4r6518k8vk31sddw4hx"; type = "gem"; }; - version = "0.93.0"; + version = "0.93.1"; }; execjs = { groups = ["default"]; @@ -1007,6 +1007,17 @@ }; version = "3.4.3"; }; + git = { + dependencies = ["addressable" "rchardet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l6mvn60qa215rjy0zjymvjb0vcgnbi4vj9d80v4qq1n6b9ld9xy"; + type = "gem"; + }; + version = "1.12.0"; + }; github-pages = { dependencies = ["github-pages-health-check" "jekyll" "jekyll-avatar" "jekyll-coffeescript" "jekyll-commonmark-ghpages" "jekyll-default-layout" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-include-cache" "jekyll-mentions" "jekyll-optional-front-matter" "jekyll-paginate" "jekyll-readme-index" "jekyll-redirect-from" "jekyll-relative-links" "jekyll-remote-theme" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jekyll-swiss" "jekyll-theme-architect" "jekyll-theme-cayman" "jekyll-theme-dinky" "jekyll-theme-hacker" "jekyll-theme-leap-day" "jekyll-theme-merlot" "jekyll-theme-midnight" "jekyll-theme-minimal" "jekyll-theme-modernist" "jekyll-theme-primer" "jekyll-theme-slate" "jekyll-theme-tactile" "jekyll-theme-time-machine" "jekyll-titles-from-headings" "jemoji" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "minima" "nokogiri" "rouge" "terminal-table"]; groups = ["default"]; @@ -1999,10 +2010,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; type = "gem"; }; - version = "1.2.1"; + version = "4.0.0"; }; net-ssh = { groups = ["default"]; @@ -2040,10 +2051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2240,10 +2251,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080469yh9k1va9v6ws2y0bwg9k1mnfs4rl7871q8aak74x6mrv9p"; + sha256 = "1l5pk6w63bj7cxy4y9mqvpclw6r0pcm7xa44c33vx3f960px8wk8"; type = "gem"; }; - version = "0.1.0"; + version = "1.0.2"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2424,15 +2435,25 @@ }; version = "2.7.0"; }; + rchardet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; + }; re2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; + sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; red-colors = { dependencies = ["matrix"]; @@ -2577,10 +2598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -2588,10 +2609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2599,10 +2620,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l1bzk6a68i1b2qix83vs40r0pbjawv67hixiq2qxsja19bbq3bc"; + sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2610,20 +2631,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; + sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rubocop = { dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2631,10 +2652,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; + sha256 = "1xhm882zzs4z4ivknrymh6lgnd3p90b651dn0fp32dciajdxr9f1"; type = "gem"; }; - version = "1.36.0"; + version = "1.37.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2642,10 +2663,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; type = "gem"; }; - version = "1.21.0"; + version = "1.23.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2989,10 +3010,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mp0b13gbkfz2chgn48ak28611yhgykdmx53p0yzby5j6ifsdirf"; + sha256 = "1im3kskcrmwa12q4pxilps7dyf9jlc82saasp6lkn5q7zqi7ilfh"; type = "gem"; }; - version = "3.6.3"; + version = "4.3.0"; }; syntax_tree-haml = { dependencies = ["haml" "prettier_print" "syntax_tree"]; @@ -3000,10 +3021,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "137v6pwkqv6dcm9r7fl3i3l8hpalilr61vy08zx3ybb1bzp2fckb"; + sha256 = "0n2ag309fzz9qvj634aibv2khfc45vvsg1sra227ssn3xwcvx4vq"; type = "gem"; }; - version = "1.3.2"; + version = "2.0.0"; }; syntax_tree-rbs = { dependencies = ["prettier_print" "rbs" "syntax_tree"]; @@ -3031,10 +3052,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + sha256 = "1kzp8c08jl137v62rafmr81b7hg01q3d1q70fr5y5cmmranfpml1"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.1"; }; terminal-table = { dependencies = ["unicode-display_width"]; |