diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c686510142c..a26605ad8f0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5496,6 +5496,12 @@
githubId = 1191859;
name = "Maxim Krivchikov";
};
+ mazurel = {
+ email = "mateusz.mazur@yahoo.com";
+ github = "Mazurel";
+ githubId = 22836301;
+ name = "Mateusz Mazur";
+ };
mbakke = {
email = "mbakke@fastmail.com";
github = "mbakke";
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 4b4ae07f2e6..b7c6e8694ba 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -56,6 +56,11 @@
section of the NixOS manual for more information.
+
+
+ Web Services Dynamic Discovery host daemon
+
+
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0a38fa31730..214d9356aa6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -583,6 +583,7 @@
./services/network-filesystems/orangefs/client.nix
./services/network-filesystems/rsyncd.nix
./services/network-filesystems/samba.nix
+ ./services/network-filesystems/samba-wsdd.nix
./services/network-filesystems/tahoe.nix
./services/network-filesystems/diod.nix
./services/network-filesystems/u9fs.nix
diff --git a/nixos/modules/services/network-filesystems/samba-wsdd.nix b/nixos/modules/services/network-filesystems/samba-wsdd.nix
new file mode 100644
index 00000000000..004d07064af
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/samba-wsdd.nix
@@ -0,0 +1,124 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.samba-wsdd;
+
+in {
+ options = {
+ services.samba-wsdd = {
+ enable = mkEnableOption ''
+ Enable Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device,
+ to be found by Web Service Discovery Clients like Windows.
+
+ If you use the firewall consider adding the following:
+
+ networking.firewall.allowedTCPPorts = [ 5357 ];
+ networking.firewall.allowedUDPPorts = [ 3702 ];
+
+
+ '';
+ interface = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "eth0";
+ description = "Interface or address to use.";
+ };
+ hoplimit = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ example = 2;
+ description = "Hop limit for multicast packets (default = 1).";
+ };
+ workgroup = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "HOME";
+ description = "Set workgroup name (default WORKGROUP).";
+ };
+ hostname = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "FILESERVER";
+ description = "Override (NetBIOS) hostname to be used (default hostname).";
+ };
+ domain = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "Set domain name (disables workgroup).";
+ };
+ discovery = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable discovery operation mode.";
+ };
+ listen = mkOption {
+ type = types.str;
+ default = "/run/wsdd/wsdd.sock";
+ description = "Listen on path or localhost port in discovery mode.";
+ };
+ extraOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ "--shortlog" ];
+ example = [ "--verbose" "--no-http" "--ipv4only" "--no-host" ];
+ description = "Additional wsdd options.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.wsdd ];
+
+ systemd.services.samba-wsdd = {
+ description = "Web Services Dynamic Discovery host daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ DynamicUser = true;
+ Type = "simple";
+ ExecStart = ''
+ ${pkgs.wsdd}/bin/wsdd ${optionalString (cfg.interface != null) "--interface '${cfg.interface}'"} \
+ ${optionalString (cfg.hoplimit != null) "--hoplimit '${toString cfg.hoplimit}'"} \
+ ${optionalString (cfg.workgroup != null) "--workgroup '${cfg.workgroup}'"} \
+ ${optionalString (cfg.hostname != null) "--hostname '${cfg.hostname}'"} \
+ ${optionalString (cfg.domain != null) "--domain '${cfg.domain}'"} \
+ ${optionalString cfg.discovery "--discovery --listen '${cfg.listen}'"} \
+ ${escapeShellArgs cfg.extraOptions}
+ '';
+ # Runtime directory and mode
+ RuntimeDirectory = "wsdd";
+ RuntimeDirectoryMode = "0750";
+ # Access write directories
+ UMask = "0027";
+ # Capabilities
+ CapabilityBoundingSet = "";
+ # Security
+ NoNewPrivileges = true;
+ # Sandboxing
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ PrivateUsers = false;
+ ProtectHostname = true;
+ ProtectClock = true;
+ ProtectKernelTunables = true;
+ ProtectKernelModules = true;
+ ProtectKernelLogs = true;
+ ProtectControlGroups = true;
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+ RestrictNamespaces = true;
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ PrivateMounts = true;
+ # System Call Filtering
+ SystemCallArchitectures = "native";
+ SystemCallFilter = "~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @resources @swap";
+ };
+ };
+ };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3c10d621518..899509696e3 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -315,6 +315,7 @@ in
runInMachine = handleTest ./run-in-machine.nix {};
rxe = handleTest ./rxe.nix {};
samba = handleTest ./samba.nix {};
+ samba-wsdd = handleTest ./samba-wsdd.nix {};
sanoid = handleTest ./sanoid.nix {};
sbt = handleTest ./sbt.nix {};
sbt-extras = handleTest ./sbt-extras.nix {};
diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix
new file mode 100644
index 00000000000..1edef6c0056
--- /dev/null
+++ b/nixos/tests/samba-wsdd.nix
@@ -0,0 +1,44 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+ name = "samba-wsdd";
+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
+
+ nodes = {
+ client_wsdd = { pkgs, ... }: {
+ services.samba-wsdd = {
+ enable = true;
+ interface = "eth1";
+ workgroup = "WORKGROUP";
+ hostname = "CLIENT-WSDD";
+ discovery = true;
+ extraOptions = [ "--no-host" ];
+ };
+ networking.firewall.allowedTCPPorts = [ 5357 ];
+ networking.firewall.allowedUDPPorts = [ 3702 ];
+ };
+
+ server_wsdd = { ... }: {
+ services.samba-wsdd = {
+ enable = true;
+ interface = "eth1";
+ workgroup = "WORKGROUP";
+ hostname = "SERVER-WSDD";
+ };
+ networking.firewall.allowedTCPPorts = [ 5357 ];
+ networking.firewall.allowedUDPPorts = [ 3702 ];
+ };
+ };
+
+ testScript = ''
+ client_wsdd.start()
+ client_wsdd.wait_for_unit("samba-wsdd")
+
+ server_wsdd.start()
+ server_wsdd.wait_for_unit("samba-wsdd")
+
+ client_wsdd.wait_until_succeeds(
+ "echo list | ${pkgs.libressl.nc}/bin/nc -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
+ )
+ '';
+})
diff --git a/pkgs/applications/audio/noisetorch/config.patch b/pkgs/applications/audio/noisetorch/config.patch
deleted file mode 100644
index f6e258862db..00000000000
--- a/pkgs/applications/audio/noisetorch/config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config.go b/config.go
-index de16249..fb91ec0 100644
---- a/config.go
-+++ b/config.go
-@@ -20,7 +20,7 @@ const configFile = "config.toml"
-
- func initializeConfigIfNot() {
- log.Println("Checking if config needs to be initialized")
-- conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: true}
-+ conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: false}
- configdir := configDir()
- ok, err := exists(configdir)
- if err != nil {
diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index 1739d27870a..1932f239cfd 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "NoiseTorch";
- version = "0.5.2-beta";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "lawl";
repo = "NoiseTorch";
rev = version;
- sha256 = "1q0gfpqczlpybxcjjkiybcy6yc0gnrq8x27r0mpg4pvgwy7mps47";
+ sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf";
};
- patches = [ ./version.patch ./config.patch ./embedlibrnnoise.patch ];
+ patches = [ ./version.patch ./embedlibrnnoise.patch ];
vendorSha256 = null;
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index c43640b6524..4e727e9a22a 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "edbrowse";
- version = "3.7.6";
+ version = "3.7.7";
buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "CMB";
repo = "edbrowse";
rev = "v${version}";
- sha256 = "0yk4djb9q8ll94fs57y706bsqlar4pfx6ysasvkzj146926lrh8a";
+ sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf";
};
meta = with stdenv.lib; {
description = "Command Line Editor Browser";
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
index ee9c125827c..8fd5fba7d7e 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/share/kak/autoload/plugins
- cp -r rc $out/share/kak/autoload/plugins/auto-pairs
+ cp -r rc $out/share/kak/autoload/plugins/prelude
'';
meta = with stdenv.lib;
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index eb026f6dca3..a99659c7669 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "sigil";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
repo = "Sigil";
owner = "Sigil-Ebook";
rev = version;
- sha256 = "02bkyi9xpaxdcivm075y3praxgvfay9z0189gvr6g8yc3ml1miyr";
+ sha256 = "1vywybnx2zy75mkx647fhq4xvh5k64b33w69hdjw2v7jz27h4sab";
};
pythonPath = with python3Packages; [ lxml ];
diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
index 43b12c40d96..f619d79c0f5 100644
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "photoflare";
- version = "1.6.5";
+ version = "1.6.6";
src = fetchFromGitHub {
owner = "PhotoFlare";
repo = "photoflare";
rev = "v${version}";
- sha256 = "0a394324h7ds567z3i3pw6kkii78n4qwdn129kgkkm996yh03q89";
+ sha256 = "07lrlxagv1bljj607s8m0zsbzx9jrvi18bnxahnm7r4i5car5x2d";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 7eb0851834f..fb74c3d2d1a 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
# For wrapGAppsHook setup hook
- buildInputs = [ jre.gtk3 ];
+ buildInputs = [ (jre.gtk3 or null) ];
dontConfigure = true;
dontBuild = true;
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
platforms = jre.meta.platforms;
maintainers = with maintainers; [ abbradar ];
+ broken = !("gtk3" ? jre);
};
}
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 1a7f240ffda..4f1d4391181 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
- version = "7.2.4";
+ version = "7.2.5";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "sha256-RsXLznTz/U23e77xzyINi8HVuGqR4TrPaf+w++zPOH4=";
+ sha256 = "sha256-CRyAeizhaSDmVFGRhrYIW0Ofli9HnkgItiAGRJAETQM=";
};
installPhase = ''
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index ea7672abf6e..eab2519ad08 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
let
pname = "josm";
- version = "17084";
+ version = "17329";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0avzpzmvv371jpbph9xpq0ia2nikha2aib9v10hr2f9q7vka9zx4";
+ sha256 = "0hra146akadqz9acj1xa2vzrmipfzf8li7sgsmk169xr991y653k";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
- sha256 = "1vd2r4sshjpd6ic460cdil75skrm6f6q48lm6n3g1ywkn4mx63p1";
+ sha256 = "0i09jnfqbcirmic9vayrp78lnyk4mfh7ax3v3cs8kyqhk930pscf";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "An extensible editor for OpenStreetMap";
homepage = "https://josm.openstreetmap.de/";
+ changelog = "https://josm.openstreetmap.de/wiki/Changelog";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ rycee sikmir ];
platforms = platforms.all;
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index ae3d9181a3e..ac28694c45e 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
- version = "0.9.11";
+ version = "0.9.15";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
- sha256 = "11z22pglqsqjms1ykxmj7lfdwpcmkbdsd5r812m5gv94xsv38lnr";
+ sha256 = "0cfzci2l1bbjc5mqs3hjyy3grz5jk3qbna57vfcvxz36kcd5djv5";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 40b67484360..9ed20d7da64 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rssguard";
- version = "3.7.2";
+ version = "3.8.0";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
- sha256 = "1l2ra06am6bgwb4q200lhi64sz3np1dzf2vpjh10znxbx0mahbq6";
+ sha256 = "1fkd5j4ppk36ly6b5pjgng2vksqj6jvpyysg1xz77h2rl4xkzmkw";
};
buildInputs = [ qtwebengine qttools ];
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 871850fd6a6..f2d882ad75e 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.13",
+ "version": "1.7.14",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 4f387045bb4..9a3dab920f4 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.13";
+ version = "1.7.14";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
- sha256 = "04nm5amhc0bqqwcc1c9x88lnbjaaryfs0xhi4as65l5ac4jdkzjc";
+ sha256 = "04zqvj7n803dwp4jkhiihhynp82birb14vamm6ys39a0zgs91cnv";
};
electron = electron_9;
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 93f9e34f867..46ac18af9ee 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.13";
+ version = "1.7.14";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "13ylzyr1kkrppvp86kih60pqxlsvqlcsgz2gj4azgmrf2bijfby3";
+ sha256 = "1wyk1si0dmlcskf25zmbijpz6505yzjxa7pvd3g2k9kxc49vi20j";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index 3bdfcbfe7d1..a9306a751ac 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoPackage, fetchFromGitLab }:
+{ stdenv, buildGoModule, fetchgit }:
-buildGoPackage {
+buildGoModule {
pname = "mm";
- version = "2016.11.04";
+ version = "2020.11.17";
- goPackagePath = "gitlab.com/meutraa/mm";
-
- src = fetchFromGitLab {
- owner = "meutraa";
- repo = "mm";
- rev = "473fdd97285168054b672dbad2ffc4047324c518";
- sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp";
+ src = fetchgit {
+ url = "https://git.lost.host/meutraa/mm.git";
+ rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c";
+ sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk=";
};
- meta = {
+ vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM=";
+
+ meta = with stdenv.lib; {
description = "A file system based matrix client";
- homepage = "https://gitlab.com/meutraa/mm";
- license = stdenv.lib.licenses.isc;
+ homepage = "https://git.lost.host/meutraa/mm";
+ license = licenses.isc;
+ maintainers = with maintainers; [ meutraa ];
};
}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index aca9a9a111d..0b60617cbb3 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -20,15 +20,17 @@ let
requests
python_magic
]);
+
+ version = "0.2.0";
in buildPythonPackage {
pname = "weechat-matrix";
- version = "0.1.0";
+ inherit version;
src = fetchFromGitHub {
owner = "poljar";
repo = "weechat-matrix";
- rev = "65a5db7291439b6132e35e8cc09ed901614fabf6";
- sha256 = "0m3k5vrv5ab1aw1mjd0r8d71anwqzvncvv9v5zx9xp1i188sdm8x";
+ rev = version;
+ hash = "sha256-qsTdF9mGHac4rPs53mgoOElcujicRNXbJ7GsoptWSGc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index da54ecf44db..80e108b355f 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "2.09";
+ version = "2.10";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
- sha256 = "0yy5a7hr597vj6xbn7f5vzqdwnr637b3l1d62cmk0h7qbmh4anji";
+ sha256 = "0ymkkj7nf70rwlzfj6x78dx07mv32qvcb6dp8m92hc4s2ckdz3ly";
};
vendorSha256 = "1r7k0rzizs61r4gqqll7l2j7mdpi3w1ja6l4w6vxgzb45h2sjhi7";
diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix
index d95d894bdef..d7c4b035966 100644
--- a/pkgs/applications/radio/flrig/default.nix
+++ b/pkgs/applications/radio/flrig/default.nix
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.3.51";
+ version = "1.3.52";
pname = "flrig";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
- sha256 = "0aq4x0ai9q08ypfhzfj2inc4z3q39zq1l6h9as1kil9yn4zbay61";
+ sha256 = "18c154080vl25cy4l5amh96abm6kzm7mzld9h58pabc28yqq8zl8";
};
buildInputs = [
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index c331acbfe70..f2e1a2a8fee 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "star";
- version = "2.7.5c";
+ version = "2.7.6a";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
- sha256 = "1plx9akrzwjk7f2j94l9ss0apg0asqmrf2bp0728d4bvlhnzmjyy";
+ sha256 = "1zw9f4jbhz0y51namnmid42pa7pviviy94q9db8w0774nksdf8is";
};
sourceRoot = "source/source";
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index 4038db17f93..971eb93e2a1 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "workcraft";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchurl {
url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
- sha256 = "072i7kan2c9f4s9jxwqr4ccsi9979c12xhwr385sbq06rwyrna85";
+ sha256 = "1xcdf3c8rlvjmhiah3g2j83c889qh9x04kv3kb4nsa2imrpsqaqk";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index db7e238e8de..41c9846b23b 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "gmsh";
- version = "4.6.0";
+ version = "4.7.0";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "075dyblmlfdlhgbb1dwk6jzlqx93q90n6zwpr3mpii5n1zjmab0g";
+ sha256 = "03ij2hnh393gw59hgrz3qrmgc4qw82bc9nd98sks4jrp5gwk4zz2";
};
buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 3e6057c9aef..87fb205174b 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -4,8 +4,9 @@
, pkgconfig
, flint
, gmp
-, python2
+, python3
, singular
+, ncurses
}:
stdenv.mkDerivation rec {
@@ -23,8 +24,8 @@ stdenv.mkDerivation rec {
flint
gmp
singular
- singular
- python2
+ python3
+ ncurses
];
nativeBuildInputs = [
diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/applications/science/misc/nextinspace/default.nix
new file mode 100644
index 00000000000..390b2c58ca6
--- /dev/null
+++ b/pkgs/applications/science/misc/nextinspace/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "nextinspace";
+ version = "1.0.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1h3dksxyy5gq071fa7i2p73s50918y1bkk38hgfwr4226c3wipvg";
+ };
+
+ pythonPath = with python3Packages; [
+ requests
+ tzlocal
+ colorama
+ ];
+
+ meta = with lib; {
+ description = "Print upcoming space-related events in your terminal";
+ homepage = "https://github.com/The-Kid-Gid/nextinspace";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ penguwin ];
+ };
+}
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index d53c189986d..d979a25d2d1 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
mkDerivation rec {
pname = "clipgrab";
- version = "3.8.15";
+ version = "3.9.2";
src = fetchurl {
- sha256 = "1anp8hhwbkirsvc7mn11k272f0d85vzb5ppiw3gg9ss2hdai563n";
+ sha256 = "1ckcprqck96ns752vk9bzlc3gm6b5f0piff2d3m55zrvdh7wpgy5";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};
diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix
index 3a3ca044bb8..e4814e40c1f 100644
--- a/pkgs/applications/video/gnomecast/default.nix
+++ b/pkgs/applications/video/gnomecast/default.nix
@@ -3,11 +3,11 @@
with python3Packages;
buildPythonApplication rec {
pname = "gnomecast";
- version = "1.4.1";
+ version = "1.9.11";
src = fetchPypi {
inherit pname version;
- sha256 = "0mn03gqbwmhch0055bzgdwkzsl304qdyqwrgyiq0k5c5d2gyala5";
+ sha256 = "4d8cd7a71f352137252c5a9ee13475bd67fb99594560ecff1efb0f718d8bbaac";
};
nativeBuildInputs = [ wrapGAppsHook ];
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 4fcff75f095..aa66155d17a 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgconfig, zlib }:
stdenv.mkDerivation rec {
- version = "1.0.0";
+ version = "1.0.1";
pname = "gpac";
src = fetchFromGitHub {
owner = "gpac";
repo = "gpac";
rev = "v${version}";
- sha256 = "11jrklaahhdfqhci7f3lzv8wchh9bc91rg6w8ibh6varrk692vsb";
+ sha256 = "0gj46jpprfqv3wyagblv3a52chbplyzhvpra66v63czjibqsslm5";
};
postPatch = ''
diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/applications/window-managers/windowchef/default.nix
index efba3863276..0f65e4443ca 100644
--- a/pkgs/applications/window-managers/windowchef/default.nix
+++ b/pkgs/applications/window-managers/windowchef/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "windowchef";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "tudurom";
repo = "windowchef";
rev = "v${version}";
- sha256 = "0fs5ss2z6qjxvmls0g2f3gmv8hshi81xsmmcjn9x7651rv9552pl";
+ sha256 = "1m4vly7w2f28lrj26rhh3x9xsp3d97m5cxj91fafgh5rds4ygyhp";
};
buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto];
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index e4e8f794bc4..4da26ba7cfd 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -15,7 +15,6 @@
moreutils,
nix,
pigz,
- referencesByPopularity,
rsync,
runCommand,
runtimeShell,
@@ -772,7 +771,7 @@ rec {
then tag
else
lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
- paths = referencesByPopularity overallClosure;
+ paths = buildPackages.referencesByPopularity overallClosure;
nativeBuildInputs = [ jq ];
} ''
${if (tag == null) then ''
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index d1a9a7742a8..499a0a5f936 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools.
'';
- maintainers = with maintainers; [ matthewbauer ];
+ maintainers = with maintainers; [ matthewbauer NieDzejkob ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix
new file mode 100644
index 00000000000..c231361acb5
--- /dev/null
+++ b/pkgs/development/libraries/LAStools/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "LAStools";
+ version = "201003"; # LAStools makes release-ish commits with a message containing their version number as YYMMDD; these align with their website changelog
+
+ src = fetchFromGitHub {
+ owner = "LAStools";
+ repo = "LAStools";
+ rev = "635b76b42cc4912762da31b92f875df5310e1714";
+ sha256 = "0682ca3bp51lmfp46vsjnd1bqpn05g95pf4kclvjv1y8qivkxsaq";
+ };
+
+ patches = [
+ ./drop-64-suffix.patch # necessary to prevent '64' from being appended to the names of the executables
+ ];
+
+ hardeningDisable = [
+ "format"
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Software for rapid LiDAR processing";
+ homepage = http://lastools.org/;
+ license = licenses.unfree;
+ maintainers = with maintainers; [ stephenwithph ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/pkgs/development/libraries/LAStools/drop-64-suffix.patch
new file mode 100644
index 00000000000..2090baeb3b2
--- /dev/null
+++ b/pkgs/development/libraries/LAStools/drop-64-suffix.patch
@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -32,6 +32,6 @@ endforeach(TARGET)
+ foreach(TARGET ${ALL_TARGETS})
+ target_link_libraries(${TARGET} LASlib)
+ set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64)
+- set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64)
++ set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET})
+ install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
+ endforeach(TARGET)
+--
+2.28.0
+
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index b2a31edd0b6..49c8e14a74f 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ace";
- version = "6.5.10";
+ version = "6.5.11";
src = fetchurl {
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
- sha256 = "1qnq63r9cnaaqb5yrbb7apr7kjl6x31wfclizplri3lj4rwl7plh";
+ sha256 = "0fbbysy6aymys30zh5m2bygs84dwwjnbsdl9ipj1rvfrhq8jbylb";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 1bb79a64ba1..b6914f944aa 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
- version = "1.7.14";
+ version = "1.7.15";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
- sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55";
+ sha256 = "1jqc98pc6gfxsbfdar7x3nlaywyibix8gl9gvs44zwrdi5mpiiyc";
};
outputs = [ "bin" "dev" "out" "lib" ];
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 212b2f743d3..1635827340e 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "indilib";
- version = "1.8.6";
+ version = "1.8.7";
src = fetchFromGitHub {
owner = "indilib";
repo = "indi";
rev = "v${version}";
- sha256 = "1yzvcm7lwhwssnvv6gp8f7igmnvs35bpidmzz6z15awm5841yw30";
+ sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz";
};
patches = [
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 75cb2db4f1b..a1de88ef1ca 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
- version = "1.12.2";
+ version = "1.12.3";
src = fetchFromGitHub {
- sha256 = "1iz8w0q4m7dqshjqfbwxwrasabs4j8jlil4w3kxdr3v9ldkl4v3d";
+ sha256 = "1mhj29n40z7bvn1ns61wf8812ikm2mpc0d5ip0ha920z0anzqhwr";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 9d80e5de449..7bfc96fbf47 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "wxsqlite3";
- version = "4.6.0";
+ version = "4.6.1";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
- sha256 = "0snsysfrr5h66mybls8r8k781v732dlfn4jdnmk348jgvny275fj";
+ sha256 = "0q5glzr49rjnpp6iqrx7zr9bz4n2ca0q0i0phk7y27rmxzrgpxk1";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index bc540b45de4..44b769636ca 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
, cryptography
, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
-, openssl, openssh }:
+, openssl, openssh, pytestCheckHook }:
buildPythonPackage rec {
pname = "asyncssh";
@@ -23,6 +23,11 @@ buildPythonPackage rec {
./fix-sftp-chmod-test-nixos.patch
];
+ # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
+ postPatch = ''
+ rm tests/sspi_stub.py
+ '';
+
propagatedBuildInputs = [
bcrypt
cryptography
@@ -36,12 +41,10 @@ buildPythonPackage rec {
checkInputs = [
openssh
openssl
+ pytestCheckHook
];
- # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
- postPatch = ''
- rm tests/sspi_stub.py
- '';
+ disabledTests = [ "test_expired_root" "test_confirm" ];
meta = with stdenv.lib; {
description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
index 658ea3baee7..201f7646e01 100644
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -4,15 +4,15 @@
buildPythonPackage rec {
pname = "genanki";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "08eddb4a203e36e4fc3b66f85e00252070379867dbbc04fd8902ddc14fb352c6";
+ sha256 = "e8bd0d117b2ddfc6bfebe86344979134c7acbd9e4c6cd04578df2cd6077785c1";
};
propagatedBuildInputs = [
- pytestrunner
+ pytestrunner
cached-property
frozendict
pystache
@@ -24,7 +24,7 @@ buildPythonPackage rec {
disabled = !isPy3k;
# relies on upstream anki
- doCheck = false;
+ doCheck = false;
checkPhase = ''
py.test
'';
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 9013c7d978f..e5149f6025a 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "gssapi";
- version = "1.6.9";
+ version = "1.6.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pythongssapi";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "1shm3pc0l2r91qadkpq4bx45my0165nw3kdcp0gw4lk50z215hag";
+ sha256 = "11w8z9ik6zzv3pw3319mz91cgbfkgx0mffxbapqnhilzij2jad4q";
};
# It's used to locate headers
diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 9a99fb0953a..8f9d69a8941 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "hcloud";
- version = "1.9.1";
+ version = "1.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "069bf78a3c6cd642aae0b1a562b443d2670e6d73d507ce77cbf8a2c16974ca29";
+ sha256 = "11sdyays90lmkbdxhllc8ccx0xhrafb7dknqgjlrfpzq04v67vyy";
};
propagatedBuildInputs = [ future requests python-dateutil ];
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index ed0ab2d533a..8133b677db2 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "pyside2";
- version = "5.15.1";
+ version = "5.15.2";
src = fetchurl {
url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
- sha256 = "1yn3f414ql8rrvwxlfpp2sckpmb89zj5iszgy1690mrjh7cc2xgi";
+ sha256 = "060ljj1nzyp4zfz2vasbv2i7gs5rfkkjwxxbisd0fdw01d5m01mk";
};
patches = [
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index d71cf2a0f43..d181d6a29d9 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -13,8 +13,7 @@ buildPythonPackage rec {
postPatch = ''
sed -i "s/'pypandoc'//" setup.py
- # Current release works fine with py4j 0.10.8.1
- substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11'
+ substituteInPlace setup.py --replace py4j==0.10.9 'py4j>=0.10.9,<0.11'
'';
propagatedBuildInputs = [ py4j ];
diff --git a/pkgs/development/python-modules/sumtypes/default.nix b/pkgs/development/python-modules/sumtypes/default.nix
new file mode 100644
index 00000000000..4a3a22f2780
--- /dev/null
+++ b/pkgs/development/python-modules/sumtypes/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchFromGitHub, attrs, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "sumtypes";
+ version = "0.1a5";
+
+ src = fetchFromGitHub {
+ owner = "radix";
+ repo = "sumtypes";
+ rev = version;
+ sha256 = "0wcw1624xxx2h6lliv13b59blg60j8sgf5v2ni3cwx3j4wld4csr";
+ };
+
+ propagatedBuildInputs = [ attrs ];
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "Algebraic data types for Python";
+ homepage = "https://github.com/radix/sumtypes";
+ license = licenses.mit;
+ maintainers = with maintainers; [ NieDzejkob ];
+ };
+}
diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix
index 380bdc58d49..46482a84913 100644
--- a/pkgs/development/tools/knightos/mkrom/default.nix
+++ b/pkgs/development/tools/knightos/mkrom/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mkrom";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "mkrom";
rev = version;
- sha256 = "1nx3787gvs04xdvvamzkjkn9nmy2w70ja8dnh4szk420mvpc85na";
+ sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 3cb5ae2b930..6ee5e884ea2 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -38,10 +38,10 @@ let
];
in stdenv.mkDerivation rec {
pname = "react-native-debugger";
- version = "0.11.4";
+ version = "0.11.5";
src = fetchurl {
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
- sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698";
+ sha256 = "0b917lihypx7ansy64dmwvgi943yy0n6fs8myam635bsr4l1srzb";
};
buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index 41c03923ec0..ee0074f7d83 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -5,7 +5,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-c";
- version = "0.6.15";
+ version = "0.6.18";
src = stdenv.mkDerivation rec {
name = "${pname}-source-${version}";
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
owner = "lu-zero";
repo = pname;
rev = "v${version}";
- sha256 = "04hrk3vy8294vxcsggdpcs8hg3ykzj2564ifsqc4zwz4b4wd1p8l";
+ sha256 = "1dh5z210nl8grjxb8zxch8h7799w61bah7r2j0s07091rcpfsrsb";
};
cargoLock = fetchurl {
url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock";
- sha256 = "0rqb6ssqsdlm8zbshbxkwxlyy7j7p2gyficavzz33cw9g6fpmzbd";
+ sha256 = "1h5wmfmm2a2ilyw3ar88rqm7yvdc2vhyx4pgg781615ax52fhjli";
};
installPhase = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "1q2s28nqd6l9qmhmdksdjjlypxry5ff18i2pgwmgiilcry51mj4b";
+ cargoSha256 = "0ll9p2rbnw46zd9m2bmdmn99v9jjjf8i33xpkvd1rx42ki7sys62";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index 9657543e0c7..f86e2857fee 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -5,11 +5,11 @@ with python3Packages;
buildPythonApplication rec {
pname = "vcstool";
- version = "0.2.9";
+ version = "0.2.14";
src = fetchPypi {
inherit pname version;
- sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa";
+ sha256 = "c51300f074ea9c5da162ed8f3bc354c3fd69564895fee90abf1e1bd525919f2b";
};
propagatedBuildInputs = [ pyyaml setuptools ];
diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix
index 945a9e8df21..8c4d9ef1092 100644
--- a/pkgs/games/amoeba/default.nix
+++ b/pkgs/games/amoeba/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xlibs, pkgconfig }:
+{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }:
stdenv.mkDerivation rec {
name = "amoeba-${version}-${debver}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xlibs.libXxf86vm ];
+ buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ];
installPhase = ''
mkdir -p $out/bin $out/share/man/man1/
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 0226acf1604..0e2592de919 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -63,11 +63,11 @@ let
x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
alpha = {
stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
- experimental = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
+ experimental = bdist { sha256 = "0n00nbh44nyf485jys6pkga3pb9j4zywk0liq6jq99pil6z7na3y"; version = "1.1.0"; withAuth = true; };
};
headless = {
stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
- experimental = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
+ experimental = bdist { sha256 = "15qiwz3wvyaidndrrm1wfznbidnpf12wpzb8vlm9g0gaq3b0f6h6"; version = "1.1.0"; };
};
demo = {
stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 9cd6475d127..88f0c6abfc5 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
- version = "2020.1017.0";
+ version = "2020.1121.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
- sha256 = "0sz3l8cxi9vlryjd7cb86dh3gcanim2pvhag3cg5sslqzrrinp2v";
+ sha256 = "54AP3NZv5Nov3CAJoxn5E5tO9HhtlEY36x8OHAV8YVE=";
};
patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index eb9fa617d5b..42e5969dfc4 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -281,8 +281,53 @@
})
(fetchNuGet {
name = "Markdig";
- version = "0.21.1";
- sha256 = "119v22rvg51ifg54r1ndf2bw7hv1lf5wn3cd04ccg8d7r8c0yhbk";
+ version = "0.22.0";
+ sha256 = "0k7v4xlhfgyca8bb1g85062m22skmk6ay0hcyqlpi2cnvy7f61qf";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.Connections.Abstractions";
+ version = "3.1.9";
+ sha256 = "0vsnc87fqh61mjl2zgv7nfx6wkrg055cq12ql6cxmcawv6qsl0lw";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.Http.Connections.Client";
+ version = "3.1.9";
+ sha256 = "1m5w8pmm4bn7w1ml2xcs43kfr2hkicch46zr616ml8j6fsks6wmw";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.Http.Connections.Common";
+ version = "3.1.9";
+ sha256 = "0ppzxfgnhn0jpn0rg72gcwb0hcjk1qbzpzk9aiykp8vnfvqlmb20";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.Http.Features";
+ version = "3.1.9";
+ sha256 = "0xg0psas8k38yfd72q7m5sm00yyxj51j1fqg473za2kxf8z4p2wx";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.SignalR.Client";
+ version = "3.1.9";
+ sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.SignalR.Client.Core";
+ version = "3.1.9";
+ sha256 = "0ld7hch240z7zc7ckrppd4yrwwdhx3nbc8fgf4qql8ld8bih223y";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.SignalR.Common";
+ version = "3.1.9";
+ sha256 = "1kvp8y3fnhvfm7fpg1qsymwzch7jcfc9337zybwryfyzxjxq7aaj";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.SignalR.Protocols.Json";
+ version = "3.1.9";
+ sha256 = "1gp6wjidhbbpibnam2fimm3pc5p70wv17zhis5qf6an49xvlmmmb";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson";
+ version = "3.1.9";
+ sha256 = "1hdmsfk5ymp2vi4saxiw19j83ykvz5jzv0f4060cgc8bafndakrr";
})
(fetchNuGet {
name = "Microsoft.Bcl.AsyncInterfaces";
@@ -306,8 +351,8 @@
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.BannedApiAnalyzers";
- version = "3.3.0";
- sha256 = "04z03ir9sal5h9ha97isbh660jijslb8zfiaa48w2r2l6pabz5kd";
+ version = "3.3.1";
+ sha256 = "0xh23x91xg8qwfam70wsn039sn5li0pkay36lds9dl15p1vbfasm";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Common";
@@ -326,13 +371,13 @@
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.FxCopAnalyzers";
- version = "3.0.0";
- sha256 = "0a17vb6jnj6kch70d7vki84728hlc3zpffsbv533yji6kf6x6d24";
+ version = "3.3.1";
+ sha256 = "0wkrxymb9si2v0rzqnr8mdi89fi7swd1vbbclccjp8645ha1nif0";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer";
- version = "3.0.0";
- sha256 = "11g3hj3p885zj7bn99qzh68m1xifbwzrgmx1pkvpi10rmgkpyh8j";
+ version = "3.3.1";
+ sha256 = "010fadvngp21yz1b4vk0bbx79p5yr6nji19w56ma9zp1hj7fn2y1";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Workspaces.Common";
@@ -346,8 +391,8 @@
})
(fetchNuGet {
name = "Microsoft.CodeQuality.Analyzers";
- version = "3.0.0";
- sha256 = "1x3yf21m41w2iv9nlwp03q6byqgivd48h2dlm5vgv5bd53xjfz77";
+ version = "3.3.1";
+ sha256 = "1ng91xf3shjl74xvckygh9aqccwqapia46gilddkb5kiqj847bik";
})
(fetchNuGet {
name = "Microsoft.CSharp";
@@ -371,8 +416,8 @@
})
(fetchNuGet {
name = "Microsoft.Diagnostics.Runtime";
- version = "2.0.145301";
- sha256 = "02gzyal13ilqdxzzdzdavw85xk4z8zp88waanr7b72zxhm0fzfj9";
+ version = "2.0.151903";
+ sha256 = "1y7hsgzjs6b3323fcq5km515knykfgvdx4x8l1g03sy5h3lwwhak";
})
(fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions";
@@ -429,26 +474,51 @@
version = "2.2.0";
sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Configuration";
+ version = "3.1.9";
+ sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions";
version = "2.2.0";
sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Configuration.Abstractions";
+ version = "3.1.9";
+ sha256 = "0skilj4gfzyn05mn74w2q4jp1ww2wwbsxw2i7v8bwk73nymsqpr8";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Binder";
version = "2.2.0";
sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Configuration.Binder";
+ version = "3.1.9";
+ sha256 = "1n8fndd9vrd3d7041p42li8v129mgl3gi8sl1x8whhycy0ahqr78";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection";
version = "2.2.0";
sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.DependencyInjection";
+ version = "3.1.9";
+ sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection.Abstractions";
version = "2.2.0";
sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.DependencyInjection.Abstractions";
+ version = "3.1.9";
+ sha256 = "1l7ng71y18fwdlyq2ycl12hmv9wrf7k7knz2jwv9w9w7spmp8jv6";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyModel";
version = "2.1.0";
@@ -459,26 +529,46 @@
version = "2.2.0";
sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Logging";
+ version = "3.1.9";
+ sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions";
version = "2.2.0";
sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Logging.Abstractions";
+ version = "3.1.9";
+ sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
- version = "3.1.8";
- sha256 = "00il5z4pwysii0di9lxx7a2hc9ca64rrvw3zvzfi4wgf05xm66ff";
+ version = "3.1.9";
+ sha256 = "1gq1i7rb50dzj9hp07q0w9siyqy3hl0zqpk8na37s4jq6ikb5q82";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
version = "2.2.0";
sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Options";
+ version = "3.1.9";
+ sha256 = "0rpix172cmwwbddh4gm0647x1ql0ly5n68bpz71v915j97anwg90";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.Primitives";
version = "2.2.0";
sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Primitives";
+ version = "3.1.9";
+ sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc";
+ })
(fetchNuGet {
name = "Microsoft.Net.Compilers.Toolset";
version = "3.1.0";
@@ -486,8 +576,8 @@
})
(fetchNuGet {
name = "Microsoft.NetCore.Analyzers";
- version = "3.0.0";
- sha256 = "0b8biyw7nymqfbg08g2vmpf1xm6g1mm6hz4gjxc5f3g72kd2nswj";
+ version = "3.3.1";
+ sha256 = "16cx0x5hcjs2ml5zjalfsp7n3rfyz75ihnvh1p10z96yaz43gdwn";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
@@ -526,8 +616,8 @@
})
(fetchNuGet {
name = "Microsoft.NetFramework.Analyzers";
- version = "3.0.0";
- sha256 = "09dqizym3bca4281714yxrhhgryxpjhjfjnyfswlhyh42qi3ix2k";
+ version = "3.3.1";
+ sha256 = "06vjmjmqhrmfc57ndsc8jaybc8np06s797nhg40bf44603bx6159";
})
(fetchNuGet {
name = "Microsoft.Win32.Primitives";
@@ -586,8 +676,8 @@
})
(fetchNuGet {
name = "ppy.osu.Framework";
- version = "2020.1009.0";
- sha256 = "0mqx9wjp639k56f0cjlrk67mq7c4h4vlglvss93dnvbb20ljn54r";
+ version = "2020.1120.0";
+ sha256 = "13vm6qly09f9b9bnf8r4wkypbxz673x852fjllj33sz55qh6957m";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@@ -596,8 +686,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
- version = "2020.1016.0";
- sha256 = "1zsqmmlxbb2ncrlvha33cz0inbd6ijbcvxn0y0cysfkg7zb9iisy";
+ version = "2020.1030.0";
+ sha256 = "1sxip1m5y7c5jblf9br8f0i5yhv0qjpidv9w6bbdxiy29mfwnz6d";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";
@@ -606,8 +696,8 @@
})
(fetchNuGet {
name = "ppy.SDL2-CS";
- version = "1.0.15";
- sha256 = "0qld7sp7y7hwwxsdxc8m17nyb2zwfxym63j50icvf0rlawmrl7ca";
+ version = "1.0.40";
+ sha256 = "1pvc154nqdbhn0rm6id0710yh72wvd2s5xmqxx3935h1jxrjgk8s";
})
(fetchNuGet {
name = "ppy.squirrel.windows";
@@ -796,8 +886,8 @@
})
(fetchNuGet {
name = "StbiSharp";
- version = "1.0.12";
- sha256 = "044lyc6522s8q4kgvly0rsxghkiv4dwzycl2ibxf7q5dvws02qvp";
+ version = "1.0.13";
+ sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q";
})
(fetchNuGet {
name = "System.AppContext";
@@ -1054,6 +1144,11 @@
version = "4.7.0";
sha256 = "1vivvf158ilcpp6bq70zyafimi0lng546b34csmjb09k19wgxpiv";
})
+ (fetchNuGet {
+ name = "System.IO.Pipelines";
+ version = "4.7.3";
+ sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy";
+ })
(fetchNuGet {
name = "System.Linq";
version = "4.1.0";
@@ -1084,6 +1179,11 @@
version = "4.5.1";
sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c";
})
+ (fetchNuGet {
+ name = "System.Memory";
+ version = "4.5.2";
+ sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld";
+ })
(fetchNuGet {
name = "System.Memory";
version = "4.5.3";
@@ -1259,6 +1359,11 @@
version = "4.5.2";
sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi";
})
+ (fetchNuGet {
+ name = "System.Runtime.CompilerServices.Unsafe";
+ version = "4.5.3";
+ sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln";
+ })
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.7.0";
@@ -1434,6 +1539,16 @@
version = "4.3.0";
sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
})
+ (fetchNuGet {
+ name = "System.Text.Encodings.Web";
+ version = "4.7.1";
+ sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb";
+ })
+ (fetchNuGet {
+ name = "System.Text.Json";
+ version = "4.7.2";
+ sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4";
+ })
(fetchNuGet {
name = "System.Text.RegularExpressions";
version = "4.1.0";
@@ -1454,6 +1569,11 @@
version = "4.3.0";
sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
})
+ (fetchNuGet {
+ name = "System.Threading.Channels";
+ version = "4.7.1";
+ sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2";
+ })
(fetchNuGet {
name = "System.Threading.Tasks";
version = "4.0.11";
@@ -1479,6 +1599,11 @@
version = "4.5.3";
sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i";
})
+ (fetchNuGet {
+ name = "System.Threading.Tasks.Extensions";
+ version = "4.5.4";
+ sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153";
+ })
(fetchNuGet {
name = "System.Threading.Thread";
version = "4.0.0";
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index e16a771d272..94fb9d063b3 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "terraria-server";
- version = "1.4.0.5";
+ version = "1.4.1.2";
urlVersion = lib.replaceChars [ "." ] [ "" ] version;
src = fetchurl {
- url = "https://terraria.org/system/dedicated_servers/archives/000/000/039/original/terraria-server-${urlVersion}.zip";
- sha256 = "1bvcafpjxp7ddrbhm3z0xamgi71ymbi41dlx990daz0b5kbdir8y";
+ url = "https://terraria.org/system/dedicated_servers/archives/000/000/042/original/terraria-server-${urlVersion}.zip";
+ sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh";
};
buildInputs = [ file unzip ];
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 21a89e5f5f2..8db6995b6fa 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "seafile-shared";
- version = "7.0.8";
+ version = "7.0.9";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "v${version}";
- sha256 = "0q0zylv8hkhnfw0084bj1wmqwqvpflmdy1njxvvkjsbnflh8kc2y";
+ sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk";
};
nativeBuildInputs = [
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e39fac50d89..51bf6876aaf 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1653,6 +1653,18 @@ let
meta.homepage = "https://github.com/idris-hackers/idris-vim/";
};
+ idris2-vim = buildVimPluginFrom2Nix {
+ pname = "idris2-vim";
+ version = "2020-05-25";
+ src = fetchFromGitHub {
+ owner = "edwinb";
+ repo = "idris2-vim";
+ rev = "099129e08c89d9526ad092b7980afa355ddaa24c";
+ sha256 = "1gip64ni2wdd5v4crl64f20pbrx24dmr3ci7w5c9da9hs85x1p29";
+ };
+ meta.homepage = "https://github.com/edwinb/idris2-vim/";
+ };
+
Improved-AnsiEsc = buildVimPluginFrom2Nix {
pname = "Improved-AnsiEsc";
version = "2015-08-26";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 197f445bd35..06f50910643 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -94,6 +94,7 @@ eagletmt/ghcmod-vim
eagletmt/neco-ghc
easymotion/vim-easymotion
editorconfig/editorconfig-vim
+edwinb/idris2-vim
ehamberg/vim-cute-python
eikenb/acp
elixir-editors/vim-elixir
diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix
index 575da8aca73..1eecacad60c 100644
--- a/pkgs/os-specific/linux/earlyoom/default.nix
+++ b/pkgs/os-specific/linux/earlyoom/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "earlyoom";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "rfjakob";
repo = "earlyoom";
rev = "v${version}";
- sha256 = "1cn0bgbgiq69i8mk8zxly1f7j01afm82g672qzccz6swsi2637j4";
+ sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq";
};
nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ];
diff --git a/pkgs/os-specific/linux/swapview/default.nix b/pkgs/os-specific/linux/swapview/default.nix
new file mode 100644
index 00000000000..c88c8757db3
--- /dev/null
+++ b/pkgs/os-specific/linux/swapview/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "swapview";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "lilydjwg";
+ repo = "swapview";
+ rev = "v${version}";
+ sha256 = "0339biydk997j5r72vzp7djwkscsz89xr3936nshv23fmxjh2rzj";
+ };
+
+ cargoSha256 = "0z99pqd41y8cci3yvwsnm5zbq7pzli62z8qqqghmz1hcq5pb5q7g";
+
+ meta = with lib; {
+ description = "A simple program to view processes' swap usage on Linux";
+ homepage = "https://github.com/lilydjwg/swapview";
+ platforms = platforms.linux;
+ license = with licenses; [ bsd3 ];
+ maintainers = with maintainers; [ oxalica ];
+ };
+}
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 2d0d4abd914..2d55e0da85c 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
- version = "3.8.8";
+ version = "3.8.9";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
- sha256 = "14rzlikaqxi7cvpy4np1s1pnkila547zdxsb7nl4ilman1zwdgk7";
+ sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
};
buildInputs =
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index a2ae37efe89..497d1fa2540 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.16.2131";
+ version = "0.16.2152";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "1689w80cjji7wq1x3sgkpmx0n543mqkzvhb3hdmz6f66h479hcpk";
+ sha256 = "1q1bydyhddhz110xzbhhjj3gm0rwvjrjgc8j8wsj7xd9k0laygqd";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index 4eab9d364e1..c47980a577c 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
- version = "0.22.15";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
- sha256 = "1hc0aahfxyv05d3bskfxcv7ik5zvd1j22r3z964idhch8csxw92l";
+ sha256 = "1cn5335zpcqwra3widwnwqan2r1ardxc6ac7z5nn98r7kd3kll5v";
};
dontBuild = true;
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 08b873ea034..24406d1c5c2 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
- version = "0.21.4";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
- sha256 = "13dr3iq3v14i9zlcpv8yvq6yp90b70512bk2jkr5arlk2bilba8c";
+ sha256 = "14km34wjhijfwxvqcplf2jmh69zj7llsrimafmz94jy8cy85cpa1";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
- vendorSha256 = "1x3a4q629jrgh7x8b81n2iapbxjfd389pj1wc2zd6c5l9r70xr97";
+ vendorSha256 = "01lf5f2iigv8pihblwxyqx0pgj6gqir3b7rcna0xkirrfpvzd38c";
doCheck = false;
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 288c30734fe..a4374b83390 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "shaarli";
- version = "0.11.1";
+ version = "0.12.1";
src = fetchurl {
url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
- sha256 = "1psijcmi24hk0gxh1zdsm299xj11i7find2045nnx3r96cgnwjpn";
+ sha256 = "02zwfr92bmr8pnkrg6my31wx2qapddcgmfsq44msfpmvvnxfj57n";
};
outputs = [ "out" "doc" ];
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix
new file mode 100644
index 00000000000..1411b6f3adc
--- /dev/null
+++ b/pkgs/servers/wsdd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }:
+
+stdenv.mkDerivation rec {
+ pname = "wsdd";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "christgau";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0444xh1r5wd0zfch1hg1f9s4cw68srrm87hqx16qvlgx6jmz5j0p";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [ python3 ];
+
+ installPhase = ''
+ install -Dm0755 src/wsdd.py $out/bin/wsdd
+ wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
+ '';
+
+ passthru = {
+ tests.samba-wsdd = nixosTests.samba-wsdd;
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/christgau/wsdd";
+ description = "A Web Service Discovery (WSD) host daemon for SMB/Samba";
+ maintainers = with maintainers; [ izorkin ];
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index 030e5695b22..bc270daf09c 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,17 +1,25 @@
{ stdenv, buildPackages, autoreconfHook, fetchurl }:
stdenv.mkDerivation rec {
- name = "dash-0.5.11.2";
+ pname = "dash";
+ version = "0.5.11.2";
src = fetchurl {
- url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
+ url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0";
};
hardeningDisable = [ "format" ];
# Temporary fix until a proper one is accepted upstream
- patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch;
+ patches = [
+ (fetchurl {
+ # Dash executes code when noexec ("-n") is specified
+ # https://www.openwall.com/lists/oss-security/2020/11/11/3
+ url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
+ sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5";
+ })
+ ] ++ stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
diff --git a/pkgs/tools/X11/devour/default.nix b/pkgs/tools/X11/devour/default.nix
new file mode 100644
index 00000000000..4f39c0a9890
--- /dev/null
+++ b/pkgs/tools/X11/devour/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, libX11 }:
+
+stdenv.mkDerivation rec {
+ pname = "devour";
+ version = "12";
+
+ src = fetchFromGitHub {
+ owner = "salman-abedin";
+ repo = "devour";
+ rev = version;
+ sha256 = "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp";
+ };
+
+ installPhase = ''
+ install -Dm555 -t $out/bin devour
+ '';
+
+ buildInputs = [ libX11 ];
+
+ meta = with stdenv.lib; {
+ description = "Devour hides your current window when launching an external program";
+ longDescription = "Devour hides your current window before launching an external program and unhides it after quitting";
+ homepage = "https://github.com/salman-abedin/devour";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ mazurel ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix
index 97abeadffc0..4b8eb4dfab2 100644
--- a/pkgs/tools/archivers/ctrtool/default.nix
+++ b/pkgs/tools/archivers/ctrtool/default.nix
@@ -2,22 +2,23 @@
stdenv.mkDerivation rec {
pname = "ctrtool";
- version = "0.16";
+ version = "0.7";
src = fetchFromGitHub {
owner = "jakcron";
repo = "Project_CTR";
- rev = "v${version}";
- sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap";
+ rev = "ctrtool-v${version}";
+ sha256 = "07aayck82w5xcp3si35d7ghybmrbqw91fqqvmbpjrjcixc6m42z7";
};
sourceRoot = "source/ctrtool";
+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++"];
enableParallelBuilding = true;
installPhase = "
mkdir $out/bin -p
- cp ctrtool $out/bin/ctrtool
+ cp ctrtool${stdenv.hostPlatform.extensions.executable} $out/bin/
";
meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index 3ca9a7b5e8d..9a52d453185 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "yafaray-core";
- version = "3.5.0";
+ version = "3.5.1";
src = fetchFromGitHub {
owner = "YafaRay";
repo = "Core";
rev = "v${version}";
- sha256 = "05r08ynm6p9jq9l3v1v3lqkrfx3bm6zlqcxm1yk7mdv1zv2yxikd";
+ sha256 = "043ixf3h4ay2fahsw9lh0pha82f7ri04mlfhvn2pg251012jvhrx";
};
preConfigure = ''
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index b34206e6cf6..2dc667277dd 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ibus-bamboo";
- version = "0.6.6";
+ version = "0.6.7";
src = fetchFromGitHub {
owner = "BambooEngine";
repo = pname;
rev = "v${version}";
- sha256 = "0bjcc2dm6c6s0v271nyslmwf5z0xxpcbvmk4lyirs48hc1bzv3n6";
+ sha256 = "0w3z36p8d3a04fgzc12xnpdkg6h8alfgqy5rjxbwqwi25h3byj6k";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index b84ef63edc9..b5fea3cc3a9 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "bat";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
- sha256 = "161pfix42j767ziyp4mslffdd20v9i0ncplvjw2pmpccwdm106kg";
+ sha256 = "118pqws32j2hx13vjda5wz1kfjfnb4h76wlj90q768na8b522kn0";
};
- cargoSha256 = "19vhhxfyx3nrngcs6dvwldnk9h4lvs7xjkb31aj1y0pyawz882h9";
+ cargoSha256 = "1r1gxpb0qsbl4245sqw3gsi33pigsj16z4cxii3fmsnq0y77yd5r";
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix
index eddcba1c9c8..2d0d43871e8 100644
--- a/pkgs/tools/misc/birdfont/xmlbird.nix
+++ b/pkgs/tools/misc/birdfont/xmlbird.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "xmlbird";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchurl {
url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz";
- sha256 = "1ycbgjvywnlc0garw8qjqd18s0xnrwjvssdrb410yschv3wjq1i0";
+ sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04";
};
nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ];
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index 56292f3ad7d..b2aa0a16f92 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.2.5";
+ version = "5.3.0";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
- sha256 = "0mq33khmsay646csr7j7mqb1fr2dlacb58hjqyxfbh83r0a1q67p";
+ sha256 = "0g7yj2a3cddaaa0n38zjqq79w5xs3sqa9zwqn2ffr2wr6y80754i";
};
dontConfigure = true;
diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix
index bbd4125c4b0..3f27be2c9f9 100644
--- a/pkgs/tools/misc/pipreqs/default.nix
+++ b/pkgs/tools/misc/pipreqs/default.nix
@@ -1,16 +1,17 @@
-{ lib, python2Packages }:
+{ lib, python3 }:
-# Using python 2 because when packaging with python 3 pipreqs fails to parse python 2 code.
-python2Packages.buildPythonApplication rec {
+with python3.pkgs;
+
+buildPythonApplication rec {
pname = "pipreqs";
version = "0.4.10";
- src = python2Packages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
sha256 = "0fdr3mbxjpmrxr7yfc1sn9kbpcyb0qwafimhhrrqvf989dj1sdcy";
};
- propagatedBuildInputs = with python2Packages; [ yarg docopt ];
+ propagatedBuildInputs = [ yarg docopt ];
# Tests requires network access. Works fine without sandboxing
doCheck = false;
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index 7d68ada2c1b..5c4a3301d27 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, utillinux, coreutils}:
stdenv.mkDerivation rec {
- version = "6.40";
+ version = "6.42";
pname = "profile-sync-daemon";
src = fetchurl {
url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
- sha256 = "1z1n7dqbkk0x9w2pq71nf93wp4hrzin4a0hcvfynj1khf12z369h";
+ sha256 = "1x47ydrwawkic5cgzp0ikd99g1hbpzc2aalq9z630vm13yw2adnp";
};
installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sed -i '/^HOME/d' $out/bin/profile-sync-daemon
substituteInPlace $out/bin/psd-overlay-helper \
--replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \
- --replace "sudo " "/run/wrappers/bin/sudo "
+ --replace "sudo " "/run/wrappers/bin/sudo "
'';
preferLocalBuild = true;
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 16d088c0098..0ba72852c40 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "rpm-ostree";
- version = "2020.7";
+ version = "2020.8";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
- sha256 = "1f8ajri6k5ni2rm8c75nydl8wcza0q6bv2bia3aqd0mr7iw31pbm";
+ sha256 = "1iyl6bjkj3drlwds579bh25xcmlwj9lkkbdmcdanq5b3shbmpyhi";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 2f5a52531b9..fce992acd31 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,27 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchpatch, coreutils
-, python3Packages, substituteAll }:
+{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
- version = "0.20.11.7";
+ version = "0.20.11.23";
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
rev = version;
- sha256 = "0083vagy0jkahb5sw1il7r53ggk45zbjwwjsqd76v7ph3v1awf4v";
+ sha256 = "1fjkmpnbpzxniypql68cpwc2rrnih8b34p8pzabrf55f49wcmcph";
};
- patches = [
- (substituteAll {
- src = ./nix-paths.patch;
- df = "${coreutils}/bin/df";
- libc =
- if stdenv.hostPlatform.isDarwin
- then "/usr/lib/libSystem.dylib"
- else "${stdenv.cc.libc}/lib/libc.so.6";
- })
- ];
+ propagatedBuildInputs = [ python3Packages.psutil ];
checkInputs = with python3Packages; [
nose
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 2056fb9d0a5..f058f2cb8dd 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
-, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline
+, flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline
, python3
, svfSupport ? true
, bsdlSupport ? true
@@ -7,19 +7,18 @@
, jedecSupport ? true
}:
-stdenv.mkDerivation {
- version = "0.10";
+stdenv.mkDerivation rec {
+ version = "2019.12";
pname = "urjtag";
- src = fetchsvn {
- url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
- rev = "2051";
- sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f";
+ src = fetchurl {
+ url = "https://downloads.sourceforge.net/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz";
+ sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gettext autoconf automake libtool bison flex which
- subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ];
+ subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ];
configureFlags = [
(stdenv.lib.enableFeature svfSupport "svf")
@@ -28,8 +27,6 @@ stdenv.mkDerivation {
(stdenv.lib.enableFeature jedecSupport "jedec-exp")
];
- preConfigure = "./autogen.sh";
-
meta = {
description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
homepage = "http://urjtag.org/";
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 452a9873bec..fdad966c81b 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "eternal-terminal";
- version = "6.0.11";
+ version = "6.0.13";
src = fetchFromGitHub {
owner = "MisterTea";
repo = "EternalTerminal";
rev = "et-v${version}";
- sha256 = "0yjf639ldfaxrw4pbg9avdkhhmcpnx58j3x70zskvgkajny8yqqr";
+ sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/security/b3sum/add-cargo-lock.patch b/pkgs/tools/security/b3sum/cargo-lock.patch
similarity index 77%
rename from pkgs/tools/security/b3sum/add-cargo-lock.patch
rename to pkgs/tools/security/b3sum/cargo-lock.patch
index ecbb2b0bab9..1f849408947 100644
--- a/pkgs/tools/security/b3sum/add-cargo-lock.patch
+++ b/pkgs/tools/security/b3sum/cargo-lock.patch
@@ -1,9 +1,9 @@
-diff --git a/b3sum/Cargo.lock b/b3sum/Cargo.lock
+diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 0000000..1ce7abc
+index 0000000..1dff162
--- /dev/null
+++ b/Cargo.lock
-@@ -0,0 +1,495 @@
+@@ -0,0 +1,507 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
@@ -17,9 +17,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "anyhow"
-+version = "1.0.31"
++version = "1.0.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
++checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
+
+[[package]]
+name = "arrayref"
@@ -29,9 +29,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "arrayvec"
-+version = "0.5.1"
++version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "atty"
@@ -46,13 +46,13 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "autocfg"
-+version = "1.0.0"
++version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "b3sum"
-+version = "0.3.4"
++version = "0.3.7"
+dependencies = [
+ "anyhow",
+ "blake3",
@@ -73,12 +73,12 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "blake3"
-+version = "0.3.4"
++version = "0.3.7"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
-+ "cfg-if",
++ "cfg-if 0.1.10",
+ "constant_time_eq",
+ "crypto-mac",
+ "digest",
@@ -87,9 +87,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "cc"
-+version = "1.0.57"
++version = "1.0.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe"
++checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
+
+[[package]]
+name = "cfg-if"
@@ -98,10 +98,16 @@ index 0000000..1ce7abc
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
-+name = "clap"
-+version = "2.33.1"
++name = "cfg-if"
++version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "clap"
++version = "2.33.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
@@ -113,64 +119,69 @@ index 0000000..1ce7abc
+]
+
+[[package]]
++name = "const_fn"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
++
++[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
-+name = "crossbeam-deque"
-+version = "0.7.3"
++name = "crossbeam-channel"
++version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++dependencies = [
++ "cfg-if 1.0.0",
+ "crossbeam-epoch",
+ "crossbeam-utils",
-+ "maybe-uninit",
+]
+
+[[package]]
+name = "crossbeam-epoch"
-+version = "0.8.2"
++version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
++checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+dependencies = [
-+ "autocfg",
-+ "cfg-if",
++ "cfg-if 1.0.0",
++ "const_fn",
+ "crossbeam-utils",
+ "lazy_static",
-+ "maybe-uninit",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
-+name = "crossbeam-queue"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-+dependencies = [
-+ "cfg-if",
-+ "crossbeam-utils",
-+ "maybe-uninit",
-+]
-+
-+[[package]]
+name = "crossbeam-utils"
-+version = "0.7.2"
++version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+dependencies = [
+ "autocfg",
-+ "cfg-if",
++ "cfg-if 1.0.0",
++ "const_fn",
+ "lazy_static",
+]
+
+[[package]]
+name = "crypto-mac"
-+version = "0.7.0"
++version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
++checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
+dependencies = [
+ "generic-array",
+ "subtle",
@@ -178,9 +189,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "digest"
-+version = "0.8.1"
++version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
@@ -199,26 +210,27 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "either"
-+version = "1.5.3"
++version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "generic-array"
-+version = "0.12.3"
++version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+dependencies = [
+ "typenum",
++ "version_check",
+]
+
+[[package]]
+name = "getrandom"
-+version = "0.1.14"
++version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+dependencies = [
-+ "cfg-if",
++ "cfg-if 0.1.10",
+ "libc",
+ "wasi",
+]
@@ -231,9 +243,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "hermit-abi"
-+version = "0.1.15"
++version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+dependencies = [
+ "libc",
+]
@@ -252,15 +264,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "libc"
-+version = "0.2.71"
++version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
-+
-+[[package]]
-+name = "maybe-uninit"
-+version = "2.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+
+[[package]]
+name = "memmap"
@@ -274,9 +280,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "memoffset"
-+version = "0.5.5"
++version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
++checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+dependencies = [
+ "autocfg",
+]
@@ -293,9 +299,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "once_cell"
-+version = "1.4.0"
++version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+
+[[package]]
+name = "os_pipe"
@@ -309,9 +315,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "ppv-lite86"
-+version = "0.2.8"
++version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "rand"
@@ -356,9 +362,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "rayon"
-+version = "1.3.1"
++version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
@@ -368,12 +374,12 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "rayon-core"
-+version = "1.7.1"
++version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+dependencies = [
++ "crossbeam-channel",
+ "crossbeam-deque",
-+ "crossbeam-queue",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
@@ -381,9 +387,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "redox_syscall"
-+version = "0.1.56"
++version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "remove_dir_all"
@@ -418,9 +424,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "subtle"
-+version = "1.0.0"
++version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
++checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
+
+[[package]]
+name = "tempfile"
@@ -428,7 +434,7 @@ index 0000000..1ce7abc
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+dependencies = [
-+ "cfg-if",
++ "cfg-if 0.1.10",
+ "libc",
+ "rand",
+ "redox_syscall",
@@ -464,6 +470,12 @@ index 0000000..1ce7abc
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
++name = "version_check"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
++
++[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix
index dd6a538d11d..d36dfc8e18c 100644
--- a/pkgs/tools/security/b3sum/default.nix
+++ b/pkgs/tools/security/b3sum/default.nix
@@ -2,25 +2,25 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
- version = "0.3.4";
+ version = "0.3.7";
src = fetchFromGitHub {
owner = "BLAKE3-team";
repo = "BLAKE3";
rev = version;
- sha256 = "02yyv91wvy5w7i05z6f3kzxm5x34a4xgkgmcqxnb0ivsxnnld73h";
+ sha256 = "0r3nj7jbrpb2gkkfa9h6nv6blrbv6dlrhxg131qnh340q1ysh0x7";
};
sourceRoot = "source/b3sum";
- cargoSha256 = "0ycn5788dc925wx28sgfs121w4x7yggm4mnmwij829ka8859bymk";
+ cargoSha256 = "0n8hp83hw7g260vmf4qcicpca75faam7k0zmb0k4cdzsar96gdrr";
- cargoPatches = [ ./add-cargo-lock.patch ];
+ cargoPatches = [ ./cargo-lock.patch ];
meta = {
description = "BLAKE3 cryptographic hash function";
homepage = "https://github.com/BLAKE3-team/BLAKE3/";
- maintainers = with lib.maintainers; [ fpletz ];
+ maintainers = with lib.maintainers; [ fpletz ivan ];
license = with lib.licenses; [ cc0 asl20 ];
};
}
diff --git a/pkgs/tools/security/b3sum/update-cargo-lock.sh b/pkgs/tools/security/b3sum/update-cargo-lock.sh
new file mode 100755
index 00000000000..8c52ad5cf6c
--- /dev/null
+++ b/pkgs/tools/security/b3sum/update-cargo-lock.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# This updates cargo-lock.patch for the b3sum version listed in default.nix.
+
+set -eu -o verbose
+
+here=$PWD
+version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
+checkout=$(mktemp -d)
+git clone -b "$version" --depth=1 https://github.com/BLAKE3-team/BLAKE3 "$checkout"
+cd "$checkout"
+
+(cd b3sum && cargo generate-lockfile)
+mv b3sum/Cargo.lock ./
+git add -f Cargo.lock
+git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
+
+cd "$here"
+rm -rf "$checkout"
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 19dd9e9819a..0065758e1c3 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "chrome-token-signing";
- version = "1.1.2";
+ version = "1.1.2-1";
src = fetchFromGitHub {
owner = "open-eid";
repo = "chrome-token-signing";
rev = "v${version}";
- sha256 = "0fqgci4336fbnd944zx9w37d5ky7i27n6wvlp5zv3hj955ldbh7g";
+ sha256 = "1vbghy12fjmq4m5l7hisq1ylnzy0rdnnd920xwamjamlx38jj3ln";
};
buildInputs = [ qmake pcsclite pkgconfig ];
diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index d31ad30ff61..114807bf124 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
- version = "3.16.1";
+ version = "3.17.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
- sha256 = "141ic9vgkqv3hdcpj1dlb4lawzd2rm7h2np21x28mmsd0hlg6v7y";
+ sha256 = "178kn9bn17xgv4vfg38mcb3gdnxxhjk09p8qywiwjypbjqg4zidi";
};
vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";
diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix
index e2392df495f..3cf3a1b116b 100644
--- a/pkgs/tools/system/netdata/go.d.plugin.nix
+++ b/pkgs/tools/system/netdata/go.d.plugin.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "netdata-go.d.plugin";
- version = "0.20.0";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "netdata";
repo = "go.d.plugin";
rev = "v${version}";
- sha256 = "0wd1wg56q955jm5ksq2zqzlms1nlxx7n7vv43l096k1578fv93jv";
+ sha256 = "0cp1asw10a8ndndzq8r57mncrm8521aw3x081vrlfqvhp6qahr3j";
};
- vendorSha256 = "1k84l97fw4s9jdwbka4p168m7l7wil0c4cpijis8ypj3g1xfrw90";
+ vendorSha256 = "16b6i9cpk8j7292qgjvida70rg7nixi6g94wayzikx01vmdbis5r";
doCheck = false;
diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix
new file mode 100644
index 00000000000..fa58d110550
--- /dev/null
+++ b/pkgs/tools/text/chars/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "chars";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "antifuchs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1pyda3b6svxzc98d7ggl7v9xd0xhilmpjrnajzh77zcwzq42s17l";
+ };
+
+ cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5";
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+ meta = with stdenv.lib; {
+ description = "Commandline tool to display information about unicode characters";
+ homepage = "https://github.com/antifuchs/chars";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bbigras ];
+ };
+}
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 0dd01d382ed..fc0ec487ad5 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
- version = "5.0";
+ version = "5.1";
src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
- sha256 = "1jyd4z62ldwhqx9r7v4b9k4pl300wr4b7ggj4f0yjf0gpwg7l9p7";
+ sha256 = "07a2cxsa04lzifphlf5mv88xpnixalmryd0blawblxsmdyhmvg3y";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix
index 08351dd6f3e..391c78814e7 100644
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/pkgs/tools/typesetting/asciidoctorj/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "asciidoctorj";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchzip {
url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
- sha256 = "1m00cdg1520ampg3i2j64si8gmwph7j4189agjlimx3fjjsp3xrh";
+ sha256 = "1b4ivyzpg9p3idk48nfvgpz18qlxyycswkaab31j3dp1mniwvjla";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
index 7edbeee88b5..61da0d86e33 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "rootlesskit";
- version = "0.11.0";
+ version = "0.11.1";
goPackagePath = "github.com/rootless-containers/rootlesskit";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "rootlesskit";
rev = "v${version}";
- sha256 = "1x5f02yw5bzkjwg7lcsa7549d8fj13dnk596rgg90q0z6vqfarzj";
+ sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r";
};
meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f38cc951117..c14eff0267d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -230,6 +230,8 @@ in
device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {};
+ devour = callPackage ../tools/X11/devour {};
+
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
@@ -962,6 +964,10 @@ in
charm = callPackage ../applications/misc/charm { };
+ chars = callPackage ../tools/text/chars {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
@@ -2875,7 +2881,7 @@ in
clementineUnfree = clementine.unfree;
- mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { };
+ mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
ciopfs = callPackage ../tools/filesystems/ciopfs { };
@@ -7466,6 +7472,8 @@ in
swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
+ swapview = callPackage ../os-specific/linux/swapview/default.nix { };
+
swec = callPackage ../tools/networking/swec { };
svnfs = callPackage ../tools/filesystems/svnfs { };
@@ -13551,6 +13559,8 @@ in
lasso = callPackage ../development/libraries/lasso { };
+ LAStools = callPackage ../development/libraries/LAStools { };
+
LASzip = callPackage ../development/libraries/LASzip { };
LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { };
@@ -17648,6 +17658,8 @@ in
webmetro = callPackage ../servers/webmetro { };
+ wsdd = callPackage ../servers/wsdd { };
+
webhook = callPackage ../servers/http/webhook { };
winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat.";
@@ -22940,7 +22952,7 @@ in
obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
- obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { };
+ obs-ndi = libsForQt5.callPackage ../applications/video/obs-studio/obs-ndi.nix { };
obsidian = callPackage ../applications/misc/obsidian { };
@@ -27098,6 +27110,8 @@ in
netlogo = callPackage ../applications/science/misc/netlogo { };
+ nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { };
+
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
root = callPackage ../applications/science/misc/root {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55f859d0305..2a0b5f7198d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7011,6 +7011,8 @@ in {
sumo = callPackage ../development/python-modules/sumo { };
+ sumtypes = callPackage ../development/python-modules/sumtypes { };
+
sunpy = callPackage ../development/python-modules/sunpy { };
supervise_api = callPackage ../development/python-modules/supervise_api { };