diff options
48 files changed, 424 insertions, 1146 deletions
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index 9feb8d5c1526e..a86cd569e4215 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -60,6 +60,7 @@ in makeTest { name = "cloud-init"; meta = with pkgs.lib.maintainers; { maintainers = [ lewo ]; + broken = true; # almost always times out after spending many hours }; nodes.machine = { ... }: { diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index 73e47c3c9d0d6..25a7b6fdea46e 100644 --- a/nixos/tests/custom-ca.nix +++ b/nixos/tests/custom-ca.nix @@ -191,5 +191,5 @@ in firefox = { error = "Security Risk"; }; chromium = { error = "not private"; }; qutebrowser = { args = "-T"; error = "Certificate error"; }; - midori = { error = "Security"; }; + midori = { args = "-p"; error = "Security"; }; } diff --git a/nixos/tests/domination.nix b/nixos/tests/domination.nix index 09027740ab8de..409a7f3029c42 100644 --- a/nixos/tests/domination.nix +++ b/nixos/tests/domination.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_x() machine.execute("domination >&2 &") machine.wait_for_window("Menu") - machine.wait_for_text("New Game") + machine.wait_for_text(r"(New Game|Start Server|Load Game|Help Manual|Join Game|About|Play Online)") machine.screenshot("screen") ''; }) diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index cb843e2e9e3e8..b1ac55d951cef 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -32,6 +32,7 @@ import ../make-test-python.nix ( name = "mjolnir"; meta = with pkgs.lib; { maintainers = teams.matrix.members; + broken = true; # times out after spending many hours }; nodes = { diff --git a/nixos/tests/systemd-cryptenroll.nix b/nixos/tests/systemd-cryptenroll.nix index 055ae7d1681f2..9ee2d280fbbea 100644 --- a/nixos/tests/systemd-cryptenroll.nix +++ b/nixos/tests/systemd-cryptenroll.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd-cryptenroll"; meta = with pkgs.lib.maintainers; { maintainers = [ ymatsiuk ]; + broken = true; # times out after two hours, details -> https://github.com/NixOS/nixpkgs/issues/167994 }; nodes.machine = { pkgs, lib, ... }: { diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index c724608b91554..4269d05056d8c 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -23,8 +23,9 @@ with pkgs.lib; let tests = { alacritty.pkg = p: p.alacritty; - contour.pkg = p: p.contour; - contour.cmd = "contour $command"; + # times out after spending many hours + #contour.pkg = p: p.contour; + #contour.cmd = "contour $command"; cool-retro-term.pkg = p: p.cool-retro-term; cool-retro-term.colourTest = false; # broken by gloss effect @@ -103,7 +104,8 @@ let tests = { wayst.pkg = p: p.wayst; wayst.pinkValue = "#FF0066"; - wezterm.pkg = p: p.wezterm; + # times out after spending many hours + #wezterm.pkg = p: p.wezterm; xfce4-terminal.pkg = p: p.xfce.xfce4-terminal; diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 8a64c3179c518..7cbe7ac94f1e7 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -44,5 +44,8 @@ in listToAttrs ( map (makeWineTest "winePackages" [ hello32 ]) variants ++ optionals pkgs.stdenv.is64bit - (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) + (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) + # This wayland combination times out after spending many hours. + # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux + (pkgs.lib.remove "wayland" variants)) ) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 74668bccacf2c..22d62247301aa 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.172.5"; + version = "1.173.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-bet0hLplxTjizYhRKDqafsps1kULW8jves1faEeLAKE="; + hash = "sha256-IMvcGuZotAOdbvMthkmeje3OmToPfPDlx0m87MW3lDE="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 4af7813e75a71..781185b71b4dd 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.09.18", - "hash": "sha256-4d27eW4gpJHwGlRZ4iPzuKIw/o/J4utxXbEhglk31Bw=" + "rev": "2022.10.15", + "hash": "sha256-+UU/+etbxrAfCEklY3mfiSrBANIXZbfrXEPrrCsg9u4=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.10.09", - "hash": "sha256-FUqkKcX0UbknvhntIo782ZGIteEE1SvPsfXo4yv6310=" + "rev": "2022.10.15", + "hash": "sha256-TZYaEr5KO8nU6X3tEL2tl+G+JblCeQRwH1EXQXLbPLs=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.10.03", - "hash": "sha256-2XP3LyB18ZHLQOxzP4lBuhlUA8u1+wHl97cxmRYa7Xg=" + "rev": "2022.10.15", + "hash": "sha256-McJTjPMzqtajtfpn01YoeHmZWkmbHxqAy5BmkKID1gE=" }, "EControl": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/28.nix b/pkgs/applications/editors/emacs/28.nix index 7ed37e0dfb541..b6abb4c4cdb57 100644 --- a/pkgs/applications/editors/emacs/28.nix +++ b/pkgs/applications/editors/emacs/28.nix @@ -1,5 +1,4 @@ import ./generic.nix (rec { version = "28.2"; sha256 = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; - patches = _: [ ]; }) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 6190d25ce93d0..15efa5ae160a2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -554,6 +554,13 @@ let }); }); + wordnut = super.wordnut.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace wordnut.el \ + --replace 'wordnut-cmd "wn"' 'wordnut-cmd "${lib.getExe pkgs.wordnet}"' + ''; + }); + mozc = super.mozc.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' substituteInPlace src/unix/emacs/mozc.el \ diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 5e455b6bcd9f5..91110c48a74b2 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -4,19 +4,26 @@ , versionModifier ? "" , pname ? "emacs" , name ? "emacs-${version}${versionModifier}" - , patches ? [ ] + , patches ? _: [ ] + , macportVersion ? null }: -{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux -, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, alsa-lib, cairo, acl, gpm, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests , recurseIntoAttrs, emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params -, fetchFromSavannah +, fetchFromSavannah, fetchFromBitbucket + + # macOS dependencies for NS and macPort +, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, ImageCaptureCore, GSS, ImageIO # These may be optional + , systemd ? null , withX ? !stdenv.isDarwin && !withPgtk -, withNS ? stdenv.isDarwin +, withNS ? stdenv.isDarwin && !withMacport +, withMacport ? macportVersion != null , withGTK2 ? false, gtk2-x11 ? null , withGTK3 ? withPgtk, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null @@ -44,24 +51,30 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise assert withNS -> !withX; assert withNS -> stdenv.isDarwin; -assert (withGTK2 && !withNS) -> withX; -assert (withGTK3 && !withNS) -> withX || withPgtk; +assert withMacport -> !withNS; +assert (withGTK2 && !withNS && !withMacport) -> withX; +assert (withGTK3 && !withNS && !withMacport) -> withX || withPgtk; assert withGTK2 -> !withGTK3 && gtk2-x11 != null && !withPgtk; assert withGTK3 -> !withGTK2 && ((gtk3-x11 != null) || withPgtk); assert withPgtk -> withGTK3 && !withX && gtk3 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { +let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { - pname = pname + lib.optionalString ( !withX && !withNS && !withGTK2 && !withGTK3 ) "-nox"; + pname = pname + lib.optionalString ( !withX && !withNS && !withMacport && !withGTK2 && !withGTK3 ) "-nox"; inherit version; patches = patches fetchpatch; - src = fetchFromSavannah { + src = if macportVersion != null then fetchFromBitbucket { + owner = "mituharu"; + repo = "emacs-mac"; + rev = macportVersion; + inherit sha256; + } else fetchFromSavannah { repo = "emacs"; rev = version; inherit sha256; @@ -122,12 +135,13 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ]; nativeBuildInputs = [ pkg-config makeWrapper ] - ++ lib.optionals srcRepo [ autoreconfHook texinfo ] + ++ lib.optionals (srcRepo || withMacport) [ texinfo ] + ++ lib.optionals srcRepo [ autoreconfHook ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = - [ ncurses gconf libxml2 gnutls alsa-lib acl gpm gettext jansson harfbuzz.dev ] - ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] + [ ncurses gconf libxml2 gnutls gettext jansson harfbuzz.dev ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd alsa-lib acl gpm ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft gconf cairo ] @@ -143,6 +157,11 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional withWebP libwebp ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] + ++ lib.optionals withMacport [ + AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit + # TODO are these optional? + ImageCaptureCore GSS ImageIO + ] ++ lib.optionals stdenv.isDarwin [ sigtool ] ++ lib.optionals nativeComp [ libgccjit ]; @@ -160,6 +179,12 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" "--with-gif=no" "--with-tiff=no" ]) + ++ lib.optionals withMacport [ + "--with-mac" + "--enable-mac-app=$$out/Applications" + "--with-xml2=yes" + "--with-gnutls=yes" + ] ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-native-compilation" ++ lib.optional withImageMagick "--with-imagemagick" @@ -190,7 +215,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { '' + lib.optionalString withNS '' mkdir -p $out/Applications mv nextstep/Emacs.app $out/Applications - '' + lib.optionalString (nativeComp && withNS) '' + '' + lib.optionalString (nativeComp && (withNS || withMacport)) '' ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp '' + lib.optionalString nativeComp '' echo "Generating native-compiled trampolines..." @@ -219,11 +244,11 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { }; meta = with lib; { - description = "The extensible, customizable GNU text editor"; - homepage = "https://www.gnu.org/software/emacs/"; + description = "The extensible, customizable GNU text editor" + optionalString withMacport " with Mitsuharu Yamamoto's macport patches"; + homepage = if withMacport then "https://bitbucket.org/mituharu/emacs-mac/" else "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 jwiegley adisbladis ]; - platforms = platforms.all; + maintainers = with maintainers; [ lovek323 jwiegley adisbladis matthewbauer atemu ]; + platforms = if withMacport then platforms.darwin else platforms.all; longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 8d210f822bf30..9a30b2b5b408b 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,123 +1,6 @@ -{ lib, stdenv, fetchurl, ncurses, pkg-config, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson -, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit -, ImageCaptureCore, GSS, ImageIO # These may be optional -}: - -stdenv.mkDerivation rec { - pname = "emacs"; - version = "28.1"; - - emacsName = "emacs-${version}"; - macportVersion = "9.0"; - name = "emacs-mac-${version}-${macportVersion}"; - - src = fetchurl { - url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98"; - }; - - macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "10gyynz8wblz6r6dkk12m98kjbsmdwcbrhxpmsjylmdqmjxhlj4m"; - name = "${emacsName}-mac-${macportVersion}.tar.xz"; # It's actually compressed with xz, not gz - }; - - hiresSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-3.0.tar.gz"; - sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ pkg-config autoconf automake ]; - - buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson - AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit - ImageCaptureCore GSS ImageIO # may be optional - ]; - - postUnpack = '' - mv $sourceRoot $name - tar xf $macportSrc -C $name --strip-components=1 - mv $name $sourceRoot - - # extract retina image resources - tar xfv $hiresSrc --strip 1 -C $sourceRoot - ''; - - postPatch = '' - patch -p1 < patch-mac - substituteInPlace lisp/international/mule-cmds.el \ - --replace /usr/share/locale ${gettext}/share/locale - - # use newer emacs icon - cp nextstep/Cocoa/Emacs.base/Contents/Resources/Emacs.icns mac/Emacs.app/Contents/Resources/Emacs.icns - - # Fix sandbox impurities. - substituteInPlace Makefile.in --replace '/bin/pwd' 'pwd' - substituteInPlace lib-src/Makefile.in --replace '/bin/pwd' 'pwd' - - # Reduce closure size by cleaning the environment of the emacs dumper - substituteInPlace src/Makefile.in \ - --replace 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs' - ''; - - configureFlags = [ - "LDFLAGS=-L${ncurses.out}/lib" - "--with-xml2=yes" - "--with-gnutls=yes" - "--with-mac" - "--with-modules" - "--enable-mac-app=$$out/Applications" - ]; - - CFLAGS = "-O3"; - LDFLAGS = "-O3 -L${ncurses.out}/lib"; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - ''; - - # fails with: - - # Ran 3870 tests, 3759 results as expected, 6 unexpected, 105 skipped - # 5 files contained unexpected results: - # lisp/url/url-handlers-test.log - # lisp/simple-tests.log - # lisp/files-x-tests.log - # lisp/cedet/srecode-utest-template.log - # lisp/net/tramp-tests.log - doCheck = false; - - meta = with lib; { - description = "The extensible, customizable text editor"; - homepage = "https://www.gnu.org/software/emacs/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley matthewbauer ]; - platforms = platforms.darwin; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - extensions are distributed with GNU Emacs; others are available - separately. - - This is the "Mac port" addition to GNU Emacs. This provides a native - GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later - already contain the official GUI support via the NS (Cocoa) port for - Mac OS X 10.4 and later. So if it is good enough for you, then you - don't need to try this. - ''; - }; +import ./generic.nix rec { + pname = "emacs-mac"; + version = "28.2"; + macportVersion = "emacs-${version}-mac-9.1"; + sha256 = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; } diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 195dcb3bc016f..83acab8704d72 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-PNfEiin4Hble/H8cOvSK+A7wmoeOlyITRUTwGTd3B6s="; + sha256 = "sha256-pkyYfGpACF8kRCCUwEQtA5tMDSShsm+58KzUruc5pXE="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 89e952945c87f..ea09e1a942f13 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -37,6 +37,11 @@ , libjpeg_turbo , buildServer ? true , nocaps ? false +, AudioToolbox +, AVFoundation +, Carbon +, Cocoa +, CoreMedia }: let @@ -47,6 +52,11 @@ let dir = "libfreerdp/crypto/test"; file = "Test_x509_cert_info.c"; } + ] ++ lib.optionals stdenv.isDarwin [ + { + dir = "winpr/libwinpr/sysinfo/test"; + file = "TestGetComputerName.c"; + } ]; in @@ -64,6 +74,9 @@ stdenv.mkDerivation rec { postPatch = '' export HOME=$TMP + # skip NIB file generation on darwin + sed -z 's/NIB file generation.*//' -i client/Mac{,/cli}/CMakeLists.txt + # failing test(s) ${lib.concatMapStringsSep "\n" (e: '' substituteInPlace ${e.dir}/CMakeLists.txt \ @@ -82,7 +95,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsa-lib cairo cups ffmpeg @@ -111,9 +123,18 @@ stdenv.mkDerivation rec { orc pcre pcsclite - wayland zlib - ] ++ lib.optional stdenv.isLinux systemd; + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + systemd + wayland + ] ++ lib.optionals stdenv.isDarwin [ + AudioToolbox + AVFoundation + Carbon + Cocoa + CoreMedia + ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -132,8 +153,19 @@ stdenv.mkDerivation rec { WITH_VAAPI = true; WITH_JPEG = (libjpeg_turbo != null); WITH_CAIRO = (cairo != null); + WITH_X11 = true; }; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ + "-DTARGET_OS_IPHONE=0" + "-DTARGET_OS_WATCH=0" + "-include AudioToolbox/AudioToolbox.h" + ]; + + NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + "-framework AudioToolbox" + ]; + meta = with lib; { description = "A Remote Desktop Protocol Client"; longDescription = '' diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index 230654d995798..dc96263e98134 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , rustPlatform , pkg-config , meson @@ -9,42 +8,34 @@ , desktop-file-utils , blueprint-compiler , ninja -, gobject-introspection , gtk4 , libadwaita , gst_all_1 +, ffmpeg-full }: stdenv.mkDerivation rec { pname = "video-trimmer"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "YaLTeR"; - repo = "video-trimmer"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-D7wjJkdqqjjwwYEUZnNr7hFQK59wfTnaCLXCy+SK8Jo="; + hash = "sha256-0zhQoxzU1GikYP5OwqMl34RsnefJtdZox5EuTqOFnas="; }; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-cB5dVrEbISvHrOb87uVZSkT694VKtPtyk+c1tYNCTp0="; + hash = "sha256-kH9AfEskh7TTXF+PZwOZNWVJmnEeMJrSEEuDGyP5A5o="; }; - patches = [ - # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 - (fetchpatch { - url = "https://gitlab.gnome.org/YaLTeR/video-trimmer/-/commit/2faf4bb13d44463ea940c39ece9187f76627dbe9.diff"; - sha256 = "sha256-BPjwfFCDIqnS1rAlIinQ982VKdAYLyzDAPLCmPDvdp4="; - }) - ]; - nativeBuildInputs = [ pkg-config meson wrapGAppsHook4 - gobject-introspection desktop-file-utils blueprint-compiler ninja @@ -68,6 +59,12 @@ stdenv.mkDerivation rec { doCheck = true; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ ffmpeg-full ]}" + ) + ''; + meta = with lib; { homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer"; description = "Trim videos quickly"; diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix index 539b86c6c408c..2c9acc391711a 100644 --- a/pkgs/data/fonts/amiri/default.nix +++ b/pkgs/data/fonts/amiri/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "0.117"; + version = "0.900"; in fetchzip rec { name = "Amiri-${version}"; url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; - sha256 = "sha256-TCdL4Am+mT7E9fHEagcR7i9kBziyJuO3r1kM+ekfvbU="; + sha256 = "sha256-FjuzWW9xVWDOxHBwYL4pmopQVc9KYHGHhye5tPdw68s="; postFetch = '' rm -rf $out/otf diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 3f118243f22db..d01a0d1aac532 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation { mixins, abstract classes, reified generics, and optional typing. ''; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6d3c677397d2f..cc35fbc5804eb 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -257,9 +257,10 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "5"; + patch = "9"; }; - sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0="; + + sha256 = "sha256-ObCXKVb2VIzlgoAZ264SUDwy1svpGivs+I0+QsxSGXs="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.python27; @@ -268,25 +269,32 @@ in { inherit (darwin.apple_sdk.frameworks) Security; }; - pypy38 = callPackage ./pypy { - self = __splicedPackages.pypy38; + pypy39 = callPackage ./pypy { + self = __splicedPackages.pypy39; sourceVersion = { major = "7"; minor = "3"; - patch = "7"; + patch = "9"; }; - sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY="; - pythonVersion = "3.8"; + + sha256 = "sha256-Krqh6f4ewOIzyfvDd6DI6aBjQICo9PMOtomDAfZhjBI="; + pythonVersion = "3.9"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.python27; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; }; - pypy37 = __splicedPackages.pypy38.override { + + pypy38 = __splicedPackages.pypy39.override { + self = __splicedPackages.pythonInterpreters.pypy38; + pythonVersion = "3.8"; + sha256 = "sha256-W12dklbxKhKa+DhOL1gb36s7wPu+OgpIDZwdLpVJDrE="; + }; + pypy37 = __splicedPackages.pypy39.override { self = __splicedPackages.pythonInterpreters.pypy37; pythonVersion = "3.7"; - sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc="; + sha256 = "sha256-cEJhY7GU7kYAmYbuptlCYJij/7VS2c29PfqmSkc3P0k="; }; pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { @@ -295,23 +303,24 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "8"; + patch = "9"; }; - sha256 = "0h493q0lhpz035afi4g09f4mz5a72vqx4sa7qcry5z4zagxq8bhz"; # linux64 + + sha256 = "sha256-FyqSiwCWp+ALfVj1I/VzAMNcPef4IkkeKnvIRTdcI/g="; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; - pypy38_prebuilt = callPackage ./pypy/prebuilt.nix { + pypy39_prebuilt = callPackage ./pypy/prebuilt.nix { # Not included at top-level self = __splicedPackages.pythonInterpreters.pypy38_prebuilt; sourceVersion = { major = "7"; minor = "3"; - patch = "7"; + patch = "9"; }; - sha256 = "sha256-Xe43x8PLixYAKPveOlkBxoBD36VFoWeUUCuJfUvEDX4="; # linux64 - pythonVersion = "3.8"; + sha256 = "sha256-RoGMs9dLlrNHh1SDQ9Jm4lYrUx3brzMDg7qTD/GTDtU="; # linux64 + pythonVersion = "3.9"; inherit passthruFun; }; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 4498930bd838b..a76805d8d1fbd 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { }; }; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ + "-DTARGET_OS_IPHONE=0" + "-DTARGET_OS_WATCH=0" + ]; + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; description = "RDP viewer widget for GTK"; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 1ff5eb338a9ef..177189f765a2b 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.4.6"; + version = "5.1.6"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-eWUuORMZs6Bl/zFGYZkpgNAgJPIei+k0cQoWl+v+zxo="; + hash = "sha256-vhi/VzT/WmkfWi+hliN60o7eT+XgDr7T/k8DG3N1moc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 8fa003ed77414..3d7021bf35a8e 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "sha256-PuLpwhyyht+kkPUTrJTH+VTY5WuOhi2mIUDrFqubF+w="; + hash = "sha256-PuLpwhyyht+kkPUTrJTH+VTY5WuOhi2mIUDrFqubF+w="; }; nativeBuildInputs = [ perl cmake gfortran ]; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 3ed2f24f45f91..512398dde9a16 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: +{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib, Cocoa }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ hoppet lhapdf root5 zlib ]; + buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; patches = [ ./bad_code.patch diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d6f9927738112..fa6731161cd3a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -153,7 +153,7 @@ buildLuarocksPackage { }) {}; busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, say, luassert, lua_cliargs, luasystem, luafilesystem, lua, mediator_lua, penlight, lua-term, dkjson +, fetchgit, dkjson, lua, lua-term, lua_cliargs, luafilesystem, luassert, luasystem, mediator_lua, penlight, say }: buildLuarocksPackage { pname = "busted"; @@ -176,7 +176,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ say luassert lua_cliargs luasystem luafilesystem lua mediator_lua penlight lua-term dkjson ]; + propagatedBuildInputs = [ dkjson lua lua-term lua_cliargs luafilesystem luassert luasystem mediator_lua penlight say ]; meta = { homepage = "https://lunarmodules.github.io/busted/"; @@ -220,7 +220,7 @@ buildLuarocksPackage { }) {}; cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, penlight, lua +, fetchgit, lua, penlight }: buildLuarocksPackage { pname = "cldr"; @@ -243,7 +243,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ penlight lua ]; + propagatedBuildInputs = [ lua penlight ]; meta = { homepage = "https://github.com/alerque/cldr-lua"; @@ -399,7 +399,7 @@ buildLuarocksPackage { }) {}; digestif = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lpeg +, fetchgit, lpeg, lua }: buildLuarocksPackage { pname = "digestif"; @@ -419,7 +419,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.3"); - propagatedBuildInputs = [ lua lpeg ]; + propagatedBuildInputs = [ lpeg lua ]; meta = { homepage = "https://github.com/astoff/digestif/"; @@ -458,14 +458,14 @@ fennel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "fennel"; - version = "1.2.0-1"; + version = "1.2.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.2.0-1.rockspec"; - sha256 = "14qr0gldqgvzx3yzfjvy48inqn46xf0d92pcxp3hr1a17sf7xqmf"; + url = "mirror://luarocks/fennel-1.2.1-1.rockspec"; + sha256 = "0v4gh7a767zlng3pxpl2bkr3cpqa39k8ljvvspfwkhc9g176r49z"; }).outPath; src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.2.0.tar.gz"; - sha256 = "0ymnsri27pj98jbwx7hxsn1w39rxns0i8ds1fl421spc13gx88gx"; + url = "https://fennel-lang.org/downloads/fennel-1.2.1.tar.gz"; + sha256 = "0ihxvrz1p4p4f1bid39wy30y9x52qa2z6rx3kxanmd8bqw787ai7"; }; disabled = with lua; (luaOlder "5.1"); @@ -504,7 +504,7 @@ buildLuarocksPackage { }) {}; fluent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luaepnf, penlight, cldr, lua +, fetchgit, cldr, lua, luaepnf, penlight }: buildLuarocksPackage { pname = "fluent"; @@ -527,7 +527,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ luaepnf penlight cldr lua ]; + propagatedBuildInputs = [ cldr lua luaepnf penlight ]; meta = { homepage = "https://github.com/alerque/fluent-lua"; @@ -546,10 +546,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "f98c85e7c3d65a51f45863a34feb4849c82f240f", - "date": "2022-09-19T00:23:17+01:00", - "path": "/nix/store/7gx7accssqrpn18g9325a8d4wx48467b-gitsigns.nvim", - "sha256": "0ljzja43jdkv77nh4253x3gwk2hjx968yk7b5ag4y1mvyp1540qn", + "rev": "56e01cb0ea52635854e97bd2dd2587c8ebfab978", + "date": "2022-10-16T16:50:37+01:00", + "path": "/nix/store/yrm4xpi43x2sijw8gamvlfgqnyd7j19l-gitsigns.nvim", + "sha256": "0rdfnw2pr0hjxlw7bfjfvbh7lll4ba8ymp5nxq58d0jq01lzsxkr", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -568,7 +568,7 @@ buildLuarocksPackage { }) {}; http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, compat53, lpeg, cqueues, luaossl, bit32, lua, binaryheap, basexx, lpeg_patterns, fifo +, fetchzip, basexx, binaryheap, bit32, compat53, cqueues, fifo, lpeg, lpeg_patterns, lua, luaossl }: buildLuarocksPackage { pname = "http"; @@ -583,7 +583,7 @@ buildLuarocksPackage { }; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ compat53 lpeg cqueues luaossl bit32 lua binaryheap basexx lpeg_patterns fifo ]; + propagatedBuildInputs = [ basexx binaryheap bit32 compat53 cqueues fifo lpeg lpeg_patterns lua luaossl ]; meta = { homepage = "https://github.com/daurnimator/lua-http"; @@ -685,7 +685,7 @@ buildLuarocksPackage { }) {}; ldoc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, penlight, markdown +, fetchgit, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; @@ -704,7 +704,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - propagatedBuildInputs = [ penlight markdown ]; + propagatedBuildInputs = [ markdown penlight ]; meta = { homepage = "https://github.com/lunarmodules/LDoc"; @@ -1329,7 +1329,7 @@ buildLuarocksPackage { }) {}; lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua-resty-http, lua, lua-resty-session, lua-resty-jwt +, fetchgit, lua, lua-resty-http, lua-resty-jwt, lua-resty-session }: buildLuarocksPackage { pname = "lua-resty-openidc"; @@ -1352,7 +1352,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua-resty-http lua lua-resty-session lua-resty-jwt ]; + propagatedBuildInputs = [ lua lua-resty-http lua-resty-jwt lua-resty-session ]; meta = { homepage = "https://github.com/zmartzone/lua-resty-openidc"; @@ -1365,17 +1365,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit}: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.10-1"; + version = "0.8.13-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.10-1.rockspec"; - sha256 = "0rwqc8yy9jk419vyil3c1dc2cmlsy1yf2f8b85i1xvwd8safvc8g"; + url = "mirror://luarocks/lua-resty-openssl-0.8.13-1.rockspec"; + sha256 = "12wd4v2pc3ppnr64109nx4sh33clwllfbp11mmg1c1n2w13fz578"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "c569d6c2ed4512f2228b61a52c9bb1949dc55f7c", - "date": "2022-06-24T12:22:19+08:00", - "path": "/nix/store/kbpwc7yhba4gqp6lkmdphkvkvhc1m4h6-lua-resty-openssl", - "sha256": "08cw03kihqa2j23p29dxli84zafpdxnx5a4zm625dqzlqnq86ajc", + "rev": "3293e301f6c3818b780f1a818eacc9b78960b274", + "date": "2022-10-14T16:38:23+08:00", + "path": "/nix/store/ykj5yj8sj9rc5122gg7dcnq723fsxjq5-lua-resty-openssl", + "sha256": "0hkhy8x34z9m7wsqxrrc4vfqw0dbjhq36pjkqcq391vlsvzxhx5h", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1631,7 +1631,7 @@ buildLuarocksPackage { }) {}; luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, argparse, luafilesystem +, fetchgit, argparse, lua, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; @@ -1654,7 +1654,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua argparse luafilesystem ]; + propagatedBuildInputs = [ argparse lua luafilesystem ]; meta = { homepage = "https://github.com/lunarmodules/luacheck"; @@ -1730,7 +1730,7 @@ buildLuarocksPackage { }) {}; luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luadbi, lua +, fetchgit, lua, luadbi }: buildLuarocksPackage { pname = "luadbi-mysql"; @@ -1753,7 +1753,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ luadbi lua ]; + propagatedBuildInputs = [ lua luadbi ]; meta = { homepage = "https://github.com/mwild1/luadbi"; @@ -1796,7 +1796,7 @@ buildLuarocksPackage { }) {}; luadbi-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luadbi, lua +, fetchgit, lua, luadbi }: buildLuarocksPackage { pname = "luadbi-sqlite3"; @@ -1819,7 +1819,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ luadbi lua ]; + propagatedBuildInputs = [ lua luadbi ]; meta = { homepage = "https://github.com/mwild1/luadbi"; @@ -1898,10 +1898,10 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luaexpat.git", - "rev": "10b10ca30536ee5df8c814dd18991148984efe24", - "date": "2022-08-29T13:45:12+02:00", - "path": "/nix/store/prmd5hiippdd32qa0xicbf9rw8k39md7-luaexpat", - "sha256": "0rzwrmjy2kbkvhgmprnlqmkl6kqvxqlb5kh9ww3zff0xv7xf03vb", + "rev": "57f8966088abf8a00f8ab0bf88e1b6deea89c0bb", + "date": "2022-10-04T16:36:23+02:00", + "path": "/nix/store/dgrdkalikpqdap642qhppha1ajdnsvx0-luaexpat", + "sha256": "1b4ck23p01ks3hgayan9n33f2kb6jvv63v4ww2mqczc09rqi0q46", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2044,7 +2044,7 @@ buildLuarocksPackage { }) {}; luaposix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua, bit32 +, fetchzip, bit32, lua }: buildLuarocksPackage { pname = "luaposix"; @@ -2059,7 +2059,7 @@ buildLuarocksPackage { }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua bit32 ]; + propagatedBuildInputs = [ bit32 lua ]; meta = { homepage = "http://github.com/luaposix/luaposix/"; @@ -2173,10 +2173,10 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luasql.git", - "rev": "b7da7097d91b3233156aba2e7d0c6e5590766884", - "date": "2022-07-27T13:39:06-03:00", - "path": "/nix/store/rb4i0qxm8yy552hhmxdh65sf463qn02f-luasql", - "sha256": "046zv23kk2riyiw1vngbwn2a4rkg9wm3ra2b1vmmhkr9idlncq94", + "rev": "e2660cbaeb13cb33d8346bb816c6a526241b3c2d", + "date": "2022-10-03T18:44:40-03:00", + "path": "/nix/store/mxzq779w3l19bgb424aa4cqdzxczmwr3-luasql", + "sha256": "052hc174am05plidilzf36vr736sp8vyydfb12qa8xr6mk74f6d1", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2196,7 +2196,7 @@ buildLuarocksPackage { }) {}; luassert = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, say, lua +, fetchgit, lua, say }: buildLuarocksPackage { pname = "luassert"; @@ -2219,7 +2219,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ say lua ]; + propagatedBuildInputs = [ lua say ]; meta = { homepage = "https://lunarmodules.github.io/busted/"; @@ -2309,14 +2309,14 @@ luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luautf8"; - version = "0.1.3-1"; + version = "0.1.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luautf8-0.1.3-1.rockspec"; - sha256 = "16i9wfgd0f299g1afgjp0hhczlrk5g8i0kq3ka0f8bwj3mp2wmcp"; + url = "mirror://luarocks/luautf8-0.1.4-1.rockspec"; + sha256 = "1pa91djyymhzfqnlc559v9wgk5l0m40wq0hnlnf841w6h5aj4fra"; }).outPath; src = fetchurl { - url = "https://github.com/starwing/luautf8/archive/0.1.3.tar.gz"; - sha256 = "02rf8jmazmi8rp3i5v4jsz0d7mrf1747qszsl8i2hv1sl0ik92r0"; + url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.4.tar.gz"; + sha256 = "08r4swiipzs0fif3311rr493j4lb3pyapl0sp70pl8s4rmknm43h"; }; disabled = with lua; (luaOlder "5.1"); @@ -2372,10 +2372,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/rktjmp/lush.nvim", - "rev": "fabf012e243bc58c4785ab4c44f05e94b34c431a", - "date": "2022-09-14T20:24:03+10:00", - "path": "/nix/store/z7nnsj480w2v8i3w0idy0z49yysvsa90-lush.nvim", - "sha256": "0bxxdlbay4r48xng1djljbgb93ls3xa83nb79gzvagfaiwgf6pn8", + "rev": "fca6940b754812746c9758cc512cc97dcdb47de0", + "date": "2022-10-17T06:32:03+11:00", + "path": "/nix/store/aybmp713rb8qa0crm94hgzjcqdvjjv8f-lush.nvim", + "sha256": "1q8jzyxdxlif7sjxjqs8x696q1734saca5g05gqhvv5d23287hrn", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2531,7 +2531,7 @@ buildLuarocksPackage { }) {}; moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, lua, lpeg, luafilesystem +, fetchgit, argparse, lpeg, lua, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; @@ -2551,7 +2551,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ argparse lua lpeg luafilesystem ]; + propagatedBuildInputs = [ argparse lpeg lua luafilesystem ]; meta = { homepage = "http://moonscript.org"; @@ -2584,7 +2584,7 @@ buildLuarocksPackage { }) {}; nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, luv, coxpcall, mpack, lua +, fetchurl, coxpcall, lua, luv, mpack }: buildLuarocksPackage { pname = "nvim-client"; @@ -2596,7 +2596,7 @@ buildLuarocksPackage { }; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ luv coxpcall mpack lua ]; + propagatedBuildInputs = [ coxpcall lua luv mpack ]; meta = { homepage = "https://github.com/neovim/lua-client"; @@ -2614,10 +2614,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "3347dd3c59b6c62288d861ddb92b9ba1227257a8", - "date": "2022-10-15T15:20:35+09:00", - "path": "/nix/store/yz8ak36srpzaw6qm2gip07ppl6zladcd-nvim-cmp", - "sha256": "1ca9mpxq7cqi36mqz0cgyhl9w1dwcalwh6v4kj377g1vqslyl5ay", + "rev": "e94d3489311f941788756953df23ca84f83eec95", + "date": "2022-10-16T18:29:26+09:00", + "path": "/nix/store/jplbdkkgdbwxm930wyvxs6ghbljvh47g-nvim-cmp", + "sha256": "1v6iw2bqaqxzspl239jw3aqj64mc9sq2xxibvll7rmxxgv2mgyb5", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2668,7 +2668,7 @@ buildLuarocksPackage { }) {}; plenary-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luassert, lua +, fetchgit, lua, luassert }: buildLuarocksPackage { pname = "plenary.nvim"; @@ -2688,7 +2688,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ luassert lua ]; + propagatedBuildInputs = [ lua luassert ]; meta = { homepage = "http://github.com/nvim-lua/plenary.nvim"; @@ -2908,7 +2908,7 @@ buildLuarocksPackage { }) {}; std-normalize = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, std-_debug, lua +, fetchgit, lua, std-_debug }: buildLuarocksPackage { pname = "std.normalize"; @@ -2928,7 +2928,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ std-_debug lua ]; + propagatedBuildInputs = [ lua std-_debug ]; meta = { homepage = "https://lua-stdlib.github.io/normalize"; @@ -2964,7 +2964,7 @@ buildLuarocksPackage { }) {}; tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, luafilesystem, compat53 +, fetchgit, argparse, compat53, luafilesystem , dkjson}: buildLuarocksPackage { pname = "tl"; @@ -2986,7 +2986,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - propagatedBuildInputs = [ argparse luafilesystem compat53 ]; + propagatedBuildInputs = [ argparse compat53 luafilesystem ]; checkInputs = [ dkjson ]; meta = { diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix new file mode 100644 index 0000000000000..8381cf821ed34 --- /dev/null +++ b/pkgs/development/ocaml-modules/mec/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchzip, buildDunePackage, ocaml +, zarith, eqaf, bigarray-compat, hex, ff-sig, ff +, alcotest, bisect_ppx }: + +buildDunePackage rec { + pname = "mec"; + version = "0.1.0"; + src = fetchzip { + url = "https://gitlab.com/nomadic-labs/cryptography/ocaml-ec/-/archive/${version}/ocaml-ec-${version}.tar.bz2"; + sha256 = "sha256-uIcGj/exSfuuzsv6C/bnJXpYRu3OY3dcKMW/7+qwi2U="; + }; + + minimalOCamlVersion = "4.12"; + + propagatedBuildInputs = [ + eqaf + bigarray-compat + hex + ff-sig + ff + alcotest + ]; + + buildInputs = [ + zarith + ]; + + checkInputs = [ + alcotest + bisect_ppx + ]; + + meta = { + description = "Mec - Mini Elliptic Curve library"; + homepage = "https://gitlab.com/nomadic-labs/cryptography/ocaml-ec"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index c9d0b436bbb8b..f9976817660d3 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -12,7 +12,7 @@ , dpkt , fetchFromGitHub , GitPython -, itanium_demangler +, itanium-demangler , mulpyplexer , nampa , networkx @@ -69,7 +69,7 @@ buildPythonPackage rec { cppheaderparser dpkt GitPython - itanium_demangler + itanium-demangler mulpyplexer nampa networkx diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index a3bc87c8d086f..eae3bd65bc13e 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -1,21 +1,23 @@ { lib , arrow +, azure-storage-blob +, boto , buildPythonPackage , colour , email-validator , enum34 , fetchPypi , flask -, flask-sqlalchemy , flask-babelex , flask-mongoengine +, flask-sqlalchemy , geoalchemy2 -, isPy27 , mongoengine , pillow , psycopg2 , pymongo , pytestCheckHook +, pythonOlder , shapely , sqlalchemy , sqlalchemy-citext @@ -29,26 +31,35 @@ buildPythonPackage rec { version = "1.6.0"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "Flask-Admin"; inherit version; - sha256 = "1209qhm51d4z66mbw55cmkzqvr465shnws2m2l2zzpxhnxwzqks2"; + hash = "sha256-Qk/8ebew3/8FFVVobqEuhuSN/6ysFL6qMZ+0UCrECYg="; }; propagatedBuildInputs = [ flask wtforms - ] ++ lib.optionals isPy27 [ - enum34 ]; + passthru.optional-dependencies = { + aws = [ + boto + ]; + azure = [ + azure-storage-blob + ]; + }; + checkInputs = [ arrow colour email-validator - flask-sqlalchemy flask-babelex flask-mongoengine + flask-sqlalchemy geoalchemy2 mongoengine pillow @@ -65,6 +76,13 @@ buildPythonPackage rec { disabledTests = [ # Incompatible with werkzeug 2.1 "test_mockview" + # Tests are outdated and don't work with peewee + "test_nested_flask_views" + "test_export_csv" + "test_list_row_actions" + "test_column_editable_list" + "test_column_filters" + "test_export_csv" ]; disabledTestPaths = [ @@ -84,7 +102,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Simple and extensible admin interface framework for Flask"; + description = "Admin interface framework for Flask"; homepage = "https://github.com/flask-admin/flask-admin/"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 844f396816489..72e8ad60e066b 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2022.5.0"; + version = "2022.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "intake"; repo = "filesystem_spec"; rev = version; - hash = "sha256-WOzw9UPF8LZuOhp5p/CJUUJcYpAfixV6GiI8tfnoklc="; + hash = "sha256-eT1zqTbU5kfQ7bvzigT9579HfXU6VaOEjRg8VG/DHMI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 85a88dc3d5b53..6ac2d6e23bf77 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2022.5.0"; + version = "2022.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = version; - hash = "sha256-gIkK1VSg1h04+MQBoxFtXIdn80faJlgQ9ayqV5p0RMU="; + hash = "sha256-BnnKFrWz47izKc7nS8NR1Vze1x9kJdYBsQT2KEY9ghM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/itanium_demangler/default.nix b/pkgs/development/python-modules/itanium-demangler/default.nix index ade063a625aec..6ec44062d8b8f 100644 --- a/pkgs/development/python-modules/itanium_demangler/default.nix +++ b/pkgs/development/python-modules/itanium-demangler/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "itanium-demangler"; - version = "1.0"; # pulled from pypi version + version = "1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "whitequark"; repo = "python-itanium_demangler"; - rev = "29c77860be48e6dafe3496e4d9d0963ce414e366"; - hash = "sha256-3fXwHO8JZgE0QSWScMKgRKDX5380cYPSMNMKUgwtqWI="; + rev = "v${version}"; + hash = "sha256-I6NUfckt2cocQt5dZSFadpshTCuA/6bVNauNXypWh+A="; }; checkInputs = [ @@ -31,6 +35,6 @@ buildPythonPackage rec { description = "Python parser for the Itanium C++ ABI symbol mangling language"; homepage = "https://github.com/whitequark/python-itanium_demangler"; license = licenses.bsd0; - maintainers = with maintainers; [ pamplemousse ]; + maintainers = with maintainers; [ fab pamplemousse ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 1c2976cdf03e4..8e8f8ef87b24d 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -19,13 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.15.2"; + version = "2.16.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wLzdRgbmQObxbSNs6sVTNtyL+Yy7zgZ68nUkzML7JkA="; + hash = "sha256-0bo0LPfoQ+yyw6Pf4z3hS4Nd+Xiqe0Ecqt3/lacr0so="; }; nativeBuildInputs = [ @@ -39,7 +40,9 @@ buildPythonPackage rec { babel jupyter_server tomli - ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; + ] ++ lib.optional (pythonOlder "3.10") [ + importlib-metadata + ]; checkInputs = [ openapi-core @@ -71,8 +74,9 @@ buildPythonPackage rec { meta = with lib; { description = "A set of server components for JupyterLab and JupyterLab like applications"; - homepage = "https://jupyter.org"; + homepage = "https://jupyterlab-server.readthedocs.io/"; + changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index bb1370fe07376..089088a09bd34 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.15.1"; + version = "3.15.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2rxGOUCITEHuM83qhaKQGK4jSf4r8hcBAGxRImT/rhE="; + hash = "sha256-6s+JTUYmuP6Y6D+mi8YTznHbPYUS7yk259MuPpm9H/s="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 00b3b9406617d..a62e90a80e71b 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -1,33 +1,64 @@ { lib , buildPythonPackage , fetchFromGitHub -, wheel -, setuptools -, setuptools-scm -, pytestCheckHook +, importlib-metadata +, numpy +, pydantic , pytest-mypy-plugins -, pytest-cov -, pytest -, mypy +, pytestCheckHook +, pythonOlder +, setuptools-scm , typing-extensions -}: buildPythonPackage rec -{ +, wheel +, wrapt +}: + +buildPythonPackage rec { pname = "psygnal"; - version = "0.3.5"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "tlambert03"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-8X6d0KZ61Uy5B68zuxtaimwnDSldWsVrL19iROS4X78="; + hash = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8="; }; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ typing-extensions ]; - checkInputs = [ pytestCheckHook pytest-cov pytest-mypy-plugins ]; - doCheck = false; # mypy checks are failing + SETUPTOOLS_SCM_PRETEND_VERSION = version; + buildInputs = [ + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + typing-extensions + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + numpy + pydantic + pytest-mypy-plugins + pytestCheckHook + wrapt + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=psygnal --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ + "psygnal" + ]; + meta = with lib; { - description = "Pure python implementation of Qt Signals"; + description = "Implementation of Qt Signals"; homepage = "https://github.com/tlambert03/psygnal"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 2d77b8155271a..b01ab969338a8 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.16.2"; + version = "5.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-ta25THygR0zlberqelDRr/EwUwxSq2hZjtWW0RjOJnI="; + hash = "sha256-xqlQwVqjzqQ0cBNcAlS/R0Ut3aA6umEjogRnlSMHdro="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 5b2f3941b2b40..c82bf2504860f 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pyscf"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nwnhaqSn/9WHBjUPaEabK4x23fJ83WwEYvz6aCcvsDw="; + hash = "sha256-KMxwyAK00Zc0i76zWTMznfXQCVCt+4HOH8SlwuOCORk="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. @@ -74,6 +74,7 @@ buildPythonPackage rec { -e test_jk_hermi0 \ -e test_j_kpts \ -e test_k_kpts \ + -e test_lda \ -e high_cost \ -e skip \ -e call_in_background \ diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index ce123e5afc41d..7b9f82cd6c518 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.13"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - hash = "sha256-48Gphpo3tPcVEGNOSEb8mQaSQARQDCOGFyhGJ+i4BWI="; + hash = "sha256-aBL7k10kZNQG/wNIxO37TbDSlbhrVjTfv2aXcrS2Ibo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index c7b6f72ac8ec0..56859969708e9 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.18.0"; + version = "3.20.0"; owner = "erlang"; deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "09648hzc2mnjwf9klm20cg4hb5rn2xv2gmzcg98ffv37p5yfl327"; + sha256 = "1mh5cd3cpnvfv2cwm5bs64ldd2d7iqvikn47v9bpfd76nck3h8nh"; }; buildInputs = [ erlang ]; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 3848600cb4c7f..fa4e8b04f8bcd 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -16,11 +16,11 @@ let }; relx = builder { name = "relx"; - version = "4.6.0"; + version = "4.7.0"; src = fetchHex { pkg = "relx"; - version = "4.6.0"; - sha256 = "sha256-L/gTHGMJPGIcazfcUtGyhIqTiIZYS0twHTW9vkN39Qk="; + version = "4.7.0"; + sha256 = "sha256-oqv6+nC846C5im5RQKyYQpuZgPg1/7RzV/BkVCL8L6M="; }; beamDeps = [ bbmustache ]; }; @@ -86,11 +86,11 @@ let }; certifi = builder { name = "certifi"; - version = "2.8.0"; + version = "2.9.0"; src = fetchHex { pkg = "certifi"; - version = "2.8.0"; - sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o="; + version = "2.9.0"; + sha256 = "sha256-Jm2ka9sG1sbTX955m8so022YXUJK18CLW7SPW1zdRkE"; }; beamDeps = [ ]; }; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index d99f203f6d27c..ce689f0c1e269 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,24 +1,23 @@ { luarocks, fetchFromGitHub, unstableGitUpdater }: -luarocks.overrideAttrs(old: { + +luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2022-09-04"; + version = "unstable-2022-10-12"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "cfc1439a29ac666fb0fcf440224adf73004655d4"; - sha256 = "sha256-uHkE9ztOZDs2pi7to3kZ0iELRhv/gPQgTK+qyYpFZ/Y="; + rev = "7b3cc90ebf07813ed511f530cc50d602e9502001"; + sha256 = "sha256-zN+8BzUkKUQU/6BWg1kcsL3XV9qehnwm1L4vRKOejPs="; }; - patches = []; + patches = [ ]; passthru = { - updateScript = unstableGitUpdater { - branch = "use-fetchzip"; - }; + updateScript = unstableGitUpdater { }; }; - meta = { + meta = { mainProgram = "luarocks"; }; }) diff --git a/pkgs/development/tools/rust/cargo-hf2/add-cargo-lock.patch b/pkgs/development/tools/rust/cargo-hf2/add-cargo-lock.patch deleted file mode 100644 index 8b7dba9a2cf8d..0000000000000 --- a/pkgs/development/tools/rust/cargo-hf2/add-cargo-lock.patch +++ /dev/null @@ -1,789 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..c249e21 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,783 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "addr2line" -+version = "0.17.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "android_system_properties" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -+dependencies = [ -+ "addr2line", -+ "cc", -+ "cfg-if", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "bumpalo" -+version = "3.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" -+ -+[[package]] -+name = "cargo-hf2" -+version = "0.3.3" -+dependencies = [ -+ "cargo-project", -+ "colored", -+ "hf2", -+ "hidapi", -+ "log", -+ "maplit", -+ "pretty_env_logger 0.3.1", -+ "structopt", -+] -+ -+[[package]] -+name = "cargo-project" -+version = "0.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04e57b974bffaf97c6a66551e4f947e34637ec25f35aaf9b45f03326a9e3874f" -+dependencies = [ -+ "failure", -+ "glob", -+ "log", -+ "rustc-cfg", -+ "serde", -+ "serde_derive", -+ "toml", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "chrono" -+version = "0.4.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -+dependencies = [ -+ "iana-time-zone", -+ "js-sys", -+ "num-integer", -+ "num-traits", -+ "time", -+ "wasm-bindgen", -+ "winapi", -+] -+ -+[[package]] -+name = "clap" -+version = "2.34.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "colored" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -+dependencies = [ -+ "atty", -+ "lazy_static", -+ "winapi", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -+ -+[[package]] -+name = "crc-any" -+version = "2.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df" -+ -+[[package]] -+name = "env_logger" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -+dependencies = [ -+ "backtrace", -+ "failure_derive", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.26.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "goblin" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884" -+dependencies = [ -+ "log", -+ "plain", -+ "scroll", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hf2" -+version = "0.3.3" -+dependencies = [ -+ "crc-any", -+ "goblin", -+ "hidapi", -+ "log", -+ "maplit", -+ "scroll", -+] -+ -+[[package]] -+name = "hf2-cli" -+version = "0.3.3" -+dependencies = [ -+ "crc-any", -+ "hf2", -+ "hidapi", -+ "log", -+ "maplit", -+ "pretty_env_logger 0.4.0", -+ "structopt", -+] -+ -+[[package]] -+name = "hidapi" -+version = "1.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38b1717343691998deb81766bfcd1dce6df0d5d6c37070b5a3de2bb6d39f7822" -+dependencies = [ -+ "cc", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "humantime" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+dependencies = [ -+ "quick-error", -+] -+ -+[[package]] -+name = "iana-time-zone" -+version = "0.1.46" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" -+dependencies = [ -+ "android_system_properties", -+ "core-foundation-sys", -+ "js-sys", -+ "wasm-bindgen", -+ "winapi", -+] -+ -+[[package]] -+name = "js-sys" -+version = "0.3.59" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "libc" -+version = "0.2.132" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" -+ -+[[package]] -+name = "log" -+version = "0.4.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "maplit" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -+ -+[[package]] -+name = "memchr" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" -+dependencies = [ -+ "adler", -+] -+ -+[[package]] -+name = "num-integer" -+version = "0.1.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -+dependencies = [ -+ "autocfg", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "object" -+version = "0.29.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.13.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" -+ -+[[package]] -+name = "plain" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" -+ -+[[package]] -+name = "pretty_env_logger" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" -+dependencies = [ -+ "chrono", -+ "env_logger 0.6.2", -+ "log", -+] -+ -+[[package]] -+name = "pretty_env_logger" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" -+dependencies = [ -+ "env_logger 0.7.1", -+ "log", -+] -+ -+[[package]] -+name = "proc-macro-error" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -+dependencies = [ -+ "proc-macro-error-attr", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro-error-attr" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quick-error" -+version = "1.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "regex" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+ -+[[package]] -+name = "rustc-cfg" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ad221fe7cd09334f8735dcc157b1178e343f43dfaefcd1b09d7fd4fc0921b6f" -+dependencies = [ -+ "failure", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -+ -+[[package]] -+name = "scroll" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" -+dependencies = [ -+ "scroll_derive", -+] -+ -+[[package]] -+name = "scroll_derive" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde" -+version = "1.0.144" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.144" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "structopt" -+version = "0.3.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -+dependencies = [ -+ "clap", -+ "lazy_static", -+ "structopt-derive", -+] -+ -+[[package]] -+name = "structopt-derive" -+version = "0.4.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -+dependencies = [ -+ "libc", -+ "wasi", -+ "winapi", -+] -+ -+[[package]] -+name = "toml" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+ -+[[package]] -+name = "version_check" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+ -+[[package]] -+name = "wasi" -+version = "0.10.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -+dependencies = [ -+ "cfg-if", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -+dependencies = [ -+ "bumpalo", -+ "log", -+ "once_cell", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index 8813af645e961..92a0a54581754 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -1,10 +1,9 @@ { lib -, stdenv , rustPlatform -, fetchFromGitHub -, libusb1 +, fetchCrate , pkg-config -, rustfmt +, libusb1 +, stdenv , AppKit }: @@ -12,20 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hf2"; version = "0.3.3"; - src = fetchFromGitHub { - owner = "jacobrosenthal"; - repo = "hf2-rs"; - rev = "v${version}"; - sha256 = "1vkmdmc2041h7msygqb97zcl8vdxjqwy7w0lvbnw99h693q3hqa0"; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; }; - cargoPatches = [ - ./add-cargo-lock.patch - ]; - - cargoSha256 = "sha256-5aTqiJ23XuY9MNIt3lVMIJ+33BZkcS02HbctIJrnEfo="; + cargoSha256 = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI="; - nativeBuildInputs = [ pkg-config rustfmt ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index d71f11fc5bbd3..df3d7cf870e70 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1WQo1v5TJPPJjC2lc8k9aWmtRUFITYEuwSfsPzh5320="; + sha256 = "sha256-atJKpr4XLedG+A26ijlZKKFbskpLpJw9ThZvMuQYw+s="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 139a4b5db7419..b32ab9d076d41 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -36,6 +36,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ yorickvp ivan ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index af8032b81a509..0e491fcbb27ac 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus lgpl21Plus ]; description = "The RPM Package Manager"; maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0a714555437e..ef7b8100b489b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15573,7 +15573,7 @@ with pkgs; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy38; + pypy3 = pypy39; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -15619,7 +15619,7 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38 pypy37 rustpython; + inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; @@ -15636,6 +15636,7 @@ with pkgs; pypy3Packages = pypy3.pkgs; pypy37Packages = pypy37.pkgs; pypy38Packages = pypy38.pkgs; + pypy39Packages = pypy39.pkgs; py3c = callPackage ../development/libraries/py3c { }; @@ -27810,7 +27811,9 @@ with pkgs; alsa-lib = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; + inherit (darwin.apple_sdk.frameworks) + AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit + ImageCaptureCore GSS ImageIO; inherit (darwin) sigtool; }; @@ -27826,10 +27829,14 @@ with pkgs; }); emacsMacport = callPackage ../applications/editors/emacs/macport.nix { + withMacport = true; + + gconf = null; + inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + inherit (darwin) sigtool; }; emacsPackagesFor = emacs: import ./emacs-packages.nix { @@ -28475,6 +28482,7 @@ with pkgs; xrdp = callPackage ../applications/networking/remote/xrdp { }; freerdp = callPackage ../applications/networking/remote/freerdp { + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; @@ -35910,7 +35918,9 @@ with pkgs; apfel = callPackage ../development/libraries/physics/apfel { }; - applgrid = callPackage ../development/libraries/physics/applgrid { }; + applgrid = callPackage ../development/libraries/physics/applgrid { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; hoppet = callPackage ../development/libraries/physics/hoppet { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cf5b4fcb59876..49bd070524504 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -793,6 +793,8 @@ let mdx = callPackage ../development/ocaml-modules/mdx { }; + mec = callPackage ../development/ocaml-modules/mec { }; + menhir = callPackage ../development/ocaml-modules/menhir { }; menhirLib = callPackage ../development/ocaml-modules/menhir/lib.nix { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ba0f5a7f52402..fc7a250da6859 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -97,6 +97,7 @@ mapAliases ({ imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 + itanium_demangler = itanium-demangler; # added 2022-1017 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f95c949e74d26..bb55c0ff7b10f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4722,7 +4722,7 @@ in { isoweek = callPackage ../development/python-modules/isoweek { }; - itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; + itanium-demangler = callPackage ../development/python-modules/itanium-demangler { }; itemadapter = callPackage ../development/python-modules/itemadapter { }; |