diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md
index 72b895f5da1..9ce046d05b6 100644
--- a/doc/languages-frameworks/agda.section.md
+++ b/doc/languages-frameworks/agda.section.md
@@ -67,13 +67,13 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim
+ `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`.
+ `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`.
-### Build phase
+### Building Agda packages
The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file.
If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden.
Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file.
`agda` and the Agda libraries contained in `buildInputs` are made available during the build phase.
-### Install phase
+### Installing Agda packages
The default install phase copies agda source files, agda interface files (`*.agdai`) and `*.agda-lib` files to the output directory.
This can be overridden.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 38ed481b7c6..14675f3e23b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3901,6 +3901,12 @@
githubId = 2396926;
name = "Justin Woo";
};
+ jwatt = {
+ email = "jwatt@broken.watch";
+ github = "jjwatt";
+ githubId = 2397327;
+ name = "Jesse Wattenbarger";
+ };
jwiegley = {
email = "johnw@newartisans.com";
github = "jwiegley";
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 89a1c0bbbe0..8cc63963370 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -18,6 +18,7 @@ dkjson,,,,,
fifo,,,,,
http,,,,,vcunat
inspect,,,,,
+ldbus,,http://luarocks.org/dev,,,
ldoc,,,,,
lgi,,,,,
linenoise,,,,,
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 25a4995b733..703a6a031d6 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -57,6 +57,18 @@ with lib.maintainers; {
scope = "Maintain GNOME desktop environment and platform.";
};
+ matrix = {
+ members = [
+ ma27
+ pacien
+ fadenb
+ mguentner
+ ekleog
+ ralith
+ ];
+ scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
+ };
+
php = {
members = [
aanderse
diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml
index 5fa0b29e6d6..badc374ebcf 100644
--- a/nixos/doc/manual/administration/boot-problems.xml
+++ b/nixos/doc/manual/administration/boot-problems.xml
@@ -19,9 +19,9 @@
- Start a root shell if something goes wrong in stage 1 of the boot process
- (the initial ramdisk). This is disabled by default because there is no
- authentication for the root shell.
+ Allows the user to start a root shell if something goes wrong in stage 1
+ of the boot process (the initial ramdisk). This is disabled by default
+ because there is no authentication for the root shell.
@@ -49,6 +49,22 @@
+
+
+ boot.debug1mounts
+
+
+
+ Like boot.debug1 or
+ boot.debug1devices, but runs stage1 until all
+ filesystems that are mounted during initrd are mounted (see
+
+ ). As a motivating example, this could be useful if you've forgotten to set
+
+ on a file system.
+
+
+
boot.trace
@@ -90,6 +106,15 @@
1.
+
+ Notice that for boot.shell_on_fail,
+ boot.debug1, boot.debug1devices, and
+ boot.debug1mounts, if you did not
+ select "start the new shell as pid 1", and you exit from
+ the new shell, boot will proceed normally from the point where it failed, as
+ if you'd chosen "ignore the error and continue".
+
+
If no login prompts or X11 login screens appear (e.g. due to hanging
dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index d1eecd65085..9bbbecc0569 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -614,6 +614,34 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
queued on the kernel side of the netlink socket.
+
+
+ Specifying mailboxes in the dovecot2 module
+ as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the name
+ should be the key of the attribute.
+
+
+ This means that a configuration like this
+{
+ services.dovecot2.mailboxes = [
+ { name = "Junk";
+ auto = "create";
+ }
+ ];
+}
+ should now look like this:
+{
+ services.dovecot2.mailboxes = {
+ Junk.auto = "create";
+ };
+}
+
+
+
+
+ netbeans was upgraded to 12.0 and now defaults to OpenJDK 11. This might cause problems if your projects depend on packages that were removed in Java 11.
+
+
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 141e43fec39..7fbbfcec751 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -600,6 +600,38 @@ in {
}
];
+ warnings =
+ builtins.filter (x: x != null) (
+ flip mapAttrsToList cfg.users (name: user:
+ # This regex matches a subset of the Modular Crypto Format (MCF)[1]
+ # informal standard. Since this depends largely on the OS or the
+ # specific implementation of crypt(3) we only support the (sane)
+ # schemes implemented by glibc and BSDs. In particular the original
+ # DES hash is excluded since, having no structure, it would validate
+ # common mistakes like typing the plaintext password.
+ #
+ # [1]: https://en.wikipedia.org/wiki/Crypt_(C)
+ let
+ sep = "\\$";
+ base64 = "[a-zA-Z0-9./]+";
+ id = "[a-z0-9-]+";
+ value = "[a-zA-Z0-9/+.-]+";
+ options = "${id}(=${value})?(,${id}=${value})*";
+ scheme = "${id}(${sep}${options})?";
+ content = "${base64}${sep}${base64}";
+ mcf = "^${sep}${scheme}${sep}${content}$";
+ in
+ if (user.hashedPassword != null
+ && builtins.match mcf user.hashedPassword == null)
+ then
+ ''
+ The password hash of user "${name}" may be invalid. You must set a
+ valid hash or the user will be locked out of his account. Please
+ check the value of option `users.users."${name}".hashedPassword`.
+ ''
+ else null
+ ));
+
};
}
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index e3e43177def..1ed5269c5ae 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -173,7 +173,9 @@ in
config = mkIf cfg.enable {
- security.sudo.extraRules = [
+ # We `mkOrder 600` so that the default rule shows up first, but there is
+ # still enough room for a user to `mkBefore` it.
+ security.sudo.extraRules = mkOrder 600 [
{ groups = [ "wheel" ];
commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ];
}
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 9fbf0c19752..51cbcbf1cbc 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -125,6 +125,8 @@ let
mailboxConfig = mailbox: ''
mailbox "${mailbox.name}" {
auto = ${toString mailbox.auto}
+ '' + optionalString (mailbox.autoexpunge != null) ''
+ autoexpunge = ${mailbox.autoexpunge}
'' + optionalString (mailbox.specialUse != null) ''
special_use = \${toString mailbox.specialUse}
'' + "}";
@@ -132,8 +134,9 @@ let
mailboxes = { ... }: {
options = {
name = mkOption {
- type = types.strMatching ''[^"]+'';
+ type = types.nullOr (types.strMatching ''[^"]+'');
example = "Spam";
+ default = null;
description = "The name of the mailbox.";
};
auto = mkOption {
@@ -148,6 +151,15 @@ let
example = "Junk";
description = "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid.";
};
+ autoexpunge = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "60d";
+ description = ''
+ To automatically remove all email from the mailbox which is older than the
+ specified time.
+ '';
+ };
};
};
in
@@ -323,9 +335,24 @@ in
};
mailboxes = mkOption {
- type = types.listOf (types.submodule mailboxes);
- default = [];
- example = [ { name = "Spam"; specialUse = "Junk"; auto = "create"; } ];
+ type = with types; let m = submodule mailboxes; in either (listOf m) (attrsOf m);
+ default = {};
+ apply = x:
+ if isList x then warn "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03!" x
+ else mapAttrsToList (name: value:
+ if value.name != null
+ then throw ''
+ When specifying dovecot2 mailboxes as attributes, declaring
+ a `name'-attribute is prohibited! The name ${value.name} should
+ be the attribute key!
+ ''
+ else value // { inherit name; }
+ ) x;
+ example = literalExample ''
+ {
+ Spam = { specialUse = "Junk"; auto = "create"; };
+ }
+ '';
description = "Configure mailboxes and auto create or subscribe them.";
};
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 8ed4bbdd031..e982eb16fa7 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -727,5 +727,6 @@ in {
];
meta.doc = ./matrix-synapse.xml;
+ meta.maintainers = teams.matrix.members;
}
diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 61bcd84f2e6..690eb70079d 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -107,6 +107,7 @@ in
++ cfg.lockOn.extraTargets;
before = optional cfg.lockOn.suspend "systemd-suspend.service"
++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
+ ++ optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service"
++ cfg.lockOn.extraTargets;
serviceConfig = {
Type = "forking";
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index b8d0606be7c..be06d6feb11 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -448,7 +448,7 @@ in
description =
''
An alternate BIOS (such as qboot) with which to start the VM.
- Should containin a file named bios.bin.
+ Should contain a file named bios.bin.
If null, QEMU's builtin SeaBIOS will be used.
'';
};
diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix
index f3623aa3c09..9ca80872176 100644
--- a/nixos/tests/matrix-synapse.nix
+++ b/nixos/tests/matrix-synapse.nix
@@ -29,8 +29,8 @@ import ./make-test-python.nix ({ pkgs, ... } : let
in {
name = "matrix-synapse";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ corngood ];
+ meta = with pkgs.stdenv.lib; {
+ maintainers = teams.matrix.members;
};
nodes = {
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index 7d90ac36f36..998535a8eb0 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -12,11 +12,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.9.5";
+ version = "2.9.6";
pname = "asunder";
src = fetchurl {
url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
- sha256 = "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4";
+ sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a";
};
nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index b72406b064d..8121c0caeec 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
- version = "1.17";
+ version = "1.19";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
- sha256 = "0paagzc1c7gdnvs2wwsw2h15d0x8a7fl995qq3pi06g8kmdm85pi";
+ sha256 = "0lr8gq4immc5cx1wr5ng6ccxs9afbd2dk6i0n5np25z14dvbvk3k";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index dce73c38670..4a195b4c345 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "0.6.10";
+ version = "0.6.12";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld";
+ sha256 = "0p09xp7andfg0gvarzc979pwglr0xjj1c0cziqj0c9z7p1v0fkws";
};
buildInputs = [
diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
index 450102da66f..7a4386d2386 100644
--- a/pkgs/applications/blockchains/bitcoin.nix
+++ b/pkgs/applications/blockchains/bitcoin.nix
@@ -1,59 +1,74 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck, hexdump
-, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent
-, withGui }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, autoreconfHook
+, db48
+, boost
+, zeromq
+, hexdump
+, zlib
+, miniupnpc
+, qtbase ? null
+, qttools ? null
+, wrapQtAppsHook ? null
+, utillinux
+, python3
+, qrencode
+, libevent
+, withGui
+}:
with stdenv.lib;
-
let
- version = "0.19.1";
+ version = "0.20.0";
majorMinorVersion = versions.majorMinor version;
-
desktop = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
};
-
pixmap = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png";
sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d";
};
-
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
pname = if withGui then "bitcoin" else "bitcoind";
inherit version;
src = fetchurl {
- urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
- "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
- ];
- sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0";
+ urls = [
+ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
+ "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
+ ];
+ sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28";
};
nativeBuildInputs =
[ pkgconfig autoreconfHook ]
++ optional stdenv.isDarwin hexdump
++ optional withGui wrapQtAppsHook;
- buildInputs = [ openssl db48 boost zlib zeromq
- miniupnpc libevent]
- ++ optionals stdenv.isLinux [ utillinux ]
- ++ optionals withGui [ qtbase qttools qrencode ];
+ buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ]
+ ++ optionals stdenv.isLinux [ utillinux ]
+ ++ optionals withGui [ qtbase qttools qrencode ];
postInstall = optional withGui ''
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png
'';
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
- "--disable-bench"
- ] ++ optionals (!doCheck) [
- "--disable-tests"
- "--disable-gui-tests"
- ]
- ++ optionals withGui [ "--with-gui=qt5"
- "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
- ];
+ configureFlags = [
+ "--with-boost-libdir=${boost.out}/lib"
+ "--disable-bench"
+ ] ++ optionals (!doCheck) [
+ "--disable-tests"
+ "--disable-gui-tests"
+ ]
+ ++ optionals withGui [
+ "--with-gui=qt5"
+ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+ ];
- checkInputs = [ rapidcheck python3 ];
+ checkInputs = [ python3 ];
doCheck = true;
@@ -67,13 +82,15 @@ in stdenv.mkDerivation rec {
meta = {
description = "Peer-to-peer electronic cash system";
- longDescription= ''
+ longDescription = ''
Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
'';
homepage = "https://bitcoin.org/";
+ downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/";
+ changelog = "https://bitcoincore.org/en/releases/${version}/";
maintainers = with maintainers; [ roconnor AndersonTorres ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix
index 02f2249862d..d52d87b9571 100644
--- a/pkgs/applications/blockchains/namecoin.nix
+++ b/pkgs/applications/blockchains/namecoin.nix
@@ -3,14 +3,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "nc0.19.1";
+ version = "nc0.20.0";
name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
src = fetchFromGitHub {
owner = "namecoin";
repo = "namecoin-core";
rev = version;
- sha256 = "13rdvngrl2w0gk7km3sd9fy8yxzgxlkcwn50ajsbrhgzl8kx4q7m";
+ sha256 = "115nlsq5g169mj4qjmkhxx1bnx740871zqyng9zbm2y4i0xf71c4";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index fbe08dbfe7b..dec3c795501 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -3,14 +3,14 @@
let
versions = {
atom = {
- version = "1.42.0";
- sha256 = "1ira528nwxi30jfwyivlac3wkkqb9d2z4jhxwq5m7mnpm5yli6jy";
+ version = "1.48.0";
+ sha256 = "1693bxbylf6jhld9bdcr5pigk36wqlbj89praldpz9s96yxig9s1";
};
atom-beta = {
- version = "1.43.0";
+ version = "1.49.0";
beta = 0;
- sha256 = "06if3w5hx7njmyal0012zawn8f5af1z4bjcbzj2c0gd15nlsgm95";
+ sha256 = "1fr6m4a7shdj3wpn6g4n95cqpkkg2x9srwjf7bqxv9f3d5jb1y33";
};
};
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index cf783053679..5e3c1070ad2 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,6 +1,7 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
+, at-spi2-core
}:
let
@@ -10,7 +11,7 @@ let
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
- xorg.libxcb libsecret libuuid at-spi2-atk
+ xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core
];
libPathNative = lib.makeLibraryPath packages;
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix
index 80a5436c955..9fb251d5295 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
- version = "5.5.1";
+ version = "5.5.2";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "0k4j2kp77sz2p8s77wmcawia81bx7vfb2nnh9lqxzdk2mmlg387c";
+ sha256 = "1qxvsz19iv5fr0nvz75b13knmsbkhkgvlvrhip8y4j66ypscs652";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 476819369cf..e07e7300048 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -10,11 +10,11 @@
mkDerivation rec {
pname = "kdevelop";
- version = "5.5.1";
+ version = "5.5.2";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy";
+ sha256 = "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index b2a13e3db7c..ecc3c058f70 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "11.3";
+ version = "12.0";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
- sha512 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6";
+ sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4";
};
buildCommand = ''
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 85f78035a0f..5191b916b6c 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "vis";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
rev = "v${version}";
- sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb";
+ sha256 = "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh";
repo = "vis";
owner = "martanne";
};
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 098aee119e6..fa97ceb5eb2 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
- version = "4.6.4";
+ version = "4.7.0";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "1hkqv2lix58my009i61cy0vpazxqpzapfhxkw5439ndn6qk1782d";
+ sha256 = "0kn0422k4vi2qifasnkd0cjf5l6z0rmkqv6l46ygxk3qyykjnqcm";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; [
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 6fb5b91c2a9..40d0f4a3db8 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goxel";
- version = "0.10.5";
+ version = "0.10.6";
src = fetchFromGitHub {
owner = "guillaumechereau";
repo = "goxel";
rev = "v${version}";
- sha256 = "1b63jqryq19qa81g1ml6d85f27wj1ci3h56r02cl9xn8di5p674f";
+ sha256 = "1wmxy5wfk1xrqgz0y0zcr4vkddylqc70cv4vzk117x6whjnldsm3";
};
patches = [ ./disable-imgui_ini.patch ];
diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index dff6b15494b..7f04a93d6a3 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -11,7 +11,7 @@
buildGoPackage rec {
pname = "aminal";
- version = "0.8.6";
+ version = "0.9.0";
goPackagePath = "github.com/liamg/aminal";
@@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "liamg";
repo = "aminal";
rev = "v${version}";
- sha256 = "0qhjdckj2kr0vza6qssd9z8dfrsif1qxb1mal1d4wgdsy12lrmwl";
+ sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n";
};
preBuild = ''
diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index f301122a92d..7709a42baee 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "heimer";
- version = "1.15.1";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
- sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic";
+ sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar";
};
nativeBuildInputs = [ cmake ];
@@ -19,5 +19,6 @@ mkDerivation rec {
homepage = "https://github.com/juzzlin/Heimer";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 0ca4f11e548..849e156b529 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -35,13 +35,13 @@
buildPythonApplication rec {
pname = "orca";
- version = "3.36.2";
+ version = "3.36.3";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0hxz8wlyjn6w3zqg1p56pwdj0p23d6vynzczklyc6n91dyvma06g";
+ sha256 = "1x0xrcyxlvcjlqp6wcsx5d951i500079wqs04scssjzwqggy330n";
};
patches = [
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index a793ee88724..c324a3f8be4 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,6 +1,7 @@
{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
, python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
+, removeReferencesTo
# optional packages-- override the variables ending in 'Support' to enable or
# disable modules
@@ -74,6 +75,10 @@ stdenv.mkDerivation rec {
'' else "";
nativeBuildInputs = [
- cmake pkgconfig
+ cmake pkgconfig removeReferencesTo
];
+
+ postFixup = ''
+ remove-references-to -t ${stdenv.cc} $out/bin/polybar
+ '';
}
diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix
index 30868a9900e..7b9efb6bbe5 100644
--- a/pkgs/applications/misc/tut/default.nix
+++ b/pkgs/applications/misc/tut/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "tut";
- version = "0.0.8";
+ version = "0.0.9";
goPackagePath = "github.com/RasmusLindroth/tut";
goDeps = ./deps.nix;
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "RasmusLindroth";
repo = pname;
rev = version;
- sha256 = "0wb5lf0zbhmg962p71bqlpyxn8f1n9fp1jh7y7fcg6w5mga8gqq3";
+ sha256 = "19y6brw1d6dlp2gnkdpbp261662h5j46rmiqg73cxhrlws0y0kfk";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 8fb07b1ae79..d4d93c77ed4 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
- version = "5.11.2";
+ version = "5.11.3";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- sha256 = "1mhqa9jb4475phhqnkc7k1mwgkan7zp7y4z2c7n2x43r48ghxpfx";
+ sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 524e2a99ae9..39cd5020409 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig-proxy";
- version = "5.10.2";
+ version = "5.11.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
- sha256 = "1mkamkqhqj7nbvaxdim1rbc3f5sw410wzly4ln73ackzlvdwn319";
+ sha256 = "0wwvsmanvcn0kbb5zqrj8786yg9rmdbink6rsnsm7ifak1iwvls9";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index e5cd08f7df7..fb30bbfd2b6 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -7,6 +7,9 @@
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos, libdrm, mesa
+# Command line programs
+, coreutils
+
# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""
@@ -58,7 +61,7 @@ let
liberation_ttf curl utillinux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core
- kerberos libdrm mesa
+ kerberos libdrm mesa coreutils
] ++ optional pulseSupport libpulseaudio
++ [ gtk ];
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index df39e5d8676..304a3c6fa28 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "jx";
- version = "2.1.31";
+ version = "2.1.65";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
- sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn";
+ sha256 = "0zkp0z5qpqw44bjnl20xna7s251k7jsxccqnqkdqqrzmqjpkkwgx";
};
- vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s";
+ vendorSha256 = "0zi2n8fywzy87yfwcx7di74s8mx0468zmg6kwjln7mwhr6q23adf";
subPackages = [ "cmd/jx" ];
diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix
index a3cb55ce329..cd946284fa7 100644
--- a/pkgs/applications/networking/cluster/kube-router/default.nix
+++ b/pkgs/applications/networking/cluster/kube-router/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "kube-router";
- version = "0.3.1";
+ version = "0.4.0";
goPackagePath = "github.com/cloudnativelabs/kube-router";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "cloudnativelabs";
repo = pname;
rev = "v${version}";
- sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h";
+ sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa";
};
buildFlagsArray = ''
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index bf4ec949215..b8bef9ecc05 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
-let version = "0.13.1"; in
+let version = "0.16.0"; in
buildGoPackage {
pname = "kubecfg";
@@ -10,7 +10,7 @@ buildGoPackage {
owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
- sha256 = "0x2mg13p8r1sgqr1bbzh57kfymb8z392y43djgks2agc7rjnd45f";
+ sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4";
};
goPackagePath = "github.com/bitnami/kubecfg";
diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix
index 48540bffb53..5b1f1245246 100644
--- a/pkgs/applications/networking/cluster/kubeless/default.nix
+++ b/pkgs/applications/networking/cluster/kubeless/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "kubeless";
- version = "1.0.4";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "kubeless";
repo = "kubeless";
rev = "v${version}";
- sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040";
+ sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd";
};
goPackagePath = "github.com/kubeless/kubeless";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index daffb593090..42ed3d21066 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -19,7 +19,7 @@
buildGoPackage rec {
pname = "terraform-provider-libvirt";
- version = "0.6.1";
+ version = "0.6.2";
goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
@@ -27,7 +27,7 @@ buildGoPackage rec {
owner = "dmacvicar";
repo = "terraform-provider-libvirt";
rev = "v${version}";
- sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz";
+ sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index acdf40e772e..b05f64c1382 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -78,7 +78,7 @@ in mkYarnPackage rec {
description = "A feature-rich client for Matrix.org";
homepage = "https://about.riot.im/";
license = licenses.asl20;
- maintainers = with maintainers; [ pacien worldofpeace ma27 ];
+ maintainers = teams.matrix.members;
inherit (electron.meta) platforms;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index c08d1dbe033..cc4eb4161f1 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "A glossy Matrix collaboration client for the web";
homepage = "http://riot.im/";
- maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ];
+ maintainers = stdenv.lib.teams.matrix.members;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
hydraPlatforms = [];
diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix
new file mode 100644
index 00000000000..719965455f9
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/meli/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchgit
+, rustPlatform
+, pkgconfig
+, openssl
+, dbus
+, sqlite
+, file
+, gzip
+, notmuch
+ # Build with support for notmuch backend
+, withNotmuch ? true
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "meli";
+ version = "alpha-0.5.1";
+
+ src = fetchgit {
+ url = "https://git.meli.delivery/meli/meli.git";
+ rev = version;
+ sha256 = "1y5567hdm1s2s272drxvmp6x4y1jpyl7423iz58hgqcsjm9085zv";
+ };
+
+ cargoSha256 = "040dfr09bg5z5pn68dy323hcppd599d3f6k7zxqw5f8n4whnlc9y";
+
+ cargoBuildFlags = lib.optional withNotmuch "--features=notmuch";
+
+ nativeBuildInputs = [ pkgconfig gzip ];
+
+ buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;
+
+ checkInputs = [ file ];
+
+ postInstall = ''
+ mkdir -p $out/share/man/man1
+ gzip < meli.1 > $out/share/man/man1/meli.1.gz
+ mkdir -p $out/share/man/man5
+ gzip < meli.conf.5 > $out/share/man/man5/meli.conf.5.gz
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults";
+ homepage = "https://meli.delivery";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ maintainers."0x4A6F" matthiasbeyer erictapen ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index c6dc66a0ca7..d025222b010 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -31,6 +31,9 @@ in stdenv.mkDerivation {
"-DCMAKE_INSTALL_LIBDIR=lib"
];
+ # Avoid referencing -dev paths because of debug assertions.
+ NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
+
nativeBuildInputs = [
bison cmake flex pkgconfig
] ++ optional withQt qt5.wrapQtAppsHook;
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 58bdd5c722d..4cfad20e695 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -13,11 +13,11 @@ let
in
mkDerivation rec {
pname = "eagle";
- version = "9.6.1";
+ version = "9.6.2";
src = fetchurl {
url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
- sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw";
+ sha256 = "18syygnskl286kn8aqfzzdsyzq59d2w19y1h1ynyxsnrvkyv71h0";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 88f8df4e254..2afed8c099c 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.0.0";
+ version = "7.0.1";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "0ws1gb7fgy72s6hxkf9g16x565m58k1cdzx9ldcdghfffimz4cqx";
+ sha256 = "0vj2ggbm617fypl69ksbrbl048xp4v6wc46y4sp7hrk6lg0gw1b0";
};
dontBuild = true;
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 3ee662f73c5..91fb36c3974 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra
stdenv.mkDerivation rec {
pname = "vlc";
- version = "3.0.10";
+ version = "3.0.11";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
- sha256 = "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9";
+ sha256 = "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y";
};
# VLC uses a *ton* of libraries for various pieces of functionality, many of
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index be6196855e2..d5abb569e7b 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
- version = "2.0.17";
+ version = "2.0.18";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "01bicv0qr4aiahkw9cp6igk3jv1fqkbxmsp80nfvq6rxx873v0q7";
+ sha256 = "0f32g048jamfhrds68vzirx8iqizr45wf2d4bfvdsk176amrj4k0";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index 7dc715e126c..e547cea3c54 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -8,11 +8,11 @@ assert withDoc -> asciidoc != null;
stdenv.mkDerivation rec {
pname = "herbstluftwm";
- version = "0.8.1";
+ version = "0.8.3";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
- sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y";
+ sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1";
};
outputs = [
diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix
new file mode 100644
index 00000000000..274c75a3c13
--- /dev/null
+++ b/pkgs/applications/window-managers/hikari/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchzip,
+ pkgconfig, bmake,
+ cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman,
+ libucl, wayland, wayland-protocols, wlroots,
+ features ? {
+ gammacontrol = true;
+ layershell = true;
+ screencopy = true;
+ xwayland = true;
+ }
+}:
+
+let
+ pname = "hikari";
+ version = "2.0.2";
+in
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchzip {
+ url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
+ sha256 = "1a3i01936pw11hrmjmrhzzwpndl1jqjgx376m5m724wd1j9awm68";
+ };
+
+ nativeBuildInputs = [ pkgconfig bmake ];
+
+ buildInputs = [
+ cairo
+ glib
+ libevdev
+ libinput
+ libxkbcommon
+ linux-pam
+ pango
+ pixman
+ libucl
+ wayland
+ wayland-protocols
+ wlroots
+ ];
+
+ enableParallelBuilding = true;
+
+ # Must replace GNU Make by bmake
+ buildPhase = with stdenv.lib; concatStringsSep " " (
+ [ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ]
+ ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES"
+ ++ mapAttrsToList (feat: enabled:
+ optionalString enabled "WITH_${toUpper feat}=YES"
+ ) features
+ );
+
+ # Can't suid in nix store
+ # Run hikari as root (it will drop privileges as early as possible), or create
+ # a systemd unit to give it the necessary permissions/capabilities.
+ patchPhase = ''
+ substituteInPlace Makefile --replace '4555' '555'
+ '';
+
+ installPhase = ''
+ bmake \
+ PREFIX=$out \
+ install
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux";
+ homepage = "https://hikari.acmelabs.space";
+ license = licenses.bsd2;
+ platforms = platforms.linux ++ platforms.freebsd;
+ maintainers = with maintainers; [ jpotier ];
+ };
+}
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index 29bda8e4e2b..beefdaf891c 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -1,31 +1,45 @@
-{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }:
+{ stdenv
+, fetchFromGitHub
+, libpulseaudio
+, libnotify
+, gobject-introspection
+, python3Packages
+, wrapGAppsHook
+, extraLibs ? [] }:
python3Packages.buildPythonApplication rec {
# i3pystatus moved to rolling release:
# https://github.com/enkore/i3pystatus/issues/584
- version = "unstable-2019-06-10";
+ version = "unstable-2020-06-12";
pname = "i3pystatus";
- src = fetchFromGitHub
- {
+ src = fetchFromGitHub {
owner = "enkore";
repo = "i3pystatus";
- rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
- sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
+ rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b";
+ sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq";
};
- propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
- [ libpulseaudio ] ++ extraLibs;
+ buildInputs = [ libpulseaudio libnotify gobject-introspection ];
- libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
- ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\"";
- # LC_TIME != C results in locale.Error: unsupported locale setting
- makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
+ propagatedBuildInputs = with python3Packages; [
+ keyring colour netifaces psutil basiciw pygobject3
+ ] ++ extraLibs;
+
+ makeWrapperArgs = [
+ # LC_TIME != C results in locale.Error: unsupported locale setting
+ "--set" "LC_TIME" "C"
+ "--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}"
+ ];
+
+ postPatch = ''
+ makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH")
+ '';
postInstall = ''
makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
--prefix PYTHONPATH : "$PYTHONPATH" \
- ${ldWrapperSuffix}
+ ''${makeWrapperArgs[@]}
'';
# no tests in tarball
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 05cca88e619..bacfb9674f6 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -9,13 +9,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "icewm";
- version = "1.6.5";
+ version = "1.6.6";
src = fetchFromGitHub {
owner = "bbidulock";
repo = "icewm";
rev = version;
- sha256 = "1glzpkpl0vl5sjn1d9jlvwd9ch16dvxvsf2n310kb0ycpfkl84vs";
+ sha256 = "05jg2gs5cdxn2kfm2y6yrqxpza5s1zsgb52168psmzhb4nakpv42";
};
nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];
diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix
index 9ecde1939e8..9867b84757a 100644
--- a/pkgs/data/fonts/amiri/default.nix
+++ b/pkgs/data/fonts/amiri/default.nix
@@ -1,14 +1,14 @@
{ lib, fetchzip }:
let
- version = "0.112";
+ version = "0.113";
in fetchzip rec {
name = "Amiri-${version}";
url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip";
- sha256 = "13j8kglgca296czxjz1xvrbz6yx05s2xassiliyszndbkrhn6bkl";
+ sha256 = "0v5xm4spyww8wy6j9kpb01ixrakw7wp6jng4xnh220iy6yqcxm7v";
postFetch = ''
unzip $downloadedFile
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 4460e7b40d7..87425defb87 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20200515";
+ version = "20200529";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "1m9idmmb1sjf24lp9lgng2m1jj09mn9fa9pnz36fdv5q0lskgscj";
+ sha256 = "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 82036c8b8e2..086e0cf7a57 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "elementary-code";
- version = "3.4.0";
+ version = "3.4.1";
repoName = "code";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0b1vdgb1xvh5lqbral3r0qaq05zd5q5ywxw02fggpyy8nyxs3z8f";
+ sha256 = "158zrzyyy507rxcbsb5am9768zbakpwrl61ixab57zla7z51l0g0";
};
passthru = {
diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix
new file mode 100644
index 00000000000..1eb233b90b7
--- /dev/null
+++ b/pkgs/development/compilers/dasm/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "dasm";
+ version = "2.20.13";
+
+ src = fetchFromGitHub {
+ owner = "dasm-assembler";
+ repo = "dasm";
+ rev = version;
+ sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf";
+ };
+
+ configurePhase = false;
+ installPhase = ''
+ mkdir -p $out/bin
+ install bin/* $out/bin
+ '';
+
+ preCheck = ''
+ patchShebangs ./test/
+ '';
+
+ checkTarget = "test";
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Assembler for 6502 and other 8-bit microprocessors";
+ homepage = "https://dasm-assembler.github.io";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.jwatt ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix
index e3dfa8ea324..6374846f440 100644
--- a/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -24,13 +24,13 @@ in
stdenv.mkDerivation rec {
pname = "intel-graphics-compiler";
- version = "1.0.3627";
+ version = "1.0.4062";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-graphics-compiler";
rev = "igc-${version}";
- sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8";
+ sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47";
};
nativeBuildInputs = [ clang cmake bison flex llvm python ];
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index f22771a35e9..e4d99dcec95 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
]
++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
- propagatedBuildInputs = [glib];
-
configureFlags = [
"--x-includes=${libX11.dev}/include"
"--x-libraries=${libX11.out}/lib"
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 6f61068738a..8a7fb96723a 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -18,19 +18,19 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
- version = "0.13.6";
+ version = "0.13.8";
src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
- sha256 = "04kwjjrriyizpvhs96jgyx21ppyd1ynblk24i5825ywxlw9hja25";
+ sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
- sha256 = "012znrj32aq96qh1g2hscdvhl3flgihhimiz40agk0dykpksblns";
+ sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy";
};
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
description = "A strongly-typed functional programming language that compiles to JavaScript";
homepage = "https://www.purescript.org/";
license = licenses.bsd3;
- maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ];
+ maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 52d388beaed..6fc21a0ffd1 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "rgbds";
- version = "0.3.10";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "rednex";
repo = "rgbds";
rev = "v${version}";
- sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq";
+ sha256 = "15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7";
};
nativeBuildInputs = [ bison flex pkg-config libpng ];
installFlags = [ "PREFIX=\${out}" ];
diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix
index c689f7156fb..6af08edf88a 100644
--- a/pkgs/development/dhall-modules/Prelude.nix
+++ b/pkgs/development/dhall-modules/Prelude.nix
@@ -1,26 +1,17 @@
-{ buildDhallPackage, fetchFromGitHub, lib }:
+{ buildDhallGitHubPackage, lib }:
let
makePrelude =
- version:
- lib.makeOverridable
- ( { rev, sha256, file ? "package.dhall" }:
- buildDhallPackage {
- name = "Prelude-${version}";
+ version: { rev, sha256 }:
+ buildDhallGitHubPackage {
+ name = "Prelude-${version}";
+ owner = "dhall-lang";
+ repo = "dhall-lang";
+ directory = "Prelude";
+ file = "package.dhall";
- code =
- let
- src = fetchFromGitHub {
- owner = "dhall-lang";
- repo = "dhall-lang";
-
- inherit rev sha256;
- };
-
- in
- "${src}/Prelude/${file}";
- }
- );
+ inherit rev sha256;
+ };
in
lib.mapAttrs makePrelude {
diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix
index 23a1123eacb..2de89d63ec3 100644
--- a/pkgs/development/dhall-modules/dhall-kubernetes.nix
+++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix
@@ -1,29 +1,16 @@
-{ buildDhallPackage, fetchFromGitHub, lib }:
+{ buildDhallGitHubPackage, lib }:
let
makeDhallKubernetes =
- version:
- lib.makeOverridable
- ( { rev
- , sha256
- , file ? "package.dhall"
- }:
- buildDhallPackage {
- name = "dhall-kubernetes-${version}";
+ version: { rev, sha256 }:
+ buildDhallGitHubPackage {
+ name = "dhall-kubernetes-${version}";
+ owner = "dhall-lang";
+ repo = "dhall-kubernetes";
+ file = "package.dhall";
- code =
- let
- src = fetchFromGitHub {
- owner = "dhall-lang";
- repo = "dhall-kubernetes";
-
- inherit rev sha256;
- };
-
- in
- "${src}/${file}";
- }
- );
+ inherit rev sha256;
+ };
in
lib.mapAttrs makeDhallKubernetes {
diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix
index 34ebbed6869..866b689e38a 100644
--- a/pkgs/development/dhall-modules/dhall-packages.nix
+++ b/pkgs/development/dhall-modules/dhall-packages.nix
@@ -1,47 +1,32 @@
-{ buildDhallPackage, dhall-kubernetes, fetchFromGitHub, lib, Prelude }:
+{ buildDhallGitHubPackage, dhall-kubernetes, lib, Prelude }:
let
makeDhallPackages =
- version:
- lib.makeOverridable
- ( { rev
- , sha256
- , dependencies
- }:
- buildDhallPackage {
- name = "dhall-packages-${version}";
+ version: { rev, sha256, dependencies }:
+ buildDhallGitHubPackage {
+ name = "dhall-packages-${version}";
+ owner = "EarnestResearch";
+ repo = "dhall-packages";
+ file = "package.dhall";
- inherit dependencies;
-
- code =
- let
- src = fetchFromGitHub {
- owner = "EarnestResearch";
- repo = "dhall-packages";
-
- inherit rev sha256;
- };
-
- in
- "${src}/package.dhall";
- }
- );
+ inherit rev sha256 dependencies;
+ };
in
lib.mapAttrs makeDhallPackages {
"0.11.1" =
let
- k8s_6a47bd = dhall-kubernetes."3.0.0".override {
+ k8s_6a47bd = dhall-kubernetes.override {
rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
};
- k8s_4ad581 = dhall-kubernetes."3.0.0".override {
+ k8s_4ad581 = dhall-kubernetes.override {
rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";
sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
};
- k8s_fee24c = dhall-kubernetes."3.0.0".override {
+ k8s_fee24c = dhall-kubernetes.override {
rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
};
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 99e3ddf34f1..000932cc010 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "guile-cairo";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchurl {
url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz";
- sha256 = "11fn2x2973dizzw94fkz6rj9crsyzchphq5097lvbkvqpzbyidyp";
+ sha256 = "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
new file mode 100644
index 00000000000..b4401a85d14
--- /dev/null
+++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
@@ -0,0 +1,25 @@
+{ buildDhallPackage, lib }:
+
+# This is a minor variation on `buildDhallPackage` that splits the `code`
+# argument into `src` and `file` in such a way that you can easily override
+# the `file`
+#
+# This function is used by `dhall-to-nixpkgs` when given a directory
+lib.makeOverridable
+ ( { # Arguments passed through to `buildDhallPackage`
+ name
+ , dependencies ? []
+ , source ? false
+
+ , src
+ , # The file to import, relative to the root directory
+ file ? "package.dhall"
+ }:
+
+ buildDhallPackage {
+ inherit name dependencies source;
+
+ code = "${src}/${file}";
+ }
+ )
+
diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
new file mode 100644
index 00000000000..9289e9b656d
--- /dev/null
+++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
@@ -0,0 +1,50 @@
+{ buildDhallPackage, fetchFromGitHub, lib }:
+
+# This function is used by `dhall-to-nixpkgs` when given a GitHub repository
+lib.makeOverridable
+ ( { # Arguments passed through to `buildDhallPackage`
+ name
+ , dependencies ? []
+ , source ? false
+
+ , # The directory containing the Dhall files, if other than the root of the
+ # repository
+ directory ? ""
+ , # The file to import, relative to the above directory
+ file ? "package.dhall"
+
+ # Arguments passed through to `fetchFromGitHub`
+ , owner
+ , repo
+ , rev
+ # Extra arguments passed through to `fetchFromGitHub`, such as the hash
+ # or `fetchSubmodules`
+ , ...
+ }@args:
+
+ buildDhallPackage {
+ inherit name dependencies source;
+
+ code =
+ let
+ src = fetchFromGitHub ({
+ name = "${name}-source";
+
+ inherit owner repo rev;
+ } // removeAttrs args [
+ "name"
+ "dependencies"
+ "source"
+ "directory"
+ "file"
+ "owner"
+ "repo"
+ "rev"
+ ]);
+
+ prefix = lib.optionalString (directory != "") "${directory}/";
+
+ in
+ "${src}/${prefix}${file}";
+ }
+ )
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index 7ea38b6472b..c09fb8d91ee 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "apache-activemq";
- version = "5.15.12";
+ version = "5.15.13";
src = fetchurl {
- sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1";
+ sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96";
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
};
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index df0eecfd0be..5324fe0685d 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmysofa";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
- sha256 = "053inxfl2n6wdgvnn02kf63m92r48ch4wqix9mqf3rgcf1bfkyfa";
+ sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 8a67ab09a19..312f927767d 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cimg";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
- sha256 = "1x43c1w2kzr6h3j7y3kwiwb7nba0iymck6bq9psvp53mh9xxrfd1";
+ sha256 = "0vl7dscbms4834gm1000sp17pr714pbqwicn40pbl85mxr3pnjp3";
};
installPhase = ''
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index dc742a5c051..01da4753b0e 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "cpp-hocon";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
- sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3";
+ sha256 = "1c8zy4hi0182k0vfx5l8bjq1iv7lvvw1zi4vy3429s898rx7z3d3";
rev = version;
repo = "cpp-hocon";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index 274a657cb1a..9f2710f42a4 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "curlcpp";
- version = "1.1";
+ version = "1.4";
src = fetchFromGitHub {
owner = "JosephP91";
repo = "curlcpp";
rev = version;
- sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5";
+ sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n";
};
buildInputs = [ cmake curl ];
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index f244bdc7ad2..c1b9318130c 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec {
pname = "freetds";
- version = "1.1.40";
+ version = "1.1.42";
src = fetchurl {
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
- sha256 = "0wc7xxf8fzpp3pc3hpsamnykn0vjkq53qp53nyxjjcri8g0ch7wq";
+ sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg";
};
buildInputs = [
diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix
index d7df4ab7212..a19febbfd66 100644
--- a/pkgs/development/libraries/gio-sharp/default.nix
+++ b/pkgs/development/libraries/gio-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }:
+{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }:
stdenv.mkDerivation rec {
pname = "gio-sharp";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig autoconf automake which ];
- buildInputs = [ mono gtk-sharp-2_0 ];
+ buildInputs = [ mono glib gtk-sharp-2_0 ];
dontStrip = true;
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index eb23f5c82c2..278059465ec 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gmm";
- version = "5.3";
+ version = "5.4";
src = fetchurl {
url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz";
- sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46";
+ sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index e2552ba713e..7c6168c3d3e 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "libfprint";
- version = "1.90.1";
+ version = "1.90.2";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "libfprint";
repo = pname;
rev = "v${version}";
- sha256 = "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a";
+ sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index 1d6f274cbb3..bbf0db23382 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libjcat";
- version = "0.1.2";
+ version = "0.1.3";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libjcat";
rev = version;
- sha256 = "0smd1i6gzpp34gv494jcnx40wm36v1s8bypqlfrf8l6q9cl77gyd";
+ sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc";
};
patches = [
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 83d08dc019b..5d0459b4f30 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "liblouis";
- version = "3.13.0";
+ version = "3.14.0";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
- sha256 = "1srpafxdw4627lyv92cn8wd9zda3507qpp5s2z66bsln8jnb1mza";
+ sha256 = "0v6w8b9r994mkkbm2gqgd7k5yfmdhgbabh0j1gmn375nyvhy4qqh";
};
outputs = [ "out" "dev" "man" "info" "doc" ];
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index 556db28f856..55e07c03b28 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }:
stdenv.mkDerivation rec {
- version = "1.0.3";
+ version = "1.0.4";
pname = "libnetfilter_queue";
src = fetchurl {
url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2";
- sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq";
+ sha256 = "0w7s6g8bikch1m4hnxdakpkwgrkw64ikb6wb4v4zvgyiywrk5yai";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 9443846acf1..d559efd3aab 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
- version = "0.7.13";
+ version = "0.7.14";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
- sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8";
+ sha256 = "10klbgknl2njbjl4k0l50ii7afwqrl1691ar4ry3snmc8chb1z7g";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index c84e66608f2..d5c23086233 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Implements double cryptographic ratchet and Megolm ratchet";
license = stdenv.lib.licenses.asl20;
- homepage = "https://matrix.org/git/olm/about";
+ homepage = "https://gitlab.matrix.org/matrix-org/olm";
platforms = with stdenv.lib.platforms; darwin ++ linux;
};
}
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 38041e6b5d8..5c185f630d9 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -19,7 +19,7 @@
assert !cudaSupport || cudatoolkit != null;
let
- version = "4.0.3";
+ version = "4.0.4";
cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-unsplit";
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
src = with stdenv.lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
- sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl";
+ sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7";
};
postPatch = ''
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
index 17df9eee84e..a16b8356e61 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "openwsman";
- version = "2.6.11";
+ version = "2.7.0";
src = fetchFromGitHub {
owner = "Openwsman";
repo = "openwsman";
rev = "v${version}";
- sha256 = "0s8xdxrxnh1l0v41n5cw89b89rrlqlxn1yj14sw224230y8m70ka";
+ sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index b264c3bc6c6..2421d3f8899 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -1,35 +1,31 @@
-{ stdenv, lib, fetchurl, fetchpatch
-, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps
-, uthash, which
+{ stdenv, lib, fetchFromGitHub
+, autoreconfHook, autoconf-archive, pkg-config, doxygen, perl
+, openssl, json_c, curl, libgcrypt
+, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which
}:
stdenv.mkDerivation rec {
pname = "tpm2-tss";
- version = "2.3.2";
+ version = "2.4.1";
- src = fetchurl {
- url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2";
+ src = fetchFromGitHub {
+ owner = "tpm2-software";
+ repo = pname;
+ rev = version;
+ sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs";
};
- patches = [
- # Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585
- (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch";
- sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n";
- })
+ nativeBuildInputs = [
+ autoreconfHook autoconf-archive pkg-config doxygen perl
+ ];
+ buildInputs = [ openssl json_c curl libgcrypt ];
+ checkInputs = [
+ cmocka uthash ibm-sw-tpm2 iproute procps which
];
- nativeBuildInputs = [
- doxygen perl pkgconfig
- # For unit tests and integration tests.
- ibm-sw-tpm2 iproute procps which
- ];
- buildInputs = [
- openssl
- # For unit tests and integration tests.
- cmocka uthash
- ];
+ preAutoreconf = "./bootstrap";
+
+ enableParallelBuilding = true;
postPatch = "patchShebangs script";
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2dbda51bfe8..7eae27d85c6 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -359,6 +359,33 @@ inspect = buildLuarocksPackage {
license.fullName = "MIT ";
};
};
+ldbus = buildLuarocksPackage {
+ pname = "ldbus";
+ version = "scm-0";
+
+ knownRockspec = (fetchurl {
+ url = "https://luarocks.org/dev/ldbus-scm-0.rockspec";
+ sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx";
+ }).outPath;
+
+ src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+ "url": "git://github.com/daurnimator/ldbus.git",
+ "rev": "9e176fe851006037a643610e6d8f3a8e597d4073",
+ "date": "2019-08-16T14:26:05+10:00",
+ "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s",
+ "fetchSubmodules": true
+}
+ '') ["date"]) ;
+
+ disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+ propagatedBuildInputs = [ lua ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/daurnimator/ldbus";
+ description = "A Lua library to access dbus.";
+ license.fullName = "MIT/X11";
+ };
+};
ldoc = buildLuarocksPackage {
pname = "ldoc";
version = "1.4.6-2";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 30be2c197a5..94edbd0737b 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -76,6 +76,17 @@ with super;
*/
});
+ ldbus = super.ldbus.override({
+ extraVariables = {
+ DBUS_DIR="${pkgs.dbus.lib}";
+ DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include";
+ DBUS_INCDIR="${pkgs.dbus.dev}/include/dbus-1.0";
+ };
+ buildInputs = with pkgs; [
+ dbus
+ ];
+ });
+
ljsyscall = super.ljsyscall.override(rec {
version = "unstable-20180515";
# package hasn't seen any release for a long time
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 045dd14da0d..9709037792d 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -4,14 +4,14 @@
, ply, python_magic, pytest, requests }:
buildPythonPackage rec {
- version = "2.2.3";
+ version = "2.3.0";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m";
+ sha256 = "04i788glp2cslwi67dixy1pi5l0izcl078i9mrd1j1sh8f99cvcs";
};
# Tests require files not included in the PyPI archive.
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 1b10fe166f8..9b27ae25490 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -6,6 +6,7 @@
, six
, html5lib
, setuptools
+, packaging
}:
buildPythonPackage rec {
@@ -18,11 +19,7 @@ buildPythonPackage rec {
};
checkInputs = [ pytest pytestrunner ];
- propagatedBuildInputs = [ six html5lib setuptools ];
-
- postPatch = ''
- substituteInPlace setup.py --replace ",<3dev" ""
- '';
+ propagatedBuildInputs = [ packaging six html5lib setuptools ];
# Disable network tests
checkPhase = ''
diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix
index 0027c8d32a6..82ddb8c810b 100644
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@@ -9,6 +9,7 @@
, pkgconfig
, dotnetbuildhelpers
, clang
+, glib
, mono
}:
@@ -63,6 +64,7 @@ buildPythonPackage rec {
];
buildInputs = [
+ glib
mono
psutil # needed for memory leak tests
];
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 6a54cc1ec71..f0a143ec30c 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -21,11 +21,11 @@
buildPythonPackage rec {
pname = "spacy";
- version = "2.2.4";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1fgm1zlw8mjhmk64skxs79ymhcningml13y9c9fy7rj1b1yadwzh";
+ sha256 = "0nri437dyapiq5gx8lbmjdfvqw2cnw3di13kp44rzr17bm5yh2jv";
};
propagatedBuildInputs = [
@@ -54,7 +54,7 @@ buildPythonPackage rec {
# '';
postPatch = ''
- substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8"
+ substituteInPlace setup.cfg --replace "thinc==7.4.1" "thinc>=7.4.1,<8"
'';
meta = with lib; {
@@ -62,5 +62,5 @@ buildPythonPackage rec {
homepage = "https://github.com/explosion/spaCy";
license = licenses.mit;
maintainers = with maintainers; [ danieldk sdll ];
- };
+ };
}
diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index 1f1558b23c3..1c02b05d303 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -1,108 +1,108 @@
[{
"pname": "de_core_news_md",
- "version": "2.2.5",
- "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk",
+ "version": "2.3.0",
+ "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6",
"license": "cc-by-sa-40"
},
{
"pname": "de_core_news_sm",
- "version": "2.2.5",
- "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g",
+ "version": "2.3.0",
+ "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7",
"license": "cc-by-sa-40"
},
{
"pname": "el_core_news_md",
- "version": "2.2.5",
- "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36",
+ "version": "2.3.0",
+ "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0",
"license": "cc-by-sa-40"
},
{
"pname": "el_core_news_sm",
- "version": "2.2.5",
- "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l",
+ "version": "2.3.0",
+ "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b",
"license": "cc-by-sa-40"
},
{
"pname": "en_core_web_lg",
- "version": "2.2.5",
- "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr",
+ "version": "2.3.0",
+ "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2",
"license": "cc-by-sa-40"
},
{
"pname": "en_core_web_md",
- "version": "2.2.5",
- "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy",
+ "version": "2.3.0",
+ "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh",
"license": "cc-by-sa-40"
},
{
"pname": "en_core_web_sm",
- "version": "2.2.5",
- "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0",
+ "version": "2.3.0",
+ "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a",
"license": "cc-by-sa-40"
},
{
"pname": "en_vectors_web_lg",
- "version": "2.1.0",
- "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94",
+ "version": "2.3.0",
+ "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743",
"license": "cc-by-sa-40"
},
{
"pname": "es_core_news_md",
- "version": "2.2.5",
- "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl",
+ "version": "2.3.0",
+ "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2",
"license": "cc-by-sa-40"
},
{
"pname": "es_core_news_sm",
- "version": "2.2.5",
- "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi",
+ "version": "2.3.0",
+ "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d",
"license": "cc-by-sa-40"
},
{
"pname": "fr_core_news_md",
- "version": "2.2.5",
- "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b",
+ "version": "2.3.0",
+ "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db",
"license": "cc-by-sa-40"
},
{
"pname": "fr_core_news_sm",
- "version": "2.2.5",
- "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y",
+ "version": "2.3.0",
+ "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0",
"license": "cc-by-sa-40"
},
{
"pname": "it_core_news_sm",
- "version": "2.2.5",
- "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px",
+ "version": "2.3.0",
+ "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds",
"license": "cc-by-sa-40"
},
{
"pname": "lt_core_news_sm",
- "version": "2.2.5",
- "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08",
+ "version": "2.3.0",
+ "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9",
"license": "cc-by-sa-40"
},
{
"pname": "nb_core_news_sm",
- "version": "2.2.5",
- "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1",
+ "version": "2.3.0",
+ "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7",
"license": "mit"
},
{
"pname": "nl_core_news_sm",
- "version": "2.2.1",
- "sha256": "0gw9a1j3v4f15cxcz7zr7dz7mqi2a3541b04q6kj74gg397li4ny",
+ "version": "2.3.0",
+ "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj",
"license": "cc-by-sa-40"
},
{
"pname": "pt_core_news_sm",
- "version": "2.2.5",
- "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a",
+ "version": "2.3.0",
+ "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph",
"license": "cc-by-sa-40"
},
{
"pname": "xx_ent_wiki_sm",
- "version": "2.2.0",
- "sha256": "0niwnd1mdaji92yp2dqsbmr0w420gpaybb1ppbqr1rmk6bwgyhsb",
+ "version": "2.3.0",
+ "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn",
"license": "cc-by-sa-40"
}]
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index 0d2d1f31844..2f026c9d99c 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "bazel-buildtools";
- version = "3.2.0";
+ version = "3.2.1";
goPackagePath = "github.com/bazelbuild/buildtools";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "bazelbuild";
repo = "buildtools";
rev = version;
- sha256 = "0r3vc47w5vxgy5rzh75q0lng1c490ic1a1dcc0ih7dcl6i5p1p88";
+ sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn";
};
goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index a92c96684a4..ae993f9611e 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
- version = "3.9.0";
+ version = "3.10.0";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "0qasiggaxix3gmmvax00k83q4pd1c1b5wx8ayyplaszkgr9advb8";
+ sha256 = "1h5mcbs6mkk6cqjm8qm63rynz7611gq32v2jirl1qn71x2s7pq6y";
};
buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix
index fd705c4fc1b..96b39e42d10 100644
--- a/pkgs/development/tools/database/webdis/default.nix
+++ b/pkgs/development/tools/database/webdis/default.nix
@@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
pname = "webdis";
- version = "0.1.9";
+ version = "0.1.10";
src = fetchFromGitHub {
owner = "nicolasff";
repo = pname;
rev = version;
- sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk";
+ sha256 = "1hn4fq0asivfs56rw9ck1vc3g6h6fnwywh8v4zs2bkyn62fg9mcw";
};
- patches = [
- # Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172
- (fetchpatch {
- url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch";
- sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb";
- })
- ];
-
buildInputs = [ hiredis http-parser jansson libevent ];
makeFlags = [
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 1349d4c009a..adb36d8e92c 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
- version = "6.4.3";
+ version = "6.4.4";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b";
+ sha256 = "16zckqq64jv3031ssrvzw4ny98gnxhy2hsdp877i38zxqsvzdcym";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index c0c39892635..6b64a088353 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "gllvm";
- version = "1.2.3";
+ version = "1.2.6";
goPackagePath = "github.com/SRI-CSL/gllvm";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "SRI-CSL";
repo = "gllvm";
rev = "v${version}";
- sha256 = "12kdgsma62nzksvw266qm3ivkbz62ma93dd25wy0p19789v4fi7s";
+ sha256 = "0qzmrprc7npc0ln6mhkjrm8fgh2n94rdylixk11p6imxyx5fj3gg";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index 43731b72a55..62a75026920 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-protobuf";
- version = "1.3.2";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "golang";
repo = "protobuf";
rev = "v${version}";
- sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw";
};
- vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+ vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54";
meta = with stdenv.lib; {
homepage = "https://github.com/golang/protobuf";
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 3f33ff7c13a..c59f6716a7b 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
stdenv.mkDerivation rec {
- version = "2.0";
+ version = "2.0.2";
pname = "visualvm";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
- sha256 = "057dzf7xkb4fdv4bc2fgw7mxnxclcjmflafx3n2qw0qcdky18gzr";
+ sha256 = "19h5804izhdhdwbpyfbfqsjwmnabz2djbhkv7gvzs66jxc6q8mgx";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 33928601591..1a7a3d6607f 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.123";
+ version = "0.0.131";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "1gs796n2cw8kpfsqr21zqxzp8dmnhhmjfy7vnpi838566i5ql9q3";
+ sha256 = "0b9qrraydihw4wglif3rjmjlqdsgxh873023z3rgrvf7dwrhc9y0";
};
preBuild = ''
@@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "." ];
- vendorSha256 = "10wcyxzkwvbhf86dq1rh852zgdg28draay0515zp459z34vv4zna";
+ vendorSha256 = "1gxz9pp4zl8q7pmwg9z261fjrjfr658k1sn5nq1xzz51wrlzg9ag";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ];
diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix
new file mode 100644
index 00000000000..cabe419ef5b
--- /dev/null
+++ b/pkgs/games/augustus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }:
+
+stdenv.mkDerivation rec {
+ pname = "augustus";
+ version = "1.4.1a";
+
+ src = fetchFromGitHub {
+ owner = "Keriew";
+ repo = "augustus";
+ rev = "v${version}";
+ sha256 = "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ SDL2 SDL2_mixer libpng ];
+
+ meta = with stdenv.lib; {
+ description = "An open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes";
+ homepage = "https://github.com/Keriew/augustus";
+ license = licenses.agpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ Thra11 ];
+ };
+}
diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix
new file mode 100644
index 00000000000..d1dad86e1c5
--- /dev/null
+++ b/pkgs/games/julius/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }:
+
+stdenv.mkDerivation rec {
+ pname = "julius";
+ version = "1.4.1";
+
+ src = fetchFromGitHub {
+ owner = "bvschaik";
+ repo = "julius";
+ rev = "v${version}";
+ sha256 = "12hhnhdwgz7hd3hlndbnk15pxggm1375qs0764ija4nl1gbpb110";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ SDL2 SDL2_mixer libpng ];
+
+ meta = with stdenv.lib; {
+ description = "An open source re-implementation of Caesar III";
+ homepage = "https://github.com/bvschaik/julius";
+ license = licenses.agpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ Thra11 ];
+ };
+}
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 20ec0a978f5..2eb45ded7e2 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
, Cocoa, Foundation
, enableTools ? false
@@ -6,11 +6,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
- version = "1.14.11";
+ version = "1.14.12";
- src = fetchurl {
- url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v";
+ src = fetchFromGitHub {
+ rev = version;
+ owner = "wesnoth";
+ repo = "wesnoth";
+ sha256 = "0xpypy0yfjmjp3apvlh51nm19p1cjhjw2p547kvmrckm7y6naaw8";
};
nativeBuildInputs = [ cmake pkgconfig ];
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
adventures.
'';
- homepage = "http://www.wesnoth.org/";
+ homepage = "https://www.wesnoth.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;
diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix
new file mode 100644
index 00000000000..94fbeba0e07
--- /dev/null
+++ b/pkgs/misc/emulators/melonDS/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, libpcap, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "melonDS";
+ version = "0.8.3";
+ ## When updating to the release after 0.8.3,
+ ## - Uncomment:
+ ## cmakeFlags = [ "-UUNIX_PORTABLE" ];
+ ## - Remove the postInstall, since cmake should then take care of installing icons, .desktop file, and romlist.bin
+ ## (see https://github.com/Arisotura/melonDS/pull/546)
+
+ src = fetchFromGitHub {
+ owner = "Arisotura";
+ repo = pname;
+ rev = version;
+ sha256 = "1lqmfwjpkdqfkns1aaxlp4yrg6i0r66mxfr4rrj7b5286k44hqwn";
+ };
+
+ enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
+ buildInputs = [ SDL2 gtk3 libpcap ];
+
+ postInstall = ''
+ install -Dm644 -t $out/share/melonDS/ ../romlist.bin
+ install -Dm644 -t $out/share/applications/ ../flatpak/*.desktop
+
+ for i in ../icon/melon_*.png; do
+ d="''${i##*_}"
+ d="$out/share/icons/hicolor/''${d%.png}/apps"
+ install -D $i "$d/net.kuribo64.melonds.png"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://melonds.kuribo64.net/";
+ description = "Work in progress Nintendo DS emulator";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ artemist benley ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 14189e5b387..591b2daaf15 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "stella";
- version = "6.1.2";
+ version = "6.2";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = version;
- sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1";
+ sha256 = "1d97g4m686xsj6r5vy5x74ys9yk0hcpdppxh714n8hhcc9aglm19";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index f05bb6a0d59..470536db4b7 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alsa-utils";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchurl {
url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
- sha256 = "1wz460by17rmxrcydn583rd4lhj6wlvqs6x1j5pdzxn5g3app024";
+ sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz";
};
patchPhase = ''
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index e04b8314350..ce90a1d432f 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "google-authenticator-libpam";
- version = "1.08";
+ version = "1.09";
src = fetchurl {
url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
- sha256 = "1432sfgjv7xlas1saa0whnvqim2pb12g2522x3nf5a8v4qq7avbg";
+ sha256 = "0dyhgizl2jcrnfn5sxipxawqrbr6qgjh7aggw8fz3hix861pj7db";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 36fb39fd130..5a2fb8cf7aa 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -645,6 +645,8 @@ let
SYSVIPC = yes; # System-V IPC
+ AIO = yes; # POSIX asynchronous I/O
+
UNIX = yes; # Unix domain sockets.
MD = yes; # Device mapper (RAID, LVM, etc.)
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix
index c05adb33eca..80a00082b81 100644
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nvme-cli";
- version = "1.11.2";
+ version = "1.12";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${version}";
- sha256 = "0ngh7zffjf6ac8b22hdi4ry7hjlafih172hrbpw8j17r7c0wjy9i";
+ sha256 = "0ldky34sn0m5c4hgiip0fkzm465nca69bhxicpd5dg8wxhzxqrp3";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
new file mode 100644
index 00000000000..54000a81b67
--- /dev/null
+++ b/pkgs/servers/adguardhome/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "adguardhome";
+ version = "0.101.0";
+
+ src = fetchurl {
+ url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz";
+ sha256 = "17k37hh04zhy5csl0p9g4hybfc403i38n754in1xrkzxi81r8dh5";
+ };
+
+ installPhase = ''
+ install -m755 -D ./AdGuardHome $out/bin/adguardhome
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/AdguardTeam/AdGuardHome";
+ description = "Network-wide ads & trackers blocking DNS server";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ numkem ];
+ };
+}
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
index d40adb171a6..fe428926704 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/pkgs/servers/http/webhook/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "webhook";
- version = "2.6.8";
+ version = "2.7.0";
goPackagePath = "github.com/adnanh/webhook";
excludedPackages = [ "test" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "adnanh";
repo = "webhook";
rev = version;
- sha256 = "05q6nv04ml1gr4k79czg03i3ifl05xq29iapkgrl3k0a36czxlgs";
+ sha256 = "1spiqjy0z84z96arf57bn6hyvfsd6l8w6nv874mbis6vagifikci";
};
meta = with lib; {
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index c4aaedf4ab6..a35b5459272 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
pname = "icingaweb2";
- version = "2.7.3";
+ version = "2.8.0";
src = fetchFromGitHub {
owner = "Icinga";
repo = "icingaweb2";
rev = "v${version}";
- sha256 = "1qdsrpk6jbq9b4v4f2lfpdqs1yh3irbsm5fx02wxnnwvad05bcfv";
+ sha256 = "18q3d15w7d46g4vyq4iph5c1bbxcl8ikcdc8djrfi30wx36ziybs";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 15df735b707..fbcec04e532 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -9,11 +9,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.14.0";
+ version = "1.15.1";
src = fetchPypi {
inherit pname version;
- sha256 = "09drdqcjvpk9s3hq5rx9yxsxq0wak5fg5gfaiqfnbnxav2c2v7kq";
+ sha256 = "1hfyqp5bzsqp002synxp9jcm9fwzw9p0gcklmycmv616x3flylkf";
};
patches = [
@@ -58,6 +58,7 @@ buildPythonApplication rec {
unpaddedbase64
typing-extensions
authlib
+ pyjwt
] ++ lib.optional enableSystemd systemd;
checkInputs = [ mock parameterized openssl ];
@@ -76,6 +77,6 @@ buildPythonApplication rec {
homepage = "https://matrix.org";
description = "Matrix reference homeserver";
license = licenses.asl20;
- maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ];
+ maintainers = teams.matrix.members;
};
}
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index bb6d1584a67..d644e985db5 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "matterircd";
- version = "0.18.2";
+ version = "0.19.4";
src = fetchFromGitHub {
owner = "42wim";
repo = "matterircd";
rev = "v${version}";
- sha256 = "0g57g91v7208yynf758k9v73jdhz4fbc1v23p97rzrl97aq0rd5r";
+ sha256 = "1kwyk6gy4d4v2rzyr7vwvi8vm69rz1hdn0gkpan2kh1p63z77gbv";
};
goPackagePath = "github.com/42wim/matterircd";
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 93f0531887c..6f2e51fffd6 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "kapacitor";
- version = "1.5.4";
+ version = "1.5.5";
goPackagePath = "github.com/influxdata/kapacitor";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "influxdata";
repo = "kapacitor";
rev = "v${version}";
- sha256 = "1sd0gwqwa2bk81lshs8cy49mk1nh4azjkk0283rh0rkimy90l0zz";
+ sha256 = "17zk7fs6yl5hmhr3inwkafwmg2ihaicj43gdi5888dinhpa9bij1";
};
meta = with lib; {
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index ecbed520bbd..22828e57449 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "2.0.61";
+ version = "2.0.63";
pname = "munin";
src = fetchFromGitHub {
owner = "munin-monitoring";
repo = "munin";
rev = version;
- sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs";
+ sha256 = "0p1gzy6in15d6596b260qa0a144x8n8567cxdq0x4arw18004s3a";
};
buildInputs = [
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 9402fa44eed..f5c7c062c87 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "alertmanager";
- version = "0.20.0";
+ version = "0.21.0";
rev = "v${version}";
goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
- sha256 = "1bq6vbpy25k7apvs2ga3fbp1cbnv9j0y1g1khvz2qgz6a2zvhgg3";
+ sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41";
};
buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
@@ -35,7 +35,7 @@ buildGoPackage rec {
description = "Alert dispatcher for the Prometheus monitoring system";
homepage = "https://github.com/prometheus/alertmanager";
license = licenses.asl20;
- maintainers = with maintainers; [ benley fpletz globin ];
+ maintainers = with maintainers; [ benley fpletz globin Frostman ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index adc42173f8e..388d7fe3790 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
- version = "1.14.3";
+ version = "1.14.4";
goPackagePath = "github.com/influxdata/telegraf";
@@ -14,7 +14,7 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
- sha256 = "11rd54brdbxb5ari6zan7gyr0fa1m0rmwcn5a8h8dla3xprw30wp";
+ sha256 = "0kbf1r9b9xylq0akmklzy94pcljayhdjm539fwazp5c1364qmbjm";
};
vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah";
diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix
index 3685589fa70..743fc0fa1e5 100644
--- a/pkgs/servers/nats-server/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "nats-server";
- version = "2.1.0";
+ version = "2.1.7";
goPackagePath = "github.com/nats-io/${pname}";
@@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "nats-io";
repo = pname;
- sha256 = "1zp43v69cawbp6bpby1vx51z6nyv8gxnnl2qkhwr9zrgnhlcflnl";
+ sha256 = "08wqaqar964p9adc0ma8dqg0rf88rylk1m2mddlbbqmd6l4h6m27";
};
meta = {
diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index 3a34be6304b..4a287e08444 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "grml-zsh-config";
- version = "0.16.2";
+ version = "0.17.2";
src = fetchFromGitHub {
owner = "grml";
repo = "grml-etc-core";
rev = "v${version}";
- sha256 = "08a63cdjpbvgnja0637zbm8qif4qn8ydgkwcfq3145bxfh5rq8wz";
+ sha256 = "1h17xdlxhnjqirqwksi8qhx2lyajz7b0hmvb80i7313splhjp6hn";
};
buildInputs = [ zsh coreutils txt2tags procps ]
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index a062b346fda..6896904ec9a 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-06-10";
+ version = "2020-06-17";
pname = "oh-my-zsh";
- rev = "db94f60d342ba2be7dbe3bfd86f4edb335c2a6a7";
+ rev = "d47447a5e63715ae6ab6c2f46924dc8766c8e746";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "14zvbnrnkcmqnjbw71j4jgfm7gkrgpchkfrpdw006q25gqxj0bgm";
+ sha256 = "1hfinbmwwinvqnv3ldcja8gqh9n6ll6749055vk8icdixa9jwcyl";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index dc665bf9c41..74a6777d949 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
- version = "1.194";
+ version = "1.195";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
- sha256 = "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh";
+ sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 64b205bada5..ccea6a2233c 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
xset() { ${xset}/bin/xset "$@"; }\
perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\
+ PATH=$PATH:'"$out"'/bin\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index a9fd2f19b89..8bf253a7b12 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
stdenv.mkDerivation rec {
- name = "bacula-9.6.3";
+ name = "bacula-9.6.5";
src = fetchurl {
url = "mirror://sourceforge/bacula/${name}.tar.gz";
- sha256 = "02jvijwfw8nqrq61pyr5b9d5zjpmrsimkg6dq42rbd71g2k6a4zc";
+ sha256 = "0yn7qwkzix78bs811vmrn5gbywy7ggnsv72mdjz2lirqc6w3a3si";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index c6bb07e7b87..e87cecbf8fd 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }:
+{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }:
let
@@ -22,7 +22,7 @@ let
];
nativeBuildInputs = [
- pythonPackages.markdown # documentation build
+ python3Packages.markdown # documentation build
];
preBuild = ''
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix
index 77d6dca066a..f12187be810 100644
--- a/pkgs/tools/filesystems/convoy/default.nix
+++ b/pkgs/tools/filesystems/convoy/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
pname = "convoy";
- version = "0.5.0";
+ version = "0.5.2";
goPackagePath = "github.com/rancher/convoy";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "rancher";
repo = "convoy";
- sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1";
+ sha256 = "09nygrxd5hril4xcfsvgjg74xxhhimznqq4sdk0f360c5ra0dbhj";
};
buildInputs = [lvm2];
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index ee083c3e301..093ab9ad5c4 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -3,14 +3,14 @@
, openssl, libX11, libXext, libXrender }:
mkDerivation rec {
- version = "0.12.5";
+ version = "0.12.6";
pname = "wkhtmltopdf";
src = fetchFromGitHub {
owner = "wkhtmltopdf";
repo = "wkhtmltopdf";
rev = version;
- sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1";
+ sha256 = "0m2zy986kzcpg0g3bvvm815ap9n5ann5f6bdy7pfj6jv482bm5mg";
};
buildInputs = [
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index a6aed47d964..39a28214fe2 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -2,14 +2,14 @@
libevdev, udev }:
let
- version = "0.1.1";
+ version = "0.2.1";
baseName = "interception-tools";
in stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchurl {
url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz";
- sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j";
+ sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 0f98b819b0f..36adc09cdba 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, ncurses, bat
-# batgrep and batwatch
+{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat
+# batdiff, batgrep, and batwatch
+, coreutils
, less
# batgrep
, ripgrep
@@ -10,34 +11,35 @@
, withRustFmt ? rustfmt != null, rustfmt ? null
# batwatch
, withEntr ? entr != null, entr ? null
- }:
+# batdiff
+, gitMinimal
+, withDelta ? gitAndTools?delta, gitAndTools ? null
+}:
let
# Core derivation that all the others are based on.
# This includes the complete source so the per-script derivations can run the tests.
core = stdenv.mkDerivation rec {
pname = "bat-extras";
- version = "20200408";
+ # there hasn't been a release since 2020-05-01 but there are important bugfixes
+ # to the test suite so we'll pull the latest commit as of 2020-06-17.
+ version = "20200515-dev"; # latest commit was dated 2020-05-15
src = fetchFromGitHub {
owner = "eth-p";
repo = pname;
- rev = "v${version}";
- sha256 = "184d5rwasfpgbj2k98alg3wy8jmzna2dgfik98w2a297ky67s51v";
+ rev = "3029b6749f61f7514e9eef30e035cfab0e31eb1d";
+ sha256 = "08mb94k2n182ql97c5s5j1v7np25ivynn5g0418whrx11ra41wr7";
fetchSubmodules = true;
};
- nativeBuildInputs = [ bash makeWrapper ];
+ # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up
+ nativeBuildInputs = [ bash bat ];
dontConfigure = true;
postPatch = ''
- substituteInPlace lib/constants.sh \
- --replace 'EXECUTABLE_BAT="bat"' 'EXECUTABLE_BAT="${bat}/bin/bat"'
-
patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
- wrapProgram .test-framework/bin/best.sh \
- --prefix PATH : "${ncurses}/bin"
'';
buildPhase = ''
@@ -131,17 +133,13 @@ let
stdenv.lib.optional cond dep;
in
{
- batgrep = script "batgrep" [ less ripgrep ];
- batman = (script "batman" []).overrideAttrs (drv: {
- doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19)
- });
- batwatch = script "batwatch" ([ less ] ++ optionalDep withEntr entr);
- prettybat = (script "prettybat" ([]
+ batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta gitAndTools.delta);
+ batgrep = script "batgrep" [ less coreutils ripgrep ];
+ batman = script "batman" [];
+ batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr);
+ prettybat = script "prettybat" ([]
++ optionalDep withShFmt shfmt
++ optionalDep withPrettier nodePackages.prettier
++ optionalDep withClangTools clang-tools
- ++ optionalDep withRustFmt rustfmt)
- ).overrideAttrs (drv: {
- doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19)
- });
+ ++ optionalDep withRustFmt rustfmt);
}
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index 153a74f9456..9c250390e11 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geekbench";
- version = "5.1.1";
+ version = "5.2.0";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
- sha256 = "1wjyn3fkc2zgj0xrd73kidrg1d1wqmil278ak36wf87685w4n0b1";
+ sha256 = "1rvzll57igivhlxp058mhmcbq07q2zr52xbi1wyn85qr9ihrhx08";
};
dontConfigure = true;
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index d78e7f9439f..17893ef18ae 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -2,8 +2,8 @@
let
goPackagePath = "github.com/github/gh-ost";
- version = "1.0.47";
- sha256 = "0yyhkqis4j2cl6w2drrjxdy5j8x9zp4j89gsny6w4ql8gm5qgvvk";
+ version = "1.0.49";
+ sha256 = "0mncjhmv25wnhgjkn9gwkz2gzh0v6954w47ql7fs2iqr9al111dq";
in
buildGoPackage ({
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 09dba27a1ef..cb8cf1ec0a8 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2020.10";
+ version = "1.2020.12";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "00azasannh77ns3wpy6yrlw77pgq89frx0f4c7gk1gqiqjavsvdy";
+ sha256 = "0c0270kjw8vg8nphharap2p66yl72j5k4k3s5r9klafgp3sg4sjj";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix
index c7d8837f823..6013dc1c26b 100644
--- a/pkgs/tools/misc/txt2man/default.nix
+++ b/pkgs/tools/misc/txt2man/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "txt2man";
- version = "1.6.0";
+ version = "1.7.0";
src = fetchurl {
url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz";
- sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn";
+ sha256 = "06jf8hqav095db1v3njavx0rphmpmi3mgki4va6qkxjnvmdx4742";
};
preConfigure = ''
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index a52088ed231..7ecfb559dcc 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "flannel";
- version = "0.11.0";
+ version = "0.12.0";
rev = "v${version}";
goPackagePath = "github.com/coreos/flannel";
@@ -13,7 +13,7 @@ buildGoPackage rec {
inherit rev;
owner = "coreos";
repo = "flannel";
- sha256 = "0akxlrrsm2w51g0qd7dnsdy0hdajx98sdhxw4iknjr2kn7j3gph9";
+ sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd";
};
meta = {
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 7c6e6ada4c5..b686ea4d04f 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
stdenv.mkDerivation rec {
pname = "i2pd";
- version = "2.30.0";
+ version = "2.32.1";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
- sha256 = "1wvn8hs2ps3yzxzv05jnbm7zr1v8gv0phbx38m7l5xhqjmrpnscw";
+ sha256 = "15ng2c7i3jxmhpc2q0dl8arc72qbsq9y9paz5hgln907yy7dqx7c";
};
buildInputs = with stdenv.lib; [ boost zlib openssl ]
diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index 4506fbb11e3..4910ff21da6 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, openssl, fetchpatch }:
stdenv.mkDerivation rec {
- name = "iperf-3.7";
+ pname = "iperf";
+ version = "3.8.1";
src = fetchurl {
- url = "https://downloads.es.net/pub/iperf/${name}.tar.gz";
- sha256 = "033is7b5grfbiil98jxlz4ixp9shm44x6hy8flpsyz1i4h108inq";
+ url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
+ sha256 = "15pdgnan9krf3dijan9in73ir8rcmhk3iw8085d732is4zrq1c75";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix
index bd1c02f9b54..a5e46c6bc57 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
let repo = "openfortivpn";
- version = "1.14.0";
+ version = "1.14.1";
in stdenv.mkDerivation {
name = "${repo}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
owner = "adrienverge";
inherit repo;
rev = "v${version}";
- sha256 = "1qn48sp3ydbik7nc9x5l22gvvnr99f89jy1lvnf64bdg218kr0z7";
+ sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix
index fbebde2e7bf..6fe116d7015 100644
--- a/pkgs/tools/security/tpm2-abrmd/default.nix
+++ b/pkgs/tools/security/tpm2-abrmd/default.nix
@@ -1,24 +1,44 @@
-{ stdenv, fetchurl, lib
-, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }:
+{ stdenv, lib, fetchFromGitHub
+, autoreconfHook, pkg-config, autoconf-archive, makeWrapper, which
+, tpm2-tss, glib, dbus
+, cmocka
+}:
stdenv.mkDerivation rec {
pname = "tpm2-abrmd";
- version = "2.2.0";
+ version = "2.3.2";
- src = fetchurl {
- url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "1lbfhyyh9k54r8s1h8ca2czxv4hg0yq984kdh3vqh3990aca0x9a";
+ src = fetchFromGitHub {
+ owner = "tpm2-software";
+ repo = pname;
+ rev = version;
+ sha256 = "0jzglnlb700clcq6mjhhgvcq29a6893h888wsn9fbrh4f255sw8q";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- tpm2-tss glib which dbus cmocka
- ];
+ nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ];
+ buildInputs = [ tpm2-tss glib dbus ];
+ checkInputs = [ cmocka ];
+
+ enableParallelBuilding = true;
+
+ # Emulate the required behavior of ./bootstrap in the original
+ # package
+ preAutoreconf = ''
+ echo "${version}" > VERSION
+ '';
# Unit tests are currently broken as the check phase attempts to start a dbus daemon etc.
#configureFlags = [ "--enable-unit" ];
doCheck = false;
+ # Even though tpm2-tss is in the RUNPATH, starting from 2.3.0 abrmd
+ # seems to require the path to the device TCTI (used for accessing
+ # /dev/tpm0) in it's LD_LIBRARY_PATH
+ postFixup = ''
+ wrapProgram $out/bin/tpm2-abrmd \
+ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ tpm2-tss ]}"
+ '';
+
meta = with lib; {
description = "TPM2 resource manager, accessible via D-Bus";
homepage = "https://github.com/tpm2-software/tpm2-tools";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52cdce81aab..24520d139e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8212,6 +8212,8 @@ in
scry = callPackage ../development/tools/scry {};
+ dasm = callPackage ../development/compilers/dasm/default.nix { };
+
dbmate = callPackage ../development/tools/database/dbmate { };
devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};
@@ -10615,6 +10617,10 @@ in
jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;
+ julius = callPackage ../games/julius { };
+
+ augustus = callPackage ../games/augustus { };
+
kafkacat = callPackage ../development/tools/kafkacat { };
kati = callPackage ../development/tools/build-managers/kati { };
@@ -15536,6 +15542,8 @@ in
kerberos = libkrb5;
};
+ adguardhome = callPackage ../servers/adguardhome {};
+
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd = pkgs.apacheHttpd_2_4;
@@ -20230,6 +20238,8 @@ in
pulseSupport = config.pulseaudio or false;
};
+ hikari = callPackage ../applications/window-managers/hikari { };
+
i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
};
@@ -20860,6 +20870,10 @@ in
meld = callPackage ../applications/version-management/meld { };
+ meli = callPackage ../applications/networking/mailreaders/meli { };
+
+ melonDS = callPackage ../misc/emulators/melonDS { };
+
meme = callPackage ../applications/graphics/meme { };
mendeley = libsForQt5.callPackage ../applications/office/mendeley {
@@ -21323,7 +21337,9 @@ in
navit = libsForQt5.callPackage ../applications/misc/navit { };
- netbeans = callPackage ../applications/editors/netbeans { };
+ netbeans = callPackage ../applications/editors/netbeans {
+ jdk = jdk11;
+ };
ncdu = callPackage ../tools/misc/ncdu { };
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix
index 6cdd84c2279..9d4801e9dc5 100644
--- a/pkgs/top-level/dhall-packages.nix
+++ b/pkgs/top-level/dhall-packages.nix
@@ -8,20 +8,40 @@ let
let
callPackage = newScope self;
+ prefer = version: path:
+ let
+ packages = callPackage path { };
+
+ in
+ packages."${version}".overrideAttrs (_: {
+ passthru = packages;
+ }
+ );
+
buildDhallPackage =
callPackage ../development/interpreters/dhall/build-dhall-package.nix { };
+ buildDhallGitHubPackage =
+ callPackage ../development/interpreters/dhall/build-dhall-github-package.nix { };
+
+ buildDhallDirectoryPackage =
+ callPackage ../development/interpreters/dhall/build-dhall-directory-package.nix { };
+
in
- { inherit buildDhallPackage;
+ { inherit
+ buildDhallPackage
+ buildDhallGitHubPackage
+ buildDhallDirectoryPackage
+ ;
dhall-kubernetes =
- callPackage ../development/dhall-modules/dhall-kubernetes.nix { };
+ prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix;
dhall-packages =
- callPackage ../development/dhall-modules/dhall-packages.nix { };
+ prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix;
Prelude =
- callPackage ../development/dhall-modules/Prelude.nix { };
+ prefer "13.0.0" ../development/dhall-modules/Prelude.nix;
};
in
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3b58e1937b6..f14ae3133b8 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -4,6 +4,7 @@
, fetchurl
, fetchFromGitHub
, fetchNuGet
+, glib
, pkgconfig
, mono
, fsharp
@@ -544,6 +545,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
buildInputs = [
fsharp
+ glib
dotnetPackages.FSharpCompilerService
dotnetPackages.NewtonsoftJson
dotnetPackages.NDeskOptions
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 89bf25c1590..e212da33769 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3614,7 +3614,7 @@ let
sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c";
};
propagatedBuildInputs = [ ClassMix ];
- perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
+ perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
};
CryptIDEA = buildPerlPackage {
@@ -3734,7 +3734,7 @@ let
sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3";
};
propagatedBuildInputs = [ DigestSHA1 ];
- perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
+ perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
};
CryptRijndael = buildPerlPackage {