Merge branch 'master' into staging-next
This commit is contained in:
Vladimír Čunát
commit
c21cf32722
18 changed files with 56 additions and 119 deletions
|
|
@ -88,7 +88,7 @@ rec {
|
|||
else { ${elemAt attrPath n} = atDepth (n + 1); };
|
||||
in atDepth 0;
|
||||
|
||||
/* Like `attrByPath', but without a default value. If it doesn't find the
|
||||
/* Like `attrByPath`, but without a default value. If it doesn't find the
|
||||
path it will throw an error.
|
||||
|
||||
Example:
|
||||
|
|
@ -274,7 +274,7 @@ rec {
|
|||
# The set to get the named attributes from
|
||||
attrs: genAttrs names (name: attrs.${name});
|
||||
|
||||
/* Collect each attribute named `attr' from a list of attribute
|
||||
/* Collect each attribute named `attr` from a list of attribute
|
||||
sets. Sets that don't contain the named attribute are ignored.
|
||||
|
||||
Example:
|
||||
|
|
@ -357,8 +357,8 @@ rec {
|
|||
) {} list_of_attrs;
|
||||
|
||||
|
||||
/* Recursively collect sets that verify a given predicate named `pred'
|
||||
from the set `attrs'. The recursion is stopped when the predicate is
|
||||
/* Recursively collect sets that verify a given predicate named `pred`
|
||||
from the set `attrs`. The recursion is stopped when the predicate is
|
||||
verified.
|
||||
|
||||
Example:
|
||||
|
|
@ -439,9 +439,9 @@ rec {
|
|||
listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)));
|
||||
|
||||
|
||||
/* Like `mapAttrs', but allows the name of each attribute to be
|
||||
/* Like `mapAttrs`, but allows the name of each attribute to be
|
||||
changed in addition to the value. The applied function should
|
||||
return both the new name and value as a `nameValuePair'.
|
||||
return both the new name and value as a `nameValuePair`.
|
||||
|
||||
Example:
|
||||
mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value))
|
||||
|
|
@ -479,7 +479,7 @@ rec {
|
|||
map (name: f name attrs.${name}) (attrNames attrs);
|
||||
|
||||
|
||||
/* Like `mapAttrs', except that it recursively applies itself to
|
||||
/* Like `mapAttrs`, except that it recursively applies itself to
|
||||
attribute sets. Also, the first argument of the argument
|
||||
function is a *list* of the names of the containing attributes.
|
||||
|
||||
|
|
@ -499,9 +499,9 @@ rec {
|
|||
mapAttrsRecursiveCond (as: true) f set;
|
||||
|
||||
|
||||
/* Like `mapAttrsRecursive', but it takes an additional predicate
|
||||
/* Like `mapAttrsRecursive`, but it takes an additional predicate
|
||||
function that tells it whether to recurse into an attribute
|
||||
set. If it returns false, `mapAttrsRecursiveCond' does not
|
||||
set. If it returns false, `mapAttrsRecursiveCond` does not
|
||||
recurse, but does apply the map function. If it returns true, it
|
||||
does recurse, and does not apply the map function.
|
||||
|
||||
|
|
@ -655,7 +655,7 @@ rec {
|
|||
|
||||
/* Merge sets of attributes and combine each attribute value in to a list.
|
||||
|
||||
Like `lib.attrsets.zipAttrsWith' with `(name: values: values)' as the function.
|
||||
Like `lib.attrsets.zipAttrsWith` with `(name: values: values)` as the function.
|
||||
|
||||
Example:
|
||||
zipAttrs [{a = "x";} {a = "y"; b = "z";}]
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
rec {
|
||||
|
||||
|
||||
/* `overrideDerivation drv f' takes a derivation (i.e., the result
|
||||
of a call to the builtin function `derivation') and returns a new
|
||||
/* `overrideDerivation drv f` takes a derivation (i.e., the result
|
||||
of a call to the builtin function `derivation`) and returns a new
|
||||
derivation in which the attributes of the original are overridden
|
||||
according to the function `f'. The function `f' is called with
|
||||
according to the function `f`. The function `f` is called with
|
||||
the original derivation attributes.
|
||||
|
||||
`overrideDerivation' allows certain "ad-hoc" customisation
|
||||
`overrideDerivation` allows certain "ad-hoc" customisation
|
||||
scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance,
|
||||
if you want to "patch" the derivation returned by a package
|
||||
function in Nixpkgs to build another version than what the
|
||||
|
|
@ -104,10 +104,10 @@ rec {
|
|||
else result;
|
||||
|
||||
|
||||
/* Call the package function in the file `fn' with the required
|
||||
/* Call the package function in the file `fn` with the required
|
||||
arguments automatically. The function is called with the
|
||||
arguments `args', but any missing arguments are obtained from
|
||||
`autoArgs'. This function is intended to be partially
|
||||
arguments `args`, but any missing arguments are obtained from
|
||||
`autoArgs`. This function is intended to be partially
|
||||
parameterised, e.g.,
|
||||
|
||||
callPackage = callPackageWith pkgs;
|
||||
|
|
@ -116,9 +116,9 @@ rec {
|
|||
libbar = callPackage ./bar.nix { };
|
||||
};
|
||||
|
||||
If the `libbar' function expects an argument named `libfoo', it is
|
||||
If the `libbar` function expects an argument named `libfoo`, it is
|
||||
automatically passed as an argument. Overrides or missing
|
||||
arguments can be supplied in `args', e.g.
|
||||
arguments can be supplied in `args`, e.g.
|
||||
|
||||
libbar = callPackage ./bar.nix {
|
||||
libfoo = null;
|
||||
|
|
@ -255,13 +255,13 @@ rec {
|
|||
in lib.deepSeq drv' drv';
|
||||
|
||||
/* Make a set of packages with a common scope. All packages called
|
||||
with the provided `callPackage' will be evaluated with the same
|
||||
with the provided `callPackage` will be evaluated with the same
|
||||
arguments. Any package in the set may depend on any other. The
|
||||
`overrideScope'` function allows subsequent modification of the package
|
||||
set in a consistent way, i.e. all packages in the set will be
|
||||
called with the overridden packages. The package sets may be
|
||||
hierarchical: the packages in the set are called with the scope
|
||||
provided by `newScope' and the set provides a `newScope' attribute
|
||||
provided by `newScope` and the set provides a `newScope` attribute
|
||||
which can form the parent scope for later package sets. */
|
||||
makeScope = newScope: f:
|
||||
let self = f self // {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Library of low-level helper functions for nix expressions.
|
||||
*
|
||||
* Please implement (mostly) exhaustive unit tests
|
||||
* for new functions in `./tests.nix'.
|
||||
* for new functions in `./tests.nix`.
|
||||
*/
|
||||
let
|
||||
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ rec {
|
|||
|
||||
/* Return a singleton list or an empty list, depending on a boolean
|
||||
value. Useful when building lists with optional elements
|
||||
(e.g. `++ optional (system == "i686-linux") firefox').
|
||||
(e.g. `++ optional (system == "i686-linux") firefox`).
|
||||
|
||||
Type: optional :: bool -> a -> [a]
|
||||
|
||||
|
|
@ -283,7 +283,7 @@ rec {
|
|||
*/
|
||||
toList = x: if isList x then x else [x];
|
||||
|
||||
/* Return a list of integers from `first' up to and including `last'.
|
||||
/* Return a list of integers from `first` up to and including `last`.
|
||||
|
||||
Type: range :: int -> int -> [int]
|
||||
|
||||
|
|
@ -320,7 +320,7 @@ rec {
|
|||
) { right = []; wrong = []; });
|
||||
|
||||
/* Splits the elements of a list into many lists, using the return value of a predicate.
|
||||
Predicate should return a string which becomes keys of attrset `groupBy' returns.
|
||||
Predicate should return a string which becomes keys of attrset `groupBy` returns.
|
||||
|
||||
`groupBy'` allows to customise the combining function and initial value
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ rec {
|
|||
setName = name: drv: drv // {inherit name;};
|
||||
|
||||
|
||||
/* Like `setName', but takes the previous name as an argument.
|
||||
/* Like `setName`, but takes the previous name as an argument.
|
||||
|
||||
Example:
|
||||
updateName (oldName: oldName + "-experimental") somePkg
|
||||
|
|
|
|||
|
|
@ -570,10 +570,14 @@ in {
|
|||
type = "normal";
|
||||
plugins = ["python3"];
|
||||
home = webEnv;
|
||||
manage-script-name = true;
|
||||
mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
|
||||
http = "127.0.0.1:18507";
|
||||
};
|
||||
}
|
||||
// (if cfg.serve.virtualRoot == "/"
|
||||
then { module = "mailman_web.wsgi:application"; }
|
||||
else {
|
||||
mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
|
||||
manage-script-name = true;
|
||||
});
|
||||
uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
|
||||
in {
|
||||
wantedBy = ["multi-user.target"];
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "1.25.4";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "int128";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Og8ippw9rPH0Ni72mSlCjo4i/cfZXLAjG38jPvfs9ro=";
|
||||
sha256 = "sha256-A8J381KNhQbWZ+68P8+1xj/lEEc/+YiJ80LqRQatdFQ=";
|
||||
};
|
||||
|
||||
subPackages = ["."];
|
||||
|
||||
vendorSha256 = "sha256-E7I8GNcI/QRgbrstc2Ky0q/DPaqNP11BaDzrrfZofLQ=";
|
||||
vendorSha256 = "sha256-V+O3yFxGJTcFETD2qYOurQUbME5NvRNQTr43OkxXFFE=";
|
||||
|
||||
# Rename the binary instead of symlinking to avoid conflict with the
|
||||
# Azure version of kubelogin
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, fontconfig
|
||||
, freetype
|
||||
, fribidi
|
||||
, imlib
|
||||
, libSM
|
||||
, libX11
|
||||
, libXcursor
|
||||
|
|
@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fontconfig
|
||||
freetype
|
||||
fribidi
|
||||
imlib
|
||||
libSM
|
||||
libX11
|
||||
libXcursor
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
, gdk-pixbuf-xlib
|
||||
, gettext
|
||||
, gtk2
|
||||
, imlib
|
||||
, libICE
|
||||
, libSM
|
||||
, libxcrypt
|
||||
|
|
@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gdk-pixbuf-xlib
|
||||
gtk2
|
||||
imlib
|
||||
libICE
|
||||
libSM
|
||||
libxcrypt
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, giflib
|
||||
, libX11
|
||||
, libXext
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, xorgproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imlib";
|
||||
version = "1.9.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2007-3568.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch";
|
||||
sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg";
|
||||
})
|
||||
|
||||
# The following two patches fix the build with recent giflib.
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-1.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828";
|
||||
sha256 = "0jynlhxcyjiwnz1m8j48xwz4z5csgyg03jfjc8xgpvvcyid4m65l";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-2.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828";
|
||||
sha256 = "164x7rd992930rqllmr89p5ahfmbz37ipi8x0igd8gkvc8a4fd5x";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-shm"
|
||||
"--x-includes=${libX11.dev}/include"
|
||||
"--x-libraries=${libX11.out}/lib"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libXext
|
||||
libX11
|
||||
xorgproto
|
||||
libtiff
|
||||
giflib
|
||||
libpng
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An image loading and rendering library for X11";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ gpl2Only lgpl2Only ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
@ -19,7 +19,6 @@
|
|||
, gdal
|
||||
, openimageio
|
||||
, freeimage
|
||||
, imlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib;
|
||||
inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage;
|
||||
inherit (python3Packages) pillow imread;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -13,13 +13,14 @@ stdenv.mkDerivation rec {
|
|||
./nlojet_clang_fix.patch
|
||||
];
|
||||
|
||||
# error: no member named 'finite' in the global namespace; did you mean simply 'finite'?
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite";
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html";
|
||||
license = lib.licenses.gpl2;
|
||||
description = "Implementation of calculation of the hadron jet cross sections";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thepeg";
|
||||
|
|
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-8hRzGXp2H8MpF7CKjSTSv6+T/1fzRB/WBdqZrJ3l1Qs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -25,7 +27,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
platforms = platforms.unix;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.209";
|
||||
version = "0.0.211";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DYMGGA/GGE4Vue8G61gmDFspODVI81vTK9iOuIB8dDA=";
|
||||
sha256 = "sha256-rU/+IZCSkMdDlfWgEZJIS6/55n8id2UAF/kK2NpXDaQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Uvl/3VutaquorMMd8KQlqBc5DOdh23oLZSjGExTqUWE=";
|
||||
cargoSha256 = "sha256-OnolQKFqHRQmWy152SSIK9NuDh12tHxXfo6/2essPmc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-upGVWCK3gEPH6BZ7W410AnQPIWOCeD4sawQqPLRowfw=";
|
||||
sha256 = "sha256-hhw5jzdquehkdq6iEtQQW6Z2Cu3+J2o2p10VGPOVcCs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PYZe7OO/cevictnWGc+NHVpJXctU2XyejF8jPjSNp3M=";
|
||||
cargoSha256 = "sha256-AE4yk6r02h04P3GmEh7te+GHg8k9/gQpJ+I19o9j9I0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
@ -31,8 +31,12 @@ rustPlatform.buildRustPackage rec {
|
|||
# requires nightly version of cargo-rustdoc
|
||||
"--skip=dump::tests"
|
||||
"--skip=query::tests"
|
||||
"--skip=verify_binary_contains_lints"
|
||||
];
|
||||
|
||||
# use system openssl
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to scan your Rust crate for semver violations";
|
||||
homepage = "https://github.com/obi1kenobi/cargo-semver-checks";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "2.0-1169";
|
||||
version = "2.0-1182";
|
||||
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
|
||||
hash = "sha256-5XOE0XYKwlAuSgZ4iRISp2QcEN54LvYfL1OTZl3eWm0=";
|
||||
hash = "sha256-2mo45+cbOyej5stJ8DFobvqECTTMLandcoPFnD4nY7s=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -649,6 +649,7 @@ mapAliases ({
|
|||
imagemagick7Big = imagemagickBig; # Added 2021-02-22
|
||||
imagemagick7 = imagemagick; # Added 2021-02-22
|
||||
imagemagick7_light = imagemagick_light; # Added 2021-02-22
|
||||
imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04
|
||||
impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
|
||||
i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21
|
||||
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped";
|
||||
|
|
|
|||
|
|
@ -20126,10 +20126,6 @@ with pkgs;
|
|||
|
||||
imtui = callPackage ../development/libraries/imtui { };
|
||||
|
||||
imlib = callPackage ../development/libraries/imlib {
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
imv = callPackage ../applications/graphics/imv { };
|
||||
|
||||
iml = callPackage ../development/libraries/iml { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue