diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-07-03 20:21:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-03 20:21:23 +0800 |
| commit | 88256e9829174d219a5176cab55e11569c0e058e (patch) | |
| tree | 6e109209a469520621b4ab29e9aee83c04ceb2b5 | |
| parent | Merge pull request #179997 from NixOS/backport-179988-to-release-22.05 (diff) | |
| parent | pantheon.elementary-camera: backport two fixes from 6.2.0 (diff) | |
| download | nixpkgs-88256e9829174d219a5176cab55e11569c0e058e.tar.gz | |
Merge pull request #179967 from bobby285271/pantheon-stable
[22.05] Pantheon 6.1 updates 2022-07-02
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 31dfa369818f..8ad926fc0b2d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -40,6 +40,18 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch"; sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4="; }) + # Fix jpeg pipeline + # https://github.com/elementary/camera/pull/212 + (fetchpatch { + url = "https://github.com/elementary/camera/commit/bb4c9e1eaef51469e562e6befce289b5822f281c.patch"; + sha256 = "sha256-UMciKs7k7QKHFaH7zazGRtkhP6+f38U2ZR3lE5fF22A="; + }) + # Add image/jpeg caps to device filter to support MJPEG webcams + # https://github.com/elementary/camera/pull/237 + (fetchpatch { + url = "https://github.com/elementary/camera/commit/2159d4142fb044f5724f883e8669726080da60ec.patch"; + sha256 = "sha256-snXtYRes9O27S51G4q13F4cV+zfRdki8FXwoR9DLJP4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 312be10811b1..6944dfac1ea5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.1.3"; + version = "6.1.4"; outputs = [ "out" "dev" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-aA3cerBKvxrh5vmDrLeWyLfbz7YjeN0aoTCX9NnVWhQ="; + sha256 = "sha256-3j0b+hExUe6OBmEHQVmd2uBkbOGxMdpgDmymuCiph80="; }; nativeBuildInputs = [ |