diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 22dc8578b26f..7adf629cc0ab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9044,6 +9044,12 @@
githubId = 116740;
name = "Paweł Pacana";
};
+ pb- = {
+ email = "pbaecher@gmail.com";
+ github = "pb-";
+ githubId = 84886;
+ name = "Paul Baecher";
+ };
pbogdan = {
email = "ppbogdan@gmail.com";
github = "pbogdan";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 2a65b2f11a88..d02f951a03ca 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -83,11 +83,22 @@
release based on GTK+3 and Python 3.
+
+
+ The writers.writePython2 and corresponding
+ writers.writePython2Bin convenience
+ functions to create executable Python 2 scripts in the store
+ were removed in preparation of removal of the Python 2
+ interpreter. Scripts have to be converted to Python 3 for use
+ with writers.writePython3 or
+ writers.writePyPy2 needs to be used.
+
+
Other Notable Changes
-
+
The option
@@ -113,6 +124,16 @@
socket /run/redis-${serverName}/redis.sock.
+
+
+ The
+ writers.writePyPy2/writers.writePyPy3
+ and corresponding
+ writers.writePyPy2Bin/writers.writePyPy3Bin
+ convenience functions to create executable Python 2/3 scripts
+ using the PyPy interpreter were added.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 2c75718bb1ed..11e5462b3316 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -34,6 +34,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.
Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3.
+- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
+ Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
+
## Other Notable Changes {#sec-release-22.05-notable-changes}
- The option [services.redis.servers](#opt-services.redis.servers) was added
@@ -51,3 +54,5 @@ In addition to numerous new and upgraded packages, this release has the followin
are only accessible by default
to the members of the Unix group `redis-${serverName}`
through the Unix socket `/run/redis-${serverName}/redis.sock`.
+
+- The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index d9df34c41f78..6ba52306e8c4 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "sha256-fZ0yQGLGnEFxt+OiG9J+niYzvttybudfciu5xo104Qo=";
+ sha256 = "sha256-k4EGyQjjJCvUhp56OjYl63n+giI05GiIS2++I1SVhCg=";
};
- cargoSha256 = "sha256-i3/96rVfP8TbIz3pNArTp8w27rfp1aPhohfFMMHgubo=";
+ cargoSha256 = "sha256-YsjInqmkPnAwqgRBDiwcLH0DDqCF0NElrn+WO2v+ATM=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix
index fb076797fb5f..4a2ad9ab779e 100644
--- a/pkgs/applications/audio/pamix/default.nix
+++ b/pkgs/applications/audio/pamix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config, cmake
, libpulseaudio, ncurses }:
@@ -13,6 +13,20 @@ stdenv.mkDerivation rec {
sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp";
};
+ patches = [
+ # ncurses-6.3 support, included in next release
+ (fetchpatch {
+ name = "ncurses-6.3-p1.patch";
+ url = "https://github.com/patroclos/PAmix/commit/3400b9c048706c572373e4617b4d5fcdb8dd2505.patch";
+ sha256 = "0rw56a844pz876ad9p8hfvn2fkd5rh29gpp47h55g08spf0vwb2z";
+ })
+ (fetchpatch {
+ name = "ncurses-6.3-p2.patch";
+ url = "https://github.com/patroclos/PAmix/commit/5ef67fc5ef6fc0dc0b48ff07ba48093881561d9c.patch";
+ sha256 = "0f8shpdv2swxdz04bkqgmkvl6c17r5mn4slzr7xd6pvw8hh51p4h";
+ })
+ ];
+
preConfigure = ''
substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg"
'';
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index dacf91e56229..bfeb8a7dab3a 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -9,16 +9,16 @@
rustPackages.rustPlatform.buildRustPackage rec {
pname = "spotifyd";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "Spotifyd";
repo = "spotifyd";
rev = "v${version}";
- sha256 = "1a578h13iv8gqmskzlncfr42jlg5gp0zfcizv4wbd48y9hl8fh2l";
+ sha256 = "1liql2wp7cx0x4ha1578wx3m4byd295m4ph268s05yw2wrnr3v6c";
};
- cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z";
+ cargoSha256 = "1plvqd55d1gj0ydimv3154pwgj2sh1fqx2182nw8akzdfmzg1150";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index c52e43373c17..29c063633fce 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -2,7 +2,7 @@
, zlib, jdk, glib, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
, makeWrapper, perl, ... }:
-{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }:
+{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }:
stdenv.mkDerivation rec {
inherit name src;
@@ -37,13 +37,12 @@ stdenv.mkDerivation rec {
# settings in ~/.eclipse/org.eclipse.platform_ rather
# than ~/.eclipse/org.eclipse.platform__.
productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
- productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
+ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"
# Create desktop item.
mkdir -p $out/share/applications
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 77cf5088a406..c97cbaf60ea5 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -16,18 +16,21 @@ assert stdenv ? glibc;
let
platform_major = "4";
- platform_minor = "21";
+ platform_minor = "22";
year = "2021";
- month = "09";
- timestamp = "${year}${month}060500";
+ month = "12"; #release month
+ buildmonth = "11"; #sometimes differs from release month
+ timestamp = "${year}${buildmonth}241800";
gtk = gtk3;
in rec {
- buildEclipse = callPackage ./build-eclipse.nix {
+ # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
+ buildEclipseUnversioned = callPackage ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk
makeWrapper;
};
+ buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });
### Eclipse CPP
@@ -37,7 +40,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "3xdj7b0mlhdys9q4l19kkf1hm0d67dwx55gzfmgv90nvswv0jhyvs42my4wrlrmkh6lz8m0z6dakadhl1bxf2fd8pdp5sm4bv0w0gwc";
+ hash = "sha512-Lniaw8aUptHI0a75olTNHaMba+ugUdJKf9sJ0hGzKqY94vvfU3N2TH5eQBeXb1MyQdRdBL1D8Vs3+LD9lWlTMg==";
};
};
@@ -49,7 +52,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "20xy4vzqlmg4sdvqimz2nc212vb45k5kwh40qagm13r6h3vfv3yrl8bznnappaf4msfa9xdaxns2kz0x94hw444zjmrnbf7614a48xi";
+ hash = "sha512-F/5yroFDbrSclmUP5vTNSkYR+OZ1dkPv2FPZT1XM5HFoynitYkDxnj+uTcJIBOWv3Zu1plU4yweW0DF1E9jLcg==";
};
};
@@ -61,16 +64,17 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "29hab3ha3spk0048k3mf2x5m80hlh1l6nazsykx0xxrqy9vdkdibv6mq74dzf1n93h1bd5qh9axicnhs465kp7r1irdl04761c1wibi";
+ hash = "sha512-3XsBk8/KHtTjit/WMneOghuOkqEHOIdLwof7718dsrDP4vfgcfhb47V7fPYDOw2eld88pHk+85mTGpZOTTywxw==";
};
};
### Eclipse Scala SDK
eclipse-scala-sdk =
- buildEclipse.override { jdk = jdk8; gtk = gtk2; } {
+ buildEclipseUnversioned.override { jdk = jdk8; gtk = gtk2; } {
name = "eclipse-scala-sdk-4.7.0";
description = "Eclipse IDE for Scala Developers";
+ productVersion = "4.7";
src =
fetchurl {
url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz";
@@ -86,7 +90,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "3ag7nfpnn1149gkva58x0037pbdb5wds0qpwv21lif7a6b1a1n7g2n056bn43a7fkxkkj38752gkz29nvqh5g8hqkg29lax8sjlm7sm";
+ hash = "sha512-7bTYIFnX8oUPaqDrMOlGNnpyC+xvDQsNmgZUps/epGkzM9Fjlc2lPr75VR7UaezBCoAuNTSHCYtG5d6TJOKjmQ==";
};
};
@@ -98,7 +102,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "27h5wjr4k0jhi256rk74kbjbm5h7xi4hbml89n1jhppq1yfyv2mf75zb32iaia2pxclx6hc0cd1hvq85fwvcshnq79fw8za687yvbhv";
+ hash = "sha512-ahykujYH9RLvxVMPFlFILGYJO0LXHvuhnILifeAo5v5Tp5ktGVlZWG461iZHETlt8Zr76liGAqm1ytQcuzCyQA==";
};
};
@@ -110,7 +114,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "03li2bkhkdybwp411xs8i3cp2hmrfg2xd7inbdsxh07y4b9806spi3q10vga97m7ngl6fl5n0mvgxwj8dbdvp133wn9mgrlajb1n4n8";
+ hash = "sha512-CuKxjcnvkROURtavZJN0AhCuA0x7NayZTpIOn9oE21rUzVqR0p7x7C5RPtMZ9gS4ZMWcYyQDJ0BVgRHBoKsYqQ==";
};
};
@@ -122,7 +126,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "38xwwvg59bdp0a6brmcvq0wlfikik0wnqq897abf5a8vyr0ci7xp5f4ii90x2l5sj5gmcc6jiwvi99c03cjbgivpalr741yka0p3pv5";
+ hash = "sha512-CqUbxUUMIJsXsx4XEOQ1d2L3U22VpAfQP+R8HNoVetDawhR+b2tyDVnTQRKTL4dJ0fjLXDeoHvTlPm1EXi/ahA==";
};
};
@@ -134,7 +138,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "30hhy83lmjldcwwbjpk5q9zjai5r3xyhlrddalgrw8mspknayncaa2l32gg327fw0a8qaakzgwkh68gj81pmk3dps5wzy881pf22dhc";
+ hash = "sha256-ys3MjIBr2hLZC/GB8Am/Qlto4+dSzOoK9p7QF+GS0Eg=";
};
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 337479b16bc6..32b0dfd864f0 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -248,12 +248,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
# find current version at https://www.eclipse.org/cdt/downloads.php
- version = "10.4.1";
+ version = "10.5.0";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
- sha256 = "1l3v6dryaqifwrv2h4knwmpyf11qbyl04p7gcvgrx3hczc82a6p1";
+ hash = "sha256-0sf38Ekw9mMjiEmJDcunVL3VS3KqWVXKZlQIGBk4V4g=";
};
meta = with lib; {
diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix
index e0e41a78b9ce..436785c34f68 100644
--- a/pkgs/applications/editors/emacs/27.nix
+++ b/pkgs/applications/editors/emacs/27.nix
@@ -2,7 +2,6 @@ import ./generic.nix (rec {
version = "27.2";
sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";
patches = fetchpatch: [
- ./tramp-detect-wrapped-gvfsd.patch
(fetchpatch {
name = "fix-aarch64-darwin-triplet.patch";
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index 2a1ed2f8b1a4..6b4491169212 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -64,6 +64,16 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
rm -fr .git
'')
+ # Add the name of the wrapped gvfsd
+ # This used to be carried as a patch but it often got out of sync with upstream
+ # and was hard to maintain for emacs-overlay.
+ (lib.concatStrings (map (fn: ''
+ sed -i 's#(${fn} "gvfs-fuse-daemon")#(${fn} "gvfs-fuse-daemon") (${fn} ".gvfsd-fuse-wrapped")#' lisp/net/tramp-gvfs.el
+ '') [
+ "tramp-compat-process-running-p"
+ "tramp-process-running-p"
+ ]))
+
# Reduce closure size by cleaning the environment of the emacs dumper
''
substituteInPlace src/Makefile.in \
diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch
deleted file mode 100644
index 5d16194fd202..000000000000
--- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
-index f370abba31..f2806263a9 100644
---- a/lisp/net/tramp-gvfs.el
-+++ b/lisp/net/tramp-gvfs.el
-@@ -164,7 +164,8 @@ tramp-gvfs-enabled
- (and (featurep 'dbusbind)
- (tramp-compat-funcall 'dbus-get-unique-name :system)
- (tramp-compat-funcall 'dbus-get-unique-name :session)
-- (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
-+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
-+ (tramp-compat-process-running-p "gvfs-fuse-daemon")
- (tramp-compat-process-running-p "gvfsd-fuse"))))
- "Non-nil when GVFS is available.")
-
diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
deleted file mode 100644
index b27dfd47e60e..000000000000
--- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
-index 9e26c8fd6d..fa220e513c 100644
---- a/lisp/net/tramp-gvfs.el
-+++ b/lisp/net/tramp-gvfs.el
-@@ -125,5 +125,6 @@
- ;; for some processes. Better we don't check.
- (<= emacs-major-version 25)
- (tramp-compat-process-running-p "gvfs-fuse-daemon")
-+ (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
- (tramp-compat-process-running-p "gvfsd-fuse"))))
- "Non-nil when GVFS is available.")
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index fd56434e7b04..0cf3ba1bd2c8 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -14,17 +14,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1w28rmb9fi45s85rrlzzh6r826dnyisd6lh3j8ir4hx6d34cawsf";
- x86_64-darwin = "1fyg3ygqk0z3jcj5bskgprlq8k9j134y75xq06z4xbv1dhgwhswj";
- aarch64-linux = "0hha9ksbj51zmq0p3d1fwni4jd0yp0wab0w19carmbhnydhrgh22";
- aarch64-darwin = "1cmrh621z7ddl4qh95hm0nwzazshl71a43c6113jf4w6b1kvy5m5";
- armv7l-linux = "1kipvqc5hrpgsfw7x2ab5jydf7zksdd3q8qr2mg20kjsdi4skwy4";
+ x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9";
+ x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig";
+ aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3";
+ aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz";
+ armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.63.0";
+ version = "1.63.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 4b795fceba2d..a224c88b761b 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "17kck7pkklhifm6hpsd93wmnyk06vi9sa55gp62m3diymp1b129z";
- x86_64-darwin = "1japc6yyvw07rll53pf2jfg89m2g9jqj5daghg10v1gqk98j7r3x";
- aarch64-linux = "0zg05q0hyldnw5g8b9zdf0ls4s07fixib7v830wa5dyi2sjcv149";
- armv7l-linux = "0mky66cyxhx3cfm35sa4vlwh8m1878rc80jml9mqxdhlrpnxgdiy";
+ x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq";
+ x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk";
+ aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5";
+ armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn";
}.${system};
sourceRoot = {
@@ -31,7 +31,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.63.0";
+ version = "1.63.1";
pname = "vscodium";
executableName = "codium";
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 6a6666763c18..478a4fe74d13 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "grip";
- version = "4.2.2";
+ version = "4.2.3";
src = fetchurl {
url = "mirror://sourceforge/grip/grip-${version}.tar.gz";
- sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE=";
+ sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw=";
};
nativeBuildInputs = [ pkg-config libtool ];
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 4f2f800ebd25..a1788587d701 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "masterpdfeditor";
- version = "5.7.90";
+ version = "5.8.20";
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
- sha256 = "sha256-wUHLesJ/YV3QyTJfGUr1lFD55JBnfSmjO2VvriaqlII=";
+ sha256 = "sha256-2YfjTRTC/ZvgnV4tEY4wwoqUeUG8+0SCYuRPBzQ8ba4=";
};
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 9ff1182c1c8a..464085d2116d 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -93,11 +93,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.32.115";
+ version = "1.33.106";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "6DY3gLyaMSkjZEPR9o1hiuFFsL22bTeq2SN9Nt3DCSc=";
+ sha256 = "XSqlQyc6gJthchfmq29d5+OVVSaxYG7zpVZNFZpl67s=";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 7550e72277f5..feb6a0c4b77f 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.77.0.97";
+ version = "8.79.0.92";
rpath = lib.makeLibraryPath [
alsa-lib
@@ -69,7 +69,7 @@ let
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
- sha256 = "sha256-0u1fpKJrsEgbvTwdkqJZ/SwCRDmJwEi9IXHbMmY8MJI=";
+ sha256 = "sha256-wGt0zNBmJf5NJGGOopWNUoBoy8sr4jWp8UKLd8AudnM=";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 158f2aa327e0..f292adfa4273 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -6,11 +6,11 @@
mkDerivation rec {
pname = "teamviewer";
- version = "15.22.3";
+ version = "15.24.5";
src = fetchurl {
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
- sha256 = "15fvzhdq7mnx2l2w4byvij8ww16qwdlkbadal60rm66yzv79mv9w";
+ sha256 = "sha256-u4azVjwD5xTc0vWe8tDEx44rBdYFZljZPVQ0yilqeR0=";
};
unpackPhase = ''
diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix
new file mode 100644
index 000000000000..431bd3788e7d
--- /dev/null
+++ b/pkgs/applications/science/biology/subread/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchurl
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "subread";
+ version = "2.0.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz";
+ sha256 = "sha256-Vs7zovkU1DJxMGnVwoL0iDHDoezIlDKtVYDKoyKl9Ws=";
+ };
+
+ buildInputs = [
+ zlib
+ ];
+
+ configurePhase = ''
+ cd src
+ cp Makefile.${if stdenv.isLinux then "Linux" else "MacOS"} Makefile
+ '';
+
+ makeFlags = [ "CC_EXEC=cc" ];
+
+ installPhase = ''
+ mkdir $out
+ cp -r ../bin $out
+ '';
+
+ meta = with lib; {
+ description = "High-performance read alignment, quantification and mutation discovery";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ jbedo ];
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ homepage = "http://subread.sourceforge.net/";
+ };
+
+}
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
index 7b45656c5e9c..f68c1ddc8a50 100644
--- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix
+++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
- version = "20.0";
+ version = "20.1";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
- sha256 = "1j2p2phv1fxsa2mdr66gyswqgij33m3sdaa460xrf98dm581bqw2";
+ sha256 = "1r55ykxwa0xr1f9sp7mnv8nqf0dr7vw62b1w8r7mmyrndwnq6z5b";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
- cargoSha256 = "12fmpq1y29mawa3xdwbwa3fw2hnhy5rqhlx54qp0s3x9g2jd7gsa";
+ cargoSha256 = "07wpfhlp82hp3hr8vc52vhkrxd8xpyvdvfqh1dn1fnhxk3b1z7lz";
meta = with lib; {
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index ebfaac0bde1f..cd8a1f5041aa 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "docker-slim";
- version = "1.37.2";
+ version = "1.37.3";
goPackagePath = "github.com/docker-slim/docker-slim";
@@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
- sha256 = "1svhi9xf71zrk843bnwkpmq4iaaln07dpfrdvq0vdqhj5xvbx47g";
+ sha256 = "sha256-jzwQ3nrhLDiQXcVkPiXrRAmpLQOD8ILBnoCEUiEbxzw=";
};
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
diff --git a/pkgs/build-support/writers/aliases.nix b/pkgs/build-support/writers/aliases.nix
new file mode 100644
index 000000000000..fb108a6fd857
--- /dev/null
+++ b/pkgs/build-support/writers/aliases.nix
@@ -0,0 +1,35 @@
+lib: prev:
+
+let
+ # Removing recurseForDerivation prevents derivations of aliased attribute
+ # set to appear while listing all the packages available.
+ removeRecurseForDerivations = alias: with lib;
+ if alias.recurseForDerivations or false then
+ removeAttrs alias ["recurseForDerivations"]
+ else alias;
+
+ # Disabling distribution prevents top-level aliases for non-recursed package
+ # sets from building on Hydra.
+ removeDistribute = alias: with lib;
+ if isDerivation alias then
+ dontDistribute alias
+ else alias;
+
+ # Make sure that we are not shadowing something from
+ # writers.
+ checkInPkgs = n: alias: if builtins.hasAttr n prev
+ then throw "Alias ${n} is still in writers"
+ else alias;
+
+ mapAliases = aliases:
+ lib.mapAttrs (n: alias: removeDistribute
+ (removeRecurseForDerivations
+ (checkInPkgs n alias)))
+ aliases;
+
+in
+mapAliases ({
+ /* Cleanup before 22.05, Added 2021-12-11 */
+ writePython2 = "Python 2 is EOL and the use of writers.writePython2 is deprecated.";
+ writePython2Bin = "Python 2 is EOL and the use of writers.writePython2Bin is deprecated.";
+})
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 3797df56afa5..30301e3b2e54 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -1,7 +1,9 @@
-{ pkgs, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }:
+{ pkgs, config, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }:
-with lib;
-rec {
+let
+ aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else prev: {};
+
+ writers = with lib; rec {
# Base implementation for non-compiled executables.
# Takes an interpreter, for example `${pkgs.bash}/bin/bash`
#
@@ -245,11 +247,11 @@ rec {
'');
} name;
- # writePython2 takes a name an attributeset with libraries and some python2 sourcecode and
+ # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and
# returns an executable
#
# Example:
- # writePython2 "test_python2" { libraries = [ pkgs.python2Packages.enum ]; } ''
+ # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } ''
# from enum import Enum
#
# class Test(Enum):
@@ -257,11 +259,11 @@ rec {
#
# print Test.a
# ''
- writePython2 = makePythonWriter pkgs.python2 pkgs.python2Packages;
+ writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages;
- # writePython2Bin takes the same arguments as writePython2 but outputs a directory (like writeScriptBin)
- writePython2Bin = name:
- writePython2 "/bin/${name}";
+ # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin)
+ writePyPy2Bin = name:
+ writePyPy2 "/bin/${name}";
# writePython3 takes a name an attributeset with libraries and some python3 sourcecode and
# returns an executable
@@ -280,4 +282,25 @@ rec {
# writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin)
writePython3Bin = name:
writePython3 "/bin/${name}";
-}
+
+ # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and
+ # returns an executable
+ #
+ # Example:
+ # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } ''
+ # import yaml
+ #
+ # y = yaml.load("""
+ # - test: success
+ # """)
+ # print(y[0]['test'])
+ # ''
+ writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages;
+
+ # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin)
+ writePyPy3Bin = name:
+ writePyPy3 "/bin/${name}";
+
+};
+in
+writers // (aliases writers)
diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 69bc7dd2c61a..decd7e42d5cc 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -3,8 +3,9 @@
, lib
, nodePackages
, perlPackages
-, python2Packages
+, pypy2Packages
, python3Packages
+, pypy3Packages
, runCommand
, writers
, writeText
@@ -54,7 +55,7 @@ let
print "success\n" if true;
'';
- python2 = writePython2Bin "test-writers-python2-bin" { libraries = [ python2Packages.enum ]; } ''
+ pypy2 = writePyPy2Bin "test-writers-pypy2-bin" { libraries = [ pypy2Packages.enum ]; } ''
from enum import Enum
@@ -73,6 +74,15 @@ let
""")
print(y[0]['test'])
'';
+
+ pypy3 = writePyPy3Bin "test-writers-pypy3-bin" { libraries = [ pypy3Packages.pyyaml ]; } ''
+ import yaml
+
+ y = yaml.load("""
+ - test: success
+ """)
+ print(y[0]['test'])
+ '';
};
simple = {
@@ -111,7 +121,7 @@ let
print "success\n" if true;
'';
- python2 = writePython2 "test-writers-python2" { libraries = [ python2Packages.enum ]; } ''
+ pypy2 = writePyPy2 "test-writers-pypy2" { libraries = [ pypy2Packages.enum ]; } ''
from enum import Enum
@@ -131,13 +141,26 @@ let
print(y[0]['test'])
'';
- python2NoLibs = writePython2 "test-writers-python2-no-libs" {} ''
+ pypy3 = writePyPy3 "test-writers-pypy3" { libraries = [ pypy3Packages.pyyaml ]; } ''
+ import yaml
+
+ y = yaml.load("""
+ - test: success
+ """)
+ print(y[0]['test'])
+ '';
+
+ pypy2NoLibs = writePyPy2 "test-writers-pypy2-no-libs" {} ''
print("success")
'';
python3NoLibs = writePython3 "test-writers-python3-no-libs" {} ''
print("success")
'';
+
+ pypy3NoLibs = writePyPy3 "test-writers-pypy3-no-libs" {} ''
+ print("success")
+ '';
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index f23120c0b6dd..5aa61062a8f6 100644
--- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -28,17 +28,15 @@
stdenv.mkDerivation rec {
pname = "elementary-dock";
- version = "unstable-2021-11-08";
+ version = "unstable-2021-12-08";
outputs = [ "out" "dev" ];
- repoName = "dock";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
- rev = "51e8d3ddfbed0dfce3158d80f997ab183e92567b";
- sha256 = "sha256-w6HGxEAXNod/uMEEfSz9nRNTRrCbcEqJCP9EFkVbX1U=";
+ repo = "dock";
+ rev = "5e4b5ba2eec3b522e107ad834a59c0f1271d4699";
+ sha256 = "sha256-/Ul21t9VFxhmlQbfx4eY86UKU33hiRfXF9OPHBzPe5o=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 940b379173fb..a91105adc33e 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -4,20 +4,20 @@ let
getPatches = dir:
let files = builtins.attrNames (builtins.readDir dir);
in map (f: dir + ("/" + f)) files;
- version = "2.5.1";
+ version = "2.8.0";
channel = "stable";
filename = "flutter_linux_${version}-${channel}.tar.xz";
# Decouples flutter derivation from dart derivation,
# use specific dart version to not need to bump dart derivation when bumping flutter.
- dartVersion = "2.14.2";
+ dartVersion = "2.15.0";
dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
dartForFlutter = dart.override {
version = dartVersion;
sources = {
"${dartVersion}-x86_64-linux" = fetchurl {
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
- sha256 = "1gr2dr683kz0a0k6rcn4jcbxf9fr2xlzi5fcgn1lzrrxvys2lddx";
+ sha256 = "sha256-U1V1OPmFeNZCdBxFy7yqAbAE0cxh9f2UqKQmreJu9YA=";
};
};
};
@@ -29,7 +29,7 @@ in {
pname = "flutter";
src = fetchurl {
url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
- sha256 = "12ycz7iasrc9p9c6zr95l6llyji3za43gsx8cmr2kjfiv23bcrv2";
+ sha256 = "sha256-sSz/owGdCMB5b9+cAWvLkrfFcIIq5665Xopd4JKv1G4=";
};
patches = getPatches ./patches;
};
diff --git a/pkgs/development/compilers/flutter/patches/move-cache.patch b/pkgs/development/compilers/flutter/patches/move-cache.patch
index 2610c155804b..533d2d5d8a66 100644
--- a/pkgs/development/compilers/flutter/patches/move-cache.patch
+++ b/pkgs/development/compilers/flutter/patches/move-cache.patch
@@ -1,62 +1,57 @@
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
-index 80fb16673f..5723f93f9f 100644
+index ed42baea29..fee2fb1d62 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
-@@ -7,6 +7,7 @@
- import 'package:meta/meta.dart';
- import 'package:package_config/package_config.dart';
-
-+import 'base/common.dart';
- import 'base/context.dart';
- import 'base/deferred_component.dart';
- import 'base/file_system.dart';
-@@ -16,6 +17,7 @@ import 'build_info.dart';
- import 'cache.dart';
+@@ -11,11 +11,11 @@ import 'base/file_system.dart';
+ import 'base/logger.dart';
+ import 'base/platform.dart';
+ import 'build_info.dart';
+-import 'cache.dart';
import 'convert.dart';
import 'dart/package_map.dart';
-+import 'globals.dart' as globals;
import 'devfs.dart';
import 'flutter_manifest.dart';
++import 'globals.dart' as globals;
import 'license_collector.dart';
-@@ -449,7 +451,7 @@ class ManifestAssetBundle implements AssetBundle {
- for (final Map font in family['fonts'] as List>) {
- final Uri entryUri = _fileSystem.path.toUri(font['asset'] as String);
+ import 'project.dart';
+
+@@ -504,7 +504,7 @@ class ManifestAssetBundle implements AssetBundle {
+ }
+ final Uri entryUri = _fileSystem.path.toUri(asset);
result.add(_Asset(
-- baseDir: _fileSystem.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
-+ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
+- baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),
++ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, 'bin', 'cache', 'artifacts', 'material_fonts'),
relativeUri: Uri(path: entryUri.pathSegments.last),
entryUri: entryUri,
package: null,
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
-index 152d4e75e5..1fcff7e2bd 100644
+index 7870c7807f..3fcf92f20d 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -9,6 +9,7 @@ import 'package:file/memory.dart';
- import 'package:meta/meta.dart';
- import 'package:process/process.dart';
-
+@@ -22,6 +22,7 @@ import 'base/user_messages.dart';
+ import 'build_info.dart';
+ import 'convert.dart';
+ import 'features.dart';
+import 'globals.dart' as globals;
- import 'base/common.dart';
- import 'base/error_handling_io.dart';
- import 'base/file_system.dart';
-@@ -298,8 +299,15 @@ class Cache {
+
+ const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
+ const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
+@@ -302,8 +303,13 @@ class Cache {
return;
}
assert(_lock == null);
-+
+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
+ if (!dir.existsSync()) {
+ dir.createSync(recursive: true);
+ globals.os.chmod(dir, '755');
+ }
-+
final File lockFile =
- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile'));
+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile'));
try {
_lock = lockFile.openSync(mode: FileMode.write);
} on FileSystemException catch (e) {
-@@ -404,7 +412,7 @@ class Cache {
+@@ -453,7 +459,7 @@ class Cache {
if (_rootOverride != null) {
return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
} else {
diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix
index 93ee83cb0abe..93423d5a1b29 100644
--- a/pkgs/development/compilers/ldc/generic.nix
+++ b/pkgs/development/compilers/ldc/generic.nix
@@ -132,6 +132,6 @@ stdenv.mkDerivation rec {
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
maintainers = with maintainers; [ ThomasMader lionello ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
+ platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index e7b86eef96c2..1931867d14f9 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -299,4 +299,8 @@ in {
inherit passthruFun;
};
+ rustpython = callPackage ./rustpython/default.nix {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+ };
+
})
diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix
new file mode 100644
index 000000000000..ad4382203223
--- /dev/null
+++ b/pkgs/development/interpreters/python/rustpython/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, SystemConfiguration
+, python3
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rustpython";
+ version = "unstable-2021-12-09";
+
+ src = fetchFromGitHub {
+ owner = "RustPython";
+ repo = "RustPython";
+ rev = "db3b3127df34ff5dd569301aa36ed71ae5624e4e";
+ sha256 = "sha256-YwGfXs3A5L/18mHnnWubPU3Y8EI9uU3keJ2HJnnTwv0=";
+ };
+
+ cargoHash = "sha256-T85kiPG80oZ4mwpb8Ag40wDHKx2Aens+gM7NGXan5lM=";
+
+ # freeze the stdlib into the rustpython binary
+ cargoBuildFlags = "--features=freeze-stdlib";
+
+ buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+
+ checkInputs = [ python3 ];
+
+ meta = with lib; {
+ description = "Python 3 interpreter in written Rust";
+ homepage = "https://rustpython.github.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ prusnak ];
+
+ # TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions.
+ # Probably macOS SDK 10.13 or later. Check the current version in
+ # .../os-specific/darwin/apple-sdk/default.nix
+ #
+ # From the build logs:
+ #
+ # > Undefined symbols for architecture x86_64: "_utimensat"
+ broken = stdenv.isDarwin && stdenv.isx86_64;
+ };
+}
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index 3d2a83dca4f4..983ec33cdbdf 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl
+, fetchpatch
, autoconf
, automake
, pkg-config
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z";
};
+ patches = [
+ (fetchpatch { # included in > 2.3.3
+ name = "restore-GD_FLIP.patch";
+ url = "https://github.com/libgd/libgd/commit/f4bc1f5c26925548662946ed7cfa473c190a104a.diff";
+ sha256 = "XRXR3NOkbEub3Nybaco2duQk0n8vxif5mTl2AUacn9w=";
+ })
+ ];
+
hardeningDisable = [ "format" ];
# -pthread gets passed to clang, causing warnings
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index ca2e240dd869..e9935317cdf0 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -207,8 +207,8 @@ in {
};
openssl_3_0 = common {
- version = "3.0.0";
- sha256 = "sha256-We7fy0bCUhTJvTftYHgpe03wHQEiZ/6enu4x9hvHBTY=";
+ version = "3.0.1";
+ sha256 = "sha256-wxGthTNTvOeW7a0BqGLFCopYf2Ln4hAO9GWrU+ybBtE=";
patches = [
./3.0/nix-ssl-cert-file.patch
diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix
index 80a5205a2301..c1a76e4149e6 100644
--- a/pkgs/development/ocaml-modules/sha/default.nix
+++ b/pkgs/development/ocaml-modules/sha/default.nix
@@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "sha";
- version = "1.14";
+ version = "1.15.1";
src = fetchurl {
url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
- sha256 = "114vydrfdp7fayigvgk3ckiby0kh4n49c1j53v8k40gk6nzm3l19";
+ sha256 = "sha256-cRtjydvwgXgimi6F3C48j7LrWgfMO6m9UJKjKlxvp0Q=";
};
useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix
index 82764af64f53..7dfb46ce63cf 100644
--- a/pkgs/development/ocaml-modules/wayland/default.nix
+++ b/pkgs/development/ocaml-modules/wayland/default.nix
@@ -12,15 +12,15 @@
buildDunePackage rec {
pname = "wayland";
- version = "0.2";
+ version = "1.0";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
- url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-v${version}.tbz";
- sha256 = "4eb323e42a8c64e9e49b15a588342bfcc1e99640305cb261d128c75612d9458c";
+ url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz";
+ sha256 = "bf8fd0057242d11f1c265c11cfa5de3c517ec0ad5994eae45e1efe3aac034510";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 944136840f63..53bebb6affa2 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "1.15.0";
+ version = "1.15.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "05jg8qm0ix02qvcjqcfalp15j22hzlf9wfdnhrll57bnwgk4kkf8";
+ sha256 = "1majsbpldsch3wgg7pdm87vk9dhqll9nk2pjjvqp8rvg93x2kkww";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index 52d1daa14d0f..afb81cc103bc 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "flask-appbuilder";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchPypi {
pname = "Flask-AppBuilder";
inherit version;
- sha256 = "a5dfb559a0e96dd06bf5ff023f72bb3cc855e6db68e573e70f30caa31840f50f";
+ sha256 = "c0830935077c4d06d57237ca4791fcabfc682fe3e315c1c9444a2bd6f94e7514";
};
# See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch
diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix
index 95e035864711..5ff88388818f 100644
--- a/pkgs/development/python-modules/manimpango/default.nix
+++ b/pkgs/development/python-modules/manimpango/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "manimpango";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "ManimCommunity";
repo = pname;
rev = "v${version}";
- sha256 = "ldZfvv5kloQ0uj0agxOP8cRh+Ix8f9Z0PT+pnhWYjiQ=";
+ sha256 = "1qffb04bz4s2anb6a7nm6dpqwdlvq6626z1whqwrwsvn8z9sry76";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix
index 6a7d5cfeb6e0..520af3062eac 100644
--- a/pkgs/development/python-modules/open-meteo/default.nix
+++ b/pkgs/development/python-modules/open-meteo/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "open-meteo";
- version = "0.2.0";
+ version = "0.2.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-open-meteo";
rev = "v${version}";
- sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs=";
+ sha256 = "0i8jmhd29vvkpfxs9l5wy8525ngs79mnc7si2j9b1nc41xrv91f6";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
index 5d17a907caeb..8701fa98e67d 100644
--- a/pkgs/development/python-modules/somajo/default.nix
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "SoMaJo";
- version = "2.1.5";
+ version = "2.1.6";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "tsproisl";
repo = pname;
rev = "v${version}";
- sha256 = "17v1vmbjwpxwql25vlbm7xsair7945ljmyaricxx8fd6fxvgn9rr";
+ sha256 = "1q88x05729qdnl1gbahisjk3s97wha0b5dj3n63kq2qyvyy0929s";
};
propagatedBuildInputs = [ regex ];
diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix
index 94de671acaf6..329ec20e2090 100644
--- a/pkgs/development/python-modules/tailscale/default.nix
+++ b/pkgs/development/python-modules/tailscale/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "tailscale";
- version = "0.1.4";
+ version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-tailscale";
rev = "v${version}";
- sha256 = "sha256-xRVkmofD2pOco0kJfVcmUaPow2ZZNEZrhvNmldUjQuw=";
+ sha256 = "1a33xibkbavl442sc7phvj6d6w17x91zh64f59w0xrsccabn25b1";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix
index 9d5f15a3e1b1..7447ce14cfca 100644
--- a/pkgs/development/python-modules/vehicle/default.nix
+++ b/pkgs/development/python-modules/vehicle/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "vehicle";
- version = "0.2.2";
+ version = "0.3.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-vehicle";
rev = "v${version}";
- sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo=";
+ sha256 = "0blpyh246l16bn6jy8ifym2br13k8qxagggbwpzwrwfxkb3kdz5x";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 0bf9715de6fb..cbdd2d37d80d 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tflint";
- version = "0.33.2";
+ version = "0.34.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-CjpeBB1krbRJxwfvBbhhHUf5IDOZFWRds/t9h22iLE0=";
+ sha256 = "sha256-MdA1bS8ZPsfwnmnmIKBissuvwWY9HHxoLJEfGcJQ3j0=";
};
vendorSha256 = "sha256-y+bPFCjgTu+C5Cx85lYRjUbLd6c5PcckXRpg102d1zk=";
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix
index 5b1fd72a7f51..25121bf1ad7d 100644
--- a/pkgs/development/tools/misc/tcptrack/default.nix
+++ b/pkgs/development/tools/misc/tcptrack/default.nix
@@ -1,16 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:
stdenv.mkDerivation rec {
pname = "tcptrack";
- version = "1.4.3";
+ version = "unstable-2017-04-29";
src = fetchFromGitHub {
owner = "bchretien";
repo = "tcptrack";
- rev = "d05fe08154ff1e46578e92be49e4cfa2c6543283";
- sha256 = "08lh3l67wn4kq9q0nfspc7rj0jvp9dzwjgxpvqliwcif8cy5mi45";
+ rev = "2b096ac103af2884bbd7648cff8adcbadbda9394";
+ sha256 = "0084g9s0ynv1az67j08q9nz4p07bqqz9k6w5lprzj3ljlh0x10gj";
};
+ patches = [
+ # Fix pending upstream inclusion for ncurses-6.3 support:
+ # https://github.com/bchretien/tcptrack/pull/10
+ (fetchpatch {
+ name = "ncurses-6.3.patch";
+ url = "https://github.com/bchretien/tcptrack/commit/409007afbce8ec5a81312a2a4123dd83b62b4494.patch";
+ sha256 = "00641jyr52ksww5bbzvxlprmbb36jnvzg2w1aj1jgnm75jiajcfc";
+ })
+ ];
+
buildInputs = [ ncurses libpcap ];
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
diff --git a/pkgs/games/fishfight/default.nix b/pkgs/games/fishfight/default.nix
index 420d024d5f67..422901fd9864 100644
--- a/pkgs/games/fishfight/default.nix
+++ b/pkgs/games/fishfight/default.nix
@@ -2,6 +2,7 @@
, rustPlatform
, fetchFromGitHub
, stdenv
+, SDL2
, alsa-lib
, libGL
, libX11
@@ -9,25 +10,28 @@
, AudioToolbox
, Cocoa
, CoreAudio
-, CoreFoundation
-, IOKit
, OpenGL
}:
rustPlatform.buildRustPackage rec {
pname = "fishfight";
- version = "0.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "fishfight";
repo = pname;
rev = "v${version}";
- sha256 = "0mbg9zshyg9hlbsk5npslbnwjf8fh6gxszi5hxks380z080cjxs2";
+ sha256 = "sha256-kLdk7zTICZ8iawNttTsWUVKGvh2zykXVsMqUyYoGrBs=";
};
- cargoSha256 = "sha256-fZXqJ6a2erAQSgAZRwmkor94eMryjiq3gbY102pJb9Q=";
+ # use system sdl2 instead of bundled sdl2
+ cargoPatches = [ ./use-system-sdl2.patch ];
- buildInputs = lib.optionals stdenv.isLinux [
+ cargoSha256 = "sha256-KQiqUzdsVMIjDmmreihekrrFoXeyNzd6ZbqApwH8B4Q=";
+
+ buildInputs = [
+ SDL2
+ ] ++ lib.optionals stdenv.isLinux [
alsa-lib
libGL
libX11
@@ -36,15 +40,11 @@ rustPlatform.buildRustPackage rec {
AudioToolbox
Cocoa
CoreAudio
- CoreFoundation
- IOKit
OpenGL
];
postPatch = ''
- substituteInPlace assets/levels/levels.toml --replace assets $out/share/assets
- substituteInPlace src/gui.rs --replace \"assets \"$out/share/assets
- substituteInPlace src/main.rs --replace \"assets \"$out/share/assets
+ substituteInPlace src/main.rs --replace ./assets $out/share/assets
'';
postInstall = ''
@@ -57,6 +57,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://fishfight.org/";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ figsoda ];
- mainProgram = "fishgame";
};
}
diff --git a/pkgs/games/fishfight/use-system-sdl2.patch b/pkgs/games/fishfight/use-system-sdl2.patch
new file mode 100644
index 000000000000..fcae36ce68b0
--- /dev/null
+++ b/pkgs/games/fishfight/use-system-sdl2.patch
@@ -0,0 +1,39 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -96,15 +96,6 @@ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+-[[package]]
+-name = "cmake"
+-version = "0.1.46"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089"
+-dependencies = [
+- "cc",
+-]
+-
+ [[package]]
+ name = "color_quant"
+ version = "1.1.0"
+@@ -605,7 +596,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "94cb479353c0603785c834e2307440d83d196bf255f204f7f6741358de8d6a2f"
+ dependencies = [
+ "cfg-if",
+- "cmake",
+ "libc",
+ "version-compare",
+ ]
+diff --git a/Cargo.toml b/Cargo.toml
+index d2af29e..a813f30 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -14,7 +14,7 @@ macroquad-profiler = "0.1"
+
+ ff-particles = { version = "0.1", features = ["serde"] }
+
+-fishsticks = { version = "0.2.0", features = ["bundled-sdl2"] }
++fishsticks = "0.2.0"
+
+ stunclient = { git = "https://github.com/not-fl3/rust-stunclient", default-features = false }
+
diff --git a/pkgs/games/gotypist/default.nix b/pkgs/games/gotypist/default.nix
index 00fc30718182..d7c9c33d7574 100644
--- a/pkgs/games/gotypist/default.nix
+++ b/pkgs/games/gotypist/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
'';
homepage = "https://github.com/pb-/gotypist";
license = licenses.mit;
- maintainers = [ "Paul Baecher" ];
+ maintainers = with maintainers; [ pb- ];
};
}
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix
index 7dda3b40ae3a..56d34ff93c14 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/games/quakespasm/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "quakespasm";
- version = "0.94.1";
+ version = "0.94.2";
src = fetchurl {
url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
- sha256 = "19grpvsk3ikjypx9j0gpfsx5wanrqxkgf8dwl9h6ab5c8wwmjcjp";
+ sha256 = "sha256-wIgtoJVZH14EKcVNqZdwV3a5jORptYkVMTW1UmvaHyo=";
};
sourceRoot = "${pname}-${version}/Quake";
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index e3f971923e8f..555f9f34689f 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1613,13 +1613,13 @@ let
mktplcRef = {
name = "vscode-ltex";
publisher = "valentjn";
- version = "13.0.0";
+ version = "13.1.0";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix";
- sha256 = "6db4846dee4e394f7bcfb7e29520d45d6bc1534482ba73cf40cd5edf3f6ec266";
+ sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6";
};
nativeBuildInputs = [ jq moreutils ];
diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix
index c81058b47b0f..3734d7c602da 100644
--- a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix
+++ b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix
@@ -1,17 +1,25 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, python3, fetchFromGitHub, pkg-config, openssl }:
rustPlatform.buildRustPackage rec {
pname = "rust-synapse-compress-state";
- version = "0.1.0";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "matrix-org";
repo = pname;
rev = "v${version}";
- sha256 = "15jvkpbq6pgdc91wnni8fj435yqlwqgx3bb0vqjgsdyxs5lzalfh";
+ sha256 = "sha256-uL7uoJPvZoTbrmEFY7jiBphvjWSRpH9pyk3x7s3Yvrs=";
};
- cargoSha256 = "173nylp9xj88cm42yggj41iqvgb25s3awhf1dqssy8f1zyw2cf3d";
+ cargoSha256 = "sha256-3w5RyVrpCnetXnxnzgVl94kUZa+1i9bU2O8vp7sb3lY=";
+
+ cargoBuildFlags = [
+ "--all"
+ ];
+
+ nativeBuildInputs = [ python3 pkg-config ];
+
+ buildInputs = [ openssl ];
meta = with lib; {
description = "A tool to compress some state in a Synapse instance's database";
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 918a20ce5a32..e84cac380ab3 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -1,7 +1,23 @@
-{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
-, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file
-, docbook_xml_dtd_43, libtool_2
-, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
+{ lib
+, stdenv
+, buildPackages
+, fetchurl
+, which
+, autoconf
+, automake
+, flex
+, bison
+, glibc
+, perl
+, libkrb5
+, libxslt
+, docbook_xsl
+, file
+, docbook_xml_dtd_43
+, libtool_2
+, withDevdoc ? false
+, doxygen
+, dblatex # Extra developer documentation
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
}:
@@ -10,13 +26,22 @@ with (import ./srcs.nix { inherit fetchurl; });
let
inherit (lib) optional optionalString optionals;
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
pname = "openafs";
inherit version srcs;
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
- which bison ] ++ optionals withDevdoc [ doxygen dblatex ];
+ nativeBuildInputs = [
+ autoconf
+ automake
+ flex
+ libxslt
+ libtool_2
+ perl
+ which
+ bison
+ ] ++ optionals withDevdoc [ doxygen dblatex ];
buildInputs = [ libkrb5 ncurses ];
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 2543aef37690..f8b2d222af17 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -1,5 +1,17 @@
-{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
-, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
+{ lib
+, stdenv
+, fetchurl
+, which
+, autoconf
+, automake
+, flex
+, bison
+, kernel
+, glibc
+, perl
+, libtool_2
+, libkrb5
+}:
with (import ./srcs.nix {
inherit fetchurl;
@@ -9,7 +21,8 @@ let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
@@ -18,23 +31,6 @@ in stdenv.mkDerivation {
buildInputs = [ libkrb5 ];
- patches = [
- # LINUX 5.14: explicitly set set_page_dirty to default
- ((fetchpatch {
- url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch";
- sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp";
- }).overrideAttrs (o: {
- postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
- }))
- # Linux 5.15: Convert osi_Msg macro to a function
- ((fetchpatch {
- url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch";
- sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g";
- }).overrideAttrs (o: {
- postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
- }))
- ];
-
hardeningDisable = [ "pic" ];
configureFlags = [
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix
index f35903e50916..b8ea522fe4fe 100644
--- a/pkgs/servers/openafs/1.8/srcs.nix
+++ b/pkgs/servers/openafs/1.8/srcs.nix
@@ -1,14 +1,16 @@
{ fetchurl }:
rec {
- version = "1.8.8";
+ version = "1.8.8.1";
src = fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
- sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA=";
+ sha256 = "sha256-58S+1wdbzWQC4/DC1bnb52rS7jxf1d3DlzozVsoj70Q=";
};
- srcs = [ src
+ srcs = [
+ src
(fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
- sha256 = "sha256-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U=";
- })];
+ sha256 = "sha256-y17O3C4WS+o7SMayydbxw2v96R0GikxiqciF30j+jms=";
+ })
+ ];
}
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index 8011dc211b85..4b4e6217c991 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "Tautulli";
- version = "2.7.6";
+ version = "2.7.7";
format = "other";
pythonPath = [ setuptools ];
@@ -12,7 +12,7 @@ buildPythonApplication rec {
owner = "Tautulli";
repo = pname;
rev = "v${version}";
- sha256 = "1j57n8bi8qzzx1nw23rfr1g8yidg7p600pbbfv4b1dfiw8633jsl";
+ sha256 = "03zqpffc0hc8lrnc9m9562lh154bv3cnfw0n5x7j4wqr2jp5kb2h";
};
installPhase = ''
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8a415c57a61f..27a4da9622bf 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -649,11 +649,30 @@ self: super:
];
postInstall = ":"; # prevent infinite recursion
});
+
+ fpgit = commit: sha256: name: fetchpatch (
+ {
+ url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/${commit}.diff";
+ inherit sha256;
+ } // lib.optionalAttrs (name != null) {
+ name = name + ".patch";
+ }
+ );
in
if (!isDarwin)
then {
outputs = [ "out" "dev" ];
patches = [
+ # https://lists.x.org/archives/xorg-announce/2021-December/003122.html
+ (fpgit "ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60"
+ "sNi16FqN4rS4s8j5+PUVeOQBasccCkB5KvywP7xl28M=" "CVE-2021-4008")
+ (fpgit "b5196750099ae6ae582e1f46bd0a6dad29550e02"
+ "5hgzQXBBaJfhSTa9hs8K2N1fQ6+Vp8TTkertmQhkw8Y=" "CVE-2021-4009")
+ (fpgit "6c4c53010772e3cb4cb8acd54950c8eec9c00d21"
+ "1gGG9RpjLMi7Emwh13/z5CN1+ISLsPL3hJXP5gQcNkE=" "CVE-2021-4010")
+ (fpgit "e56f61c79fc3cee26d83cda0f84ae56d5979f768"
+ "e1KgSXGwwI3GgcYeWaF3KHPmkE4tf9VTqvfTYqRpysY=" "CVE-2021-4011")
+
# The build process tries to create the specified logdir when building.
#
# We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index deec8d9b838b..66f9a724986c 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
version = "2021-12-13";
pname = "oh-my-zsh";
- rev = "9a3d853481645ae0f961e9cc8421fc5d84e2c3c3";
+ rev = "5403db85998ff0c087bc97d972e1e76551127b7e";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "TFktV7xBm3KaRfW+cUGdwIZZD7TfU0gaq4J8cKBjtMM=";
+ sha256 = "xv/qruRy96omAaboedcG6+KTkR3CkaFDgw/agihTCNs=";
};
installPhase = ''
diff --git a/pkgs/tools/misc/fbmark/default.nix b/pkgs/tools/misc/fbmark/default.nix
new file mode 100644
index 000000000000..fe8bca0e2240
--- /dev/null
+++ b/pkgs/tools/misc/fbmark/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "fbmark";
+ version = "0.3";
+
+ src = fetchFromGitHub {
+ owner = "caramelli";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0n2czl2sy1k6r5ri0hp7jgq84xcwrx4x43bqvw1b4na99mqhyahn";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with lib; {
+ description = "Linux Framebuffer Benchmark";
+ homepage = "https://github.com/caramelli/fbmark";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ davidak ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 6f77c54e30b4..4c230b2dab74 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fortune-mod";
- version = "3.6.1";
+ version = "3.8.0";
# We use fetchurl instead of fetchFromGitHub because the release pack has some
# special files.
src = fetchurl {
url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
- sha256 = "1cw7xf9xhh6d73y4h4q57g6akjhc1gq6xv37k57sx0wx77wjxqdp";
+ sha256 = "sha256-HXQYYWZhfYIT7wEr9FAymaQWEfg0DcaWT0z7yvcZ+BI=";
};
nativeBuildInputs = [ cmake perl ];
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix
index 194a0c62721d..089caac7884a 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/pkgs/tools/misc/mktorrent/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.1";
src = fetchFromGitHub {
- owner = "Rudde";
+ owner = "pobrn";
repo = "mktorrent";
rev = "v${version}";
sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];
meta = {
- homepage = "http://mktorrent.sourceforge.net/";
+ homepage = "https://github.com/pobrn/mktorrent/wiki";
license = lib.licenses.gpl2Plus;
description = "Command line utility to create BitTorrent metainfo files";
maintainers = with lib.maintainers; [Profpatsch];
diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index 52654a49d65f..1d482f2bebf1 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -13,15 +13,15 @@
rustPlatform.buildRustPackage rec {
pname = "httplz";
- version = "1.12.1";
+ version = "1.12.2";
src = fetchCrate {
inherit version;
pname = "https";
- sha256 = "sha256-vMhQHWzsZlqMVkEQHCZTB8T4ETTaf8iAS9QhgYdfcx0=";
+ sha256 = "sha256-FhxNYss6n0AJEszpJ7+6CAJE2sdsflWQkvSLakTnFdY=";
};
- cargoSha256 = "sha256-9gnKVZ3HQs3kNj4i1cgC+Jl3dhjx7QRaHSih1HOB3nI=";
+ cargoSha256 = "sha256-wyksA3RYpGkD6nhllNv8WkUwEdml4TiPM2a4GzfBD1o=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index a63db582301e..48b020256eab 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
- version = "2021-12-11";
+ version = "2021-12-14";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
- sha256 = "sha256-S0PlUSSVBI5OpEsd0BoDINdX+gpsP1GMs4uH6xvrs0I=";
+ sha256 = "sha256-Ojgd2B475+Zr7CODtgg7rJZ6bPT3ZYddSQhditI9HhU=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/gomapenum/default.nix b/pkgs/tools/security/gomapenum/default.nix
new file mode 100644
index 000000000000..f77b513c42da
--- /dev/null
+++ b/pkgs/tools/security/gomapenum/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "gomapenum";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "nodauf";
+ repo = "GoMapEnum";
+ rev = "v${version}";
+ sha256 = "sha256-6WZTmRse3mj1bimHE81JdSc4VKpMFbcJN3U4zgHMzJc=";
+ };
+
+ vendorSha256 = "sha256-Z/uLZIPKd75P9nI7kTFOwzWFkRTVwUojYEQms4OJ6Bk=";
+
+ postInstall = ''
+ mv $out/bin/src $out/bin/$pname
+ '';
+
+ meta = with lib; {
+ description = "Tools for user enumeration and password bruteforce";
+ homepage = "https://github.com/nodauf/GoMapEnum";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/tools/security/lmp/default.nix
new file mode 100644
index 000000000000..945bbbbd15c3
--- /dev/null
+++ b/pkgs/tools/security/lmp/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "lmp";
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "0xInfection";
+ repo = "LogMePwn";
+ rev = "v${version}";
+ sha256 = "sha256-EDhNnNmIVBtBj+zHjLzW60sdI0dH8cLvXDQBmVgM4hM=";
+ };
+
+ vendorSha256 = "sha256-X7Djcp4reOXL6SX4jiSLicolENu7Uo5webSePYrPKug=";
+
+ meta = with lib; {
+ description = "Scanning and validation toolkit for the Log4J vulnerability";
+ homepage = "https://github.com/0xInfection/LogMePwn";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/log4j-detect/default.nix b/pkgs/tools/security/log4j-detect/default.nix
new file mode 100644
index 000000000000..aaad1fb94efb
--- /dev/null
+++ b/pkgs/tools/security/log4j-detect/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "log4j-detect";
+ version = "unstable-2021-12-14";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "takito1812";
+ repo = pname;
+ rev = "2f5b7a598a6d0b4aee8111bb574ea72c6a1c76d6";
+ sha256 = "sha256-fFKW7uPBfrnze0UoPL3Mfwd4sFOuHYuDP7kv6VtdM3o=";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ requests
+ ];
+
+ postPatch = ''
+ sed -i "1 i #!/usr/bin/python" ${pname}.py
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -vD ${pname}.py $out/bin/${pname}
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Tool to detect the log4j vulnerability";
+ homepage = "https://github.com/takito1812/log4j-detect";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/log4j-scan/default.nix b/pkgs/tools/security/log4j-scan/default.nix
new file mode 100644
index 000000000000..142c1dd8c1b1
--- /dev/null
+++ b/pkgs/tools/security/log4j-scan/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "log4j-scan";
+ version = "unstable-2021-12-14";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "fullhunt";
+ repo = pname;
+ rev = "7be0f1c02ce3494469dc73a177e6f0c96f0016d9";
+ sha256 = "sha256-HazxK0wJ8xeFauD2xOxmOwWw1nEpQh+QdcBVZNaUgrM=";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ pycryptodome
+ requests
+ termcolor
+ ];
+
+ postPatch = ''
+ substituteInPlace log4j-scan.py \
+ --replace "headers.txt" "../share/headers.txt"
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -vD ${pname}.py $out/bin/${pname}
+ install -vD headers.txt headers-large.txt -t $out/share
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Scanner for finding hosts which are vulnerable for log4j";
+ homepage = "https://github.com/fullhunt/log4j-scan";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix
new file mode 100644
index 000000000000..ae51ecef192f
--- /dev/null
+++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "log4j-vuln-scanner";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "hillu";
+ repo = "local-log4j-vuln-scanner";
+ rev = "v${version}";
+ sha256 = "sha256-YEXYZtjcZTl+9IgRuSRK/pvnISuW6Jbwuv+dqr4pork=";
+ };
+
+ vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+
+ postInstall = ''
+ mv $out/bin/scanner $out/bin/$pname
+ mv $out/bin/patcher $out/bin/log4j-vuln-patcher
+ '';
+
+ meta = with lib; {
+ description = "Local log4j vulnerability scanner";
+ homepage = "https://github.com/hillu/local-log4j-vuln-scanner";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/log4jcheck/default.nix b/pkgs/tools/security/log4jcheck/default.nix
new file mode 100644
index 000000000000..291bf1ff96b4
--- /dev/null
+++ b/pkgs/tools/security/log4jcheck/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "log4jcheck";
+ version = "unstable-2021-12-14";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "NorthwaveSecurity";
+ repo = pname;
+ rev = "736f1f4044e8a9b7bf5db515e2d1b819253f0f6d";
+ sha256 = "sha256-1al7EMYbE/hFXKV4mYZlkEWTUIKYxgXYU3qBLlczYvs=";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ requests
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ install -vD nw_log4jcheck.py $out/bin/${pname}
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Tool to check for vulnerable Log4j (CVE-2021-44228) systems";
+ homepage = "https://github.com/NorthwaveSecurity/log4jcheck";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/tools/security/log4shell-detector/default.nix
new file mode 100644
index 000000000000..27a0eb41ad5c
--- /dev/null
+++ b/pkgs/tools/security/log4shell-detector/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "log4shell-detector";
+ version = "unstable-2021-12-14";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "Neo23x0";
+ repo = pname;
+ rev = "7bc368f376b8d95282193eac6ea3970c363577d5";
+ sha256 = "sha256-MLKd2moMLwAZXqZ5I/pIYzV0PqVwSpze3gNM0IioI1E=";
+ };
+
+ checkInputs = with python3.pkgs; [
+ pytestCheckHook
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ install -vD ${pname}.py $out/bin/${pname}
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Detector for Log4Shell exploitation attempts";
+ homepage = "https://github.com/Neo23x0/log4shell-detector";
+ # https://github.com/Neo23x0/log4shell-detector/issues/24
+ license = licenses.unfree;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
index 8673200172e4..4008461cc15f 100644
--- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
+++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
@@ -1,17 +1,18 @@
{ lib
, fetchFromGitHub
, ocamlPackages
+, buildPackages
}:
ocamlPackages.buildDunePackage rec {
pname = "wayland-proxy-virtwl";
- version = "unstable-2021-04-15";
+ version = "unstable-2021-12-05";
src = fetchFromGitHub {
owner = "talex5";
repo = pname;
- rev = "09321a28f3d4c0fa7e41ebb3014106b62090b649";
- sha256 = "03rc2jp5d2y9y7mfis6kk9gchd49gvq0jg6fq5gi9r21ckb4k5v4";
+ rev = "d7f58d405514dd031f2f12e402c8c6a58e62a885";
+ sha256 = "0riwaqdlrx2gzkrb02v4zdl4ivpmz9g5w87lj3bhqs0l3s6c249s";
};
postPatch = ''
@@ -22,12 +23,19 @@ ocamlPackages.buildDunePackage rec {
useDune2 = true;
minimumOCamlVersion = "4.08";
+ nativeBuildInputs = [
+ buildPackages.ocamlPackages.ppx_cstruct
+ ];
+
buildInputs = with ocamlPackages; [
wayland
cmdliner
logs
+ cstruct-lwt
];
+ doCheck = true;
+
meta = {
homepage = "https://github.com/talex5/wayland-virtwl-proxy";
description = "Proxy Wayland connections across a VM boundary";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f254dd622dd..5ed9702e49c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1799,6 +1799,8 @@ with pkgs;
gomatrix = callPackage ../applications/misc/gomatrix { };
+ gomapenum = callPackage ../tools/security/gomapenum { };
+
gopacked = callPackage ../applications/misc/gopacked { };
gucci = callPackage ../tools/text/gucci { };
@@ -7468,8 +7470,20 @@ with pkgs;
liquidctl = with python3Packages; toPythonApplication liquidctl;
+ lmp = callPackage ../tools/security/lmp { };
+
localtime = callPackage ../tools/system/localtime { };
+ log4j-detect = callPackage ../tools/security/log4j-detect { };
+
+ log4j-scan = callPackage ../tools/security/log4j-scan { };
+
+ log4j-vuln-scanner = callPackage ../tools/security/log4j-vuln-scanner { };
+
+ log4jcheck = callPackage ../tools/security/log4jcheck { };
+
+ log4shell-detector = callPackage ../tools/security/log4shell-detector { };
+
logcheck = callPackage ../tools/system/logcheck { };
logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { };
@@ -13615,7 +13629,7 @@ with pkgs;
python3Packages = python3.pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python { };
- inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38;
+ inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38 rustpython;
# Python package sets.
python27Packages = python27.pkgs;
@@ -30288,7 +30302,7 @@ with pkgs;
fishfight = callPackage ../games/fishfight {
inherit (xorg) libX11 libXi;
- inherit (darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio CoreFoundation IOKit OpenGL;
+ inherit (darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio OpenGL;
};
flightgear = libsForQt5.callPackage ../games/flightgear { };
@@ -31613,6 +31627,8 @@ with pkgs;
sage = callPackage ../applications/science/math/sage { };
sageWithDoc = sage.override { withDoc = true; };
+ subread = callPackage ../applications/science/biology/subread { };
+
suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix {};
suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {};
@@ -32454,6 +32470,8 @@ with pkgs;
fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix {};
fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix {};
+ fbmark = callPackage ../tools/misc/fbmark { };
+
foma = callPackage ../tools/misc/foma { };
foo2zjs = callPackage ../misc/drivers/foo2zjs {};