diff options
Diffstat (limited to 'pkgs')
27 files changed, 147 insertions, 147 deletions
diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix new file mode 100644 index 000000000000..408838a0a284 --- /dev/null +++ b/pkgs/applications/misc/cotp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, AppKit +, libxcb +}: + +rustPlatform.buildRustPackage rec { + name = "cotp"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "replydev"; + repo = "cotp"; + rev = "v${version}"; + hash = "sha256-SbS+ch7/45kZb49jW2mnRWQruLrfrNfeZFqEPHQKGUg="; + }; + + cargoHash = "sha256-2lIR3K4/hr4XSmNGFd/dhwoFOtEB9KSnUrZkcaCyc9k="; + + buildInputs = lib.optionals stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + homepage = "https://github.com/replydev/cotp"; + description = "Trustworthy, encrypted, command-line TOTP/HOTP authenticator app with import functionality"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ davsanchez ]; + }; +} diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 442f9d0e9b50..528fe1aec0c8 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -4,28 +4,24 @@ , pkg-config , gtk4 , stdenv -, DiskArbitration -, Foundation -, IOKit +, darwin }: rustPlatform.buildRustPackage rec { pname = "process-viewer"; - version = "0.5.5"; + version = "0.5.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MHVKjbD1/h7G94x6dpyRT/BPWQVUFurW7EvAUJ2xZeU="; + sha256 = "sha256-ELASfcXNhUCE/mhPKBHA78liFMbcT9RB/aoLt4ZRPa0="; }; - cargoSha256 = "sha256-NkJjwB4rBV4hFRwYHILMET8o4x1+95sVsFqNaVN8tMg="; + cargoSha256 = "sha256-K2kyZwKRALh9ImPngijgpoHyLS+c5sDYviN74JxhJLM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ - DiskArbitration - Foundation - IOKit + darwin.apple_sdk_11_0.frameworks.Foundation ]; postInstall = '' diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index a150014daa7c..f402faf965be 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost166 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: stdenv.mkDerivation rec { pname = "SkypeExport"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; }; + patches = [ + (fetchpatch { + name = "boost167.patch"; + url = "https://github.com/Temptin/SkypeExport/commit/ef60f2e4fc9e4a5764c8d083a73b585457bc10b1.patch"; + sha256 = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ boost166 ]; + buildInputs = [ boost ]; preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { description = "Export Skype history to HTML"; homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ yana ]; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index aea24b84d1d4..205fe3ebed5d 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -7,17 +7,18 @@ , maxima , wxGTK , gnome +, glib }: stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "22.05.0"; + version = "22.12.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0="; + sha256 = "sha256-RT6y4M6LQD1fXJcjtdSXnDmoJvv160g2asdV4WtTcok="; }; buildInputs = [ @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { maxima # So it won't embed svg files into headers. gnome.adwaita-icon-theme + # So it won't crash under Sway. + glib ]; nativeBuildInputs = [ @@ -33,6 +36,10 @@ stdenv.mkDerivation rec { gettext ]; + cmakeFlags = [ + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + ]; + preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 6c55027d3c6f..044f9ae56d05 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -12,11 +12,16 @@ stdenv.mkDerivation { patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; - buildInputs = [ ocaml ncurses ]; + strictDeps = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ocaml ]; - makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ]; + buildInputs = [ ncurses ]; + + makeFlags = [ + "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" + "WITHBIGARRAY=bigarray.cma" + ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 dontStrip = true; @@ -42,6 +47,6 @@ stdenv.mkDerivation { license = "non-commercial"; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 1bdd028d8101..184a15d92c01 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -7,6 +7,7 @@ , Foundation , libiconv , Security +, git }: rustPlatform.buildRustPackage rec { @@ -26,12 +27,18 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; + checkInputs = [ git ]; + postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash installShellCompletion --zsh --name _delta etc/completion/completion.zsh installShellCompletion --fish --name delta.fish etc/completion/completion.fish ''; + checkFlags = lib.optionals stdenv.isDarwin [ + "--skip=test_diff_same_non_empty_file" + ]; + meta = with lib; { homepage = "https://github.com/dandavison/delta"; description = "A syntax-highlighting pager for git"; diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 2e8d735fa0e5..8873e8c4718e 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python38Packages +, python3Packages , fetchFromGitHub , fetchurl , sd @@ -90,11 +90,7 @@ let }; # Builds the main `sl` binary and its Python extensions - # - # FIXME(lf-): when next updating this package, delete the python 3.8 override - # here, since the fix for https://github.com/facebook/sapling/issues/279 that - # required it will be in the next release. - sapling = python38Packages.buildPythonPackage { + sapling = python3Packages.buildPythonPackage { pname = "sapling-main"; inherit src version; @@ -135,7 +131,7 @@ let # so that 'sl web' always works # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB preFixup = '' - sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages + sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages chmod +w $sitepackages cp -r ${isl} $sitepackages/edenscm-isl '' + lib.optionalString (!enableMinimal) '' diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix deleted file mode 100644 index a350c224e8a6..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck2, libgtop, pkg-config, python2, gtk2 }: - -let - inherit (python2.pkgs) python pygtk; -in stdenv.mkDerivation rec { - ver_maj = "2.32"; - ver_min = "0"; - version = "${ver_maj}.${ver_min}"; - pname = "gnome-python-desktop"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; - sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 librsvg libwnck2 libgtop python ]; - propagatedBuildInputs = [ gnome_python pygtk ]; - - # gnome-python-desktop expects that .pth file is already installed by PyGTK - # in the same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth - ''; - - meta = with lib; { - homepage = "http://www.pygtk.org"; - description = "Python bindings for GNOME desktop packages"; - license = licenses.lgpl21; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix deleted file mode 100644 index 0c636ffa5417..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, python2, pkg-config, libgnome, GConf, glib, gtk2, gnome_vfs }: - -with lib; - -let - inherit (python2.pkgs) python pygobject2 pygtk dbus-python; -in stdenv.mkDerivation rec { - pname = "gnome-python"; - version = "2.28.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python/${lib.versions.majorMinor version}/gnome-python-${version}.tar.bz2"; - sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ]; - propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; - - # gnome-python expects that .pth file is already installed by PyGTK in the - # same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/gnome-python-${version}.pth - ''; - - meta = with lib; { - homepage = "http://pygtk.org/"; - description = "Python wrapper for GNOME libraries"; - platforms = platforms.linux; - license = licenses.lgpl2; - maintainers = with maintainers; [ qknight ]; - }; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 2082caf7f9d1..3dfcc5190974 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -33,10 +33,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_mime_data = callPackage ./platform/gnome-mime-data { }; - gnome_python = callPackage ./bindings/gnome-python { }; - - gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; @@ -72,7 +68,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; gtkmm = pkgs.gtkmm2; - python_rsvg = self.gnome_python_desktop; gtkdoc = pkgs.gtk-doc; startup_notification = pkgs.libstartup_notification; @@ -82,5 +77,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; - libglademm = throw "libglademm has been removed"; # 2022-01-15 + gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14 + gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 + libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15 + python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 }) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index dfc7cb3a1cab..78f5f059d156 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NB5qXO1RrVAPwd00ZZ1YhsP3YEViS1POZBv/Y8WwimE="; + sha256 = "nD4OlDPBhTqZ7VLt7BMmP0Q/hW28o7IWXC46cLhjKzA="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index dea63dd14d0b..0cb6f374f29b 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.2"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wCIdJQvkXqNulxrmO/3pcaRhRclnscZZ6WxbBypxVR0="; + sha256 = "sha256-iVUelLEnEwXP/yBLRMGDZyZ3gaV9LMt7b3u6Yo4JxRE="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 2e813fc10de7..ff2141030faa 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lzpLDeto+fkaVKTdQVtq/em1rj7mhLx2FHH5QpD59ss="; + sha256 = "sha256-MwRcehI/qife5+ubqabybxsXGMWg52M30Hmg1MkA4UY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 9ec95d1e4f16..67ac1cfa9708 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/tef88oZusYvJxVcm91p7vh1hwuXHm3LCqOMCT0TGXE="; + sha256 = "sha256-nc/c5VhakOK7HPV+N3yx6xLUG9m8ubus31BrwbE1Tvk="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 251d0af37f83..1a79cce0848f 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.2"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-hKn9Zam62M73NIL9otIKzRIvC4Uhsd6GyUE4ibn6l3E="; + hash = "sha256-EdRR0f3kTxgJ6/Ya/0vqX570/cAjWaiWR/bp59RUKaw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index ee15653d1254..450da49cf980 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.2"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Iqp/CjF8dw9ouJfp5RKyy+2xgbaV/9sLZY2Zu9ZPNo0="; + sha256 = "k+6AdHl4rSzALlrnPQo9Psgu6hNPx3niqpFpAbu1gJA="; }; patches = [ diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index a4f01aadc206..e431d2de012f 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZDP+3y9C+yK/IC2fE47C7gcjetXXQ4CQULXICbVs28s="; + sha256 = "c08JLZX8YECe6so0J7WkjLm1mdoRmVEZ2FuqmWU+ApI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index 99a6cce66431..f5c1e83ee4d0 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.8"; + version = "40.9"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "bBeMFg/LtNEb49FWnVOODngUDVC721KnWDGI95XAF+4="; + sha256 = "+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index 2471910fdb5b..c33c35e61427 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8="; + sha256 = "sha256-TQOj3DYmzFT4ClZ/sBAOs5XJWRgGTaVQjH+8JotSb1A="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index 6ed310649368..da3d1e7e7c60 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "arduino-language-server"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; - rev = version; - hash = "sha256-7xuVCD27gE8uDFBTQgBwH8bx8OWc9Lj71o27FYOSiTY="; + rev = "refs/tags/${version}"; + hash = "sha256-A5JcHdcSrRC1BxoJsPtLKBq1fu58SvwHm9hbgu8Uy5k="; }; subPackages = [ "." ]; - vendorHash = "sha256-Xa26ilo95sQ/6dGvl4gB2bb0vzWXr+WPKLezAnZPeqM="; + vendorHash = "sha256-SKqorfgesYE0kXR/Fm6gI7Me0CxtDeNsTRGYuGJW+vo="; doCheck = false; @@ -22,11 +26,14 @@ buildGoModule rec { "-w" "-X github.com/arduino/arduino-language-server/version.versionString=${version}" "-X github.com/arduino/arduino-language-server/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + ] ++ lib.optionals stdenv.isLinux [ + "-extldflags '-static'" + ]; meta = with lib; { - inherit (src.meta) homepage; description = "An Arduino Language Server based on Clangd to Arduino code autocompletion"; + homepage = "https://github.com/arduino/arduino-language-server"; + changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ BattleCh1cken ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index f305aebecf5e..e11d085f0632 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.7.10"; + version = "3.7.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zewi/LroLKFPCVYp2yBvn6gL/KAvbH5p8yNDxaHHTDY="; + hash = "sha256-k0+Ce/lZY00G9/q0FE9skUWqKiaWnHoEcfAqf4u6dko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 33380342178b..6a5802c388f9 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.48.0"; + version = "8.49.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iyywuAYDf3bY5He2rVgyjQcrD2MH123H6ham4xTAnXM="; + hash = "sha256-POrDx4xXCIOBU4hvXu03XcZI2F6xHsjHNJRBaGFC8U8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 63720359dabd..d4ca96c82d08 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tololib"; - version = "0.1.0b3"; + version = "0.1.0b4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "MatthiasLohr"; repo = pname; rev = "v${version}"; - sha256 = "qkdMy6/ZuBksbBTbDhPyCPWMjubQODjdMsqHTJ7QvQI="; + hash = "sha256-2OQaJR70bx8qWs1IPErF+B3X1iRvHW74axTqtdvum3U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; homepage = "https://gitlab.com/MatthiasLohr/tololib"; + changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 803476e3f98c..7b81126dae98 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -32,14 +32,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.49.0"; + version = "1.53.0"; pname = "conan"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = version; - hash = "sha256-BJGstNAnAZtpwagsCY+4quTd0/79zL+v4ifKikS3vaw="; + hash = "sha256-2DNDNdZO1D30egOiYa3qw8F2xsUTBOm/CHv07v5OrC8="; }; propagatedBuildInputs = with newPython.pkgs; [ diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index c4e1dbf6b0a0..65098f631a54 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.443"; + version = "0.0.447"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-v4N2Li7AGPMMIfleJ6sk2fEwJ9cYXJeV6WcDp1rI0xY="; + sha256 = "sha256-JJk3lNNRzIrU/z45ePUin10gEW5KLvcPRy+NzcMHYRs="; }; - vendorHash = "sha256-l921q3RHyEZ6dx8gHThrC18IUChUOYvB+W5PYsE7Nu0="; + vendorHash = "sha256-xmad9HdcWr4BiMMfdO6Ua1nqpFCsFoLvtDfcKiRZYVM="; subPackages = [ "." ]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index e1a75976cfb1..a20aa5dc09e0 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -12,6 +12,8 @@ , libiconv , makeFontsConf , gentium +, runCommand +, sile }: let @@ -69,12 +71,20 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; - checkInputs = [ - poppler_utils - ]; passthru = { # So it will be easier to inspect this environment, in comparison to others inherit luaEnv; + # Copied from Makefile.am + tests.test = lib.optionalAttrs (!(stdenv.isDarwin && stdenv.isAarch64)) ( + runCommand "${pname}-test" + { + nativeBuildInputs = [ poppler_utils sile ]; + inherit FONTCONFIG_FILE; + } '' + output=$(mktemp -t selfcheck-XXXXXX.pdf) + echo "<sile>foo</sile>" | sile -o $output - + pdfinfo $output | grep "SILE v${version}" > $out + ''); }; postPatch = '' @@ -91,8 +101,6 @@ stdenv.mkDerivation rec { ]; }; - doCheck = true; - enableParallelBuilding = true; preBuild = lib.optionalString stdenv.cc.isClang '' @@ -106,7 +114,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" "dev" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A typesetting system"; longDescription = '' SILE is a typesetting system; its job is to produce beautiful diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6f574f6464d..61a8fa4bc024 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -385,6 +385,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + cotp = callPackage ../applications/misc/cotp { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + cmark = callPackage ../development/libraries/cmark { }; cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; @@ -15218,7 +15222,7 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocaml-ng.ocamlPackages_4_04; + ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; opaline = callPackage ../development/tools/ocaml/opaline { }; @@ -18128,9 +18132,7 @@ with pkgs; process-compose = callPackage ../applications/misc/process-compose { }; - process-viewer = callPackage ../applications/misc/process-viewer { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; - }; + process-viewer = callPackage ../applications/misc/process-viewer { }; procodile = callPackage ../tools/system/procodile { }; @@ -30952,7 +30954,7 @@ with pkgs; }; monotoneViz = callPackage ../applications/version-management/monotone-viz { - ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; + ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; monitor = callPackage ../applications/system/monitor { @@ -36650,7 +36652,9 @@ with pkgs; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { - wxGTK = wxGTK32; + wxGTK = wxGTK32.override { + withWebKit = true; + }; }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; @@ -36746,9 +36750,7 @@ with pkgs; wxGTK = wxGTK32; }; - megam = callPackage ../applications/science/misc/megam { - inherit (ocaml-ng.ocamlPackages_4_07) ocaml; - }; + megam = callPackage ../applications/science/misc/megam { }; netlogo = callPackage ../applications/science/misc/netlogo { }; |