Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2022-03-20 00:11:09 +00:00 committed by GitHub
commit 05517edcd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
151 changed files with 3274 additions and 2131 deletions

View File

@ -4,8 +4,8 @@
let
inherit (builtins) head tail length;
inherit (lib.trivial) id;
inherit (lib.strings) concatStringsSep sanitizeDerivationName;
inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all;
inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;
inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl;
in
rec {
@ -78,6 +78,103 @@ rec {
in attrByPath attrPath (abort errorMsg);
/* Update or set specific paths of an attribute set.
Takes a list of updates to apply and an attribute set to apply them to,
and returns the attribute set with the updates applied. Updates are
represented as { path = ...; update = ...; } values, where `path` is a
list of strings representing the attribute path that should be updated,
and `update` is a function that takes the old value at that attribute path
as an argument and returns the new
value it should be.
Properties:
- Updates to deeper attribute paths are applied before updates to more
shallow attribute paths
- Multiple updates to the same attribute path are applied in the order
they appear in the update list
- If any but the last `path` element leads into a value that is not an
attribute set, an error is thrown
- If there is an update for an attribute path that doesn't exist,
accessing the argument in the update function causes an error, but
intermediate attribute sets are implicitly created as needed
Example:
updateManyAttrsByPath [
{
path = [ "a" "b" ];
update = old: { d = old.c; };
}
{
path = [ "a" "b" "c" ];
update = old: old + 1;
}
{
path = [ "x" "y" ];
update = old: "xy";
}
] { a.b.c = 0; }
=> { a = { b = { d = 1; }; }; x = { y = "xy"; }; }
*/
updateManyAttrsByPath = let
# When recursing into attributes, instead of updating the `path` of each
# update using `tail`, which needs to allocate an entirely new list,
# we just pass a prefix length to use and make sure to only look at the
# path without the prefix length, so that we can reuse the original list
# entries.
go = prefixLength: hasValue: value: updates:
let
# Splits updates into ones on this level (split.right)
# And ones on levels further down (split.wrong)
split = partition (el: length el.path == prefixLength) updates;
# Groups updates on further down levels into the attributes they modify
nested = groupBy (el: elemAt el.path prefixLength) split.wrong;
# Applies only nested modification to the input value
withNestedMods =
# Return the value directly if we don't have any nested modifications
if split.wrong == [] then
if hasValue then value
else
# Throw an error if there is no value. This `head` call here is
# safe, but only in this branch since `go` could only be called
# with `hasValue == false` for nested updates, in which case
# it's also always called with at least one update
let updatePath = (head split.right).path; in
throw
( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' does "
+ "not exist in the given value, but the first update to this "
+ "path tries to access the existing value.")
else
# If there are nested modifications, try to apply them to the value
if ! hasValue then
# But if we don't have a value, just use an empty attribute set
# as the value, but simplify the code a bit
mapAttrs (name: go (prefixLength + 1) false null) nested
else if isAttrs value then
# If we do have a value and it's an attribute set, override it
# with the nested modifications
value //
mapAttrs (name: go (prefixLength + 1) (value ? ${name}) value.${name}) nested
else
# However if it's not an attribute set, we can't apply the nested
# modifications, throw an error
let updatePath = (head split.wrong).path; in
throw
( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' needs to "
+ "be updated, but path '${showAttrPath (take prefixLength updatePath)}' "
+ "of the given value is not an attribute set, so we can't "
+ "update an attribute inside of it.");
# We get the final result by applying all the updates on this level
# after having applied all the nested updates
# We use foldl instead of foldl' so that in case of multiple updates,
# intermediate values aren't evaluated if not needed
in foldl (acc: el: el.update acc) withNestedMods split.right;
in updates: value: go 0 true value updates;
/* Return the specified attributes from a set.
Example:
@ -477,6 +574,20 @@ rec {
overrideExisting = old: new:
mapAttrs (name: value: new.${name} or value) old;
/* Turns a list of strings into a human-readable description of those
strings represented as an attribute path. The result of this function is
not intended to be machine-readable.
Example:
showAttrPath [ "foo" "10" "bar" ]
=> "foo.\"10\".bar"
showAttrPath []
=> "<root attribute path>"
*/
showAttrPath = path:
if path == [] then "<root attribute path>"
else concatMapStringsSep "." escapeNixIdentifier path;
/* Get a package output.
If no output is found, fallback to `.out` and then to the default.

View File

@ -78,9 +78,10 @@ let
mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond
genAttrs isDerivation toDerivation optionalAttrs
zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
recursiveUpdate matchAttrs overrideExisting getOutput getBin
recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin
getLib getDev getMan chooseDevOutputs zipWithNames zip
recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets;
recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets
updateManyAttrsByPath;
inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1
concatMap flatten remove findSingle findFirst any all count
optional optionals toList range partition zipListsWith zipLists

View File

@ -4,6 +4,7 @@
let
inherit (lib.strings) toInt;
inherit (lib.trivial) compare min;
inherit (lib.attrsets) mapAttrs;
in
rec {
@ -340,15 +341,15 @@ rec {
groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
=> { true = 12; false = 3; }
*/
groupBy' = op: nul: pred: lst:
foldl' (r: e:
let
key = pred e;
in
r // { ${key} = op (r.${key} or nul) e; }
) {} lst;
groupBy' = op: nul: pred: lst: mapAttrs (name: foldl op nul) (groupBy pred lst);
groupBy = groupBy' (sum: e: sum ++ [e]) [];
groupBy = builtins.groupBy or (
pred: foldl' (r: e:
let
key = pred e;
in
r // { ${key} = (r.${key} or []) ++ [e]; }
) {});
/* Merges two lists of the same size together. If the sizes aren't the same
the merging stops at the shortest. How both lists are merged is defined

View File

@ -761,4 +761,156 @@ runTests {
{ a = 3; b = 30; c = 300; }
];
};
# The example from the showAttrPath documentation
testShowAttrPathExample = {
expr = showAttrPath [ "foo" "10" "bar" ];
expected = "foo.\"10\".bar";
};
testShowAttrPathEmpty = {
expr = showAttrPath [];
expected = "<root attribute path>";
};
testShowAttrPathVarious = {
expr = showAttrPath [
"."
"foo"
"2"
"a2-b"
"_bc'de"
];
expected = ''".".foo."2".a2-b._bc'de'';
};
testGroupBy = {
expr = groupBy (n: toString (mod n 5)) (range 0 16);
expected = {
"0" = [ 0 5 10 15 ];
"1" = [ 1 6 11 16 ];
"2" = [ 2 7 12 ];
"3" = [ 3 8 13 ];
"4" = [ 4 9 14 ];
};
};
testGroupBy' = {
expr = groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ];
expected = { false = 3; true = 12; };
};
# The example from the updateManyAttrsByPath documentation
testUpdateManyAttrsByPathExample = {
expr = updateManyAttrsByPath [
{
path = [ "a" "b" ];
update = old: { d = old.c; };
}
{
path = [ "a" "b" "c" ];
update = old: old + 1;
}
{
path = [ "x" "y" ];
update = old: "xy";
}
] { a.b.c = 0; };
expected = { a = { b = { d = 1; }; }; x = { y = "xy"; }; };
};
# If there are no updates, the value is passed through
testUpdateManyAttrsByPathNone = {
expr = updateManyAttrsByPath [] "something";
expected = "something";
};
# A single update to the root path is just like applying the function directly
testUpdateManyAttrsByPathSingleIncrement = {
expr = updateManyAttrsByPath [
{
path = [ ];
update = old: old + 1;
}
] 0;
expected = 1;
};
# Multiple updates can be applied are done in order
testUpdateManyAttrsByPathMultipleIncrements = {
expr = updateManyAttrsByPath [
{
path = [ ];
update = old: old + "a";
}
{
path = [ ];
update = old: old + "b";
}
{
path = [ ];
update = old: old + "c";
}
] "";
expected = "abc";
};
# If an update doesn't use the value, all previous updates are not evaluated
testUpdateManyAttrsByPathLazy = {
expr = updateManyAttrsByPath [
{
path = [ ];
update = old: old + throw "nope";
}
{
path = [ ];
update = old: "untainted";
}
] (throw "start");
expected = "untainted";
};
# Deeply nested attributes can be updated without affecting others
testUpdateManyAttrsByPathDeep = {
expr = updateManyAttrsByPath [
{
path = [ "a" "b" "c" ];
update = old: old + 1;
}
] {
a.b.c = 0;
a.b.z = 0;
a.y.z = 0;
x.y.z = 0;
};
expected = {
a.b.c = 1;
a.b.z = 0;
a.y.z = 0;
x.y.z = 0;
};
};
# Nested attributes are updated first
testUpdateManyAttrsByPathNestedBeforehand = {
expr = updateManyAttrsByPath [
{
path = [ "a" ];
update = old: old // { x = old.b; };
}
{
path = [ "a" "b" ];
update = old: old + 1;
}
] {
a.b = 0;
};
expected = {
a.b = 1;
a.x = 1;
};
};
}

View File

@ -8722,6 +8722,12 @@
fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE";
}];
};
nbr = {
email = "nbr@users.noreply.github.com";
github = "nbr";
githubId = 3819225;
name = "Nick Braga";
};
nbren12 = {
email = "nbren12@gmail.com";
github = "nbren12";

View File

@ -63,32 +63,32 @@ mount --rbind /sys "$mountPoint/sys"
# modified from https://github.com/archlinux/arch-install-scripts/blob/bb04ab435a5a89cd5e5ee821783477bc80db797f/arch-chroot.in#L26-L52
chroot_add_resolv_conf() {
local chrootdir=$1 resolv_conf=$1/etc/resolv.conf
local chrootDir="$1" resolvConf="$1/etc/resolv.conf"
[[ -e /etc/resolv.conf ]] || return 0
# Handle resolv.conf as a symlink to somewhere else.
if [[ -L $chrootdir/etc/resolv.conf ]]; then
if [[ -L "$resolvConf" ]]; then
# readlink(1) should always give us *something* since we know at this point
# it's a symlink. For simplicity, ignore the case of nested symlinks.
# We also ignore the possibility if `../`s escaping the root.
resolv_conf=$(readlink "$chrootdir/etc/resolv.conf")
if [[ $resolv_conf = /* ]]; then
resolv_conf=$chrootdir$resolv_conf
# We also ignore the possibility of `../`s escaping the root.
resolvConf="$(readlink "$resolvConf")"
if [[ "$resolvConf" = /* ]]; then
resolvConf="$chrootDir$resolvConf"
else
resolv_conf=$chrootdir/etc/$resolv_conf
resolvConf="$chrootDir/etc/$resolvConf"
fi
fi
# ensure file exists to bind mount over
if [[ ! -f $resolv_conf ]]; then
install -Dm644 /dev/null "$resolv_conf" || return 1
if [[ ! -f "$resolvConf" ]]; then
install -Dm644 /dev/null "$resolvConf" || return 1
fi
mount --bind /etc/resolv.conf "$resolv_conf"
mount --bind /etc/resolv.conf "$resolvConf"
}
chroot_add_resolv_conf "$mountPoint" || print "ERROR: failed to set up resolv.conf"
chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf" >&2
(
# If silent, write both stdout and stderr of activation script to /dev/null

View File

@ -1,6 +1,7 @@
{ config, options, lib, pkgs, stdenv, ... }:
let
cfg = config.services.pleroma;
cookieFile = "/var/lib/pleroma/.cookie";
in {
options = {
services.pleroma = with lib; {
@ -8,7 +9,7 @@ in {
package = mkOption {
type = types.package;
default = pkgs.pleroma;
default = pkgs.pleroma.override { inherit cookieFile; };
defaultText = literalExpression "pkgs.pleroma";
description = "Pleroma package to use.";
};
@ -100,7 +101,6 @@ in {
after = [ "network-online.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ];
environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie";
serviceConfig = {
User = cfg.user;
Group = cfg.group;
@ -118,10 +118,10 @@ in {
# Better be safe than sorry migration-wise.
ExecStartPre =
let preScript = pkgs.writers.writeBashBin "pleromaStartPre" ''
if [ ! -f /var/lib/pleroma/.cookie ]
if [ ! -f "${cookieFile}" ] || [ ! -s "${cookieFile}" ]
then
echo "Creating cookie file"
dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie
dd if=/dev/urandom bs=1 count=16 | ${pkgs.hexdump}/bin/hexdump -e '16/1 "%02x"' > "${cookieFile}"
fi
${cfg.package}/bin/pleroma_ctl migrate
'';

View File

@ -219,24 +219,7 @@ in
session = mkOption {
default = [];
type = with types; listOf (submodule ({ ... }: {
options = {
manage = mkOption {
description = "Whether this is a desktop or a window manager";
type = enum [ "desktop" "window" ];
};
name = mkOption {
description = "Name of this session";
type = str;
};
start = mkOption {
description = "Commands to run to start this session";
type = lines;
};
};
}));
type = types.listOf types.attrs;
example = literalExpression
''
[ { manage = "desktop";

View File

@ -32,8 +32,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
# system one. Overriding this pretty bad default behaviour.
export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
export TOOT_LOGIN_CLI_PASSWORD="jamy-password"
toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test"
echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test"
echo "Login OK"
# Send a toot then verify it's part of the public timeline
@ -168,21 +167,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
cp key.pem cert.pem $out
'';
/* Toot is preventing users from feeding login_cli a password non
interactively. While it makes sense most of the times, it's
preventing us to login in this non-interactive test. This patch
introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to
provide a password to toot login_cli
If https://github.com/ihabunek/toot/pull/180 gets merged at some
point, feel free to remove this patch. */
custom-toot = pkgs.toot.overrideAttrs(old:{
patches = [ (pkgs.fetchpatch {
url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch";
sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg=";
}) ];
});
hosts = nodes: ''
${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test
${nodes.client.config.networking.primaryIPAddress} client.nixos.test
@ -194,7 +178,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
networking.extraHosts = hosts nodes;
environment.systemPackages = with pkgs; [
custom-toot
toot
send-toot
];
};

