Unverified Commit ba94491a authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 7c7735b2 5f1c568a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "flatpak";
  version = "1.16.2";
  version = "1.16.3";

  # TODO: split out lib once we figure out what to do with triggerdir
  outputs = [
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
    hash = "sha256-aRctGw2Fxo+B5t3wEV+OGwXXOxsBD+qNnssDvIrYQ+s=";
    hash = "sha256-PWvT9fiUDoDAhyhso+QhgvxjDXgIlFNlEfzSz/wSz1s=";
  };

  patches = [
+3 −3
Original line number Diff line number Diff line
@@ -12,16 +12,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "fresh";
  version = "0.2.3";
  version = "0.2.5";

  src = fetchFromGitHub {
    owner = "sinelaw";
    repo = "fresh";
    tag = "v${finalAttrs.version}";
    hash = "sha256-nWMqO4O3Z2SBWYKtAmVci4w8oPepjvJA+MhHdMVkaHw=";
    hash = "sha256-JbjTHMvncM5wCiPa3Tmv/HJbg7sKgmOXhmu9He6Tzhk=";
  };

  cargoHash = "sha256-hi/b9kjKIDGI5RWcYIGVSS9IJyHjt6UxB7zbdRYpLUE=";
  cargoHash = "sha256-1b9v7K+EUOtHF3J3vOv1YyFxqnGZ5SbzyUBPCQ5i90U=";

  nativeBuildInputs = [
    gzip
+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "ggml";
  version = "0.9.6";
  version = "0.9.7";

  src = fetchFromGitHub {
    owner = "ggml-org";
    repo = "ggml";
    tag = "v${finalAttrs.version}";
    hash = "sha256-qi2ztJdDn3QVy6O1sAOHnWiVn8iDfEM5ijwuvDRMJ1E=";
    hash = "sha256-xTNDenY+1Tf7Nqr/EnXtYejpqU/guemySKR2WFvY9d0=";
  };

  # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@

buildGoModule (finalAttrs: {
  pname = "go-ecoflow-exporter";
  version = "1.5.0";
  version = "1.6.0";

  src = fetchFromGitHub {
    owner = "tess1o";
    repo = "go-ecoflow-exporter";
    tag = finalAttrs.version;
    hash = "sha256-oh/i4LToGnI2TuforL36tIYrhq4VUNNYVtYgaU2sf8w=";
    hash = "sha256-y273U4314oydC94sdFKiAEoZ7n4bYgiUxXf71p82qAc=";
  };

  vendorHash = "sha256-UbV6V06zxXMTd0v+rDPGoMFn9X5mMCiX41g49IGnoT8=";
  vendorHash = "sha256-hsyEv+K8qL9KOrh5L6meeBOvE/WQ4F6hGBY5bWN0EFE=";

  ldflags = [
    "-s"
+3 −3
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@
let
  rootSrc = stdenv.mkDerivation {
    pname = "iEDA-src";
    version = "0.1.0-unstable-2025-12-16";
    version = "0.1.0-unstable-2025-12-23";
    src = fetchgit {
      url = "https://gitee.com/oscc-project/iEDA";
      rev = "b73be0f1909294b56b2dbb27dba04b6cd9e0070d";
      sha256 = "sha256-bvSHfQXDk7caTELtjgpSZhJdYfRzfk9VmFm2iBW2lRw=";
      rev = "59662dcd768165f3957003522cb929d42b252023";
      sha256 = "sha256-LaFGp9U7K+HmvHW1XK6HyUB/WM5O3y/tngul+cdbCP4=";
    };

    patches = [
Loading