Commit 311c0ae6 authored by Weijia Wang's avatar Weijia Wang
Browse files

Merge branch 'master' into staging-next

parents 825f80fb c97fbef1

nixos/lib/make-btrfs-fs.nix

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
, volumeLabel

, uuid ? "44444444-4444-4444-8888-888888888888"

, btrfs-progs

, libfaketime

, fakeroot

}:



let
@@ -23,7 +25,7 @@ in 
pkgs.stdenv.mkDerivation {

  name = "btrfs-fs.img${lib.optionalString compressImage ".zst"}";



  nativeBuildInputs = [ btrfs-progs ] ++ lib.optional compressImage zstd;

  nativeBuildInputs = [ btrfs-progs libfaketime fakeroot ] ++ lib.optional compressImage zstd;



  buildCommand =

    ''
@@ -50,7 +52,7 @@ pkgs.stdenv.mkDerivation { 
      cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration



      touch $img

      mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./rootImage --shrink $img

      faketime -f "1970-01-01 00:00:01" fakeroot mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./rootImage --shrink $img



      if ! btrfs check $img; then

        echo "--- 'btrfs check' failed for BTRFS image ---"

pkgs/applications/file-managers/felix-fm/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
, fetchFromGitHub

, pkg-config

, bzip2

, libgit2

, zlib

, zstd

, zoxide

}:
@@ -24,11 +26,17 @@ rustPlatform.buildRustPackage rec { 


  buildInputs = [

    bzip2

    libgit2

    zlib

    zstd

  ];



  nativeCheckInputs = [ zoxide ];



  env = {

    ZSTD_SYS_USE_PKG_CONFIG = true;

  };



  buildFeatures = [ "zstd/pkg-config" ];



  checkFlags = [
@@ -37,11 +45,6 @@ rustPlatform.buildRustPackage rec { 
    "--skip=state::tests::test_has_write_permission"

  ];



  # Cargo.lock is outdated

  postConfigure = ''

    cargo metadata --offline

  '';



  meta = with lib; {

    description = "A tui file manager with vim-like key mapping";

    homepage = "https://github.com/kyoheiu/felix";

pkgs/applications/gis/qgis/unwrapped-ltr.nix

+2 −2
Original line number Diff line number Diff line
@@ -76,14 +76,14 @@ let 
    urllib3

  ];

in mkDerivation rec {

  version = "3.28.11";

  version = "3.28.12";

  pname = "qgis-ltr-unwrapped";



  src = fetchFromGitHub {

    owner = "qgis";

    repo = "QGIS";

    rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

    hash = "sha256-3yV47GlIhYGR7+ZlPLQw1vy1x8xuJd5erUJO3Pw7L+g=";

    hash = "sha256-C80ZrQW7WFXz8UMXSt3FJcK2gDd292H24Ic3pJD/yqI=";

  };



  passthru = {

pkgs/applications/misc/lunatask/default.nix

+4 −3
Original line number Diff line number Diff line 
{ lib, appimageTools, fetchurl }:



let

  version = "1.7.7";

  version = "1.7.8";

  pname = "lunatask";



  src = fetchurl {

    url = "https://lunatask.app/download/Lunatask-${version}.AppImage";

    sha256 = "sha256-3WiJR+gwudeLs6Mn75SJP4BZ6utwxvvRLOHe/W+1Pfs=";

    sha256 = "sha256-DhTWD9uL7zKWiRfeLYKxPtmAy1yR20wjlVA+N33YgpQ=";

  };



  appimageContents = appimageTools.extractType2 {

    inherit pname version src;

  };



in appimageTools.wrapType2 rec {

in

appimageTools.wrapType2 rec {

  inherit pname version src;



  extraInstallCommands = ''

pkgs/applications/misc/spicetify-cli/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "spicetify-cli";

  version = "2.25.2";

  version = "2.26.0";



  src = fetchFromGitHub {

    owner = "spicetify";

    repo = "spicetify-cli";

    rev = "v${version}";

    hash = "sha256-llPxR4awKBBv0jiLr5MbE33D5KZx3LmBo5BDwZI8ZM0=";

    hash = "sha256-3u55Pcd4VNgWGyu/IVsrMqm8E4H9y4Bvt3JMyIL/KXo=";

  };



  vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc=";