View File

@ -120,6 +120,9 @@ import ../make-test-python.nix ({pkgs, ...}:
# Check if PeerTube is running
client.succeed("curl --fail http://peertube.local:9000/api/v1/config/about | jq -r '.instance.name' | grep 'PeerTube\ Test\ Server'")
# Check PeerTube CLI version
assert "${pkgs.peertube.version}" in server.succeed('su - peertube -s /bin/sh -c "peertube --version"')
client.shutdown()
server.shutdown()
database.shutdown()

View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "alfis";
version = "0.6.10";
version = "0.6.11";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80=";
sha256 = "sha256-vm/JBJh58UaSem18RpJuPUzM2GCy4RfCb6Hr1B7KWQA=";
};
cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0=";
cargoSha256 = "sha256-8ijGO8up0qVQ/kVX5/DveKyovYLh7jm+d7vooS1waAA=";
checkFlags = [
# these want internet access, disable them

View File

@ -425,6 +425,21 @@
license = lib.licenses.free;
};
}) {};
buffer-env = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "buffer-env";
ename = "buffer-env";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/buffer-env-0.2.tar";
sha256 = "1420qln8ww43d6gs70cnxab6lf10dhmk5yk29pwsvjk86afhwhwf";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/buffer-env.html";
license = lib.licenses.free;
};
}) {};
buffer-expose = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -463,10 +478,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
version = "0.6";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cape-0.6.tar";
sha256 = "0pc0vvdb0pczz9n50wry6k6wkdaz3bqin07nmlxm8w1aqvapb2pr";
url = "https://elpa.gnu.org/packages/cape-0.7.tar";
sha256 = "1icgd5d55x7x7czw349v8m19mgq4yrx6j6zhbb666h2hdkbnykbg";
};
packageRequires = [ emacs ];
meta = {
@ -609,6 +624,21 @@
license = lib.licenses.free;
};
}) {};
code-cells = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "code-cells";
ename = "code-cells";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/code-cells-0.2.tar";
sha256 = "19v6a7l23646diazl0rzjxjsam12hm08hgyq8hdcc7l3xl840ghk";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/code-cells.html";
license = lib.licenses.free;
};
}) {};
coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "coffee-mode";
@ -711,10 +741,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.15";
version = "0.16";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-0.15.tar";
sha256 = "0hsmxaiadb8smi1hk90n9napqrygh9rvj7g9a3d9isi47yrbg693";
url = "https://elpa.gnu.org/packages/consult-0.16.tar";
sha256 = "172w4d9hbzj98j1gyfhzw2zz4fpw90ak8ccg35fngwjlk9mjdrzk";
};
packageRequires = [ emacs ];
meta = {
@ -741,10 +771,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.19";
version = "0.20";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.19.tar";
sha256 = "0jilhsddzjm0is7kqdklpr2ih50k2c3sik2i9vlgcizxqaqss97c";
url = "https://elpa.gnu.org/packages/corfu-0.20.tar";
sha256 = "03yycimbqs4ixz7lxp7f1b4fipq6kl2bbjnl87r0n9x8mzfslbdl";
};
packageRequires = [ emacs ];
meta = {
@ -756,10 +786,10 @@
elpaBuild {
pname = "coterm";
ename = "coterm";
version = "1.4";
version = "1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/coterm-1.4.tar";
sha256 = "0cs9hqffkzlkkpcfhdh67gg3vzvffrjawmi89q7x9p52fk9rcxp6";
url = "https://elpa.gnu.org/packages/coterm-1.5.tar";
sha256 = "1v8cl3bw5z0f36iw8x3gcgiizml74m1kfxfrasyfx8k01nbxcfs8";
};
packageRequires = [ emacs ];
meta = {
@ -921,10 +951,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.30";
version = "0.31";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.30.tar";
sha256 = "05yy1hhxd59rhricb14iai71w681222sv0i703yrgg868mphl7sb";
url = "https://elpa.gnu.org/packages/debbugs-0.31.tar";
sha256 = "11vdjrn5m5g6pirw8jv0602fbwwgdhazfrrwxxplii8x02gqk0sr";
};
packageRequires = [ emacs soap-client ];
meta = {
@ -1127,16 +1157,16 @@
license = lib.licenses.free;
};
}) {};
dts-mode = callPackage ({ elpaBuild, fetchurl, lib }:
dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dts-mode";
ename = "dts-mode";
version = "0.1.1";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dts-mode-0.1.1.tar";
sha256 = "1hdbf7snfbg3pfg1vhbak1gq5smaklvaqj1y9mjcnxyipqi47q28";
url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar";
sha256 = "0ihwqkv1ddysjgxh01vpayv3ia0vx55ny8ym0mi5b4iz95idj60s";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/dts-mode.html";
license = lib.licenses.free;
@ -1236,10 +1266,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20220224";
version = "20220316";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20220224.tar";
sha256 = "008750fm7w5k9yrkwyxgank02smxki2857cd2d8qvhsa2qnz6c5n";
url = "https://elpa.gnu.org/packages/eev-20220316.tar";
sha256 = "1ax487ca2rsq6ck2g0694fq3z7a89dy4pcns15wd7ygkf3a4sykf";
};
packageRequires = [ emacs ];
meta = {
@ -1354,10 +1384,10 @@
elpaBuild {
pname = "embark";
ename = "embark";
version = "0.15";
version = "0.16";
src = fetchurl {
url = "https://elpa.gnu.org/packages/embark-0.15.tar";
sha256 = "0dr97549xrs9j1fhnqpdspvbfxnzqvzvpi8qc91fd2v4jsfwlklh";
url = "https://elpa.gnu.org/packages/embark-0.16.tar";
sha256 = "1fgsy4nqwl1cah287fbabpi9lwmbiyn36c4z918514iwr5hgrmfi";
};
packageRequires = [ emacs ];
meta = {
@ -1374,10 +1404,10 @@
elpaBuild {
pname = "embark-consult";
ename = "embark-consult";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/embark-consult-0.4.tar";
sha256 = "1z0xc11y59lagfsd2raps4iz68hvw132ff0qynbmvgw63mp1w4yy";
url = "https://elpa.gnu.org/packages/embark-consult-0.5.tar";
sha256 = "1z4n5gm30yan3gg2aqwb1ygql56v9sg2px1dr0gdl32lgmn9kvg6";
};
packageRequires = [ consult emacs embark ];
meta = {
@ -2419,6 +2449,21 @@
license = lib.licenses.free;
};
}) {};
logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "logos";
ename = "logos";
version = "0.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/logos-0.2.0.tar";
sha256 = "0cqmgvgyyn656rg60bbnxr2flmnw9h4z5i2w98bsf4krlp3s4i6x";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/logos.html";
license = lib.licenses.free;
};
}) {};
map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "map";
@ -2438,10 +2483,10 @@
elpaBuild {
pname = "marginalia";
ename = "marginalia";
version = "0.12";
version = "0.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/marginalia-0.12.tar";
sha256 = "01dy9dg2ac6s84ffcxn2pw1y75pinkdvxg1j2g3vijwjd5hpfakq";
url = "https://elpa.gnu.org/packages/marginalia-0.13.tar";
sha256 = "1d5y3d2plkxnmm4458l0gfpim6q3vzps3bsfakvnzf86hh5nm77j";
};
packageRequires = [ emacs ];
meta = {
@ -3006,6 +3051,21 @@
license = lib.licenses.free;
};
}) {};
org-modern = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "org-modern";
ename = "org-modern";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-modern-0.3.tar";
sha256 = "14f5grai6k9xbpyc33pcpgi6ka8pgy7vcnqqi77nclzq2yxhl9c1";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-modern.html";
license = lib.licenses.free;
};
}) {};
org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }:
elpaBuild {
pname = "org-real";
@ -3025,10 +3085,10 @@
elpaBuild {
pname = "org-remark";
ename = "org-remark";
version = "1.0.2";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-remark-1.0.2.tar";
sha256 = "12g9kmr0gfs1pi1410akvcaiax0dswbw09sgqbib58mikb3074nv";
url = "https://elpa.gnu.org/packages/org-remark-1.0.4.tar";
sha256 = "1mbsp92vw8p8l2pxs53r7wafrplrwfx0rmfk723cl9hpvghvl9vf";
};
packageRequires = [ emacs org ];
meta = {
@ -3055,10 +3115,10 @@
elpaBuild {
pname = "org-translate";
ename = "org-translate";
version = "0.1.3";
version = "0.1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el";
sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33";
url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar";
sha256 = "0dvg3h8mmzlqfg60rwxjgy17sqv84p6nj2ngjdafkp9a4halv0g7";
};
packageRequires = [ emacs org ];
meta = {
@ -3096,6 +3156,21 @@
license = lib.licenses.free;
};
}) {};
osm = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "osm";
ename = "osm";
version = "0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/osm-0.6.tar";
sha256 = "0p19qyx4gw1rn2f5hlxa7gx1sph2z5vjw7cnxwpjhbbr0430zzwb";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/osm.html";
license = lib.licenses.free;
};
}) {};
other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "other-frame-window";
@ -3220,10 +3295,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.17";
version = "0.4.19";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.17.tar";
sha256 = "1j3whjxhjawl1i5449yf56ljbazx90272gr8zfr36s8h8rijfjn9";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.19.tar";
sha256 = "1l9ivg6x084r235jpd90diaa4v29r1kyfsblzsb8blskb9ka5b56";
};
packageRequires = [ emacs ];
meta = {
@ -4245,10 +4320,10 @@
elpaBuild {
pname = "tempel";
ename = "tempel";
version = "0.2";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tempel-0.2.tar";
sha256 = "0xn2vqaxqv04zmlp5hpb9vxkbs3bv4dk22xs5j5fqjid2hcv3714";
url = "https://elpa.gnu.org/packages/tempel-0.3.tar";
sha256 = "0aa3f3sfvibp3wl401fdlww70axl9hxasbza70i44vqq0y9csv40";
};
packageRequires = [ emacs ];
meta = {
@ -4395,16 +4470,16 @@
license = lib.licenses.free;
};
}) {};
undo-tree = callPackage ({ elpaBuild, fetchurl, lib }:
undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }:
elpaBuild {
pname = "undo-tree";
ename = "undo-tree";
version = "0.7.5";
version = "0.8.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/undo-tree-0.7.5.el";
sha256 = "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p";
url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar";
sha256 = "0fgir9pls9439zwyl3j2yvrwx9wigisj1jil4ijma27dfrpgm288";
};
packageRequires = [];
packageRequires = [ emacs queue ];
meta = {
homepage = "https://elpa.gnu.org/packages/undo-tree.html";
license = lib.licenses.free;
@ -4605,10 +4680,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.20";
version = "0.21";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.20.tar";
sha256 = "1hg91f74klbwisxzp74d020v42l28wik9y1lg3hrbdspnhlhsdrl";
url = "https://elpa.gnu.org/packages/vertico-0.21.tar";
sha256 = "0aw3hkr46zghvyp7s2b6ziqavsf1zpml4bbxcvs4kvm05qa0y1hv";
};
packageRequires = [ emacs ];
meta = {
@ -4933,10 +5008,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.4.0";
version = "1.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.4.0.tar";
sha256 = "1ng03fyhpisa1v99sc96mpr7hna1pmg4gdc61p86r8lka9m5gqfx";
url = "https://elpa.gnu.org/packages/xref-1.4.1.tar";
sha256 = "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf";
};
packageRequires = [ emacs ];
meta = {

View File

@ -258,10 +258,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.2.0.tar";
sha256 = "1dkn5mcp4vyk6h4mqrn7fcqjs4h0dx1y1b1pcg2jpyx11mhdpjxf";
url = "https://elpa.nongnu.org/nongnu/cider-1.3.0.tar";
sha256 = "10kg30s0gb09l0z17v2hqxy9v5pscnpqp5dng62cjh0x3hdi4i7x";
};
packageRequires = [
clojure-mode
@ -281,10 +281,10 @@
elpaBuild {
pname = "clojure-mode";
ename = "clojure-mode";
version = "5.13.0";
version = "5.14.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.13.0.tar";
sha256 = "16xll0sp7mqzwldfsihp7j3dlm6ps1l1awi122ff8w7xph7b0wfh";
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.14.0.tar";
sha256 = "1lirhp6m5r050dm73nrslgzdgy6rdbxn02wal8n52q37m2armra2";
};
packageRequires = [ emacs ];
meta = {
@ -292,6 +292,21 @@
license = lib.licenses.free;
};
}) {};
coffee-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "coffee-mode";
ename = "coffee-mode";
version = "0.6.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar";
sha256 = "1yv1b5rzlj7cpz7gsv2j07mr8z6lkwxp1cldkrc6xlhcbqh8795a";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
license = lib.licenses.free;
};
}) {};
color-theme-tangotango = callPackage ({ color-theme
, elpaBuild
, fetchurl
@ -688,16 +703,21 @@
license = lib.licenses.free;
};
}) {};
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }:
geiser = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, project
, transient }:
elpaBuild {
pname = "geiser";
ename = "geiser";
version = "0.22.2";
version = "0.23";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-0.22.2.tar";
sha256 = "0mva8arcxj1kf6g7s6f6ik70gradmbnhhiaf7rdkycxdd8kdqn7i";
url = "https://elpa.nongnu.org/nongnu/geiser-0.23.tar";
sha256 = "1g82jaldq4rxiyhnzyqf82scys1545djc3y2nn9ih292g8rwqqms";
};
packageRequires = [ emacs transient ];
packageRequires = [ emacs project transient ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser.html";
license = lib.licenses.free;
@ -782,10 +802,10 @@
elpaBuild {
pname = "geiser-guile";
ename = "geiser-guile";
version = "0.21.2";
version = "0.23";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.2.tar";
sha256 = "06mr8clsk8fj73q4ln90i28xs8axl4sd68wiyl41kgg9w5y78cb7";
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.tar";
sha256 = "0fxn15kpljkdj1vvrv51232km49z2sbr6q9ghpvqwkgi0z9khxz6";
};
packageRequires = [ emacs geiser ];
meta = {
@ -2210,10 +2230,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.1.4";
version = "17.2.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.1.4.tar";
sha256 = "0863p8ikc8yqw0dahswi5s9q7v7rg1hasdxz5jwkd796fh1ih78n";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.0.tar";
sha256 = "15m7rx7sz7f6h0x90811bcl8gdcpn216ia48nmkqhqrm85synlja";
};
packageRequires = [ emacs ];
meta = {

View File

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "ghostwriter";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = version;
hash = "sha256-w4qCJgfBnN1PpPfhdsLdBpCRAWai9RrwU3LZl8DdEcw=";
hash = "sha256-NpgtxYqxMWMZXZRZjujob40Nn6hirsSzcjoqRJR6Rws=";
};
nativeBuildInputs = [ qmake pkg-config qttools ];

View File

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "pixinsight";
version = "1.8.8-12";
version = "1.8.9";
src = requireFile rec {
name = "PI-linux-x64-${version}-20211229-c.tar.xz";
name = "PI-linux-x64-${version}-20220313-c.tar.xz";
url = "https://pixinsight.com/";
sha256 = "7095b83a276f8000c9fe50caadab4bf22a248a880e77b63e0463ad8d5469f617";
sha256 = "sha256-LvrTB8fofuysxR3OoZ2fkkOQU62yUAu8ePOczJG2uqU=";
message = ''
PixInsight is available from ${url} and requires a commercial (or trial) license.
After a license has been obtained, PixInsight can be downloaded from the software distribution

View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.23.5";
version = "0.24.0";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-kVM/F0LsIgMtur8jHZzUWkFIcfHe0i8y9Zxe3z5SkVM=";
sha256 = "sha256-QyexUZNn7QGHjXYO/+1kUebTmAzdVpwG9Ile8Uh3i8Q=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.23.0";
version = "1.24.0";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
sha256 = "sha256-MUF57begai6yMYLPC5dnyO9S39uHogB+Ie3qDA46Cn8=";
sha256 = "sha256-Em+WAI8G492h7FJTnTHFj5L7M4xBZhW4qC0MMc2JRUU=";
};
vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as=";

View File

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
version = "1.20.5";
version = "1.21.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UJAoxRybEYxQY+7l/szSj9fy1J552yaxF3MdaEmDiQQ=";
sha256 = "sha256-D/K+C7IX4VGv+FFYuPQEqwVYSjiDcSeElVunVMiFWI8=";
};
propagatedBuildInputs = [ requests yt-dlp ];

