b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #222963 from cole-h/fix-ofborg-alias-detection

Browse source
This commit is contained in:
Artturi 2023-03-25 18:12:11 +02:00 committed by GitHub
parent 20e68dd6be 6705da37dd
commit 1601e054aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/customisation.nix
View file

@ -176,7 +176,7 @@ rec {
# Only show the error for the first missing argument
error = errorForArg (lib.head missingArgs);
in if missingArgs == [] then makeOverridable f allArgs else throw error;
in if missingArgs == [] then makeOverridable f allArgs else abort error;
/* Like callPackage, but for a function that returns an attribute

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, clang14Stdenv, fetchFromGitHub, openssl, sqlite }:
{ lib, stdenv, llvmPackages_14, fetchFromGitHub, openssl, sqlite }:
(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec {
(if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230316";

4
pkgs/applications/networking/remote/aws-workspaces/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib
, makeWrapper, dpkg, fetchurl, autoPatchelfHook
, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb, hiredis
, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb1, hiredis
}:
stdenv.mkDerivation rec {
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
glib-networking
graphicsmagick_q16
hiredis
libusb
libusb1
libva
];

5
pkgs/development/lua-modules/generated-packages.nix
View file

@ -1352,7 +1352,7 @@ buildLuarocksPackage {
};
}) {};
lua-resty-session = callPackage({ lua_pack, buildLuarocksPackage, fetchgit, luaOlder, lua, lua-ffi-zlib, lua-resty-openssl }:
lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua, lua-resty-openssl /*, lua_pack, lua-ffi-zlib */ }:
buildLuarocksPackage {
pname = "lua-resty-session";
version = "4.0.3-1";
@ -1374,12 +1374,13 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua lua-ffi-zlib lua-resty-openssl lua_pack ];
propagatedBuildInputs = [ lua lua-resty-openssl /* lua_pack lua-ffi-zlib */ ];
meta = {
homepage = "https://github.com/bungle/lua-resty-session";
description = "Session Library for OpenResty - Flexible and Secure";
license.fullName = "BSD";
broken = true; # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate
};
}) {};

4
pkgs/tools/audio/stt/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, bzip2, lzma }:
{ stdenv, lib, fetchurl, autoPatchelfHook, bzip2, xz }:
stdenv.mkDerivation rec {
pname = "stt";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2
lzma
xz
stdenv.cc.cc.lib
];

2
pkgs/top-level/all-packages.nix
View file

@ -494,7 +494,7 @@ with pkgs;
dinghy = with python3Packages; toPythonApplication dinghy;
djhtml = callPackage ../development/tools/djhtml { };
djhtml = python3Packages.callPackage ../development/tools/djhtml { };
deadcode = callPackage ../development/tools/deadcode { };