diff --git a/.gitignore b/.gitignore
index b166a78d7d70..1a41704c9be3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
,*
.*.swp
.*.swo
+.idea/
result
result-*
/doc/NEWS.html
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4739a46466e0..c2ff4cec169f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1693,6 +1693,12 @@
githubId = 7435854;
name = "Victor Calvert";
};
+ cameronnemo = {
+ email = "cnemo@tutanota.com";
+ github = "cameronnemo";
+ githubId = 3212452;
+ name = "Cameron Nemo";
+ };
campadrenalin = {
email = "campadrenalin@gmail.com";
github = "campadrenalin";
@@ -2279,6 +2285,12 @@
githubId = 1382175;
name = "Oliver Matthews";
};
+ cyounkins = {
+ name = "Craig Younkins";
+ email = "cyounkins@gmail.com";
+ github = "cyounkins";
+ githubId = 346185;
+ };
cypherpunk2140 = {
email = "stefan.mihaila@pm.me";
github = "stefan-mihaila";
@@ -5500,6 +5512,12 @@
githubId = 66669;
name = "Jeff Zellner";
};
+ k4leg = {
+ name = "k4leg";
+ email = "python.bogdan@gmail.com";
+ github = "k4leg";
+ githubId = 39882583;
+ };
kaction = {
name = "Dmitry Bogatov";
email = "KAction@disroot.org";
@@ -9582,6 +9600,12 @@
github = "s1341";
githubId = 5682183;
};
+ samalws = {
+ email = "sam@samalws.com";
+ name = "Sam Alws";
+ github = "samalws";
+ githubId = 20981725;
+ };
samb96 = {
email = "samb96@gmail.com";
github = "samb96";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 391f401306e9..df0c9ce7cf61 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -182,7 +182,7 @@ with lib.maintainers; {
members = [
angustrau
superherointj
- supersandro2000
+ SuperSandro2000
];
scope = "Maintain the ecosystem around OpenStack";
};
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 5deb2c75e616..f7220639adfc 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -232,6 +232,13 @@
services.nats.
+
+
+ git, a
+ distributed version control system. Available as
+ programs.git.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index fb3499750ad5..f6544cc93b7e 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -71,6 +71,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
- [nats](https://nats.io/), a high performance cloud and edge messaging system. Available as [services.nats](#opt-services.nats.enable).
+- [git](https://git-scm.com), a distributed version control system. Available as [programs.git](options.html#opt-programs.git.enable).
+
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1998a309035b..3bc7c01d7ac0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -145,6 +145,7 @@
./programs/fuse.nix
./programs/gamemode.nix
./programs/geary.nix
+ ./programs/git.nix
./programs/gnome-disks.nix
./programs/gnome-documents.nix
./programs/gnome-terminal.nix
diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix
new file mode 100644
index 000000000000..4e06b576f896
--- /dev/null
+++ b/nixos/modules/programs/git.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.git;
+in
+
+{
+ options = {
+ programs.git = {
+ enable = mkEnableOption "git";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.git;
+ defaultText = "pkgs.git";
+ example = literalExample "pkgs.gitFull";
+ description = "The git package to use";
+ };
+
+ config = mkOption {
+ type = types.attrs;
+ default = { };
+ example = {
+ init.defaultBranch = "main";
+ url."https://github.com/".insteadOf = [ "gh:" "github:" ];
+ };
+ description = ''
+ Configuration to write to /etc/gitconfig. See the CONFIGURATION FILE
+ section of git-config(1) for more information.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ cfg.package ];
+ environment.etc.gitconfig = mkIf (cfg.config != {}) {
+ text = generators.toGitINI cfg.config;
+ };
+ };
+
+ meta.maintainers = with maintainers; [ figsoda ];
+}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index d81ab4b3ac72..fa8174e3a95b 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -10,20 +10,20 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.55.498.gf9a83c60";
+ version = "1.1.67.586.gbb5ef64e";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "46";
+ rev = "50";
deps = [
alsa-lib
- atk
at-spi2-atk
at-spi2-core
+ atk
cairo
cups
curl
@@ -46,7 +46,10 @@ let
pango
stdenv.cc.cc
systemd
+ xorg.libICE
+ xorg.libSM
xorg.libX11
+ xorg.libxcb
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
@@ -56,10 +59,8 @@ let
xorg.libXrandr
xorg.libXrender
xorg.libXScrnSaver
+ xorg.libxshmfence
xorg.libXtst
- xorg.libxcb
- xorg.libSM
- xorg.libICE
zlib
];
@@ -79,7 +80,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149";
+ sha512 = "f29aa4a3f3d6a72f108f350905789f12ab3ae50cf4f4828f021d3be7759b192506c9a397e45309a5ee659578b6e85de80d7d78f994af9ab631c9fb2dc527c242";
};
nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 502c68d3269f..0c9bd808b53c 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -17,8 +17,8 @@ let
sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f";
};
latestVersion = { # canary & dev
- version = "2021.1.1.5"; # "Android Studio Bumblebee (2021.1.1) Canary 5"
- sha256Hash = "0fx6nnazg4548rhb11wzaccm5c2si57mj8qwyl5j17x4k5r3m7nh";
+ version = "2021.1.1.11"; # "Android Studio Bumblebee (2021.1.1) Canary 11"
+ sha256Hash = "0npvb7kr259799bs2bs2drvimmmwb0rdzswbkz8zgi5c2fwjcvvl";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
deleted file mode 100644
index a9afc774bc05..000000000000
--- a/pkgs/applications/editors/typora/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, makeWrapper
-, electron_9
-, dpkg
-, gtk3
-, glib
-, gsettings-desktop-schemas
-, wrapGAppsHook
-, withPandoc ? false
-, pandoc
-}:
-
-let
- electron = electron_9;
-in
-stdenv.mkDerivation rec {
- pname = "typora";
- version = "0.9.98";
-
- src = fetchurl {
- url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "sha256-JiqjxT8ZGttrcJrcQmBoGPnRuuYWZ9u2083RxZoLMus=";
- };
-
- nativeBuildInputs = [
- dpkg
- makeWrapper
- wrapGAppsHook
- ];
-
- buildInputs = [
- glib
- gsettings-desktop-schemas
- gtk3
- ];
-
- # The deb contains setuid permission on `chrome-sandbox`, which will actually not get installed.
- unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
-
- dontWrapGApps = true;
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/bin $out/share
- {
- cd usr
- mv share/typora/resources/app $out/share/typora
- mv share/{applications,icons,doc} $out/share/
- }
-
- runHook postInstall
- '';
-
- postFixup = ''
- makeWrapper ${electron}/bin/electron $out/bin/typora \
- --add-flags $out/share/typora \
- "''${gappsWrapperArgs[@]}" \
- ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \
- --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
- '';
-
- meta = with lib; {
- description = "A minimal Markdown reading & writing app";
- homepage = "https://typora.io";
- license = licenses.unfree;
- maintainers = with maintainers; [ jensbin ];
- platforms = [ "x86_64-linux"];
- };
-}
diff --git a/pkgs/applications/misc/gofu/default.nix b/pkgs/applications/misc/gofu/default.nix
new file mode 100644
index 000000000000..b951a3e48251
--- /dev/null
+++ b/pkgs/applications/misc/gofu/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "gofu";
+ version = "unstable-2021-09-11";
+
+ src = fetchFromGitHub {
+ owner = "majewsky";
+ repo = pname;
+ rev = "cb398f58a5cb4f3e858fe60e84debde6ab58f7c8";
+ sha256 = "sha256-R8Pr8SyLeoTaYKKV+PzHDPi1/RY4j7pkUbW8kE4ydBU=";
+ };
+
+ vendorSha256 = null;
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "Multibinary containing several utilities";
+ homepage = "https://github.com/majewsky/gofu";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix
new file mode 100644
index 000000000000..89e5aea943a5
--- /dev/null
+++ b/pkgs/applications/misc/joshuto/default.nix
@@ -0,0 +1,31 @@
+{ fetchFromGitHub, lib, rustPlatform, stdenv, SystemConfiguration }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "joshuto";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "kamiyaa";
+ repo = pname;
+ rev = version;
+ sha256 = "08d6h7xwcgycw5bdzwwc6aaikcrw3yc7inkiydgml9q261kql7zl";
+ # upstream includes an outdated Cargo.lock that stops cargo from compiling
+ postFetch = ''
+ mkdir -p $out
+ tar xf $downloadedFile --strip=1 -C $out
+ substituteInPlace $out/Cargo.lock \
+ --replace 0.8.6 ${version}
+ '';
+ };
+
+ cargoSha256 = "1scrqm7fs8y7anfiigimj7y5rjxcc2qvrxiq8ai7k5cwfc4v1ghm";
+
+ buildInputs = lib.optional stdenv.isDarwin SystemConfiguration;
+
+ meta = with lib; {
+ description = "Ranger-like terminal file manager written in Rust";
+ homepage = "https://github.com/kamiyaa/joshuto";
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix
new file mode 100644
index 000000000000..fac8ac2886d3
--- /dev/null
+++ b/pkgs/applications/misc/wike/default.nix
@@ -0,0 +1,60 @@
+{ lib, stdenv, fetchFromGitHub
+, meson, pkg-config, ninja
+, python3
+, glib, appstream-glib , desktop-file-utils
+, gobject-introspection, gtk3
+, wrapGAppsHook
+, libhandy, webkitgtk, glib-networking
+, gnome, dconf
+}:
+let
+ pythonEnv = python3.withPackages (p: with p; [
+ pygobject3
+ requests
+ ]);
+in stdenv.mkDerivation rec {
+ pname = "wike";
+ version = "1.5.6";
+
+ src = fetchFromGitHub {
+ owner = "hugolabe";
+ repo = "Wike";
+ rev = version;
+ sha256 = "1qnxzxqjj0sn522k15plskwa7nlhhbcipfc3w17fbq3k2zhpr1yy";
+ };
+
+ nativeBuildInputs = [
+ meson
+ pkg-config
+ ninja
+ appstream-glib
+ desktop-file-utils
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ pythonEnv
+ gtk3
+ libhandy
+ webkitgtk
+ glib-networking
+ gnome.adwaita-icon-theme
+ dconf
+ ];
+
+ postPatch = ''
+ patchShebangs build-aux/meson/postinstall.py
+ substituteInPlace src/wike.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
+ substituteInPlace src/wike-sp.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
+ '';
+
+ meta = with lib; {
+ description = "Wikipedia Reader for the GNOME Desktop";
+ homepage = "https://github.com/hugolabe/Wike";
+ license = licenses.gpl3Plus;
+ platforms = webkitgtk.meta.platforms;
+ maintainers = with maintainers; [ samalws ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 30d56c1014b3..a094e681e230 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,9 +31,9 @@
}
},
"dev": {
- "version": "95.0.4628.3",
- "sha256": "04r2db9kl77lp4jyyj01pc70jkxrifbnz5hic4r91lf8m2gf1fa3",
- "sha256bin64": "1ssf8jdk6gn2mrnyvgz2c9nkk70rsidd5y26w2kx3s0cllfr7d96",
+ "version": "95.0.4636.4",
+ "sha256": "1rhkmja9p2a8cxnjsrs0ipzajxwgp3c8q3903rp8ns1g579c4g3j",
+ "sha256bin64": "0l89iqi95fa10m3jdhbvfdjf4x88gscx6imkhy2x2ax669d19606",
"deps": {
"gn": {
"version": "2021-08-11",
diff --git a/pkgs/applications/networking/cluster/cni/plugin-flannel.nix b/pkgs/applications/networking/cluster/cni/plugin-flannel.nix
new file mode 100644
index 000000000000..69a4718d6039
--- /dev/null
+++ b/pkgs/applications/networking/cluster/cni/plugin-flannel.nix
@@ -0,0 +1,29 @@
+{ lib, pkgs, buildGoModule, fetchFromGitHub }:
+
+buildGoModule {
+ pname = "cni-plugin-flannel";
+ version = "unstable-2021-09-10";
+
+ src = fetchFromGitHub {
+ owner = "flannel-io";
+ repo = "cni-plugin";
+ rev = "8ce83510da59681da905dccb8364af9472cac341";
+ sha256 = "sha256-x6F8n+IJ1pZdbDwniWWmoGKgQm235ax3mbOcbYqWLCs=";
+ };
+
+ vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs=";
+
+ postInstall = ''
+ mv $out/bin/cni-plugin $out/bin/flannel
+ '';
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "flannel CNI plugin";
+ homepage = "https://github.com/flannel-io/cni-plugin/";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ abbe ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index b4e44a05d82e..5710d456cefb 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.20.5";
+ version = "0.22.4";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-pUKKHrShED7yp5WSmHSbS+eiYs22Nm2/ouc2a8WYc38=";
+ sha256 = "sha256-bu8U3eJc10tnQhLLX0FwDrlTUVpjZBW7V4gbc/tBTBU=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index eff838256f5c..638d60777712 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -42,11 +42,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.40.3";
+ version = "3.40.4";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw=";
+ sha256 = "BYXp36VQQOySNTWgRIdiRl2J4zE1Cawya76Eal1mA3Q=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 3623dbba6b8d..0cf131508b4e 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
- version = "2.16";
+ version = "2.16.7";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "sha256-F36MuqgVkKM2RCIGEGJmL3/KpZy3eDRZ7WWUE15mTfU=";
+ sha256 = "sha256-AJD+WV8JilclcMXc4RFv2xY9QZNUJtYX1dsb1q85qZ0=";
};
# Fix 'NameError: name 'ssl' is not defined'
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index fc8bee5fcb78..e0e26b804f58 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "yadm";
- version = "3.1.0";
+ version = "3.1.1";
buildInputs = [ git gnupg ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "TheLocehiliosan";
repo = "yadm";
rev = version;
- sha256 = "0ga0p28nvqilswa07bzi93adk7wx6d5pgxlacr9wl9v1h6cds92s";
+ sha256 = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk=";
};
dontConfigure = true;
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
index 3bcb27898cc3..05e468a73228 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 = "17.0";
+ version = "18.0";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
- sha256 = "1m4v12sjifd5mf1wzjwkndvxg53n7kwd35k6ql45hdpiz3f5ipig";
+ sha256 = "0k9gclkba2bhmyqhyigjgfgcnqpg16v3yczhh08ljxmbrsbs02ig";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
- cargoSha256 = "11qspv061y75cyln60727x15gdn9rndi697zr9fmihnwn3dx4hvh";
+ cargoSha256 = "086ldzb1rbbrzjbklay4nvhc18ipyxi9gnp56f06393zvfbhc5dl";
meta = with lib; {
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
diff --git a/pkgs/build-support/substitute/substitute.nix b/pkgs/build-support/substitute/substitute.nix
new file mode 100644
index 000000000000..7f0332334585
--- /dev/null
+++ b/pkgs/build-support/substitute/substitute.nix
@@ -0,0 +1,14 @@
+{ stdenvNoCC }:
+
+args:
+
+# This is a wrapper around `substitute` in the stdenv.
+# The `replacements` attribute should be a list of list of arguments
+# to `substitute`, such as `[ "--replace" "sourcetext" "replacementtext" ]`
+stdenvNoCC.mkDerivation ({
+ name = if args ? name then args.name else baseNameOf (toString args.src);
+ builder = ./substitute.sh;
+ inherit (args) src;
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+} // args // { replacements = args.replacements; })
diff --git a/pkgs/build-support/substitute/substitute.sh b/pkgs/build-support/substitute/substitute.sh
new file mode 100644
index 000000000000..dbac275a80ed
--- /dev/null
+++ b/pkgs/build-support/substitute/substitute.sh
@@ -0,0 +1,18 @@
+source $stdenv/setup
+
+args=
+
+target=$out
+if test -n "$dir"; then
+ target=$out/$dir/$name
+ mkdir -p $out/$dir
+fi
+
+substitute $src $target $replacements
+
+if test -n "$isExecutable"; then
+ chmod +x $target
+fi
+
+eval "$postInstall"
+
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index cd12033b505f..ced17e2cc8e0 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -3,7 +3,8 @@
}:
let
- name = "iosevka" + lib.optionalString (variant != "") "-" + variant;
+ name = if lib.hasPrefix "sgr" variant then variant
+ else "iosevka" + lib.optionalString (variant != "") "-" + variant;
variantHashes = import ./variants.nix;
validVariants = map (lib.removePrefix "iosevka-")
diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix
index f0a2339b3e63..5666eded73f0 100644
--- a/pkgs/data/themes/canta/default.nix
+++ b/pkgs/data/themes/canta/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, gdk-pixbuf
, librsvg
@@ -12,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "canta-theme";
- version = "2021-07-06";
+ version = "2021-09-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "sha256-dz78h9Qq25+/i6fmw/zGlPq3DVQB3ADYwehgaWReMQ8=";
+ sha256 = "05h42nrggb6znzjcbh4lqqfcm41h4r85n3vwimp3l4lq5p90igr2";
};
nativeBuildInputs = [
@@ -57,7 +58,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Flat Design theme for GTK based desktop environments";
homepage = "https://github.com/vinceliuice/Canta-theme";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin
maintainers = [ maintainers.romildo ];
};
diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix
index 39c10e82a1c2..17e98bb2a569 100644
--- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "gnome-weather";
- version = "40.0";
+ version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a";
+ sha256 = "PREUTEeXxG0gaMPd9c4rwDD8oPJyzwPyGMT0baO3PE0=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix
index e67a623069b1..bffcb8b74c23 100644
--- a/pkgs/desktops/gnome/core/eog/default.nix
+++ b/pkgs/desktops/gnome/core/eog/default.nix
@@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "eog";
- version = "40.2";
+ version = "40.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-kITimZMftX3ih+V9vS7i0pf7Z0DA1TW52o1fGWqP0ZU=";
+ sha256 = "sha256-KKo7BwgdlWV1RvcIlJR/qIZjGix/lV5Wz4DbcxrjsjU=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix
index 1a7887fc35da..df8096b90eec 100644
--- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix
@@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "gnome-desktop";
- version = "40.3";
+ version = "40.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-U9ZGlEbXoJsCaTZ2nllTUv3zvlYy80a7Af5XyLUWLOs=";
+ sha256 = "sha256-iK6W9YXg0IcJQbuj113fPsQDSOHFrnQTIcpIL6ydRe8=";
};
patches = [
diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
index 8013e101913e..94b29e8b4dee 100644
--- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
- version = "40.3";
+ version = "40.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "nfh/qVNSAf68o9UI/b97rQFxz3ony2ZN1OPB+WxO0Es=";
+ sha256 = "9R1MQsIru9AxLKcY9Hz0Vp/FikbvQAdDrk0cx9kKzXk=";
};
patches = [
diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix
index f3ccdbce98cb..1f92e49c4f66 100644
--- a/pkgs/desktops/gnome/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome/core/nautilus/default.nix
@@ -34,11 +34,11 @@
stdenv.mkDerivation rec {
pname = "nautilus";
- version = "40.1";
+ version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf";
+ sha256 = "tx7y/gfl7qiaK7HlvTCUe9GIc7+zD3nL8X7fvU0g9g0=";
};
patches = [
diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix
index 46491cffc5f6..6be6c77f7c27 100644
--- a/pkgs/desktops/gnome/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "devhelp";
- version = "40.0";
+ version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd";
+ sha256 = "PorZPoSEtEgjyuR0ov2dziLtbs0lZVWSzq17G2gya7s=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index 776139b36867..e73e43dd392e 100644
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
- version = "54";
+ version = "55";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
- sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8=";
+ sha256 = "0bav4vzky3p7np2gphxc6bw38c697kalmaibaar9vi0ip3xkkavk";
};
passthru = {
diff --git a/pkgs/desktops/gnome/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix
index c3724ef51058..956f9f842d3d 100644
--- a/pkgs/desktops/gnome/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix
@@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "quadrapassel";
- version = "40.1";
+ version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "1d59sxmmmhi611hvr5jmsm276j9w20hc5yq4rk0s4d3svadyap79";
+ sha256 = "C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix
index 9f7d434193a4..cad68e6f302a 100644
--- a/pkgs/development/beam-modules/erlang-ls/default.nix
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib }:
let
- version = "0.18.0";
+ version = "0.19.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@@ -19,7 +19,7 @@ rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
- sha256 = "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow=";
+ sha256 = "sha256-WesGgLoVR435lNXnsCFYcUoKXDMuL7hWImDluori+dc=";
rev = version;
};
releaseType = "escript";
diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix
index 5b73e3d7a139..6e7e1e39b38d 100644
--- a/pkgs/development/libraries/gdl/default.nix
+++ b/pkgs/development/libraries/gdl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gdl";
- version = "3.34.0";
+ version = "3.40.0";
src = fetchurl {
url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5";
+ sha256 = "NkHU/WadHhgYrv88+f+3iH/Fw2eFC3jCjHdeukq2pVU=";
};
nativeBuildInputs = [ pkg-config intltool ];
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index 0cd2f79ea552..c4d961f4b76f 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "gensio";
- version = "2.2.8";
+ version = "2.2.9";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-6+hYytLMg5E1KTBPWSteVu2VjF0APkcoOiigqzrBI+U=";
+ sha256 = "sha256-SN8zMMBX02kIS9q1/7DO+t826DpmbZBO37TDZtvRT1A=";
};
passthru = {
diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix
index c46a42049bce..ff3e9ee52e99 100644
--- a/pkgs/development/libraries/gexiv2/default.nix
+++ b/pkgs/development/libraries/gexiv2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gexiv2";
- version = "0.12.2";
+ version = "0.12.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "IyK1UqyjMO73lySmmcUaMCNF1eB0c4V4s5i38v+XlEw=";
+ sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM=";
};
nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index e86775de623b..54f19d1756cb 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -30,13 +30,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "gjs";
- version = "1.68.2";
+ version = "1.68.3";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-cP8CraaC8TAzjsXMTFEQPcDlyrjVN+t2sYHsUSpl7jA=";
+ sha256 = "sha256-ghx/T3jxUA2mpWxUY3I72P+A3mM8y6Q6WrA9jMyiHT8=";
};
patches = [
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index d940d0518155..ee8f4dfe2e0a 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -12,6 +12,7 @@
, qtbase
, libusb1
, libpcap
+, libtiff
, libXt
, libpng
, Cocoa
@@ -33,20 +34,24 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
buildInputs = [
- qhull
- flann
- boost
eigen
libusb1
libpcap
- libpng
- vtk
qtbase
libXt
]
++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]
++ lib.optionals withCuda [ cudatoolkit ];
+ propagatedBuildInputs = [
+ boost
+ flann
+ libpng
+ libtiff
+ qhull
+ vtk
+ ];
+
cmakeFlags = lib.optionals stdenv.isDarwin [
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ];
diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh
index e4e02bd82ed3..ca0073afbbb4 100644
--- a/pkgs/development/libraries/qt-5/5.14/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.14/fetch.sh
@@ -1,2 +1,2 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ \
+WGET_ARGS=( https://download.qt.io/archive/qt/5.14/5.14.2/submodules/ \
-A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.14/srcs.nix b/pkgs/development/libraries/qt-5/5.14/srcs.nix
index 6ac958442f49..b5b6eb1a32c6 100644
--- a/pkgs/development/libraries/qt-5/5.14/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.14/srcs.nix
@@ -6,7 +6,7 @@
qt3d = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz";
sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674";
name = "qt3d-everywhere-src-5.14.2.tar.xz";
};
@@ -14,7 +14,7 @@
qtactiveqt = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz";
sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9";
name = "qtactiveqt-everywhere-src-5.14.2.tar.xz";
};
@@ -22,7 +22,7 @@
qtandroidextras = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz";
sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76";
name = "qtandroidextras-everywhere-src-5.14.2.tar.xz";
};
@@ -30,7 +30,7 @@
qtbase = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz";
sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a";
name = "qtbase-everywhere-src-5.14.2.tar.xz";
};
@@ -38,7 +38,7 @@
qtcharts = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz";
sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7";
name = "qtcharts-everywhere-src-5.14.2.tar.xz";
};
@@ -46,7 +46,7 @@
qtconnectivity = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz";
sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28";
name = "qtconnectivity-everywhere-src-5.14.2.tar.xz";
};
@@ -54,7 +54,7 @@
qtdatavis3d = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz";
sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20";
name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz";
};
@@ -62,7 +62,7 @@
qtdeclarative = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz";
sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650";
name = "qtdeclarative-everywhere-src-5.14.2.tar.xz";
};
@@ -70,7 +70,7 @@
qtdoc = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz";
sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b";
name = "qtdoc-everywhere-src-5.14.2.tar.xz";
};
@@ -78,7 +78,7 @@
qtgamepad = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz";
sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03";
name = "qtgamepad-everywhere-src-5.14.2.tar.xz";
};
@@ -86,7 +86,7 @@
qtgraphicaleffects = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz";
sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f";
name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz";
};
@@ -94,7 +94,7 @@
qtimageformats = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz";
sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c";
name = "qtimageformats-everywhere-src-5.14.2.tar.xz";
};
@@ -102,7 +102,7 @@
qtlocation = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz";
sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc";
name = "qtlocation-everywhere-src-5.14.2.tar.xz";
};
@@ -110,7 +110,7 @@
qtlottie = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz";
sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978";
name = "qtlottie-everywhere-src-5.14.2.tar.xz";
};
@@ -118,7 +118,7 @@
qtmacextras = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz";
sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5";
name = "qtmacextras-everywhere-src-5.14.2.tar.xz";
};
@@ -126,7 +126,7 @@
qtmultimedia = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz";
sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9";
name = "qtmultimedia-everywhere-src-5.14.2.tar.xz";
};
@@ -134,7 +134,7 @@
qtnetworkauth = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz";
sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e";
name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz";
};
@@ -142,7 +142,7 @@
qtpurchasing = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz";
sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851";
name = "qtpurchasing-everywhere-src-5.14.2.tar.xz";
};
@@ -150,7 +150,7 @@
qtquick3d = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz";
sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e";
name = "qtquick3d-everywhere-src-5.14.2.tar.xz";
};
@@ -158,7 +158,7 @@
qtquickcontrols = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz";
sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461";
name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz";
};
@@ -166,7 +166,7 @@
qtquickcontrols2 = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz";
sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560";
name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz";
};
@@ -174,7 +174,7 @@
qtquicktimeline = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz";
sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e";
name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz";
};
@@ -182,7 +182,7 @@
qtremoteobjects = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz";
sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6";
name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz";
};
@@ -190,7 +190,7 @@
qtscript = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz";
sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe";
name = "qtscript-everywhere-src-5.14.2.tar.xz";
};
@@ -198,7 +198,7 @@
qtscxml = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz";
sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790";
name = "qtscxml-everywhere-src-5.14.2.tar.xz";
};
@@ -206,7 +206,7 @@
qtsensors = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz";
sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61";
name = "qtsensors-everywhere-src-5.14.2.tar.xz";
};
@@ -214,7 +214,7 @@
qtserialbus = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz";
sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91";
name = "qtserialbus-everywhere-src-5.14.2.tar.xz";
};
@@ -222,7 +222,7 @@
qtserialport = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz";
sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21";
name = "qtserialport-everywhere-src-5.14.2.tar.xz";
};
@@ -230,7 +230,7 @@
qtspeech = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz";
sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da";
name = "qtspeech-everywhere-src-5.14.2.tar.xz";
};
@@ -238,7 +238,7 @@
qtsvg = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz";
sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1";
name = "qtsvg-everywhere-src-5.14.2.tar.xz";
};
@@ -246,7 +246,7 @@
qttools = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz";
sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5";
name = "qttools-everywhere-src-5.14.2.tar.xz";
};
@@ -254,7 +254,7 @@
qttranslations = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz";
sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6";
name = "qttranslations-everywhere-src-5.14.2.tar.xz";
};
@@ -262,7 +262,7 @@
qtvirtualkeyboard = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz";
sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7";
name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz";
};
@@ -270,7 +270,7 @@
qtwayland = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz";
sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a";
name = "qtwayland-everywhere-src-5.14.2.tar.xz";
};
@@ -278,7 +278,7 @@
qtwebchannel = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz";
sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874";
name = "qtwebchannel-everywhere-src-5.14.2.tar.xz";
};
@@ -286,7 +286,7 @@
qtwebengine = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz";
sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947";
name = "qtwebengine-everywhere-src-5.14.2.tar.xz";
};
@@ -294,7 +294,7 @@
qtwebglplugin = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz";
sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417";
name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz";
};
@@ -302,7 +302,7 @@
qtwebsockets = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz";
sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84";
name = "qtwebsockets-everywhere-src-5.14.2.tar.xz";
};
@@ -310,7 +310,7 @@
qtwebview = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz";
sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b";
name = "qtwebview-everywhere-src-5.14.2.tar.xz";
};
@@ -318,7 +318,7 @@
qtwinextras = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz";
sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2";
name = "qtwinextras-everywhere-src-5.14.2.tar.xz";
};
@@ -326,7 +326,7 @@
qtx11extras = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz";
sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a";
name = "qtx11extras-everywhere-src-5.14.2.tar.xz";
};
@@ -334,7 +334,7 @@
qtxmlpatterns = {
version = "5.14.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz";
+ url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz";
sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7";
name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz";
};
diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index 9fc5abe968bd..1c9cb2e94570 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-web";
- version = "4.0.0";
+ version = "5.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "e57437a933e7dea9b0618fe790e0dadc63f9857735361ac8b5f5e8062b9c2a0d";
+ sha256 = "0b10542600cd268d6369681c3367373a925eedcda5414eacbd3fbc9a0bdf1f24";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index 611508b42450..99ff8bbb4e68 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-servicebus";
- version = "7.3.2";
+ version = "7.3.3";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "6c9bef0bfb4ac2bb8158fdfb3938884cd42542be3162ac288fa8df4e254d3810";
+ sha256 = "1c2133909a086bd4329135d6affcc05628e3a7da27afca584a0de8c21fc4e1ac";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix
new file mode 100644
index 000000000000..75555569e235
--- /dev/null
+++ b/pkgs/development/python-modules/debtcollector/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi, pbr, six, wrapt, callPackage }:
+
+buildPythonPackage rec {
+ pname = "debtcollector";
+ version = "2.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c7a9fac814ab5904e23905516b18356cc907e7d27c05da58d37103f001967846";
+ };
+
+ nativeBuildInputs = [ pbr ];
+
+ propagatedBuildInputs = [ six wrapt ];
+
+ # check in passthru.tests.pytest to escape infinite recursion with other oslo components
+ doCheck = false;
+
+ passthru.tests = {
+ pytest = callPackage ./tests.nix { };
+ };
+
+ pythonImportsCheck = [ "debtcollector" ];
+
+ meta = with lib; {
+ description = "A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner";
+ homepage = "https://github.com/openstack/debtcollector";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/debtcollector/tests.nix b/pkgs/development/python-modules/debtcollector/tests.nix
new file mode 100644
index 000000000000..cc3171da6d6e
--- /dev/null
+++ b/pkgs/development/python-modules/debtcollector/tests.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, debtcollector
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "debtcollector-tests";
+ inherit (debtcollector) version;
+
+ src = debtcollector.src;
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ dontBuild = true;
+ dontInstall = true;
+
+ checkInputs = [
+ debtcollector
+ stestr
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+}
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 0bdfe35514d4..4392a3c2ecf4 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "debugpy";
- version = "1.4.1";
+ version = "1.4.3";
src = fetchFromGitHub {
owner = "Microsoft";
repo = pname;
rev = "v${version}";
- hash = "sha256-W51Y9tZB1Uyp175+hWCpXChwL+MBpDWjudF87F1MRso=";
+ hash = "sha256-ULxVoZuMNDL0Win/+55RnbkCPZ8OI8nhSKshvJOMFQ4=";
};
patches = [
diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
index f74b53a831b3..537531cd9747 100644
--- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
+++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
@@ -1,5 +1,5 @@
diff --git a/tests/debug/session.py b/tests/debug/session.py
-index 101492f..4ee7cfb 100644
+index 101492fc..4ee7cfbe 100644
--- a/tests/debug/session.py
+++ b/tests/debug/session.py
@@ -630,6 +630,7 @@ class Session(object):
diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
index 8b87ec7bda7a..09851260233f 100644
--- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
+++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
@@ -1,8 +1,8 @@
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
-index 51017f2..46654ab 100644
+index 3c0e1b94..e995a20f 100644
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
-@@ -398,7 +398,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
+@@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
is_debug = 0
# Note that the space in the beginning of each line in the multi-line is important!
cmd = [
diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch
index 2879716f704d..7d3fd5abfc2d 100644
--- a/pkgs/development/python-modules/debugpy/hardcode-version.patch
+++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch
@@ -1,27 +1,25 @@
diff --git a/setup.py b/setup.py
-index cfec60d..32ca206 100644
+index e7487100..10d36520 100644
--- a/setup.py
+++ b/setup.py
-@@ -24,7 +24,6 @@ elif "--abi" in sys.argv:
- from setuptools import setup # noqa
+@@ -12,7 +12,6 @@ import sys
+
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-import versioneer # noqa
del sys.path[0]
-@@ -86,7 +85,7 @@ if __name__ == "__main__":
- if not os.getenv("SKIP_CYTHON_BUILD"):
- cython_build()
+@@ -141,13 +140,13 @@ if __name__ == "__main__":
+ if platforms is not None:
+ extras["platforms"] = platforms
- cmds = versioneer.get_cmdclass()
+ cmds = {}
- cmds["bdist_wheel"] = bdist_wheel
+ override_build(cmds)
+ override_build_py(cmds)
- extras = {}
-@@ -96,7 +95,7 @@ if __name__ == "__main__":
-
- setup(
+ setuptools.setup(
name="debugpy",
- version=versioneer.get_version(),
+ version="@version@",
@@ -29,7 +27,7 @@ index cfec60d..32ca206 100644
long_description=long_description,
long_description_content_type="text/markdown",
diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py
-index baa5a7c..5355327 100644
+index baa5a7c5..53553272 100644
--- a/src/debugpy/__init__.py
+++ b/src/debugpy/__init__.py
@@ -27,7 +27,6 @@ __all__ = [
diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix
index 387dbfa1f64d..bfbeeaea0070 100644
--- a/pkgs/development/python-modules/dpath/default.nix
+++ b/pkgs/development/python-modules/dpath/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "dpath";
- version = "2.0.3";
+ version = "2.0.4";
disabled = isPy27; # uses python3 imports
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-p6icMudH3zqfKkRrt5dHLjWb66UzlRW3pvZbIzsqMac=";
+ sha256 = "0qjaa4sjw0m4b91mm18074wpkhir3xx7s87qwckmzpfb165gk837";
};
# use pytest as nosetests hangs
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index cc8154bcb95e..92ff2cdacaf6 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -1,9 +1,9 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
, dnspython
-, enum34
, greenlet
, monotonic
, six
@@ -22,10 +22,12 @@ buildPythonPackage rec {
sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b";
};
- propagatedBuildInputs = [ dnspython greenlet monotonic six ]
- ++ lib.optional (pythonOlder "3.4") enum34;
+ propagatedBuildInputs = [ dnspython greenlet pyopenssl six ]
+ ++ lib.optional (pythonOlder "3.5") monotonic;
- checkInputs = [ nose pyopenssl ];
+ checkInputs = [ nose ];
+
+ doCheck = !stdenv.isDarwin;
preCheck = ''
echo "nameserver 127.0.0.1" > resolv.conf
@@ -47,7 +49,7 @@ buildPythonPackage rec {
# pythonImportsCheck = [ "eventlet" ];
meta = with lib; {
- homepage = "https://pypi.python.org/pypi/eventlet/";
+ homepage = "https://github.com/eventlet/eventlet/";
description = "A concurrent networking library for Python";
maintainers = with maintainers; [ SuperSandro2000 ];
license = licenses.mit;
diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix
index 02c8bce05a27..18d6cd4dabb1 100644
--- a/pkgs/development/python-modules/growattserver/default.nix
+++ b/pkgs/development/python-modules/growattserver/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "growattserver";
- version = "1.0.2";
+ version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "indykoning";
repo = "PyPi_GrowattServer";
rev = version;
- sha256 = "sha256-0i7pMJ4gAVOkvj2uYZJygr3rehgIAfyxq9cWbozwRIQ=";
+ sha256 = "sha256-Vooy+czqhrsWVw35zJb5paC5G0WwOlI5hF8PXxJG0cY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix
new file mode 100644
index 000000000000..2c345691216d
--- /dev/null
+++ b/pkgs/development/python-modules/hacking/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pbr
+, flake8
+, stestr
+, eventlet
+, ddt
+, testtools
+, testscenarios
+}:
+
+buildPythonPackage rec {
+ pname = "hacking";
+ version = "4.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m";
+ };
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "flake8<3.9.0,>=3.8.0" "flake8"
+ '';
+
+ nativeBuildInputs = [ pbr ];
+
+ propagatedBuildInputs = [
+ flake8
+ ];
+
+ checkInputs = [
+ ddt
+ stestr
+ testscenarios
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "hacking" ];
+
+ meta = with lib; {
+ description = "OpenStack Hacking Guideline Enforcement";
+ homepage = "https://github.com/openstack/hacking";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index bf671fcb1bac..86f435bc8f3d 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.16.1";
+ version = "1.16.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-R/RKMxSilv8JJW5om+l99vvrZYHjEEK1OCdsYWuxA74=";
+ sha256 = "sha256-QTisaO0LNjZ+dltHCqyWDQDNCGTqc8woMSwqsoyfhbk=";
};
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
new file mode 100644
index 000000000000..9eeb42b0b8c4
--- /dev/null
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -0,0 +1,77 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, betamax
+, hacking
+, iso8601
+, lxml
+, oauthlib
+, os-service-types
+, oslo-config
+, oslo-utils
+, pbr
+, pycodestyle
+, pyyaml
+, requests
+, requests-kerberos
+, requests-mock
+, six
+, stestr
+, stevedore
+, testresources
+, testtools
+}:
+
+buildPythonPackage rec {
+ pname = "keystoneauth1";
+ version = "4.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "93605430a6d1424f31659bc5685e9dc1be9a6254e88c99f00cffc0a60c648a64";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ propagatedBuildInputs = [
+ betamax
+ iso8601
+ lxml
+ oauthlib
+ os-service-types
+ pbr
+ requests
+ requests-kerberos
+ six
+ stevedore
+ ];
+
+ checkInputs = [
+ hacking
+ oslo-config
+ oslo-utils
+ pycodestyle
+ pyyaml
+ requests-mock
+ stestr
+ testresources
+ testtools
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "keystoneauth1" ];
+
+ meta = with lib; {
+ description = "Authentication Library for OpenStack Identity";
+ homepage = "https://github.com/openstack/keystoneauth";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index 985d4e199e18..5db17a83e8f3 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,12 +1,12 @@
{ lib
, fetchFromGitHub
}: rec {
- version = "3.0.1";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "v${version}";
- sha256 = "sha256-ptB0jP0kp1Liynkfz0B0OMw6xNQG1s8IvxhgNAdEytM=";
+ sha256 = "133szhi0xsfbnjw47xbvyidflxd8fp7pv78vk5wf9s5ch3hpnvxs";
};
meta = with lib; {
homepage = "https://openrazer.github.io/";
diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix
new file mode 100644
index 000000000000..5e7442ebc5f0
--- /dev/null
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@@ -0,0 +1,85 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, appdirs
+, cryptography
+, ddt
+, dogpile_cache
+, hacking
+, jmespath
+, jsonpatch
+, jsonschema
+, keystoneauth1
+, munch
+, netifaces
+, os-service-types
+, oslo-config
+, oslotest
+, pbr
+, prometheus-client
+, requests-mock
+, requestsexceptions
+, stestr
+, testscenarios
+}:
+
+buildPythonPackage rec {
+ pname = "openstacksdk";
+ version = "0.59.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-PfdgzScjmKv6yM6+Yu64LLxJe7JdTdcHV290qM6avw0=";
+ };
+
+ propagatedBuildInputs = [
+ appdirs
+ cryptography
+ dogpile_cache
+ jmespath
+ jsonpatch
+ keystoneauth1
+ munch
+ netifaces
+ os-service-types
+ pbr
+ requestsexceptions
+ ];
+
+ checkInputs = [
+ ddt
+ hacking
+ jsonschema
+ oslo-config
+ oslotest
+ prometheus-client
+ requests-mock
+ stestr
+ testscenarios
+ ];
+
+ checkPhase = ''
+ stestr run -e <(echo "
+ openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task
+ openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396
+ openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait
+ openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails
+ openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute
+ openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match
+ openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none
+ openstack.tests.unit.test_stats.TestStats.test_list_projects
+ openstack.tests.unit.test_stats.TestStats.test_projects
+ openstack.tests.unit.test_stats.TestStats.test_servers
+ openstack.tests.unit.test_stats.TestStats.test_servers_no_detail
+ ")
+ '';
+
+ pythonImportsCheck = [ "openstack" ];
+
+ meta = with lib; {
+ description = "An SDK for building applications to work with OpenStack";
+ homepage = "https://github.com/openstack/openstacksdk";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix
new file mode 100644
index 000000000000..990af2ce6b9d
--- /dev/null
+++ b/pkgs/development/python-modules/os-service-types/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pbr
+, six
+, callPackage
+}:
+
+buildPythonPackage rec {
+ pname = "os-service-types";
+ version = "1.7.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ propagatedBuildInputs = [ pbr six ];
+
+ # check in passthru.tests.pytest to escape infinite recursion with other oslo components
+ doCheck = false;
+
+ passthru.tests = {
+ pytest = callPackage ./tests.nix { };
+ };
+
+ pythonImportsCheck = [ "os_service_types" ];
+
+ meta = with lib; {
+ description = "Python library for consuming OpenStack sevice-types-authority data";
+ homepage = "https://github.com/openstack/os-service-types";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/os-service-types/tests.nix b/pkgs/development/python-modules/os-service-types/tests.nix
new file mode 100644
index 000000000000..33f641d14c58
--- /dev/null
+++ b/pkgs/development/python-modules/os-service-types/tests.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, keystoneauth1
+, os-service-types
+, oslotest
+, requests-mock
+, stestr
+, testscenarios
+}:
+
+buildPythonPackage rec {
+ pname = "os-service-types-tests";
+ inherit (os-service-types) version;
+
+ src = os-service-types.src;
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ dontBuild = true;
+ dontInstall = true;
+
+ checkInputs = [
+ os-service-types
+ keystoneauth1
+ oslotest
+ requests-mock
+ stestr
+ testscenarios
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+}
diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix
new file mode 100644
index 000000000000..8d0f9d51fb00
--- /dev/null
+++ b/pkgs/development/python-modules/osc-lib/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cliff
+, oslo-i18n
+, oslo-utils
+, openstacksdk
+, pbr
+, requests-mock
+, simplejson
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "osc-lib";
+ version = "2.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ianpk32vwdllpbk4zhfifqb5b064cbmia2hm02lcrh2m76z0zi5";
+ };
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ propagatedBuildInputs = [
+ cliff
+ openstacksdk
+ oslo-i18n
+ oslo-utils
+ simplejson
+ ];
+
+ checkInputs = [
+ requests-mock
+ stestr
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "osc_lib" ];
+
+ meta = with lib; {
+ description = "OpenStackClient Library";
+ homepage = "https://github.com/openstack/osc-lib";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix
new file mode 100644
index 000000000000..d3d90bfb2235
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-concurrency/default.nix
@@ -0,0 +1,70 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, bash
+, coreutils
+, eventlet
+, fasteners
+, fixtures
+, iana-etc
+, libredirect
+, oslo-config
+, oslo-utils
+, oslotest
+, pbr
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-concurrency";
+ version = "4.4.1";
+
+ src = fetchPypi {
+ pname = "oslo.concurrency";
+ inherit version;
+ sha256 = "6449cfbd15dbab20cf9907bbb2f057e0e5267f97161223d2b516cc8226b17ec3";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+
+ substituteInPlace oslo_concurrency/tests/unit/test_processutils.py \
+ --replace "/bin/bash" "${bash}/bin/bash" \
+ --replace "/bin/true" "${coreutils}/bin/true" \
+ --replace "/usr/bin/env" "${coreutils}/bin/env" \
+ --replace "/usr/bin/true" "${coreutils}/bin/true"
+ '';
+
+ propagatedBuildInputs = [
+ fasteners
+ oslo-config
+ oslo-utils
+ pbr
+ ];
+
+ checkInputs = [
+ eventlet
+ fixtures
+ oslotest
+ stestr
+ ];
+
+ checkPhase = ''
+ echo "nameserver 127.0.0.1" > resolv.conf
+ export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
+ export LD_PRELOAD=${libredirect}/lib/libredirect.so
+
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "oslo_concurrency" ];
+
+ meta = with lib; {
+ description = "Oslo Concurrency library";
+ homepage = "https://github.com/openstack/oslo.concurrency";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
new file mode 100644
index 000000000000..fface886eb94
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, debtcollector
+, netaddr
+, oslo-i18n
+, pbr
+, pyyaml
+, requests
+, rfc3986
+, stevedore
+, callPackage
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-config";
+ version = "8.7.1";
+
+ src = fetchPypi {
+ pname = "oslo.config";
+ inherit version;
+ sha256 = "a0c346d778cdc8870ab945e438bea251b5f45fae05d6d99dfe4953cca2277b60";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ propagatedBuildInputs = [
+ debtcollector
+ netaddr
+ oslo-i18n
+ pbr
+ pyyaml
+ requests
+ rfc3986
+ stevedore
+ ];
+
+ # check in passthru.tests.pytest to escape infinite recursion with other oslo components
+ doCheck = false;
+
+ passthru.tests = {
+ pytest = callPackage ./tests.nix {};
+ };
+
+ pythonImportsCheck = [ "oslo_config" ];
+
+ meta = with lib; {
+ description = "Oslo Configuration API";
+ homepage = "https://github.com/openstack/oslo.config";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-config/tests.nix b/pkgs/development/python-modules/oslo-config/tests.nix
new file mode 100644
index 000000000000..82400e67ea58
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-config/tests.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, oslo-config
+, docutils
+, oslo-log
+, oslotest
+, requests-mock
+, sphinx
+, stestr
+, testscenarios
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-config-tests";
+ inherit (oslo-config) version;
+
+ src = oslo-config.src;
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ dontBuild = true;
+ dontInstall = true;
+
+ checkInputs = [
+ oslo-config
+ docutils
+ oslo-log
+ oslotest
+ requests-mock
+ sphinx
+ stestr
+ testscenarios
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+}
diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix
new file mode 100644
index 000000000000..b4e52abd4237
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-context/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildPythonPackage, fetchPypi, debtcollector, oslotest, stestr, pbr }:
+
+buildPythonPackage rec {
+ pname = "oslo.context";
+ version = "3.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "f578ea38569cf0a677e2167178196b21a54175471358c4320ddfd5c97c52f4d1";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ propagatedBuildInputs = [
+ debtcollector
+ pbr
+ ];
+
+ checkInputs = [
+ oslotest
+ stestr
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "oslo_context" ];
+
+ meta = with lib; {
+ description = "Oslo Context library";
+ homepage = "https://github.com/openstack/oslo.context";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix
new file mode 100644
index 000000000000..c0c9dff04334
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-db/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, alembic
+, oslo-config
+, oslo-context
+, oslo-utils
+, oslotest
+, pbr
+, sqlalchemy
+, sqlalchemy_migrate
+, stestr
+, testresources
+, testscenarios
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-db";
+ version = "11.0.0";
+
+ src = fetchPypi {
+ pname = "oslo.db";
+ inherit version;
+ sha256 = "0cd5679868c0a0d194c916cc855348890820c3183b34a039af1e8698dac7afbf";
+ };
+
+ nativeBuildInputs = [ pbr ];
+
+ propagatedBuildInputs = [
+ alembic
+ oslo-config
+ oslo-context
+ oslo-utils
+ sqlalchemy
+ sqlalchemy_migrate
+ testresources
+ testscenarios
+ ];
+
+ checkInputs = [
+ oslotest
+ stestr
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "oslo_db" ];
+
+ meta = with lib; {
+ description = "Oslo Database library";
+ homepage = "https://github.com/openstack/oslo.db";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix
new file mode 100644
index 000000000000..cdb6767c7a52
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-i18n/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, oslotest
+, pbr
+, testscenarios
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-i18n";
+ version = "5.1.0";
+
+ src = fetchPypi {
+ pname = "oslo.i18n";
+ inherit version;
+ sha256 = "6bf111a6357d5449640852de4640eae4159b5562bbba4c90febb0034abc095d0";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ nativeBuildInputs = [ pbr ];
+
+ checkInputs = [
+ oslotest
+ stestr
+ testscenarios
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "oslo_i18n" ];
+
+ meta = with lib; {
+ description = "Oslo i18n library";
+ homepage = "https://github.com/openstack/oslo.i18n";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
new file mode 100644
index 000000000000..1e4598ead653
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, oslo-config
+, oslo-context
+, oslo-serialization
+, oslo-utils
+, oslotest
+, pbr
+, pyinotify
+, python-dateutil
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-log";
+ version = "4.6.0";
+
+ src = fetchPypi {
+ pname = "oslo.log";
+ inherit version;
+ sha256 = "dad5d7ff1290f01132b356d36a1bb79f98a3929d5005cce73e849ed31b385ba7";
+ };
+
+ propagatedBuildInputs = [
+ oslo-config
+ oslo-context
+ oslo-serialization
+ oslo-utils
+ pbr
+ python-dateutil
+ ] ++ lib.optionals stdenv.isLinux [
+ pyinotify
+ ];
+
+ checkInputs = [
+ oslotest
+ stestr
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "oslo_log" ];
+
+ meta = with lib; {
+ description = "oslo.log library";
+ homepage = "https://github.com/openstack/oslo.log";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix
new file mode 100644
index 000000000000..e6b8d0d0c422
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-serialization/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, msgpack
+, oslo-utils
+, oslotest
+, pbr
+, pytz
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-serialization";
+ version = "4.2.0";
+
+ src = fetchPypi {
+ pname = "oslo.serialization";
+ inherit version;
+ sha256 = "3007e1b017ad3754cce54def894054cbcd05887e85928556657434b0fc7e4d83";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ nativeBuildInputs = [ pbr ];
+
+ propagatedBuildInputs = [ msgpack oslo-utils pytz ];
+
+ checkInputs = [ oslotest stestr ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "oslo_serialization" ];
+
+ meta = with lib; {
+ description = "Oslo Serialization library";
+ homepage = "https://github.com/openstack/oslo.serialization";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix
new file mode 100644
index 000000000000..3707a196d03e
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-utils/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ddt
+, debtcollector
+, eventlet
+, fixtures
+, iso8601
+, netaddr
+, netifaces
+, oslo-i18n
+, oslotest
+, packaging
+, pbr
+, pyparsing
+, pytz
+, stestr
+, testscenarios
+, pyyaml
+, iana-etc
+, libredirect
+}:
+
+buildPythonPackage rec {
+ pname = "oslo-utils";
+ version = "4.10.0";
+
+ src = fetchPypi {
+ pname = "oslo.utils";
+ inherit version;
+ sha256 = "9646e6570ed08a79f21b03acfb60d32a3ac453d76304f8759b1211a59ce372cb";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ nativeBuildInputs = [ pbr ];
+
+ propagatedBuildInputs = [
+ debtcollector
+ iso8601
+ netaddr
+ netifaces
+ oslo-i18n
+ packaging
+ pyparsing
+ pytz
+ ];
+
+ checkInputs = [
+ ddt
+ eventlet
+ fixtures
+ oslotest
+ stestr
+ testscenarios
+ pyyaml
+ ];
+
+ checkPhase = ''
+ echo "nameserver 127.0.0.1" > resolv.conf
+ export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
+ export LD_PRELOAD=${libredirect}/lib/libredirect.so
+
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "oslo_utils" ];
+
+ meta = with lib; {
+ description = "Oslo Utility library";
+ homepage = "https://github.com/openstack/oslo.utils";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix
new file mode 100644
index 000000000000..66e06c8b3e72
--- /dev/null
+++ b/pkgs/development/python-modules/oslotest/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fixtures
+, pbr
+, subunit
+, callPackage
+}:
+
+buildPythonPackage rec {
+ pname = "oslotest";
+ version = "4.5.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "360ad2c41ba3ad6f059c7c6e7291450d082c2e5dbb0012e839a829978053dfe6";
+ };
+
+ nativeBuildInputs = [ pbr ];
+
+ propagatedBuildInputs = [
+ fixtures
+ subunit
+ ];
+
+ # check in passthru.tests.pytest to escape infinite recursion with other oslo components
+ doCheck = false;
+
+ passthru.tests = {
+ pytest = callPackage ./tests.nix {};
+ };
+
+ pythonImportsCheck = [ "oslotest" ];
+
+ meta = with lib; {
+ description = "Oslo test framework";
+ homepage = "https://github.com/openstack/oslotest";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslotest/tests.nix b/pkgs/development/python-modules/oslotest/tests.nix
new file mode 100644
index 000000000000..3c07a35c17d8
--- /dev/null
+++ b/pkgs/development/python-modules/oslotest/tests.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, oslo-config
+, oslotest
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "oslotest-tests";
+ inherit (oslotest) version;
+
+ src = oslotest.src;
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ dontBuild = true;
+ dontInstall = true;
+
+ checkInputs = [
+ oslotest
+ oslo-config
+ stestr
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+}
diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix
index 0ffdf8952277..10e50804ef58 100644
--- a/pkgs/development/python-modules/poolsense/default.nix
+++ b/pkgs/development/python-modules/poolsense/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "poolsense";
- version = "0.0.8";
+ version = "0.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp";
+ sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE=";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index b530dfe0b5b1..66129553b736 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -18,13 +18,13 @@
}:
buildPythonPackage rec {
- version = "1.5.19";
+ version = "1.5.20";
pname = "pyglet";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-/kuh2RboWWoOs4KX0PyhNlYgKI8q2SyiWvMJvprg/8w=";
+ sha256 = "ce76ce598ac910fbae6aae0db00aac21d19d62bdc8c616ed6e6a6a395dc44513";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix
new file mode 100644
index 000000000000..8346074c9c51
--- /dev/null
+++ b/pkgs/development/python-modules/python-cinderclient/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ddt
+, keystoneauth1
+, oslo-i18n
+, oslo-serialization
+, oslo-utils
+, pbr
+, requests
+, prettytable
+, requests-mock
+, simplejson
+, stestr
+, stevedore
+}:
+
+buildPythonPackage rec {
+ pname = "python-cinderclient";
+ version = "8.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b57b432b2ac9161c2482a569a023211d2d3d0ada81c4da62c8f6e47f0b2bf82d";
+ };
+
+ propagatedBuildInputs = [
+ simplejson
+ keystoneauth1
+ oslo-i18n
+ oslo-utils
+ pbr
+ prettytable
+ requests
+ stevedore
+ ];
+
+ checkInputs = [
+ ddt
+ oslo-serialization
+ requests-mock
+ stestr
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "cinderclient" ];
+
+ meta = with lib; {
+ description = "OpenStack Block Storage API Client Library";
+ homepage = "https://github.com/openstack/python-cinderclient";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix
new file mode 100644
index 000000000000..d91a3a9d3139
--- /dev/null
+++ b/pkgs/development/python-modules/python-keystoneclient/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, keystoneauth1
+, openssl
+, oslo-config
+, oslo-serialization
+, pbr
+, requests-mock
+, stestr
+, testresources
+, testscenarios
+}:
+
+buildPythonPackage rec {
+ pname = "python-keystoneclient";
+ version = "4.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "12jsiw82x2zcn8sf78xisf85kr28gl3jqj46a0wxx59v91p44j02";
+ };
+
+ propagatedBuildInputs = [
+ keystoneauth1
+ oslo-config
+ oslo-serialization
+ pbr
+ ];
+
+ checkInputs = [
+ openssl
+ requests-mock
+ stestr
+ testresources
+ testscenarios
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "keystoneclient" ];
+
+ meta = with lib; {
+ description = "Client Library for OpenStack Identity";
+ homepage = "https://github.com/openstack/python-keystoneclient";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix
new file mode 100644
index 000000000000..afc8a51988ed
--- /dev/null
+++ b/pkgs/development/python-modules/python-novaclient/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ddt
+, iso8601
+, keystoneauth1
+, openssl
+, oslo-i18n
+, oslo-serialization
+, pbr
+, prettytable
+, requests-mock
+, stestr
+, testscenarios
+}:
+
+buildPythonPackage rec {
+ pname = "python-novaclient";
+ version = "17.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU=";
+ };
+
+ propagatedBuildInputs = [
+ iso8601
+ keystoneauth1
+ oslo-i18n
+ oslo-serialization
+ pbr
+ prettytable
+ ];
+
+ checkInputs = [
+ ddt
+ openssl
+ requests-mock
+ stestr
+ testscenarios
+ ];
+
+ checkPhase = ''
+ stestr run -e <(echo "
+ novaclient.tests.unit.test_shell.ShellTest.test_osprofiler
+ novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler
+ ")
+ '';
+
+ pythonImportsCheck = [ "novaclient" ];
+
+ meta = with lib; {
+ description = "Client library for OpenStack Compute API";
+ homepage = "https://github.com/openstack/python-novaclient";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
new file mode 100644
index 000000000000..d538c01acc66
--- /dev/null
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ddt
+, osc-lib
+, pbr
+, python-cinderclient
+, python-keystoneclient
+, python-novaclient
+, requests-mock
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "python-openstackclient";
+ version = "5.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0abc6666378c5a7db83ec83515a8524fb6246a919236110169cc5c216ac997ea";
+ };
+
+ propagatedBuildInputs = [
+ osc-lib
+ pbr
+ python-cinderclient
+ python-keystoneclient
+ python-novaclient
+ ];
+
+ checkInputs = [
+ ddt
+ stestr
+ requests-mock
+ ];
+
+ checkPhase = ''
+ stestr run
+ '';
+
+ pythonImportsCheck = [ "openstackclient" ];
+
+ meta = with lib; {
+ description = "OpenStack Command-line Client";
+ homepage = "https://github.com/openstack/python-openstackclient";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 0de0015ab1ec..a69268cd5aec 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -304,6 +304,8 @@ in buildPythonPackage rec {
passthru = {
inherit cudaSupport;
cudaArchList = final_cudaArchList;
+ # At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability.
+ blasProvider = blas.provider;
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix
new file mode 100644
index 000000000000..88259dc718e1
--- /dev/null
+++ b/pkgs/development/python-modules/stestr/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cliff
+, fixtures
+, future
+, pbr
+, subunit
+, testtools
+, voluptuous
+, callPackage
+}:
+
+buildPythonPackage rec {
+ pname = "stestr";
+ version = "3.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "fb492cbdf3d3fdd6812645804efc84a99a68bb60dd7705f15c1a2949c8172bc4";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ propagatedBuildInputs = [
+ cliff
+ fixtures
+ future
+ pbr
+ subunit
+ testtools
+ voluptuous
+ ];
+
+ # check in passthru.tests.pytest to escape infinite recursion with other oslo components
+ doCheck = false;
+
+ passthru.tests = {
+ pytest = callPackage ./tests.nix { };
+ };
+
+ pythonImportsCheck = [ "stestr" ];
+
+ meta = with lib; {
+ description = "A parallel Python test runner built around subunit";
+ homepage = "https://github.com/mtreinish/stestr";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix
new file mode 100644
index 000000000000..7a5d47b5dcfe
--- /dev/null
+++ b/pkgs/development/python-modules/stestr/tests.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, ddt
+, sqlalchemy
+, stestr
+, subunit2sql
+}:
+
+buildPythonPackage rec {
+ pname = "stestr-tests";
+ inherit (stestr) version;
+
+ src = stestr.src;
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ dontBuild = true;
+ dontInstall = true;
+
+ checkInputs = [
+ stestr
+ ];
+
+ checkPhase = ''
+ export PATH=$out/bin:$PATH
+ export HOME=$TMPDIR
+ '';
+}
diff --git a/pkgs/development/python-modules/subunit2sql/default.nix b/pkgs/development/python-modules/subunit2sql/default.nix
new file mode 100644
index 000000000000..78035910397d
--- /dev/null
+++ b/pkgs/development/python-modules/subunit2sql/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mock
+, oslo-concurrency
+, oslo-db
+, pbr
+, python-dateutil
+, stestr
+}:
+
+buildPythonPackage rec {
+ pname = "subunit2sql";
+ version = "1.10.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-c+Dg6moKiv30M0mmwGQSOEbc94gfH//ZnF7lnBgv8EU=";
+ };
+
+ propagatedBuildInputs = [
+ oslo-db
+ pbr
+ python-dateutil
+ ];
+
+ checkInputs = [
+ mock
+ oslo-concurrency
+ stestr
+ ];
+
+ checkPhase = ''
+ export PATH=$out/bin:$PATH
+ export HOME=$TMPDIR
+
+ stestr run -e <(echo "
+ subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_failing_test_ids_from_runs_by_key_value
+ subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_id_from_test_id
+ subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_test_run_dict_by_run_meta_key_value
+ subunit2sql.tests.migrations.test_migrations.TestWalkMigrations.test_sqlite_opportunistically
+ subunit2sql.tests.test_shell.TestMain.test_main
+ subunit2sql.tests.test_shell.TestMain.test_main_with_targets
+ ")
+ '';
+
+ pythonImportsCheck = [ "subunit2sql" ];
+
+ meta = with lib; {
+ description = "Command to Read a subunit file or stream and put the data in a SQL DB";
+ homepage = "https://opendev.org/opendev/subunit2sql";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 6f3b62fc6e42..443d9b4b1e69 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.31.0";
+ version = "0.32.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- sha256 = "1aas07r5x2f7byzslfdqxi5dr0gwg5dy2qznnrs7w83ziqw6lxkm";
+ sha256 = "1yf725lfwhvkc1mvzqpl9wchwq2z4pz3z7bp0qlbgdym8z66x8wm";
};
- vendorSha256 = "10b6ny1fq6iwvhgq5293cdvd55mq3xgr2sc9kqshvjznwimfnb5z";
+ vendorSha256 = "0jg8a6vx2n71awr2zdkiisx76qcnj3qj6vj1w9m1c9kczz3mc7m3";
doCheck = false;
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index 6661dfce8fba..348111c5e4f9 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
- version = "0.6.4";
+ version = "0.6.5";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-etnHr0epu7L/qIYNnJ2NOEL1ZmE/U62KpXSsiWsJJn0=";
+ sha256 = "sha256-JUvwp4Ptu1URWO7wyeOCjwjGW4S0XqYZwNjCyR3H/rc=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/development/tools/database/termdbms/default.nix b/pkgs/development/tools/database/termdbms/default.nix
new file mode 100644
index 000000000000..b045669ef902
--- /dev/null
+++ b/pkgs/development/tools/database/termdbms/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+ pname = "termdbms";
+ version = "unstable-2021-09-04";
+
+ src = fetchFromGitHub {
+ owner = "mathaou";
+ repo = "termdbms";
+ rev = "d46e72c796e8aee0def71b8e3499b0ebe5ca3385";
+ sha256 = "1c3xgidhmvlcdw7v5gcqzv27cb58f1ix8sfd4r14rfz7c8kbv37v";
+ };
+
+ vendorSha256 = "0h9aw68niizd9gs0i890g6ij13af04qgpfy1g5pskyr4ryx0gn26";
+
+ patches = [ ./viewer.patch ];
+
+ ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mathaou/termdbms/";
+ description = "A TUI for viewing and editing database files";
+ license = licenses.mit;
+ maintainers = with maintainers; [ izorkin ];
+ };
+}
diff --git a/pkgs/development/tools/database/termdbms/viewer.patch b/pkgs/development/tools/database/termdbms/viewer.patch
new file mode 100644
index 000000000000..1b95c71de46b
--- /dev/null
+++ b/pkgs/development/tools/database/termdbms/viewer.patch
@@ -0,0 +1,12 @@
+diff --git a/viewer/viewer.go b/viewer/viewer.go
+index fcf850e..b0a0f8d 100644
+--- a/viewer/viewer.go
++++ b/viewer/viewer.go
+@@ -5,7 +5,6 @@ import (
+ "github.com/charmbracelet/bubbles/viewport"
+ tea "github.com/charmbracelet/bubbletea"
+ "github.com/charmbracelet/lipgloss"
+- "github.com/mattn/go-runewidth"
+ "math"
+ "runtime"
+ "strings"
diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix
index bc9cba9df5f7..83da3588b275 100644
--- a/pkgs/development/tools/gops/default.nix
+++ b/pkgs/development/tools/gops/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gops";
- version = "0.3.19";
+ version = "0.3.20";
src = fetchFromGitHub {
owner = "google";
repo = "gops";
rev = "v${version}";
- sha256 = "sha256-9QEhc0OVCrIdIY220PDn2+CjUsCF84l6QRQS0HjDEZY=";
+ sha256 = "sha256-eHcCi9D5TpRWxC39SnOD2GW3qyNBR69bHb8f/Gb+qAI=";
};
vendorSha256 = null;
diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix
new file mode 100644
index 000000000000..1fe33a86f978
--- /dev/null
+++ b/pkgs/games/airshipper/default.nix
@@ -0,0 +1,74 @@
+{ lib
+, rustPlatform
+, fetchFromGitLab
+, openssl
+, vulkan-loader
+, wayland
+, wayland-protocols
+, libxkbcommon
+, libX11
+, libXrandr
+, libXi
+, libXcursor
+, pkg-config
+, makeWrapper
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "airshipper";
+ version = "0.6.0";
+
+ src = fetchFromGitLab {
+ owner = "Veloren";
+ repo = "airshipper";
+ rev = "v${version}";
+ sha256 = "sha256-m3H2FE1DoV/uk9PGgf9PCagwmWWSQO/gCi7zpS02/WY=";
+ };
+
+ cargoSha256 = "sha256-ddy4TjT/ia+sLBnpwcXBVUzAS07ar+Jjc04KS5/arlU=";
+
+ buildInputs = [
+ openssl
+ wayland
+ wayland-protocols
+ libxkbcommon
+ libX11
+ libXrandr
+ libXi
+ libXcursor
+ ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+
+ postInstall = ''
+ mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons"
+ cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications"
+ cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico"
+ '';
+
+ postFixup =
+ let
+ libPath = lib.makeLibraryPath [
+ vulkan-loader
+ wayland
+ wayland-protocols
+ libxkbcommon
+ libX11
+ libXrandr
+ libXi
+ libXcursor
+ ];
+ in ''
+ patchelf --set-rpath "${libPath}" "$out/bin/airshipper"
+ '';
+
+ doCheck = false;
+ cargoBuildFlags = [ "--package" "airshipper" ];
+ cargoTestFlags = [ "--package" "airshipper" ];
+
+ meta = with lib; {
+ description = "Provides automatic updates for the voxel RPG Veloren.";
+ homepage = "https://www.veloren.net";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ yusdacra ];
+ };
+}
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index ff5fb6e5ee76..ab6817a99453 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -1,19 +1,20 @@
{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook
+, pytestCheckHook
, gtk3, gobject-introspection, libappindicator-gtk3, librsvg
-, evdev, pygobject3, pylibacl, pytest, bluez
+, evdev, pygobject3, pylibacl, bluez, vdf
, linuxHeaders
, libX11, libXext, libXfixes, libusb1, udev
}:
buildPythonApplication rec {
pname = "sc-controller";
- version = "0.4.7";
+ version = "0.4.8.6";
src = fetchFromGitHub {
- owner = "kozec";
+ owner = "Ryochan7";
repo = pname;
rev = "v${version}";
- sha256 = "1dskjh5qcjf4x21n4nk1zvdfivbgimsrc2lq1id85bibzps29499";
+ sha256 = "1fgizgzm79zl9r2kkwvh1gf9lnxaix15283xxk6bz843inr8b88k";
};
# see https://github.com/NixOS/nixpkgs/issues/56943
@@ -23,9 +24,9 @@ buildPythonApplication rec {
buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ];
- propagatedBuildInputs = [ evdev pygobject3 pylibacl ];
+ propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ];
- checkInputs = [ pytest ];
+ checkInputs = [ pytestCheckHook ];
postPatch = ''
substituteInPlace scc/paths.py --replace sys.prefix "'$out'"
@@ -48,12 +49,8 @@ buildPythonApplication rec {
)
'';
- checkPhase = ''
- PYTHONPATH=. py.test
- '';
-
meta = with lib; {
- homepage = "https://github.com/kozec/sc-controller";
+ homepage = "https://github.com/Ryochan7/sc-controller";
# donations: https://www.patreon.com/kozec
description = "User-mode driver and GUI for Steam Controller and other controllers";
license = licenses.gpl2;
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index c36d84399e0e..dd8c9fcbc6cd 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -424,7 +424,7 @@ self: super: {
});
null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
- path = "null-ls.nvim";
+ dependencies = with self; [ plenary-nvim nvim-lspconfig ];
});
nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 5da3676a1c82..70a180e737eb 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -13,15 +13,21 @@
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.62-hardened1.patch",
- "sha256": "0xdj9mp0ccilj06pb8my5jqw47xwc2fk7f2ck36g4bzsp669nisj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.62-hardened1/linux-hardened-5.10.62-hardened1.patch"
+ "name": "linux-hardened-5.10.63-hardened1.patch",
+ "sha256": "1v1w6ybfkgqisdprny9bb658443hbld86r96cvzqdkmd8wfh4513",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.63-hardened1/linux-hardened-5.10.63-hardened1.patch"
},
"5.13": {
"extra": "-hardened1",
- "name": "linux-hardened-5.13.14-hardened1.patch",
- "sha256": "00lmqq10d66s1852q1j2m8cj90bb0gfpsg617bc7f3pm2v6iyl93",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.14-hardened1/linux-hardened-5.13.14-hardened1.patch"
+ "name": "linux-hardened-5.13.15-hardened1.patch",
+ "sha256": "1g75jh5j9qbh4wbiy2wnc982i2gld2845ai47rczcj7ciycba8n7",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.15-hardened1/linux-hardened-5.13.15-hardened1.patch"
+ },
+ "5.14": {
+ "extra": "-hardened1",
+ "name": "linux-hardened-5.14.2-hardened1.patch",
+ "sha256": "0hcw61bavhyr9v621ajsrl2zgz7kc0z8r7p5kzm37dnlggwl4qh3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.2-hardened1/linux-hardened-5.14.2-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix
index 05df86f3a784..faf87a904831 100644
--- a/pkgs/servers/dict/wiktionary/default.nix
+++ b/pkgs/servers/dict/wiktionary/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "dict-db-wiktionary";
- version = "20210201";
+ version = "20210901";
src = fetchurl {
url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
- sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs";
+ sha256 = "S87E0aAFITOTugvsXOmbq8+P/LS2J+GmFvJYeYj79PM=";
};
# script in nixpkgs does not support python2
diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/servers/dns/ncdns/default.nix
index b046aff12bd7..7fad548df7a5 100644
--- a/pkgs/servers/dns/ncdns/default.nix
+++ b/pkgs/servers/dns/ncdns/default.nix
@@ -1,27 +1,103 @@
-{ lib, nixosTests, git, buildGoPackage, fetchFromGitHub, libcap }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, nixosTests
+, libcap
+}:
-buildGoPackage rec {
- pname = "ncdns";
- version = "2020-11-22";
+let
- goPackagePath = "github.com/namecoin/ncdns";
- goDeps = ./deps.nix;
-
- src = fetchFromGitHub {
+ # ncdns source
+ ncdns = fetchFromGitHub {
owner = "namecoin";
repo = "ncdns";
- rev = "2fa54cd3b5480dba82170ab8ecb511fbd4977c41";
- sha256 = "0mrxbg5lmy3s281ff6nxpp03z4mqwq7h5hkqm9qy8nb280x1sx7h";
+ rev = "2a486311b0fe1a921af34aa3b31e6e4e0569accc";
+ sha256 = "01arwlycp1iia4bd3dgyn8dam1av2a7d9hv7f085n14l2i2aza7v";
};
- patches = [ ./fix-tpl-path.patch ];
+ # script to patch the crypto/x509 package
+ x509 = fetchFromGitHub {
+ owner = "namecoin";
+ repo = "x509-compressed";
+ rev = "fb9f2b7bc9fcba954d70f63857cc0c3841b1cf47";
+ sha256 = "1arkbpbzvhcmz5fhjqg34x2jbjnwmlisapk22rjki17qpamh7zks";
+ # ncdns must be put in a subdirectory for this to work.
+ extraPostFetch = ''
+ cp -r --no-preserve=mode "${ncdns}" "$out/ncdns"
+ '';
+ };
+
+in
+
+buildGoModule {
+ pname = "ncdns";
+ version = "unstable-2020-07-18";
+
+ src = x509;
+
+ vendorSha256 = "02bqf6vkj5msk35sr5sklnqqd16n7gns7knzqslw077xrxiz7bsg";
+
+ # Override the go-modules fetcher derivation to apply
+ # upstream's patch of the crypto/x509 library.
+ modBuildPhase = ''
+ go mod init github.com/namecoin/x509-compressed
+ go generate ./...
+ go mod tidy
+
+ cd ncdns
+ go mod init github.com/namecoin/ncdns
+ go mod edit \
+ -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest \
+ -replace github.com/namecoin/x509-compressed=$NIX_BUILD_TOP/source
+ go mod tidy
+ '';
+
+ # Copy over the lockfiles as well, because the source
+ # doesn't contain it. The fixed-output derivation is
+ # probably not reproducible anyway.
+ modInstallPhase = ''
+ mv -t vendor go.mod go.sum
+ cp -r --reflink=auto vendor "$out"
+ '';
buildInputs = [ libcap ];
+ # The fetcher derivation must run with a different
+ # $sourceRoot, but buildGoModule doesn't allow that,
+ # so we use this ugly hack.
+ unpackPhase = ''
+ runHook preUnpack
+
+ unpackFile "$src"
+ sourceRoot=$PWD/source/ncdns
+ chmod -R u+w -- "$sourceRoot"
+ cd $sourceRoot
+
+ runHook postUpack
+ '';
+
+ # Same as above: can't use `patches` because that would
+ # be also applied to the fetcher derivation, thus failing.
+ patchPhase = ''
+ runHook prePatch
+ patch -p1 < ${./fix-tpl-path.patch}
+ runHook postPatch
+ '';
+
+ preBuild = ''
+ chmod -R u+w vendor
+ mv -t . vendor/go.{mod,sum}
+ '';
+
+ preCheck = ''
+ # needed to run the ncdns test suite
+ ln -s $PWD/vendor ../../go/src
+ '';
+
postInstall = ''
mkdir -p "$out/share"
- cp -r "$src/_doc" "$out/share/doc"
- cp -r "$src/_tpl" "$out/share/tpl"
+ cp -r _doc "$out/share/doc"
+ cp -r _tpl "$out/share/tpl"
'';
meta = with lib; {
diff --git a/pkgs/servers/dns/ncdns/deps.nix b/pkgs/servers/dns/ncdns/deps.nix
deleted file mode 100644
index f48faa9648bd..000000000000
--- a/pkgs/servers/dns/ncdns/deps.nix
+++ /dev/null
@@ -1,318 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "ea60c4def909bde529d41a7e0674e31eba751da3";
- sha256 = "08xhd9jlgkql8kqpi98aaq9k8hgb6x7197r6crp84r1ic8k7im4y";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/template";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/template";
- rev = "fb15b899a75114aa79cc930e33c46b577cc664b1";
- sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/units";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/units";
- rev = "1786d5ef83d4868925e518b2995c30430aec0f06";
- sha256 = "1grs2y4gnyq8wv9w61c231a01c7qd916b7rxqy798b8sfirr3ci8";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/btcd";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/btcd";
- rev = "6bd4c64a54faeb343d5e3c1ee5802450a291787f";
- sha256 = "15plh7rrmx1ydy3ldnylr727s9szrrkqzbf2ma2ka2qag1vy6nvb";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/btclog";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/btclog";
- rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a";
- sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/btcutil";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/btcutil";
- rev = "a53e38424cce1c9de2062b69364efd35fd428d15";
- sha256 = "1izjvgi0d5wnknfwdnqa196hn4vj1n5ga7swbhcfsgghk2zngwr4";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/go-socks";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/go-socks";
- rev = "4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f";
- sha256 = "18cv2icj059lq4s99p6yh91hlas5f2gi3f1p4c10sjgwrs933d7b";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/websocket";
- rev = "31079b6807923eb23992c421b114992b95131b55";
- sha256 = "0xpkf257ml6fpfdgv7hxxc41n0d5yxxm3njm50qpzp7j71l9cjwa";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-systemd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-systemd";
- rev = "87511f396ae9991f8589f6e6dcf58e28a91ba52b";
- sha256 = "139ylav4vl4h7ndy1xkj0dn45rbknv2rfjlifrj622n96c4rrazx";
- };
- }
- {
- goPackagePath = "github.com/golang/groupcache";
- fetch = {
- type = "git";
- url = "https://github.com/golang/groupcache";
- rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba";
- sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh";
- };
- }
- {
- goPackagePath = "github.com/hlandau/buildinfo";
- fetch = {
- type = "git";
- url = "https://github.com/hlandau/buildinfo";
- rev = "337a29b5499734e584d4630ce535af64c5fe7813";
- sha256 = "1kq3r1i4rr9bcvj5yg8w1l95f6sfc3kn6kgcdmlh5i3j9w2sram8";
- };
- }
- {
- goPackagePath = "github.com/hlandau/degoutils";
- fetch = {
- type = "git";
- url = "https://github.com/hlandau/degoutils";
- rev = "8fa2440b63444dad556d76366f1c3ee070c8a577";
- sha256 = "1yj39jbrk3xx3cyl8f4asakc74lsl0brasi25xjf6219pg69q0iy";
- };
- }
- {
- goPackagePath = "github.com/hlandau/dexlogconfig";
- fetch = {
- type = "git";
- url = "https://github.com/hlandau/dexlogconfig";
- rev = "244f29bd260884993b176cd14ef2f7631f6f3c18";
- sha256 = "1d01ghx6xawj3nk3lpk51wbbpxdnc9vzvijvlayvp7cxgsacslbc";
- };
- }
- {
- goPackagePath = "github.com/hlandau/xlog";
- fetch = {
- type = "git";
- url = "https://github.com/hlandau/xlog";
- rev = "197ef798aed28e08ed3e176e678fda81be993a31";
- sha256 = "08rjlqnjbfgpz5rbjq89l7y5vyhk99ivr928sqdi5gnqznbqs4m8";
- };
- }
- {
- goPackagePath = "github.com/kr/pretty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pretty";
- rev = "a883a8422cd235c67c6c4fdcb7bbb022143e10b1";
- sha256 = "0vp5ijbapw8j52c3l992m1wm8nhl23n68xk3lqxhad3srxmdb9z4";
- };
- }
- {
- goPackagePath = "github.com/kr/text";
- fetch = {
- type = "git";
- url = "https://github.com/kr/text";
- rev = "cafcf9720371e5625e7300397de921f58e069d17";
- sha256 = "0q164xvv7nwgjq2l2lln4y7yp036jpwx8v7yfsz432czl10d4g0h";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc";
- sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd";
- };
- }
- {
- goPackagePath = "github.com/miekg/dns";
- fetch = {
- type = "git";
- url = "https://github.com/miekg/dns";
- rev = "23c4faca9d32b0abbb6e179aa1aadc45ac53a916";
- sha256 = "1iir2yrx71wg0ab9j4qm70aycym2pxrb043dmbknyzbw9s43cabz";
- };
- }
- {
- goPackagePath = "github.com/namecoin/btcd";
- fetch = {
- type = "git";
- url = "https://github.com/namecoin/btcd";
- rev = "69a10543311fa68737d0a77b4cd045b0b0abfb75";
- sha256 = "1zbfigs3hrjhdwp19877lpgivdcz3k80149nxdmxlmp03xcswcqy";
- };
- }
- {
- goPackagePath = "github.com/namecoin/ncbtcjson";
- fetch = {
- type = "git";
- url = "https://github.com/namecoin/ncbtcjson";
- rev = "fa221af062c70f802db6ed66e1546cc4a41ec277";
- sha256 = "1fmz5aylsji27vj5f3f3gg9xj99735gh5prvcfz0gmk68v1mnr4i";
- };
- }
- {
- goPackagePath = "github.com/namecoin/ncrpcclient";
- fetch = {
- type = "git";
- url = "https://github.com/namecoin/ncrpcclient";
- rev = "858e1a5acd8b2da56462f50323633cdf2fe80977";
- sha256 = "0pj951wm6fdkk2yv4bxaxka52i7rb6w3fs9ah3fy7p8wchr4smjx";
- };
- }
- {
- goPackagePath = "github.com/namecoin/splicesign";
- fetch = {
- type = "git";
- url = "https://github.com/namecoin/splicesign";
- rev = "38bb6fb3ec66c72ecb3a14e1e714768cc6e56ed7";
- sha256 = "0irlbcrarbrvzdnph9kxrf8bkij1lzqpp5mxh8i60n5ii7bj0wsd";
- };
- }
- {
- goPackagePath = "github.com/namecoin/tlsrestrictnss";
- fetch = {
- type = "git";
- url = "https://github.com/namecoin/tlsrestrictnss";
- rev = "945a9f3d995fcb175fd0b19549e21a3e87ba8c13";
- sha256 = "18qphkqnjw3bwflkyyrddyzgwscs37j7y6ynm9g78bqb5skviqqy";
- };
- }
- {
- goPackagePath = "github.com/ogier/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/ogier/pflag";
- rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb";
- sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii";
- };
- }
- {
- goPackagePath = "github.com/rogpeppe/go-internal";
- fetch = {
- type = "git";
- url = "https://github.com/rogpeppe/go-internal";
- rev = "eea92b9e2c4424af886c8c620efa50fff5a56387";
- sha256 = "0lf4x32af40ixnysfzfm9r08gpsd3k3x7p3hr2k8q72llsa1zivz";
- };
- }
- {
- goPackagePath = "github.com/shiena/ansicolor";
- fetch = {
- type = "git";
- url = "https://github.com/shiena/ansicolor";
- rev = "c7312218db184c554578219828d6c9498d02dcb1";
- sha256 = "14mhp5ir1vlshja9bam6df5wpbqdwg46qn1ysixjiap535ajhkza";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "eec23a3978adcfd26c29f4153eaa3e3d9b2cc53a";
- sha256 = "18cf6vhmx7v83ahyil7j8hkwhwf1012bgixglz7a6nc35qwwqb3r";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "6772e930b67bb09bf22262c7378e7d2f67cf59d1";
- sha256 = "0zlr39dxbg0fxfdrc20c4x0pw43n9kz749ssml97cdzqy116p5qa";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "0d417f6369309be088e227ead8736fb722d759d3";
- sha256 = "1cn19s7kg91alianr1c1bp6k6p1wccigg19h6fchd84jb2zakkvs";
- };
- }
- {
- goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/alecthomas/kingpin.v2";
- rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
- sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
- };
- }
- {
- goPackagePath = "gopkg.in/hlandau/configurable.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/hlandau/configurable.v1";
- rev = "41496864a1fe3e0fef2973f22372b755d2897402";
- sha256 = "0i9jbdvi8rz12xsrzzbfxg5lwsqakjcmccsa5a32asmv26k5byqa";
- };
- }
- {
- goPackagePath = "gopkg.in/hlandau/easyconfig.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/hlandau/easyconfig.v1";
- rev = "c31249162931b4963bbe6e501cccb60d23271a3f";
- sha256 = "1v8j1pyzcfj1l4pmb1c6mszci6xzc4agdam2kq79kyvbsvbbw9dc";
- };
- }
- {
- goPackagePath = "gopkg.in/hlandau/madns.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/hlandau/madns.v2";
- rev = "26979b3e4b5aa3e0bd53cf0a014f9eaf43b578e3";
- sha256 = "09r4m4mqdgd7hvxyvss9m64lq0kk8nylnq2bgnkrclgzpi87fmmb";
- };
- }
- {
- goPackagePath = "gopkg.in/hlandau/service.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/hlandau/service.v2";
- rev = "b64b3467ebd16f64faec1640c25e318efc0c0d7b";
- sha256 = "0lpx88f46ylx9lf6jgwcjgklll1pc1mlakrywpa0wzhjj7a4jinc";
- };
- }
- {
- goPackagePath = "gopkg.in/hlandau/svcutils.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/hlandau/svcutils.v1";
- rev = "c25dac49e50cbbcbef8c81b089f56156f4067729";
- sha256 = "12b6p71mk33r44d71xizjq82fls0ykfwfl5gnmckbgpxms4bj2xf";
- };
- }
-]
diff --git a/pkgs/shells/loksh/default.nix b/pkgs/shells/loksh/default.nix
new file mode 100644
index 000000000000..d8463d1773c4
--- /dev/null
+++ b/pkgs/shells/loksh/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, stdenv
+, meson
+, ninja
+, pkg-config
+, ncurses
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ pname = "loksh";
+ version = "6.9";
+
+ src = fetchFromGitHub {
+ owner = "dimkr";
+ repo = pname;
+ rev = version;
+ fetchSubmodules = true;
+ sha256 = "0x33plxqhh5202hgqidgccz5hpg8d2q71ylgnm437g60mfi9z0px";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ ];
+
+ buildInputs = [
+ ncurses
+ ];
+
+ postInstall = ''
+ mv $out/bin/ksh $out/bin/loksh
+ mv $out/share/man/man1/ksh.1 $out/share/man/man1/loksh.1
+ mv $out/share/man/man1/sh.1 $out/share/man/man1/loksh-sh.1
+ '';
+
+ passthru = {
+ shellPath = "/bin/loksh";
+ };
+
+ meta = with lib; {
+ description = "Linux port of OpenBSD's ksh";
+ homepage = "https://github.com/dimkr/loksh";
+ license = licenses.publicDomain;
+ maintainers = with maintainers; [ cameronnemo ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index 1a92d86ccf37..0bf1359bc272 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -191,5 +191,187 @@
sha256 = "1qb2gaiinclmbswyn5aakwjmm3gaggscckb1q2syx69k42hvp3s3";
}
];
+ aarch64-linux = [
+ {
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-linux-arm64.tar.gz";
+ sha256 = "1hzm80ajndaqchxrxdpg0fvc5rqqagbhd5zs8msw166xyanavl9p";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-arm64.tar.gz";
+ sha256 = "1l7zpvacq6kyzj8n82drs9gdfa16k4j945w8nsd0z33byrswxr3w";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-linux-arm64.tar.gz";
+ sha256 = "1d67npimg49lx1g9adds32gfpwwv0ikk52qz1kyzfbz10hz62xyx";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-linux-arm64.tar.gz";
+ sha256 = "0fh4zrpmgg16jhzdmqihwq8k39bjlchd54mbkd50fphw1w2xw2jz";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-arm64.tar.gz";
+ sha256 = "1pjvrhmci1fbakx74yndjhkvxxy4yfnwrwbk12dyb3mxc07iycfj";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-linux-arm64.tar.gz";
+ sha256 = "07c34x3g31f0bvwfwgxnnikqp5wzyn97hxzwlidvr6g1w7srj0qn";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-linux-arm64.tar.gz";
+ sha256 = "1l1p5gqnxd3rb9107m9wi76k8d57ak9w86dniiwys3dqbwxjn1ix";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz";
+ sha256 = "1lh1g90ab4blqmvx0yfp516hfsd6n1y751ab7fzhv7hcajf3klvi";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-linux-arm64.tar.gz";
+ sha256 = "0xibm242vjv1jr2c2v5a1ndlafybq66iqfdmdghys3fa4csb5d4s";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-linux-arm64.tar.gz";
+ sha256 = "18as1qkqz0b4cminqf9czd5lx04nr8da7w3g0dbp6bpr7biakra0";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-linux-arm64.tar.gz";
+ sha256 = "0pwcn2hlfj5nh5fyql8nk4rzfpsrp6ph5kd3r62872z6kz4fr1f8";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-arm64.tar.gz";
+ sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-linux-arm64.tar.gz";
+ sha256 = "0bz4i7bga2vy4pki9k93f7q6zfcy9yg17xz0j4wfyqmlaanfz8r0";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-linux-arm64.tar.gz";
+ sha256 = "1vkfrgk6lk3v7fgs10ygaw3x3srp3mncr0wna1xdzf7s1gsz8m09";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-linux-arm64.tar.gz";
+ sha256 = "1nyy1is8i9jx9ig1v01l5sbhp4xal1vklmfjnqhr8v8h5kjwkm4v";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-arm64.tar.gz";
+ sha256 = "1hicy131pj6z4ni074f34qhvjyycjxl0024iir5021g1scm3hp7w";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz";
+ sha256 = "1slrl020xl092hjfr92zjf8i2ys8vzr3nxqh65fhnl0fzfsllvn0";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-linux-arm64.tar.gz";
+ sha256 = "1cpr53shxap4s25pw3xd9vnbwh4jbmp1x0qfqz46i9af0isa10i8";
+ }
+ # pulumi-resource-packet skipped (does not exist on remote)
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-linux-arm64.tar.gz";
+ sha256 = "0mddv37k87wiygh6x9bnxpcr721qbmbqf6l5zk3xl61n56j8qyb1";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-arm64.tar.gz";
+ sha256 = "0y7wysd4j1dp73hrbydzj2bfvpgv8vxiza5m6dbg7nl66w9ng0rc";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-linux-arm64.tar.gz";
+ sha256 = "0fa295br09w7392mb62qw31ia2116dqs15f4r634zcachb0ad93g";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-arm64.tar.gz";
+ sha256 = "03z7b32l2jp1si13qy2rjvkjw789sqaypza7q2k4vhwaxyiw715z";
+ }
+ ];
+ aarch64-darwin = [
+ {
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-darwin-arm64.tar.gz";
+ sha256 = "1sasxi57ga7gazjmni4sksyih5dw1qx0bhcmh5f5xyznsb9flk4v";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-arm64.tar.gz";
+ sha256 = "1rmvc2kgjmb978sfmlga6xy4i0f629lk1l95i30wg0rmj1hx3dag";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-darwin-arm64.tar.gz";
+ sha256 = "0hw0x8bxj0rdkxchlsa30phkglgcln14xv2capx67vpdp9qg8iyi";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-darwin-arm64.tar.gz";
+ sha256 = "125mb2qmxb5cwnvqwckiaih9gq84azfb0qbrw2vmz338967sfz2c";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-arm64.tar.gz";
+ sha256 = "0p7hmdax7bzn93mv6l79g3g38fh1axnryyq8sg3h16wj8gcc8kq5";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-darwin-arm64.tar.gz";
+ sha256 = "1aijk67byw9nwlsdvmw7fiks6ih6wlcbvqpmijchzn86qxikppcq";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-darwin-arm64.tar.gz";
+ sha256 = "1smg4r1aijl42hv28v2gjvbmlrhmcs5p4w4pzngv7wsgsm5y6lzm";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz";
+ sha256 = "1z0gd0fagv55dl3ki340h0ljw7dqj8818w4072pc5xxy5id90gb0";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-darwin-arm64.tar.gz";
+ sha256 = "1170s85p6d850czb0amzk06d3bcyzyp14p49sgqvpa099jyvs4mm";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-darwin-arm64.tar.gz";
+ sha256 = "0hvsprzznj0incv60lhxxh4jsx67h7l49v65288ic0x0nsgibn4x";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-darwin-arm64.tar.gz";
+ sha256 = "0qjpay735gff28xdvippm11lh8gk2xsvh2mcil679ybgpk6kypw2";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-arm64.tar.gz";
+ sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-darwin-arm64.tar.gz";
+ sha256 = "1fcxgbqw6fpn202hza4yyq370r9vbfy8pw220g7yihg8vy9wb1dk";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-darwin-arm64.tar.gz";
+ sha256 = "0h35d4j6s22sxgf579b6f0v14qp49z5rqzcb30pi4grsk8zkqrrr";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-darwin-arm64.tar.gz";
+ sha256 = "0sg73w6h94w0mj9q45av9k2sw251k2a7lnh52ndkbc2phqx3rshh";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-arm64.tar.gz";
+ sha256 = "118kszs5y3ajh702dyy4wivwdima30s3spbr3cdm9g7aabqhl5l6";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz";
+ sha256 = "10a2f5kdgk3jcd1441zbfcfnrl5zj6ks832jjmbyym33by7scvgc";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-darwin-arm64.tar.gz";
+ sha256 = "17imdik9gb3bhqh71b82h12sx6rn13iann9dlbdxy3zj3g59k3ri";
+ }
+ # pulumi-resource-packet skipped (does not exist on remote)
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-darwin-arm64.tar.gz";
+ sha256 = "0fj1ai1kv8xgmsvfbmy5gsinxag70rx9a9gkifqgcpn3r9mj48ks";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-arm64.tar.gz";
+ sha256 = "0waf4apw5bzn276s34yaxvm3xyk5333l3zcz2j52c56wkadzxvpg";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-darwin-arm64.tar.gz";
+ sha256 = "1ywy4zv96k5x85j0fw36q331p11ka1fpg9x18d9ijwl424c7669j";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-arm64.tar.gz";
+ sha256 = "0ci3xnxnwrk6dds21yifis1mrz24z2nxqdbya0qpqprkq6syvx41";
+ }
+ ];
};
}
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index 69c417252cc3..756dce6b8eea 100755
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -33,7 +33,7 @@ plugins=(
)
function genMainSrc() {
- local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz"
+ local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-${1}-${2}.tar.gz"
local sha256
sha256=$(nix-prefetch-url "$url")
echo " {"
@@ -48,13 +48,17 @@ function genSrcs() {
local version=${plugVers#*=}
# url as defined here
# https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197
- local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-$1-amd64.tar.gz"
+ local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-${1}-${2}.tar.gz"
local sha256
sha256=$(nix-prefetch-url "$url")
- echo " {"
- echo " url = \"${url}\";"
- echo " sha256 = \"$sha256\";"
- echo " }"
+ if [ "$sha256" ]; then # file exists
+ echo " {"
+ echo " url = \"${url}\";"
+ echo " sha256 = \"$sha256\";"
+ echo " }"
+ else
+ echo " # pulumi-resource-${plug} skipped (does not exist on remote)"
+ fi
done
}
@@ -65,16 +69,29 @@ function genSrcs() {
{
version = "${VERSION}";
pulumiPkgs = {
- x86_64-linux = [
EOF
- genMainSrc "linux"
- genSrcs "linux"
- echo " ];"
- echo " x86_64-darwin = ["
- genMainSrc "darwin"
- genSrcs "darwin"
+ echo " x86_64-linux = ["
+ genMainSrc "linux" "x64"
+ genSrcs "linux" "amd64"
echo " ];"
+
+ echo " x86_64-darwin = ["
+ genMainSrc "darwin" "x64"
+ genSrcs "darwin" "amd64"
+ echo " ];"
+
+ echo " aarch64-linux = ["
+ genMainSrc "linux" "arm64"
+ genSrcs "linux" "arm64"
+ echo " ];"
+
+ echo " aarch64-darwin = ["
+ genMainSrc "darwin" "arm64"
+ genSrcs "darwin" "arm64"
+ echo " ];"
+
echo " };"
echo "}"
+
} > data.nix
diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix
new file mode 100644
index 000000000000..334b3abdfc95
--- /dev/null
+++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix
@@ -0,0 +1,95 @@
+{ lib, stdenv, fetchurl, fetchpatch
+, autoPatchelfHook, makeWrapper
+, hexdump, exfat, dosfstools, e2fsprogs, xz, util-linux, bash, parted
+}:
+
+let arch = {
+ x86_64-linux = "x86_64";
+ i686-linux = "i386";
+ aarch64-linux = "aarch64";
+ mipsel-linux = "mips64el";
+}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
+in stdenv.mkDerivation rec {
+ pname = "ventoy-bin";
+ version = "1.0.51";
+
+ nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+ buildInputs = [ hexdump exfat dosfstools e2fsprogs xz util-linux bash parted ];
+
+ src = fetchurl {
+ url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
+ sha256 = "81ae02a06b132b5965dd09c9b64e000a6dafa1d57e03d8564feefda14ef1ee02";
+ };
+ patches = [
+ (fetchpatch {
+ name = "sanitize.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=ventoy-bin&id=ce4c26c67a1de4b761f9448bf92e94ffae1c8148";
+ sha256 = "c00f9f9cd5b4f81c566267b7b2480fa94d28dda43a71b1e47d6fa86f764e7038";
+ })
+ ./fix-for-read-only-file-system.patch
+ ];
+ patchFlags = [ "-p0" ];
+ postPatch = ''
+ # Fix permissions.
+ find -type f -name \*.sh -exec chmod a+x '{}' \;
+
+ # Fix path to log.
+ sed -i 's:[lL]og\.txt:/var/log/ventoy\.log:g' WebUI/static/js/languages.js
+ '';
+ installPhase = ''
+ # Setup variables.
+ local VENTOY_PATH="$out"/share/ventoy
+ local ARCH='${arch}'
+
+ # Prepare.
+ cd tool/"$ARCH"
+ rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat*
+ for archive in *.xz; do
+ xzcat "$archive" > "''${archive%.xz}"
+ rm "$archive"
+ done
+ chmod a+x *
+ cd -
+
+ # Cleanup.
+ case "$ARCH" in
+ x86_64) rm -r tool/{i386,aarch64,mips64el};;
+ i386) rm -r tool/{x86_64,aarch64,mips64el};;
+ aarch64) rm -r tool/{x86_64,i386,mips64el};;
+ mips64el) rm -r tool/{x86_64,i386,aarch64};;
+ esac
+ rm README
+
+ # Copy from "$src" to "$out".
+ mkdir -p "$out"/bin "$VENTOY_PATH"
+ cp -r . "$VENTOY_PATH"
+
+ # Fill bin dir.
+ for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \
+ CreatePersistentImg.sh_ventoy-persistent \
+ ExtendPersistentImg.sh_ventoy-extend-persistent; do
+ makeWrapper "$VENTOY_PATH/''${f%_*}" "$out/bin/''${f#*_}" \
+ --prefix PATH : "${lib.makeBinPath buildInputs}" \
+ --run "cd '$VENTOY_PATH' || exit 1"
+ done
+ '';
+
+ meta = with lib; {
+ description = "An open source tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files";
+ longDescription = ''
+ An open source tool to create bootable USB drive for
+ ISO/WIM/IMG/VHD(x)/EFI files. With ventoy, you don't need to format the
+ disk over and over, you just need to copy the ISO/WIM/IMG/VHD(x)/EFI
+ files to the USB drive and boot them directly. You can copy many files
+ at a time and ventoy will give you a boot menu to select them
+ (screenshot). x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and
+ MIPS64EL UEFI are supported in the same way. Most type of OS supported
+ (Windows/WinPE/Linux/Unix/VMware/Xen...).
+ '';
+ homepage = "https://www.ventoy.net";
+ changelog = "https://www.ventoy.net/doc_news.html";
+ license = licenses.gpl3Plus;
+ platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ];
+ maintainers = with maintainers; [ k4leg ];
+ };
+}
diff --git a/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch b/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch
new file mode 100644
index 000000000000..fa3eb7c38b34
--- /dev/null
+++ b/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch
@@ -0,0 +1,118 @@
+diff -Naurp0 old/CreatePersistentImg.sh new/CreatePersistentImg.sh
+--- CreatePersistentImg.sh 2021-07-17 13:13:51.000000000 +0300
++++ CreatePersistentImg.sh 2021-07-20 17:37:53.605911754 +0300
+@@ -94,7 +94,3 @@ if [ -n "$config" ]; then
+- if [ -d ./persist_tmp_mnt ]; then
+- rm -rf ./persist_tmp_mnt
+- fi
+-
+- mkdir ./persist_tmp_mnt
+- if mount $freeloop ./persist_tmp_mnt; then
+- echo '/ union' > ./persist_tmp_mnt/$config
++ path_to_persist_mnt="$(mktemp -d)"
++ if mount $freeloop "$path_to_persist_mnt"; then
++ echo '/ union' > "$path_to_persist_mnt"/$config
+@@ -102 +98 @@ if [ -n "$config" ]; then
+- umount ./persist_tmp_mnt
++ umount "$path_to_persist_mnt"
+@@ -104 +100 @@ if [ -n "$config" ]; then
+- rm -rf ./persist_tmp_mnt
++ rm -rf "$path_to_persist_mnt"
+diff -Naurp0 old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh
+--- tool/VentoyWorker.sh 2021-07-17 13:13:51.000000000 +0300
++++ tool/VentoyWorker.sh 2021-07-20 17:27:10.885452119 +0300
+@@ -153,12 +152,0 @@ fi
+-#check tmp_mnt directory
+-if [ -d ./tmp_mnt ]; then
+- vtdebug "There is a tmp_mnt directory, now delete it."
+- umount ./tmp_mnt >/dev/null 2>&1
+- rm -rf ./tmp_mnt
+- if [ -d ./tmp_mnt ]; then
+- vterr "tmp_mnt directory exits, please delete it first."
+- exit 1
+- fi
+-fi
+-
+-
+@@ -322 +310 @@ if [ "$MODE" = "install" ]; then
+- mkdir ./tmp_mnt
++ path_to_mnt="$(mktemp -d)"
+@@ -326 +314 @@ if [ "$MODE" = "install" ]; then
+- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then
++ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then
+@@ -335,9 +323,9 @@ if [ "$MODE" = "install" ]; then
+- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
+- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi
+- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
+- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi
+- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi
+- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi
+- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
+- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
+- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
++ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi
++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
++ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi
++ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi
++ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi
++ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
++ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
++ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
+@@ -348 +336 @@ if [ "$MODE" = "install" ]; then
+- if umount ./tmp_mnt; then
++ if umount "$path_to_mnt"; then
+@@ -350 +338 @@ if [ "$MODE" = "install" ]; then
+- rm -rf ./tmp_mnt
++ rm -rf "$path_to_mnt"
+@@ -407,2 +395,2 @@ else
+- rm -f ./diskuuid.bin
+- dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin
++ path_to_diskuuid="$(mktemp)"
++ dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid"
+@@ -411,2 +399,2 @@ else
+- dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384
+- rm -f ./diskuuid.bin
++ dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384
++ rm -f "$path_to_diskuuid"
+@@ -415,2 +403,2 @@ else
+- rm -f ./rsvdata.bin
+- dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin
++ path_to_rsvdata="$(mktemp)"
++ dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata"
+@@ -438,2 +426,2 @@ else
+- dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK}
+- rm -f ./rsvdata.bin
++ dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK}
++ rm -f "$path_to_rsvdata"
+@@ -448 +436 @@ else
+- mkdir ./tmp_mnt
++ path_to_mnt="$(mktemp -d)"
+@@ -454 +442 @@ else
+- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then
++ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then
+@@ -463,9 +451,9 @@ else
+- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
+- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi
+- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
+- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi
+- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi
+- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi
+- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
+- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
+- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
++ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi
++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
++ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi
++ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi
++ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi
++ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
++ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
++ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
+@@ -476 +464 @@ else
+- if umount ./tmp_mnt > /dev/null 2>&1; then
++ if umount "$path_to_mnt" > /dev/null 2>&1; then
+@@ -478 +466 @@ else
+- rm -rf ./tmp_mnt
++ rm -rf "$path_to_mnt"
diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/tools/graphics/textplots/default.nix
new file mode 100644
index 000000000000..a0c5e72ac23c
--- /dev/null
+++ b/pkgs/tools/graphics/textplots/default.nix
@@ -0,0 +1,20 @@
+{ fetchCrate, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "textplots";
+ version = "0.8.0";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "07lxnvg8g24r1j6h07w91j5lp0azngmb76lagk55y28br0y70qr4";
+ };
+
+ cargoSha256 = "19xb1ann3bqx26nhjjvcwqdsvzg7lflg9fdrnlx05ndd2ip44flz";
+
+ meta = with lib; {
+ description = "Terminal plotting written in Rust";
+ homepage = "https://github.com/loony-bean/textplots-rs";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/tools/graphics/texture-synthesis/default.nix
new file mode 100644
index 000000000000..c541f874adc0
--- /dev/null
+++ b/pkgs/tools/graphics/texture-synthesis/default.nix
@@ -0,0 +1,22 @@
+{ fetchFromGitHub, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "texture-synthesis";
+ version = "0.8.2";
+
+ src = fetchFromGitHub {
+ owner = "embarkstudios";
+ repo = pname;
+ rev = version;
+ sha256 = "0n1wbxcnxb7x5xwakxdzq7kg1fn0c48i520j03p7wvm5x97vm5h4";
+ };
+
+ cargoSha256 = "1xszis3ip1hymzbhdili2hvdwd862cycwvsxxyjqmz3g2rlg5b64";
+
+ meta = with lib; {
+ description = "Example-based texture synthesis written in Rust";
+ homepage = "https://github.com/embarkstudios/texture-synthesis";
+ license = with licenses; [ mit /* or */ asl20 ];
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 677a9ddef514..710382fe8267 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -6,21 +6,35 @@ let
in
stdenv.mkDerivation rec {
pname = "bandwidth";
- version = "1.9.4";
+ version = "1.10.1";
src = fetchurl {
url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
- sha256 = "0x798xj3vhiwq2hal0vmf92sq4h7yalp3i6ylqwhnnpv99m2zws4";
+ sha256 = "sha256-trya+/cBNIittQAc5tcykZbImeISqIolO/Y8uOI0jGk=";
};
postPatch = ''
- sed -i 's,^CC=gcc .*,,' OOC/Makefile Makefile*
sed -i 's,ar ,$(AR) ,g' OOC/Makefile
+ # Remove unnecessary -m32 for 32-bit targets
+ sed -i 's,-m32,,g' OOC/Makefile
+ # Fix wrong comment character
+ sed -i 's,# 32,; 32,g' routines-x86-32bit.asm
+ # Fix missing symbol exports for macOS clang
+ echo global _VectorToVector128 >> routines-x86-64bit.asm
+ echo global _VectorToVector256 >> routines-x86-64bit.asm
'';
nativeBuildInputs = [ nasm ];
- buildFlags = [ arch ];
+ buildFlags = [
+ "AR=${stdenv.cc.targetPrefix}ar"
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "ARM_AS=${stdenv.cc.targetPrefix}as"
+ "ARM_CC=$(CC)"
+ "UNAMEPROC=${stdenv.hostPlatform.parsed.cpu.name}"
+ "UNAMEMACHINE=${stdenv.hostPlatform.parsed.cpu.name}"
+ arch
+ ];
installPhase = ''
mkdir -p $out/bin
@@ -31,7 +45,7 @@ stdenv.mkDerivation rec {
homepage = "https://zsmith.co/bandwidth.html";
description = "Artificial benchmark for identifying weaknesses in the memory subsystem";
license = licenses.gpl2Plus;
- platforms = platforms.x86;
+ platforms = platforms.x86 ++ platforms.arm ++ platforms.aarch64;
maintainers = with maintainers; [ r-burns ];
};
}
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
new file mode 100644
index 000000000000..1072bbcc5da3
--- /dev/null
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "fclones";
+ version = "0.14.0";
+
+ src = fetchFromGitHub {
+ owner = "pkolaczk";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1ni5amy903cy822yhw070bcrrixrw2m1vr66q1h32bc98pyv4w05";
+ };
+
+ cargoSha256 = "1gcb46k7bwdfsf6hyvmi6dna1nf6myzy63bhjfp0wy7c8g4m2mg8";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ udev ];
+
+ # tests in dedupe.rs fail due to
+ # "creation time is not available for the filesystem"
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Efficient Duplicate File Finder and Remover";
+ homepage = "https://github.com/pkolaczk/fclones";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cyounkins ];
+ };
+}
diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix
new file mode 100644
index 000000000000..185176440c1b
--- /dev/null
+++ b/pkgs/tools/networking/oha/default.nix
@@ -0,0 +1,30 @@
+{ fetchFromGitHub, lib, pkg-config, rustPlatform, stdenv, openssl, Security }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "oha";
+ version = "0.4.6";
+
+ src = fetchFromGitHub {
+ owner = "hatoo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja";
+ };
+
+ cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc";
+
+ nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
+
+ buildInputs = lib.optional stdenv.isLinux openssl
+ ++ lib.optional stdenv.isDarwin Security;
+
+ # tests don't work inside the sandbox
+ doCheck = false;
+
+ meta = with lib; {
+ description = "HTTP load generator inspired by rakyll/hey with tui animation";
+ homepage = "https://github.com/hatoo/oha";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix
index d2fda127e8c7..a84de966b6f4 100644
--- a/pkgs/tools/security/enum4linux-ng/default.nix
+++ b/pkgs/tools/security/enum4linux-ng/default.nix
@@ -9,13 +9,13 @@
buildPythonApplication rec {
pname = "enum4linux-ng";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "cddmp";
repo = pname;
rev = "v${version}";
- sha256 = "1j6qrhrzc4f9crbii4dpgxipngjh5icrhljxf26a7662dd4f7l8q";
+ sha256 = "0fk6hzmvxb5y3nb41qr6dssxhdahkh5nxhbx480x42fhnqpssir5";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix
index a7f4337ce815..226528782e5f 100644
--- a/pkgs/tools/system/natscli/default.nix
+++ b/pkgs/tools/system/natscli/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "natscli";
- version = "0.0.25";
+ version = "0.0.26";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = version;
- sha256 = "180511x3sciqs0njz80qc1a785m84ks9l338qi3liv7bcd541xcr";
+ sha256 = "sha256-w0a2BzfRKf55hFgdaDLsR2YeC5Jqa2uynlRN2oGPX8g=";
};
- vendorSha256 = "1j2a6wmyb9akndiwq79jqy5lz84bz2k01xp505j60ynsflim7shq";
+ vendorSha256 = "sha256-kt6KflivmsG6prxWXtODcXSP2sNn4daH8ruZMxYLk3g=";
meta = with lib; {
description = "NATS Command Line Interface";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5cb6fb243bbf..a4ca99052728 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -946,7 +946,8 @@ mapAliases ({
truecrypt = veracrypt; # added 2018-10-24
tshark = wireshark-cli; # added 2018-04-25
tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07
- turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08
+ turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08
+ typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11
uberwriter = apostrophe; # added 2020-04-23
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
ucsFonts = ucs-fonts; # added 2016-07-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49094bbb9a8a..f942a8dc19df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -661,6 +661,8 @@ with pkgs;
srcOnly = callPackage ../build-support/src-only { };
+ substitute = callPackage ../build-support/substitute/substitute.nix { };
+
substituteAll = callPackage ../build-support/substitute/substitute-all.nix { };
substituteAllFiles = callPackage ../build-support/substitute-files/substitute-all-files.nix { };
@@ -895,6 +897,8 @@ with pkgs;
gobgp = callPackage ../tools/networking/gobgp { };
+ gofu = callPackage ../applications/misc/gofu { };
+
metapixel = callPackage ../tools/graphics/metapixel { };
pferd = callPackage ../tools/misc/pferd {};
@@ -913,6 +917,8 @@ with pkgs;
veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
+ ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
+
xcd = callPackage ../tools/misc/xcd { };
xtrt = callPackage ../tools/archivers/xtrt { };
@@ -6321,6 +6327,10 @@ with pkgs;
jo = callPackage ../development/tools/jo { };
+ joshuto = callPackage ../applications/misc/joshuto {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+ };
+
jrnl = python3Packages.callPackage ../applications/misc/jrnl { };
jsawk = callPackage ../tools/text/jsawk { };
@@ -7720,6 +7730,10 @@ with pkgs;
ocserv = callPackage ../tools/networking/ocserv { };
+ oha = callPackage ../tools/networking/oha {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { };
@@ -10703,6 +10717,8 @@ with pkgs;
oksh = callPackage ../shells/oksh { };
+ loksh = callPackage ../shells/loksh { };
+
pash = callPackage ../shells/pash { };
scponly = callPackage ../shells/scponly { };
@@ -18231,6 +18247,8 @@ with pkgs;
openslp = callPackage ../development/libraries/openslp {};
+ openstackclient = with python3Packages; toPythonApplication python-openstackclient;
+
openvdb = callPackage ../development/libraries/openvdb {};
inherit (callPackages ../development/libraries/libressl { })
@@ -23489,6 +23507,7 @@ with pkgs;
cni = callPackage ../applications/networking/cluster/cni {};
cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {};
+ cni-plugin-flannel = callPackage ../applications/networking/cluster/cni/plugin-flannel.nix {};
dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {};
@@ -24256,6 +24275,8 @@ with pkgs;
fbida = callPackage ../applications/graphics/fbida { };
+ fclones = callPackage ../tools/misc/fclones { };
+
fcp = callPackage ../tools/misc/fcp { };
fdupes = callPackage ../tools/misc/fdupes { };
@@ -26165,8 +26186,6 @@ with pkgs;
mlt-qt5 = libsForQt514.mlt;
};
- typora = callPackage ../applications/editors/typora { };
-
taxi = callPackage ../applications/networking/ftp/taxi { };
librep = callPackage ../development/libraries/librep { };
@@ -27448,10 +27467,16 @@ with pkgs;
tendermint = callPackage ../tools/networking/tendermint { };
+ termdbms = callPackage ../development/tools/database/termdbms { };
+
termdown = python3Packages.callPackage ../applications/misc/termdown { };
terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
+ textplots = callPackage ../tools/graphics/textplots { };
+
+ texture-synthesis = callPackage ../tools/graphics/texture-synthesis { };
+
tty-solitaire = callPackage ../applications/misc/tty-solitaire { };
termtosvg = callPackage ../tools/misc/termtosvg { };
@@ -28810,6 +28835,8 @@ with pkgs;
adom = callPackage ../games/adom { };
+ airshipper = callPackage ../games/airshipper { };
+
airstrike = callPackage ../games/airstrike { };
alephone = callPackage ../games/alephone { };
@@ -31872,7 +31899,7 @@ with pkgs;
satysfi = callPackage ../tools/typesetting/satysfi { };
- sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
+ sc-controller = python3Packages.callPackage ../misc/drivers/sc-controller {
inherit libusb1; # Shadow python.pkgs.libusb1.
};
@@ -32126,6 +32153,8 @@ with pkgs;
websocketd = callPackage ../applications/networking/websocketd { };
+ wike = callPackage ../applications/misc/wike { };
+
wikicurses = callPackage ../applications/misc/wikicurses {
pythonPackages = python3Packages;
};
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 27b467cbb2a4..0c375a664999 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -65,6 +65,7 @@ mapAliases ({
pytestquickcheck = pytest-quickcheck; # added 2021-07-20
pytestrunner = pytest-runner; # added 2021-01-04
python-lz4 = lz4; # added 2018-06-01
+ python-subunit = subunit; # added 2021-09-10
pytest_xdist = pytest-xdist; # added 2021-01-04
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a590b000ad12..71f17acdca41 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1890,6 +1890,8 @@ in {
debian-inspector = callPackage ../development/python-modules/debian-inspector { };
+ debtcollector = callPackage ../development/python-modules/debtcollector { };
+
debts = callPackage ../development/python-modules/debts { };
debugpy = callPackage ../development/python-modules/debugpy { };
@@ -3283,6 +3285,8 @@ in {
hachoir = callPackage ../development/python-modules/hachoir { };
+ hacking = callPackage ../development/python-modules/hacking { };
+
hdate = callPackage ../development/python-modules/hdate { };
ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
@@ -3976,6 +3980,8 @@ in {
keystone-engine = callPackage ../development/python-modules/keystone-engine { };
+ keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 { };
+
keyutils = callPackage ../development/python-modules/keyutils {
inherit (pkgs) keyutils;
};
@@ -5108,6 +5114,8 @@ in {
opensimplex = callPackage ../development/python-modules/opensimplex { };
+ openstacksdk = callPackage ../development/python-modules/openstacksdk { };
+
opentimestamps = callPackage ../development/python-modules/opentimestamps { };
opentracing = callPackage ../development/python-modules/opentracing { };
@@ -5145,8 +5153,12 @@ in {
orvibo = callPackage ../development/python-modules/orvibo { };
+ os-service-types = callPackage ../development/python-modules/os-service-types { };
+
osc = callPackage ../development/python-modules/osc { };
+ osc-lib = callPackage ../development/python-modules/osc-lib { };
+
oscrypto = callPackage ../development/python-modules/oscrypto { };
oset = callPackage ../development/python-modules/oset { };
@@ -5155,6 +5167,24 @@ in {
osmpythontools = callPackage ../development/python-modules/osmpythontools { };
+ oslo-concurrency = callPackage ../development/python-modules/oslo-concurrency { };
+
+ oslo-config = callPackage ../development/python-modules/oslo-config { };
+
+ oslo-context = callPackage ../development/python-modules/oslo-context { };
+
+ oslo-db = callPackage ../development/python-modules/oslo-db { };
+
+ oslo-i18n = callPackage ../development/python-modules/oslo-i18n { };
+
+ oslo-log = callPackage ../development/python-modules/oslo-log { };
+
+ oslo-serialization = callPackage ../development/python-modules/oslo-serialization { };
+
+ oslo-utils = callPackage ../development/python-modules/oslo-utils { };
+
+ oslotest = callPackage ../development/python-modules/oslotest { };
+
osqp = callPackage ../development/python-modules/osqp { };
outcome = callPackage ../development/python-modules/outcome { };
@@ -5517,6 +5547,8 @@ in {
python-juicenet = callPackage ../development/python-modules/python-juicenet { };
+ python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { };
+
python-lsp-black = callPackage ../development/python-modules/python-lsp-black { };
python-openems = callPackage ../development/python-modules/python-openems { };
@@ -7115,6 +7147,8 @@ in {
python-box = callPackage ../development/python-modules/python-box { };
+ python-cinderclient = callPackage ../development/python-modules/python-cinderclient { };
+
python-constraint = callPackage ../development/python-modules/python-constraint { };
python-crontab = callPackage ../development/python-modules/python-crontab { };
@@ -7254,6 +7288,8 @@ in {
python-nomad = callPackage ../development/python-modules/python-nomad { };
+ python-novaclient = callPackage ../development/python-modules/python-novaclient { };
+
python-oauth2 = callPackage ../development/python-modules/python-oauth2 { };
pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core {
@@ -7265,6 +7301,8 @@ in {
python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { };
+ python-openstackclient = callPackage ../development/python-modules/python-openstackclient { };
+
python_openzwave = callPackage ../development/python-modules/python_openzwave { };
python-packer = callPackage ../development/python-modules/python-packer { };
@@ -8539,6 +8577,8 @@ in {
stem = callPackage ../development/python-modules/stem { };
+ stestr = callPackage ../development/python-modules/stestr { };
+
stevedore = callPackage ../development/python-modules/stevedore { };
stm32loader = callPackage ../development/python-modules/stm32loader { };
@@ -8591,6 +8631,8 @@ in {
inherit (pkgs) subunit cppunit check;
};
+ subunit2sql = callPackage ../development/python-modules/subunit2sql { };
+
suds-jurko = callPackage ../development/python-modules/suds-jurko { };
sumo = callPackage ../development/python-modules/sumo { };