View File

@ -2,11 +2,11 @@
rustPlatform.buildRustPackage rec {
pname = "sigi";
version = "3.0.2";
version = "3.0.3";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-N+8DdokiYW5mHIQJisdTja8xMVGip37X6c/xBYnQaRU=";
sha256 = "sha256-tjhNE20GE1L8kvhdI5Mc90I75q8szOIV40vq2CBt98U=";
};
nativeBuildInputs = [ installShellFiles ];
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
installManPage sigi.1
'';
cargoSha256 = "sha256-vO9ocTDcGt/T/sLCP+tCHXihV1H2liFDjI7OhhmPd3I=";
cargoSha256 = "sha256-0e0r6hfXGJmrc6tgCqq2dQXu2MhkThViZwdG3r3g028=";
passthru.tests.version = testVersion { package = sigi; };

View File

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "100.0.4896.30",
"sha256": "06zfx9f6wv4j4fz7ss8pjlxfcsrwrvwqkmdk5bin7slxg4sq31fl",
"sha256bin64": "06s2p81grqrxl3p9ksy9q7s3s42ijmcw316nb51f7zx4ijk5hzya",
"version": "100.0.4896.46",
"sha256": "1qx22vadv9yd3n52pjn2sr153w70k3sxi2i8f99fdpil0kin8jkx",
"sha256bin64": "1g4xygj3946322aill7lk1qf0hi07bjn3awa17pkn1sgbl3gm8nr",
"deps": {
"gn": {
"version": "2022-01-21",
@ -32,15 +32,15 @@
}
},
"dev": {
"version": "101.0.4929.5",
"sha256": "0330vs0np23x390lfnc5gzmbnkdak590rzqpa7abpfx1gzj1rd3s",
"sha256bin64": "0670z86sz2wxpfxda32cirara7yg87g67cymh8ik3w99g5q7cb1d",
"version": "101.0.4947.0",
"sha256": "176bby8xis0j3ifvxxxjgklvs7yd7v71c5lc18qdjkgzv5qdx0sy",
"sha256bin64": "1rkpc25ff8vf1p7znpmaljj8gwcym34qg28b4anv8x9zvwn7w21s",
"deps": {
"gn": {
"version": "2022-03-01",
"version": "2022-03-14",
"url": "https://gn.googlesource.com/gn",
"rev": "d7c2209cebcfe37f46dba7be4e1a7000ffc342fb",
"sha256": "0b024mr8bdsnkkd3qkh097a7w0gpicarijnsbpfgkf6imnkccg5w"
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
}
}
},

