Unverified Commit 32fb99ba authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging-next

parents 25212266 9049f88b

nixos/modules/installer/cd-dvd/iso-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ in 
        { source = config.isoImage.splashImage;

          target = "/isolinux/background.png";

        }

        { source = isolinuxCfg;

        { source = pkgs.writeText "isolinux.cfg" isolinuxCfg;

          target = "/isolinux/isolinux.cfg";

        }

        { source = "${pkgs.syslinux}/share/syslinux";

pkgs/by-name/bi/bitrise/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
}:

buildGoModule rec {

  pname = "bitrise";

  version = "2.27.0";

  version = "2.29.1";



  src = fetchFromGitHub {

    owner = "bitrise-io";

    repo = "bitrise";

    rev = version;

    hash = "sha256-qkKGkUY5d4EWTjz6IfWhjYOSpXISE4Z98P0laRKe5wo=";

    hash = "sha256-pBaXOGFDmweyJaF+Wp4qAil8yAtUYO6UoKTLAPrq7F8=";

  };



  # many tests rely on writable $HOME/.bitrise and require network access

pkgs/by-name/ec/ecapture/package.nix

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


buildGoModule rec {

  pname = "ecapture";

  version = "0.9.3";

  version = "0.9.4";



  src = fetchFromGitHub {

    owner = "gojue";

    repo = "ecapture";

    tag = "v${version}";

    hash = "sha256-nqNFbZrmCleWcRM2HsbgmCHqsar3KmiGYxt55ZqhY+U=";

    hash = "sha256-94aZBsQG7xVX3mnE3z3bmTM9NUIG0/huov2OVZJmOe4=";

    fetchSubmodules = true;

  };

pkgs/by-name/lu/ludtwig/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,19 +6,19 @@ 


rustPlatform.buildRustPackage rec {

  pname = "ludtwig";

  version = "0.9.0";

  version = "0.10.0";



  src = fetchFromGitHub {

    owner = "MalteJanz";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-J5UTVXUExVApA8VVTyhkO2JhpVCK45li9VBN+oM9TBI=";

    hash = "sha256-3E1W6AlGQ9AhMzLvTV5KBjlKiWXyi7rFwHOdU3CIp60=";

  };



  checkType = "debug";



  useFetchCargoVendor = true;

  cargoHash = "sha256-oS4YepJWqmbjAhitHOCBUrLEyVo3UpZ8UNOESuG4C2M=";

  cargoHash = "sha256-00JHtrDffFl3h3IOH+h491qGOSfXIJH9NBmaqqUtQ6k=";



  meta = with lib; {

    description = "Linter / Formatter for Twig template files which respects HTML and your time";

pkgs/by-name/se/ser2net/package.nix

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


stdenv.mkDerivation rec {

  pname = "ser2net";

  version = "4.6.3";

  version = "4.6.4";



  src = fetchFromGitHub {

    owner = "cminyard";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-rxFCACCfnPV5Lbd3k/zk9JbFAXJJTNGQzpOpD2M9zhg=";

    hash = "sha256-acj9D23J5FvcCasBq5GrPgtsStJrzanTpbKINuy/sqI=";

  };



  passthru = {