diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-04 00:03:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 00:03:34 +0000 |
| commit | 08b08d0cafdb33de47cb964f20b2bed74f930d4a (patch) | |
| tree | 3ea8ea19fd6f8af861963cffcaffa666032e907c /pkgs/misc | |
| parent | a5a5133aaf7568d869185fb4701d1fb0c73ae34c (diff) | |
| parent | 33a2310cb412c81bc735f9ccd640fcaa700a3304 (diff) | |
| download | nixpkgs-08b08d0cafdb33de47cb964f20b2bed74f930d4a.tar nixpkgs-08b08d0cafdb33de47cb964f20b2bed74f930d4a.tar.gz nixpkgs-08b08d0cafdb33de47cb964f20b2bed74f930d4a.tar.bz2 nixpkgs-08b08d0cafdb33de47cb964f20b2bed74f930d4a.tar.lz nixpkgs-08b08d0cafdb33de47cb964f20b2bed74f930d4a.tar.xz nixpkgs-08b08d0cafdb33de47cb964f20b2bed74f930d4a.tar.zst nixpkgs-08b08d0cafdb33de47cb964f20b2bed74f930d4a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/jitsi-meet-prosody/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 89a04bacd77..c844dbffee4 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; - configurePlatforms = [ "build" "host" ]; + configurePlatforms = lib.optionals stdenv.isLinux [ "build" "host" ]; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index abe7281c9d1..f8e57cf12a3 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6600"; + version = "1.0.6644"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "SrWkm+dXfBQmI9nownh7fRe6WXrF/x2GP0Guw7GmXOo="; + sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc="; }; dontBuild = true; |