View File

@ -11,15 +11,15 @@
buildGoModule rec {
pname = "werf";
version = "1.2.74";
version = "1.2.76";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-Mfgvl6ljmYn9Vu/tWS0JAuH1pzQZ4zoD5+5ejUJF/Lg=";
sha256 = "sha256-OdMY7M9HCYtQ5v3yTjS1CJXDmg9bLA5LdcIxT7C3rcw=";
};
vendorSha256 = "sha256-MsIbuwsb0sKEh3Z7ArtG/8SWFPaXLu+TGNruhsHhtb4=";
vendorSha256 = "sha256-q2blcmh1mHCfjDbeR3KQevjeDtBm0TwhhBIAvF55X00=";
proxyVendor = true;
nativeBuildInputs = [ pkg-config ];

View File

@ -22,13 +22,13 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.4.3";
version = "3.4.4";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-nryoueoqnbBAJaU11OUXKP5PNrYf4515ojBkdMFIEMA=";
sha256 = "sha256-e4me4mpK0N3UyM5MuJP3jxwM5h1dGBd+JzAr5f3BOGQ=";
};
patches = [

View File

@ -64,14 +64,27 @@ stdenv.mkDerivation rec {
];
postPatch = ''
# The GTK theme has been renamed in elementary OS 6
# https://github.com/elementary/flatpak-platform/blob/6.1.0/io.elementary.Sdk.json#L182
# Remove this in https://github.com/NixOS/nixpkgs/pull/159249
substituteInPlace src/Application.vala \
--replace '"gtk-theme-name", "elementary"' '"gtk-theme-name", "io.elementary.stylesheet.blueberry"'
# Fix build with vala 0.56
# https://github.com/alainm23/planner/pull/884
substituteInPlace src/Application.vala \
--replace "public const OptionEntry[] PLANNER_OPTIONS" "private const OptionEntry[] PLANNER_OPTIONS"
chmod +x build-aux/meson/post_install.py
patchShebangs build-aux/meson/post_install.py
'';
preFixup = ''
gappsWrapperArgs+=(
# the theme is hardcoded
# The GTK theme is hardcoded.
--prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share"
# The icon theme is hardcoded.
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
)
'';

View File

@ -1,16 +1,18 @@
{ lib
{ config
, lib
, stdenv
, fetchFromGitHub
, cmake
, codec2
, libpulseaudio
, libsamplerate
, libsndfile
, lpcnetfreedv
, portaudio
, pulseaudio
, speexdsp
, hamlib
, wxGTK31-gtk3
, pulseSupport ? config.pulseaudio or stdenv.isLinux
}:
stdenv.mkDerivation rec {
@ -33,17 +35,18 @@ stdenv.mkDerivation rec {
speexdsp
hamlib
wxGTK31-gtk3
] ++ (if stdenv.isLinux then [ pulseaudio ] else [ portaudio ]);
] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]);
cmakeFlags = [
"-DUSE_INTERNAL_CODEC2:BOOL=FALSE"
"-DUSE_STATIC_DEPS:BOOL=FALSE"
] ++ lib.optionals stdenv.isLinux [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];
] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];
meta = with lib; {
homepage = "https://freedv.org/";
description = "Digital voice for HF radio";
license = licenses.lgpl21;
maintainers = with maintainers; [ mvs ];
platforms = platforms.unix;
};
}

