Unverified Commit 173041b3 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents bd56ae56 827a4c5e

pkgs/applications/misc/meerk40t/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ 


python3Packages.buildPythonApplication rec {

  pname = "MeerK40t";

  version = "0.9.3010";

  version = "0.9.4000";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "meerk40t";

    repo = pname;

    rev = "refs/tags/${version}";

    hash = "sha256-RlIWqxmUiL1gFMxwcdWxDiebmEzVz6kTaSlAZHr8S+I=";

    hash = "sha256-ceDnnHdmJ6VOrM9pSxjeKQ748E8fsIqSQ36qFpXc9Ac=";

  };



  nativeBuildInputs = [

pkgs/applications/science/math/geogebra/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ let 
  version = "5-0-785-0";



  srcIcon = fetchurl {

    url = "http://static.geogebra.org/images/geogebra-logo.svg";

    url = "https://web.archive.org/web/20200227000442if_/https://static.geogebra.org/images/geogebra-logo.svg";

    hash = "sha256-Vd7Wteya04JJT4WNirXe8O1sfVKUgc0hKGOy7d47Xgc=";

  };

pkgs/by-name/ha/hare/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, harec

, makeWrapper

, qbe

, gitUpdater

, scdoc

, tzdata

, substituteAll
@@ -30,9 +31,6 @@ in 
'';



let

  # We use harec's override of qbe until 1.2 is released, but the `qbe` argument

  # is kept to avoid breakage.

  qbe = harec.qbeUnstable;

  arch = stdenv.hostPlatform.uname.processor;

  platform = lib.toLower stdenv.hostPlatform.uname.system;

  embeddedOnBinaryTools =
@@ -59,15 +57,15 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "hare";

  version = "unstable-2024-02-08";

  version = "0.24.0";



  outputs = [ "out" "man" ];



  src = fetchFromSourcehut {

    owner = "~sircmpwn";

    repo = "hare";

    rev = "5f65a5c112dd15efc0f0223ee895c2582e8f4915";

    hash = "sha256-Ic/2Gn3ZIJ5wKXBsNS4MHoBUfvbH3ZqAsuj7tOlDtW4=";

    rev = finalAttrs.version;

    hash = "sha256-3T+BdNj+Th8QXrcsPMWlN9GBfuMF1ulneWHpDEtyBU8=";

  };



  patches = [
@@ -96,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "HARECACHE=.harecache"

    "PREFIX=${builtins.placeholder "out"}"

    "ARCH=${arch}"

    "VERSION=${finalAttrs.version}-nixpkgs"

    # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does

    # not follow the FHS.

    "HAREPATH=$(SRCDIR)/hare/stdlib"
@@ -132,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { 
  setupHook = ./setup-hook.sh;



  passthru = {

    updateScript = gitUpdater { };

    tests = lib.optionalAttrs enableCrossCompilation {

      crossCompilation = callPackage ./cross-compilation-tests.nix {

        hare = finalAttrs.finalPackage;

pkgs/by-name/ha/harec/package.nix

+8 −21
Original line number Diff line number Diff line
@@ -2,46 +2,35 @@ 
, stdenv

, fetchFromSourcehut

, qbe

, fetchgit

, gitUpdater

}:

let

  # harec needs the dbgfile and dbgloc features implemented up to this commit.

  # This can be dropped once 1.2 is released. For a possible release date, see:

  # https://lists.sr.ht/~mpu/qbe/%3CZPkmHE9KLohoEohE%40cloudsdale.the-delta.net.eu.org%3E

  qbe' = qbe.overrideAttrs (_old: {

    version = "1.1-unstable-2024-01-12";

    src = fetchgit {

      url = "git://c9x.me/qbe.git";

      rev = "85287081c4a25785dec1ec48c488a5879b3c37ac";

      hash = "sha256-7bVbxUU/HXJXLtAxhoK0URmPtjGwMSZrPkx8WKl52Mg=";

    };

  });



  platform = lib.toLower stdenv.hostPlatform.uname.system;

  arch = stdenv.hostPlatform.uname.processor;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "harec";

  version = "unstable-2024-02-03";

  version = "0.24.0";



  src = fetchFromSourcehut {

    owner = "~sircmpwn";

    repo = "harec";

    rev = "09cb18990266eef814917d8211d38b82e0896532";

    hash = "sha256-cxWRqGipoDATN1+V9s9S2WJ3sLMcTqIJmhP5XTld3AU=";

    rev = finalAttrs.version;

    hash = "sha256-NOfoCT/wKZ3CXYzXZq7plXcun+MXQicfzBOmetXN7Qs=";

  };



  nativeBuildInputs = [

    qbe'

    qbe

  ];



  buildInputs = [

    qbe'

    qbe

  ];



  makeFlags = [

    "PREFIX=${builtins.placeholder "out"}"

    "ARCH=${arch}"

    "VERSION=${finalAttrs.version}-nixpkgs"

  ];



  strictDeps = true;
@@ -55,9 +44,7 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  passthru = {

    # We create this attribute so that the `hare` package can access the

    # overwritten `qbe`.

    qbeUnstable = qbe';

    updateScript = gitUpdater { };

  };



  meta = {

pkgs/development/compilers/cairo/default.nix

+3 −8
Original line number Diff line number Diff line
@@ -6,21 +6,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "cairo";

  version = "2.4.0";

  version = "2.5.4";



  src = fetchFromGitHub {

    owner = "starkware-libs";

    repo = "cairo";

    rev = "v${version}";

    hash = "sha256-5bCPklk9u21/9cZYisszK0Lo7is9+iFrQxve41Fy5hg=";

    hash = "sha256-ctb5VingMczzHLyyEjKgFKNAZI3/fqzjFW/RQGDSsyQ=";

  };



  cargoPatches = [

    # Upstream Cargo.lock is not up-to-date.

    # https://github.com/starkware-libs/cairo/issues/4530

    ./ensure-consistency-of-cargo-lock.patch

  ];

  cargoHash = "sha256-YCW6nwmUXMiP65QHCH6k29672gIkuz+MCmTqI+qaOyA=";

  cargoHash = "sha256-T21GuGQaX/VD907MEGp68bQPXrRK0it4o1nLEdHwTsE=";



  nativeCheckInputs = [

    rustfmt