View File

@ -5,7 +5,6 @@
, appstream-glib
, dbus
, desktop-file-utils
, elementary-icon-theme
, fetchFromGitHub
, fetchpatch
, flatpak
@ -65,7 +64,6 @@ stdenv.mkDerivation rec {
buildInputs = [
appstream
elementary-icon-theme
flatpak
glib
granite

View File

@ -13,7 +13,6 @@
, granite
, libgee
, libhandy
, elementary-icon-theme
, appstream
, wrapGAppsHook
}:
@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

View File

@ -11,7 +11,6 @@
, vala
, wrapGAppsHook
, clutter
, elementary-icon-theme
, evolution-data-server
, folks
, geoclue2
@ -48,7 +47,6 @@ stdenv.mkDerivation rec {
buildInputs = [
clutter
elementary-icon-theme
evolution-data-server
folks
geoclue2

View File

@ -13,7 +13,6 @@
, python3
, vala
, wrapGAppsHook
, elementary-icon-theme
, glib
, granite
, gst_all_1
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
glib
granite
gtk3

View File

@ -13,7 +13,6 @@
, vala
, wrapGAppsHook
, editorconfig-core-c
, elementary-icon-theme
, granite
, gtk3
, gtksourceview4
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
buildInputs = [
editorconfig-core-c
elementary-icon-theme
granite
gtk3
gtksourceview4

View File

@ -13,7 +13,6 @@
, granite
, libgee
, libhandy
, elementary-icon-theme
, gettext
, wrapGAppsHook
, appstream
@ -51,7 +50,6 @@ stdenv.mkDerivation rec {
buildInputs = [
appstream
elementary-icon-theme
granite
gtk3
libgee

View File

@ -22,7 +22,6 @@
, sqlite
, zeitgeist
, glib-networking
, elementary-icon-theme
, libcloudproviders
, libgit2-glib
, wrapGAppsHook
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
elementary-dock
elementary-icon-theme
glib
granite
gtk3

View File

@ -17,7 +17,6 @@
, libgdata
, sqlite
, granite
, elementary-icon-theme
, evolution-data-server
, appstream
, wrapGAppsHook
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
evolution-data-server
folks
granite

View File

@ -10,7 +10,6 @@
, python3
, vala
, wrapGAppsHook
, elementary-icon-theme
, glib
, granite
, gst_all_1
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
glib
granite
gtk3

View File

@ -28,7 +28,6 @@
, libwebp
, appstream
, wrapGAppsHook
, elementary-icon-theme
}:
stdenv.mkDerivation rec {
@ -63,7 +62,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
geocode-glib
gexiv2
granite

View File

@ -14,7 +14,6 @@
, libgee
, libhandy
, libcanberra
, elementary-icon-theme
, wrapGAppsHook
}:
@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libcanberra

View File

@ -11,7 +11,6 @@
, vala
, wrapGAppsHook
, clutter-gtk
, elementary-icon-theme
, evolution-data-server
, granite
, geoclue2
@ -48,7 +47,6 @@ stdenv.mkDerivation rec {
buildInputs = [
clutter-gtk
elementary-icon-theme
evolution-data-server
granite
geoclue2

View File

@ -16,7 +16,6 @@
, libnotify
, vte
, libgee
, elementary-icon-theme
, appstream
, pcre2
, wrapGAppsHook
@ -55,7 +54,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

View File

@ -15,7 +15,6 @@
, clutter-gst
, clutter-gtk
, gst_all_1
, elementary-icon-theme
, wrapGAppsHook
}:
@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
buildInputs = [
clutter-gst
clutter-gtk
elementary-icon-theme
granite
gtk3
libgee

View File

@ -2,7 +2,6 @@
, stdenv
, desktop-file-utils
, nix-update-script
, elementary-icon-theme
, fetchFromGitHub
, flatpak
, gettext
@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
flatpak
glib
granite

View File

@ -13,7 +13,6 @@
, libhandy
, granite
, gettext
, elementary-icon-theme
, wrapGAppsHook
}:
@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

View File

@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
buildInputs = [
accountsservice
clutter-gtk # else we get could not generate cargs for mutter-clutter-2
elementary-gtk-theme
elementary-icon-theme
gnome-settings-daemon
gdk-pixbuf
@ -91,8 +90,11 @@ stdenv.mkDerivation rec {
# for the compositor
--prefix PATH : "$out/bin"
# the theme is hardcoded
# the GTK theme is hardcoded
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
# the icon theme is hardcoded
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
)
'';

View File

@ -13,7 +13,6 @@
, glib
, granite
, libgee
, elementary-icon-theme
, elementary-settings-daemon
, gettext
, libhandy
@ -56,7 +55,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
elementary-settings-daemon # settings schema
glib
granite

View File

@ -14,7 +14,6 @@
, granite
, libgee
, libhandy
, elementary-icon-theme
, wrapGAppsHook
}:
@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-icon-theme
glib
granite
gtk3

View File

@ -19,7 +19,6 @@
, gnome-desktop
, mutter
, clutter
, elementary-icon-theme
, gnome-settings-daemon
, wrapGAppsHook
, gexiv2
@ -67,7 +66,6 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
clutter
elementary-icon-theme
gnome-settings-daemon
gexiv2
gnome-desktop

View File

@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-gtk-theme
elementary-icon-theme
gala
granite
@ -64,8 +63,11 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
# this theme is required
# this GTK theme is required
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
# the icon theme is required
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
)
'';

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "bctoolbox";
version = "5.1.0";
version = "5.1.10";
nativeBuildInputs = [ cmake bcunit ];
buildInputs = [ mbedtls ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-h+JeyZSXCuV6MtOrWxvpg7v3BXks5T70Cy2gP+If0A8=";
sha256 = "sha256-BOJ/NUJnoTeDuURH8Lx6S4RlNZPfsQX4blJkpUdraBg=";
};
# Do not build static libraries

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "belcard";
version = "5.0.55";
version = "5.1.10";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-5KHmyNplrVADVlD2IBPwEe3vbEjAMNlz+p5aIBHb6kI=";
sha256 = "sha256-ZxO0Y4R04T+3K+08fEJ9krWfYSodQLrjBZYbGrKOrXI=";
};
buildInputs = [ bctoolbox belr ];

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "belr";
version = "5.0.55";
version = "5.1.3";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-P3oDlaT3rN1lRhpKjbGBk7a0hJAQGQcWydFM45GMUU4=";
sha256 = "sha256-0JDwNKqPkzbXqDhgMV+okPMHPFJwmLwLsDrdD55Jcs4=";
};
buildInputs = [ bctoolbox ];

View File

@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DEXIV2_ENABLE_NLS=ON"
"-DEXIV2_BUILD_DOC=ON"
"-DEXIV2_ENABLE_BMFF=ON"
];
buildFlags = [

View File

@ -86,12 +86,8 @@ let
};
in {
libressl_3_2 = generic {
version = "3.2.7";
sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw";
};
libressl_3_4 = generic {
version = "3.4.2";
sha256 = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84=";
version = "3.4.3";
sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
};
}

View File

@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "lime";
version = "5.0.0";
version = "5.0.53";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-11vvvA+pud/eOyYsbRKVvGfiyhwdhNPfRQSfaquUro8=";
sha256 = "sha256-M+KdauIVsN3c+cEPw4CaMzXnQZwAPNXeJCriuk9NCWM=";
};
buildInputs = [ bctoolbox soci belle-sip sqlite boost ];

View File

@ -30,5 +30,6 @@ in stdenv.mkDerivation rec {
description = "Experimental Neural Net speech coding for FreeDV";
license = licenses.bsd3;
maintainers = with maintainers; [ mvs ];
platforms = platforms.all;
};
}

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.1.11752";
version = "9.1.12332";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-UbcPxYEyuX8W0uZXeCu00yBshdcPBAQKzZqhAYXTf+8=";
hash = "sha256-qWKvNhiOAonUi0qpOWtwbNZa2lgBQ+gaGrAHMgDdr4Q=";
};
propagatedBuildInputs = [

View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "aiobotocore";
version = "2.1.1";
version = "2.1.2";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2+mrmXhRwkWLB6hfaCvizPNdZ51d4Pj1cSKfdArXunE=";
sha256 = "sha256-AP1/Q8wEhNjtJ0/QvkkqoWp/6medvqlqYCu3IspMLSI=";
};
# relax version constraints: aiobotocore works with newer botocore versions

View File

@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.1.11752";
version = "9.1.12332";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-4DUM1c3M/naJFqN/gdrX/NnJrY3ElUEOQ34cwcpSC+s=";
hash = "sha256-GaW1XyFOnjU28HqptFC6+Fe41zYZMR716Nsq0dPy660=";
};
propagatedBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.1.11752";
version = "9.1.12332";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-nZGAuWp07VMpOvqw38FGSiUhaFjJOfCzOaam4Ex7qbY=";
hash = "sha256-lhwlZ7eHaEMaTW7c+WCRSeGSIQ5IeEx6XALyYJH+Ey0=";
};
propagatedBuildInputs = [

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
, nose
, pythonOlder
@ -8,7 +9,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.1.11752";
version = "9.1.12332";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-D1YssHa14q2jxn4HtOYZlTdwGPkiiMhWuOh08fj87ic=";
hash = "sha256-nv/hwQZgKv/cM8fF6GqI8zY9GAe8aCZ/AGFOmhz+bMM=";
};
checkInputs = [
@ -25,6 +26,15 @@ buildPythonPackage rec {
pytestCheckHook
];
patches = [
# Make archinfo import without installing pyvex, https://github.com/angr/archinfo/pull/113
(fetchpatch {
name = "fix-import-issue.patch";
url = "https://github.com/angr/archinfo/commit/d29c108f55ffd458ff1d3d65db2d651c76b19267.patch";
sha256 = "sha256-9vi0QyqQLIPQxFuB8qrpcnPXWOJ6d27/IXJE/Ui6HhM=";
})
];
pythonImportsCheck = [
"archinfo"
];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.13.0";
version = "1.14.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "v${version}";
sha256 = "sha256-t04g65TPeOYgEQw6kPJrlJN1ssQrsN9kl7g69J4pPwo=";
sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc=";
};
propagatedBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "beartype";
version = "0.10.2";
version = "0.10.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Lo1AUxj+QR7N2Tdif58zGBMSp5Pr0jmz2nacRDnLS5g=";
hash = "sha256-JOxp9qf05ul69APQjeJw3vMkhRgGAycJXSOxxN9kvyo=";
};
checkInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.1.11752";
version = "9.1.12332";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Z50oKwS0MZVBEUeXfj9cgtPYXFAYf4i7QkgJiXdWrxo=";
sha256 = "sha256-YrR8OkDoop6kHAuk4cM4STYYOjjaMLZCQuE07/5IXqs=";
};
propagatedBuildInputs = [

View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.1.11752";
version = "9.1.12332";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-pnbFnv/te7U2jB6gNRvE9DQssBkFsara1g6Gtqf+WVo=";
hash = "sha256-xcj6Skzzmw5g+0KsBMLNOhRyXQA7nbgnc9YyfJLteCM=";
};
propagatedBuildInputs = [

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "cloudsmith-api";
version = "1.33.7";
version = "1.42.3";
format = "wheel";
src = fetchPypi {
pname = "cloudsmith_api";
inherit format version;
sha256 = "sha256-KNm2O2kZg+YzjtebsBoL7BOHCuffDELXm2k8vIFtKdk=";
sha256 = "sha256-P0QuKkyFk3jvYJwtul0/eUTrDyj2QKAjU/Ac+4VCYYk=";
};
propagatedBuildInputs = [

View File

@ -1,16 +1,32 @@
{ lib, fetchPypi, buildPythonPackage }:
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
}:
buildPythonPackage rec {
pname = "flake8-blind-except";
version = "0.2.0";
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5";
hash = "sha256-8lpXWp3LPus8dgv5wi22C4taIxICJO0fqppD913X3RY=";
};
meta = {
homepage = "https://github.com/elijahandrews/flake8-blind-except";
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"flake8_blind_except"
];
meta = with lib; {
description = "A flake8 extension that checks for blind except: statements";
maintainers = with lib.maintainers; [ johbo ];
license = lib.licenses.mit;
homepage = "https://github.com/elijahandrews/flake8-blind-except";
license = licenses.mit;
maintainers = with maintainers; [ johbo ];
};
}

View File

@ -8,7 +8,8 @@
buildPythonPackage rec {
pname = "graphql-subscription-manager";
version = "0.5.4";
version = "0.5.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "PyGraphqlWebsocketManager";
rev = version;
sha256 = "sha256-J3us0xZN1jOFRcvUQg8PQP6AVHa/swGjKU8IivmfjQE=";
hash = "sha256-7MqFsttMNnWmmWKj1zaOORBTDGt6Wm8GU7w56DfPl2c=";
};
propagatedBuildInputs = [
@ -27,7 +28,9 @@ buildPythonPackage rec {
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "graphql_subscription_manager" ];
pythonImportsCheck = [
"graphql_subscription_manager"
];
meta = with lib; {
description = "Python3 library for graphql subscription manager";

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.37.4";
version = "0.37.7";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-Mb6ruBFM3IiU5EUwOTiWEL3qt7p/n7QIgI5+j0mrOkw=";
sha256 = "sha256-rVtXfoQ/1GAc6ugT/jduoMacCDjrlGagWhK1rYgl/1Q=";
};
propagatedBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
version = "1.26.0";
version = "1.27.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
hash = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg=";
hash = "sha256-M0Ob3HjIhlYSIWXGM54NXiEMSCmZzNLLNsCRyxAcjMc=";
};
propagatedBuildInputs = [

View File

@ -1,7 +1,6 @@
{ buildPythonPackage
, fetchPypi
, pytest
, six
, tqdm
, pyyaml
, docopt
@ -10,25 +9,25 @@
, args
, schema
, responses
, backports_csv
, isPy3k
, lib
, glibcLocales
, setuptools
, urllib3
, pythonOlder
}:
buildPythonPackage rec {
pname = "internetarchive";
version = "2.3.0";
version = "3.0.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "fa89dc4be3e0a0aee24810a4a754e24adfd07edf710c645b4f642422c6078b8d";
sha256 = "sha256-fRcqsT8p/tqXUpU2/9lAEF1IT8Cy5KK0+jKaeVwZshI=";
};
propagatedBuildInputs = [
six
tqdm
pyyaml
docopt
@ -38,7 +37,7 @@ buildPythonPackage rec {
schema
setuptools
urllib3
] ++ lib.optionals (!isPy3k) [ backports_csv ];
];
checkInputs = [ pytest responses glibcLocales ];

View File

@ -1,25 +1,33 @@
{ lib, buildPythonPackage, fetchPypi, isPy27 }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "itemadapter";
version = "0.4.0";
version = "0.5.0";
format = "setuptools";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca";
hash = "sha256-BbanndMaepk9+y6Dhqkcl+O4xs8otyVT6AjmJeC4fCA=";
};
doCheck = false; # infinite recursion with Scrapy
# Infinite recursion with Scrapy
doCheck = false;
pythonImportsCheck = [ "itemadapter" ];
pythonImportsCheck = [
"itemadapter"
];
meta = with lib; {
description = "Common interface for data container classes";
homepage = "https://github.com/scrapy/itemadapter";
changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md";
license = licenses.bsd3;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

View File

@ -19,7 +19,7 @@ let
in
buildPythonPackage rec {
pname = "jax";
version = "0.3.3";
version = "0.3.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,8 +27,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "${pname}-v${version}";
sha256 = "12k5kzgs2cxf9nvcc10a9ldl4zn68b5cnkhchfj1s7f61abx6nq3";
rev = "jax-v${version}";
sha256 = "sha256-RZqSJP2vtt8U6nmftV2VzfkMGkkk3100QqsjI7PpQbc=";
};
patches = [

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "meilisearch";
version = "0.18.0";
version = "0.18.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "v${version}";
hash = "sha256-iIFTZKORCXr4mNeWBtbOPWXwORuTV/IKhLYkqFgd3Hw=";
hash = "sha256-Rd2GmomNzW0+oI2QEGcPY4g8H+4FN7eLKY1ljcibsLw=";
};
propagatedBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyaussiebb";
version = "0.0.12";
version = "0.0.13";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "yaleman";
repo = "aussiebb";
rev = "v${version}";
hash = "sha256-4B+eq863G+iVl8UnxDumPVpkj9W8kX5LK0wo4QIYo4w=";
hash = "sha256-8DX7GwSnpiqUO20a6oLMMTkpTUxWTb8LMD4Uk0lyAOY=";
};
nativeBuildInputs = [

View File

@ -3,19 +3,23 @@
, fetchFromGitHub
, buildPythonPackage
, pytest
, pythonOlder
, xclip
, xvfb-run
}:
buildPythonPackage rec {
pname = "pyclip";
version = "0.5.4";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "spyoungtech";
repo = pname;
rev = "v${version}";
sha256 = "19ff9cgnfx03mbmy5zpbdi986ppx38a5jf97vkqnic4g5sd1qyrn";
hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4=";
};
postPatch = ''
@ -23,7 +27,12 @@ buildPythonPackage rec {
--replace docs/README.md README.md
'';
checkInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ xclip xvfb-run ];
checkInputs = [
pytest
] ++ lib.optionals stdenv.isLinux [
xclip
xvfb-run
];
checkPhase = ''
runHook preCheck

View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "pysaml2";
version = "7.1.1";
version = "7.1.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "IdentityPython";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uRfcn3nCK+tx6ol6ZFarOSrDOh0cfC9gZXBZ7EICQzw=";
sha256 = "sha256-nyQcQ1OO9PuuQROg+km2vIRF1sZ22MZhiHpmVXWl+is=";
};
propagatedBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pytest-console-scripts";
version = "1.3";
version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-w8rb9nz7MKHrHMHp5py23kTDpkhCbxub9j6F2XNX/H8=";
hash = "sha256-XGw9qunPn77Q5lUHISiThgAZPcACpc8bGHJIZEugKFc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-smarttub";
version = "0.0.29";
version = "0.0.30";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mdz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-utUpNuemyS8XEVhfhLgOwTRkPFqCBXyK1s1LWemywmU=";
sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g=";
};
propagatedBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.1.11752";
version = "9.1.12332";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-DI+Jc5MtDd2XXfjIDtPd8qt4/eQ/3nwbDUqWE2haUhM=";
hash = "sha256-e1lruHgppQ8mJbTx6xsUDSkLCYQISqM9c1vsjdQU4eI=";
};
propagatedBuildInputs = [

View File

@ -8,33 +8,53 @@
, docutils
, pyopencl
, opencl-headers
, pythonOlder
}:
buildPythonPackage rec {
pname = "sasmodels";
version = "1.0.5";
version = "1.0.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SasView";
repo = "sasmodels";
rev = "v${version}";
sha256 = "19h30kcgpvg1qirzjm0vhgvp1yn60ivlglc8a8n2b4d9fp0acfyd";
hash = "sha256-RVEPu07gp1ScciJQmjizyELcOD2WSjIlxunj5LnmXdw=";
};
buildInputs = [ opencl-headers ];
buildInputs = [
opencl-headers
];
propagatedBuildInputs = [
docutils
matplotlib
numpy
scipy
pyopencl
];
# Note: the 1.0.5 release should be compatible with pytest6, so this can
# be set back to 'pytest' at that point
checkInputs = [ pytest ];
propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ];
checkInputs = [
pytest
];
checkPhase = ''
HOME=$(mktemp -d) py.test -c ./pytest.ini
'';
meta = {
pythonImportsCheck = [
"sasmodels"
];
meta = with lib; {
description = "Library of small angle scattering models";
homepage = "http://sasview.org";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ rprospero ];
homepage = "https://github.com/SasView/sasmodels";
license = licenses.bsd3;
maintainers = with maintainers; [ rprospero ];
};
}

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "scikit-hep-testdata";
version = "0.4.11";
version = "0.4.12";
format = "pyproject";
# fetch from github as we want the data files
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "scikit-hep";
repo = pname;
rev = "v${version}";
sha256 = "18r5nk8d5y79ihzjkjm5l0hiw2sjgj87px7vwb0bxbs73f5v353b";
sha256 = "sha256-ZnsOmsajW4dDv53I/Cuu97mPJywGiwFhNGpT1WRfxSw=";
};
nativeBuildInputs = [

View File

@ -22,6 +22,7 @@
, service-identity
, sybil
, testfixtures
, tldextract
, twisted
, w3lib
, zope_interface
@ -29,13 +30,13 @@
buildPythonPackage rec {
pname = "scrapy";
version = "2.5.1";
version = "2.6.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
pname = "Scrapy";
sha256 = "13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49";
sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827";
};
nativeBuildInputs = [
@ -54,6 +55,7 @@ buildPythonPackage rec {
pyopenssl
queuelib
service-identity
tldextract
twisted
w3lib
zope_interface
@ -68,22 +70,6 @@ buildPythonPackage rec {
testfixtures
];
patches = [
# Require setuptools, https://github.com/scrapy/scrapy/pull/5122
(fetchpatch {
name = "add-setuptools.patch";
url = "https://github.com/scrapy/scrapy/commit/4f500342c8ad4674b191e1fab0d1b2ac944d7d3e.patch";
sha256 = "14030sfv1cf7dy4yww02b49mg39cfcg4bv7ys1iwycfqag3xcjda";
})
# Make Twisted[http2] installation optional, https://github.com/scrapy/scrapy/pull/5113
(fetchpatch {
name = "remove-h2.patch";
url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch";
sha256 = "0sa39yx9my4nqww8a12bk9zagx7b56vwy7xpxm4xgjapjl6mcc0k";
excludes = [ "tox.ini" ];
})
];
LC_ALL = "en_US.UTF-8";
preCheck = ''

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.10.3";
version = "3.10.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-K2zBEGzagQ6lOWIPkop1YYqB2/KZIj2beUJUu2Garno=";
sha256 = "sha256-GtdxStdWtioRgf/Y2/broyYElqIJ2RxP3otgROw3epI=";
};
propagatedBuildInputs = [ numpy ];

View File

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "typed-settings";
version = "0.11.1";
version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gcyOeUyRAwU5s+XoQO/yM0tx7QHjDsBeyoe5HRZHtIs=";
sha256 = "sha256-c+iOb1F8+9IoRbwpMTdyDfOPW2ZEo4xDAlbzLAxgSfk=";
};
nativeBuildInputs = [

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-pytz";
version = "2021.3.5";
version = "2021.3.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/vjeI47pUTWVIimiojv7h71j1abIWYEGpGz89I8Gnqg=";
sha256 = "sha256-dFR/2Q2NirTx7t86NEp9GG2XSGlziV+BIhpxLh4s2ZM=";
};
# Modules doesn't have tests

View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-tabulate";
version = "0.8.5";
version = "0.8.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw=";
hash = "sha256-P037eVRJwheO1cIU7FEUwESx7t1xrQoQA7xnDwnYcQo=";
};
# Module doesn't have tests

View File

@ -1,14 +1,27 @@
{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4, setuptools}:
{lib
, fetchFromGitHub
, pythonOlder
, buildPythonPackage
, gfortran
, xarray
, wrapt
, numpy
, netcdf4
, setuptools
}:
buildPythonPackage rec {
pname = "wrf-python";
version = "1.3.2.6";
version = "1.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "NCAR";
repo = "wrf-python";
rev = version;
sha256 = "046kflai71r7xrmdw6jn0ifn5656wj9gpnwlgxkx430dgk7zbc2y";
hash = "sha256-+v4FEK0FVE0oAIb18XDTOInHKfxXyykb1ngk9Uxwf0c=";
};
propagatedBuildInputs = [
@ -24,9 +37,8 @@ buildPythonPackage rec {
checkInputs = [
netcdf4
] ++ lib.optional (pythonOlder "3.3") mock;
];
doCheck = true;
checkPhase = ''
runHook preCheck
cd ./test/ci_tests
@ -34,10 +46,14 @@ buildPythonPackage rec {
runHook postCheck
'';
meta = {
pythonImportsCheck = [
"wrf"
];
meta = with lib; {
description = "WRF postprocessing library for Python";
homepage = "http://wrf-python.rtfd.org";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mhaselsteiner ];
license = licenses.asl20;
maintainers = with maintainers; [ mhaselsteiner ];
};
}

View File

@ -1,34 +1,53 @@
{ lib
, buildPythonPackage
, fetchPypi
, pillow
, html5lib
, pypdf2
, reportlab
, six
, python-bidi
, arabic-reshaper
, setuptools
, buildPythonPackage
, fetchFromGitHub
, html5lib
, pillow
, pypdf3
, pytestCheckHook
, python-bidi
, pythonOlder
, reportlab
, svglib
}:
buildPythonPackage rec {
pname = "xhtml2pdf";
version = "0.2.5";
version = "0.2.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-EyIERvAC98LqPTMCdwWqTkm1RiMhikscL0tnMZUHIT8=";
};
propagatedBuildInputs = [
pillow html5lib pypdf2 reportlab six
setuptools python-bidi arabic-reshaper
arabic-reshaper
html5lib
pillow
pypdf3
python-bidi
reportlab
svglib
];
src = fetchPypi {
inherit pname version;
sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"xhtml2pdf"
];
meta = with lib; {
description = "A PDF generator using HTML and CSS";
homepage = "https://github.com/xhtml2pdf/xhtml2pdf";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

View File

@ -550,14 +550,6 @@ in
"--with-libvirt-include=${libvirt}/include"
"--with-libvirt-lib=${libvirt}/lib"
];
dontBuild = false;
postPatch = ''
# https://gitlab.com/libvirt/libvirt-ruby/-/commit/43543991832c9623c00395092bcfb9e178243ba4
substituteInPlace ext/libvirt/common.c \
--replace 'st.h' 'ruby/st.h'
substituteInPlace ext/libvirt/domain.c \
--replace 'st.h' 'ruby/st.h'
'';
};
ruby-lxc = attrs: {

View File

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.971";
version = "2.0.975";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-4iY0/pCU7ezf2llSNxnUB/Sky+salpEC6N80C2Pbt6k=";
hash = "sha256-vzq6HKugjM9LBaklv0IlMauSAl3bqHOikDCzrhVBVPA=";
};
nativeBuildInputs = with py.pkgs; [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.173.0";
version = "0.174.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "sha256-F0t85/sq9p+eNEf2XAGxw+ZWeRgUbkhrKFdGASijuAs=";
sha256 = "sha256-s4wu7UW3OKz2xQpNpZZeDjyDdNbRw9w0kauiPWo/SMA=";
};
installPhase = ''

View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config meson ninja cmake (python3.withPackages (ps: [ ps.setuptools ])) ];
# meson's find_library seems to not use our compiler wrapper if static paraemter
# meson's find_library seems to not use our compiler wrapper if static parameter
# is either true/false... We work around by also providing LIBRARY_PATH
preConfigure = ''
LIBRARY_PATH=""

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
version = "0.10.1";
version = "0.10.2";
src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
hash = "sha256:hYQOmnJjsOIIri5H0/B5LhixwfiLxxpVoN4ON1NUkWg=";
hash = "sha256-lx5saJdGsMS7DLaUngoauzFS1UG4QYvrELEvTjIa1oQ=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
'';
pythonImportsCheck = [
" circup "
"circup"
];
meta = with lib; {

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-G1RQEKb3vK8lg0jakCtIMgQXmWqfsq0QWHwU8TAbBbE=";
sha256 = "sha256-BYrJ0I8ZARppy+7CJPfAm/4SIEupGZh1qd1ghZWOD/8=";
};
vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI=";

View File

@ -43,13 +43,13 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
version = "2.288.1";
version = "2.289.1";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-bP+6aAKnu6PxN9eppFXsqOSVSGQ6Lv+gEF2MdEz52WE=";
hash = "sha256-5TS/tW1hnDvPZQdR659rw+spLq98niyUms3BrixaKRE=";
};
nativeBuildInputs = [

View File

@ -3,17 +3,14 @@
(fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.71.0";
version = "1.71.1";
vendorSha256 = null;
@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "sha256-cj2+DmJyLa6kFkH9JflaR3yFFXBaVZHO6czJGLEH7L0=";
sha256 = "sha256-Y6YabrpM1WcNGp5ksvq3SBuAS6KEUVzEfxsPmBDS+Io=";
};
meta = with lib; {

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "earthly";
version = "0.6.10";
version = "0.6.11";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "sha256-CzVcoIvf9sqomua5AJtNpCnGfPmCNJMwex/l7p+hEfw=";
sha256 = "sha256-awlE+k4Oa64Z2n+XbeDuezea+5D0ol7hyscVY6j52gI=";
};
vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E=";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
version = "1.44.2";
version = "1.45.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
sha256 = "sha256-RMZZLvCJcTMzHOzUfT6aEC21T5dCwu1YOUuQ9PLS3fc=";
sha256 = "sha256-nIkDtWUGKSeuGLCgyAYzrIhEk2INX0gZUCOmq+BKbDY=";
};
vendorSha256 = "sha256-X2hZ4BQgYHI1mx/Ywky0oo7IMtrppu+rLq2LRLPH3fY=";
vendorSha256 = "sha256-ruthLNtMYMi2q3fuxOJSsJw5w3uqZi88yJ3BFgNCAHs=";
doCheck = false;

View File

@ -1,18 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGo118Module, fetchFromGitHub }:
buildGoModule rec {
buildGo118Module rec {
pname = "gopls";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "gopls/v${version}";
sha256 = "sha256-VBan3IKqf3AFrPoryT/U7lGabFHSXMhaBpnNw3LRH/I=";
sha256 = "sha256-ypuZQt6iF1QRk/FsoTKnJlb5CWIEkvK7r37t4rSxhmU=";
};
modRoot = "gopls";
vendorSha256 = "sha256-pW4G89fYFwVM2EkIqTCsl2lhN677LIMFpKPvLVV2boY=";
vendorSha256 = "sha256-SY08322wuJl8F790oXGmYo82Yadi14kDpoVGCGVMF0c=";
doCheck = false;

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "ko";
version = "0.10.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Xhe5WNHQ+Oa1m/6VwC3zCwWzXRc1spSfPp4jySsOcuU=";
sha256 = "sha256-VtPry8sF+W46gc2lI3uiE4wqilo1WhH+940QKPZ5cyI=";
};
vendorSha256 = null;
@ -40,8 +40,9 @@ buildGoModule rec {
postInstall = ''
installShellCompletion --cmd ko \
--bash <($out/bin/ko completion) \
--zsh <($out/bin/ko completion --zsh)
--bash <($out/bin/ko completion bash) \
--fish <($out/bin/ko completion fish) \
--zsh <($out/bin/ko completion zsh)
'';
meta = with lib; {

Some files were not shown because too many files have changed in this diff Show More