diff --git a/flake.nix b/flake.nix
index ba2447364a90..f9442d8ea2d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,7 +56,7 @@
legacyPackages = forAllSystems (system: import ./. { inherit system; });
nixosModules = {
- notDetected = import ./nixos/modules/installer/scan/not-detected.nix;
+ notDetected = ./nixos/modules/installer/scan/not-detected.nix;
};
};
}
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b8c4f46102b1..86cec69705fb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5298,6 +5298,16 @@
github = "gytis-ivaskevicius";
githubId = 23264966;
};
+ h7x4 = {
+ name = "h7x4";
+ email = "h7x4@nani.wtf";
+ matrix = "@h7x4:nani.wtf";
+ github = "h7x4";
+ githubId = 14929991;
+ keys = [{
+ fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC";
+ }];
+ };
hagl = {
email = "harald@glie.be";
github = "hagl";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 1efce2db6704..2542f5762fcc 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -993,6 +993,16 @@ signald -d /var/lib/signald/db \
longer accepted.
+
+
+ The Syncthing service now only allows absolute paths—starting
+ with / or ~/—for
+ services.syncthing.folders.<name>.path.
+ In a future release other paths will be allowed again and
+ interpreted relative to
+ services.syncthing.dataDir.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 10a1240ede03..c4bc7e7db09b 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -307,6 +307,11 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
apply patches. This means that your hashes are out-of-date and the (previously required) attributes `name` and `version`
are no longer accepted.
+- The Syncthing service now only allows absolute paths---starting with `/` or
+ `~/`---for `services.syncthing.folders..path`.
+ In a future release other paths will be allowed again and interpreted
+ relative to `services.syncthing.dataDir`.
+
## Other Notable Changes {#sec-release-22.11-notable-changes}
diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix
index 524199ac409c..08fb91b3994c 100644
--- a/nixos/modules/misc/man-db.nix
+++ b/nixos/modules/misc/man-db.nix
@@ -52,7 +52,7 @@ in
environment.systemPackages = [ cfg.package ];
environment.etc."man_db.conf".text =
let
- manualCache = pkgs.runCommandLocal "man-cache" { } ''
+ manualCache = pkgs.runCommand "man-cache" { } ''
echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf
${cfg.package}/bin/mandb -C man.conf -psc >/dev/null 2>&1
'';
diff --git a/nixos/modules/services/blockchain/ethereum/erigon.nix b/nixos/modules/services/blockchain/ethereum/erigon.nix
index 892262d246b7..9ff7df0b15e5 100644
--- a/nixos/modules/services/blockchain/ethereum/erigon.nix
+++ b/nixos/modules/services/blockchain/ethereum/erigon.nix
@@ -13,13 +13,13 @@ in {
services.erigon = {
enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier");
- group = mkOption {
- type = types.str;
- default = "ethereum";
+ secretJwtPath = mkOption {
+ type = types.path;
description = lib.mdDoc ''
- Group of the user running the lighthouse process. This is used to share the jwt
- secret with the execution layer.
+ Path to the secret jwt used for the http api authentication.
'';
+ default = "";
+ example = "config.age.secrets.ERIGON_JWT.path";
};
settings = mkOption {
@@ -64,19 +64,6 @@ in {
};
config = mkIf cfg.enable {
- users = {
- users.erigon = {
- name = "erigon";
- group = cfg.group;
- description = "Erigon user";
- home = "/var/lib/erigon";
- isSystemUser = true;
- };
- groups = mkIf (cfg.group == "ethereum") {
- ethereum = {};
- };
- };
-
# Default values are the same as in the binary, they are just written here for convenience.
services.erigon.settings = {
datadir = mkDefault "/var/lib/erigon";
@@ -98,9 +85,9 @@ in {
after = [ "network.target" ];
serviceConfig = {
- ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile}";
- User = "erigon";
- Group = cfg.group;
+ LoadCredential = "ERIGON_JWT:${cfg.secretJwtPath}";
+ ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT";
+ DynamicUser = true;
Restart = "on-failure";
StateDirectory = "erigon";
CapabilityBoundingSet = "";
diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix
index 6002b16785a7..db72c62d3304 100644
--- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix
+++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix
@@ -57,15 +57,6 @@ in {
'';
};
- group = mkOption {
- type = types.str;
- default = "ethereum";
- description = lib.mdDoc ''
- Group of the user running the lighthouse process. This is used to share the jwt
- secret with the execution layer.
- '';
- };
-
execution = {
address = mkOption {
type = types.str;
@@ -221,19 +212,6 @@ in {
config = mkIf (cfg.beacon.enable || cfg.validator.enable) {
- users = {
- users.lighthouse-beacon = {
- name = "lighthouse-beacon";
- group = cfg.beacon.group;
- description = "Lighthouse beacon node user";
- home = "${cfg.beacon.dataDir}";
- isSystemUser = true;
- };
- groups = mkIf (cfg.beacon.group == "ethereum") {
- ethereum = {};
- };
- };
-
environment.systemPackages = [ pkgs.lighthouse ] ;
networking.firewall = mkIf cfg.beacon.enable {
@@ -259,14 +237,14 @@ in {
--network ${cfg.network} \
--datadir ${cfg.beacon.dataDir}/${cfg.network} \
--execution-endpoint http://${cfg.beacon.execution.address}:${toString cfg.beacon.execution.port} \
- --execution-jwt ${cfg.beacon.execution.jwtPath} \
+ --execution-jwt ''${CREDENTIALS_DIRECTORY}/LIGHTHOUSE_JWT \
${lib.optionalString cfg.beacon.http.enable '' --http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}''} \
${lib.optionalString cfg.beacon.metrics.enable '' --metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}''} \
${cfg.extraArgs} ${cfg.beacon.extraArgs}
'';
serviceConfig = {
- User = "lighthouse-beacon";
- Group = cfg.beacon.group;
+ LoadCredential = "LIGHTHOUSE_JWT:${cfg.beacon.execution.jwtPath}";
+ DynamicUser = true;
Restart = "on-failure";
StateDirectory = "lighthouse-beacon";
NoNewPrivileges = true;
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index ea87e5695f87..adbb25ccb9b6 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -212,10 +212,18 @@ in {
};
path = mkOption {
- type = types.str;
+ # TODO for release 23.05: allow relative paths again and set
+ # working directory to cfg.dataDir
+ type = types.str // {
+ check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/");
+ description = types.str.description + " starting with / or ~/";
+ };
default = name;
description = lib.mdDoc ''
The path to the folder which should be shared.
+ Only absolute paths (starting with `/`) and paths relative to
+ the [user](#opt-services.syncthing.user)'s home directory
+ (starting with `~/`) are allowed.
'';
};
@@ -405,7 +413,8 @@ in {
example = "yourUser";
description = mdDoc ''
The user to run Syncthing as.
- By default, a user named `${defaultUser}` will be created.
+ By default, a user named `${defaultUser}` will be created whose home
+ directory is [dataDir](#opt-services.syncthing.dataDir).
'';
};
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index 83890e969909..d159d2ade063 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -623,15 +623,15 @@ in {
environment = env;
serviceConfig = {
Type = "oneshot";
- script = let
- olderThanDays = toString cfg.mediaAutoRemove.olderThanDays;
- in ''
- ${cfg.package}/bin/tootctl media remove --days=${olderThanDays}
- ${cfg.package}/bin/tootctl preview_cards remove --days=${olderThanDays}
- '';
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
- startAt = cfg.mediaAutoRemove.startAt;
} // cfgService;
+ script = let
+ olderThanDays = toString cfg.mediaAutoRemove.olderThanDays;
+ in ''
+ ${cfg.package}/bin/tootctl media remove --days=${olderThanDays}
+ ${cfg.package}/bin/tootctl preview_cards remove --days=${olderThanDays}
+ '';
+ startAt = cfg.mediaAutoRemove.startAt;
};
services.nginx = lib.mkIf cfg.configureNginx {
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 2ff9acd3e2de..55ff98db5382 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -14,7 +14,7 @@ let
# Containers don't have their own kernel or initrd. They boot
# directly into stage 2.
- ${optionalString (!config.boot.isContainer) ''
+ ${optionalString config.boot.kernel.enable ''
if [ ! -f ${kernelPath} ]; then
echo "The bootloader cannot find the proper kernel image."
echo "(Expecting ${kernelPath})"
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 8a1630f7e3eb..6783f8ec62ff 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -20,6 +20,9 @@ in
###### interface
options = {
+ boot.kernel.enable = mkEnableOption (lib.mdDoc "the Linux kernel. This is useful for systemd-like containers which do not require a kernel.") // {
+ default = true;
+ };
boot.kernel.features = mkOption {
default = {};
@@ -258,7 +261,7 @@ in
];
})
- (mkIf (!config.boot.isContainer) {
+ (mkIf config.boot.kernel.enable {
system.build = { inherit kernel; };
system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index a7f5044fb9cd..c2e61a77c01e 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -7,6 +7,8 @@ with lib;
config = mkIf config.boot.isContainer {
# Disable some features that are not useful in a container.
+ boot.kernel.enable = false;
+
nix.optimise.automatic = mkDefault false; # the store is host managed
powerManagement.enable = mkDefault false;
documentation.nixos.enable = mkDefault false;
diff --git a/nixos/tests/web-apps/mastodon.nix b/nixos/tests/web-apps/mastodon.nix
index 279a1c59169f..05cc727476d6 100644
--- a/nixos/tests/web-apps/mastodon.nix
+++ b/nixos/tests/web-apps/mastodon.nix
@@ -129,6 +129,9 @@ in
ca.wait_for_unit("step-ca.service")
ca.wait_for_open_port(8443)
+ # Check that mastodon-media-auto-remove is scheduled
+ server.succeed("systemctl status mastodon-media-auto-remove.timer")
+
server.wait_for_unit("nginx.service")
server.wait_for_unit("redis-mastodon.service")
server.wait_for_unit("postgresql.service")
diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
new file mode 100644
index 000000000000..ac28733c81bc
--- /dev/null
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -0,0 +1,36 @@
+{ lib, fetchurl, appimageTools, }:
+
+let
+ pname = "youtube-music";
+ version = "1.17.0";
+
+ src = fetchurl {
+ url = "https://github.com/th-ch/youtube-music/releases/download/v${version}/YouTube-Music-${version}.AppImage";
+ sha256 = "sha256-3QNmCek6UD0WNaqalIksYWLHGfMgetLRLi8mEM1J39I=";
+ };
+
+ appimageContents = appimageTools.extract { inherit pname version src; };
+in
+appimageTools.wrapType2 rec {
+ inherit pname version src;
+
+ extraInstallCommands = ''
+ mv $out/bin/{${pname}-${version},${pname}}
+ install -m 444 \
+ -D ${appimageContents}/youtube-music.desktop \
+ -t $out/share/applications
+ substituteInPlace \
+ $out/share/applications/youtube-music.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+ cp -r ${appimageContents}/usr/share/icons $out/share
+ '';
+
+ meta = with lib; {
+ description = "Electron wrapper around YouTube Music";
+ homepage = "https://th-ch.github.io/youtube-music/";
+ license = licenses.mit;
+ sourceProvenance = with sourceTypes; [ fromSource ];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.aacebedo ];
+ };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 0aeb0816bef4..2cb093a89f89 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2083,6 +2083,16 @@ let
};
};
+ redhat.vscode-xml = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-xml";
+ publisher = "redhat";
+ version = "0.22.0";
+ sha256 = "sha256-7QOw0EVcfa7MFnZAHAsUtDZHXD5AFlW54f1qaN3h+2U=";
+ };
+ meta.license = lib.licenses.epl20;
+ };
+
redhat.vscode-yaml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-yaml";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index aa452f8de2c7..3068ecd4c5cf 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -32,13 +32,13 @@ let
in
mkDerivation rec {
pname = "renderdoc";
- version = "1.21";
+ version = "1.22";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
- sha256 = "sha256-T6OAr6Pl4VmXVSlNHF6kh8jIKs3FSTZsZ+Y4IH3SPTE=";
+ sha256 = "sha256-eqMIOb9XAgXtoCJABvZkkS/rhHK7jNqabIFwdCgcSJU=";
};
buildInputs = [
diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix
new file mode 100644
index 000000000000..0f753832ad14
--- /dev/null
+++ b/pkgs/applications/maui/booth.nix
@@ -0,0 +1,52 @@
+{ lib
+, mkDerivation
+, cmake
+, extra-cmake-modules
+, kcoreaddons
+, ki18n
+, kirigami2
+, mauikit
+, mauikit-filebrowsing
+, qtgraphicaleffects
+, qtmultimedia
+, qtquickcontrols2
+, gst_all_1
+}:
+
+mkDerivation {
+ pname = "booth";
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ ];
+
+ buildInputs = [
+ kcoreaddons
+ ki18n
+ kirigami2
+ mauikit
+ mauikit-filebrowsing
+ qtgraphicaleffects
+ qtmultimedia
+ qtquickcontrols2
+ ] ++ (with gst_all_1; [
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ gstreamer
+ ]);
+
+ preFixup = ''
+ qtWrapperArgs+=(
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+ )
+ '';
+
+ meta = with lib; {
+ description = "Camera application";
+ homepage = "https://invent.kde.org/maui/booth";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ milahu ];
+ };
+}
diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix
index 97cc9a92e6de..edb6837deaa3 100644
--- a/pkgs/applications/maui/default.nix
+++ b/pkgs/applications/maui/default.nix
@@ -14,7 +14,7 @@ See also `pkgs/applications/kde` as this is what this is based on.
# Updates
-1. Update the URL in `callPackage ./fetch.sh`.
+1. Update the URL in `./fetch.sh`.
2. Run `callPackage ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui`
from the top of the Nixpkgs tree.
3. Use `nixpkgs-review wip` to check that everything builds.
@@ -67,8 +67,10 @@ let
mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
+ mauiman = callPackage ./mauiman.nix { };
# applications
+ booth = callPackage ./booth.nix { };
buho = callPackage ./buho.nix { };
clip = callPackage ./clip.nix { };
communicator = callPackage ./communicator.nix { };
diff --git a/pkgs/applications/maui/fetch.sh b/pkgs/applications/maui/fetch.sh
index cc163d289e0a..f84a2dc2c231 100644
--- a/pkgs/applications/maui/fetch.sh
+++ b/pkgs/applications/maui/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*-2.1.2.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*.tar.xz' )
diff --git a/pkgs/applications/maui/mauikit.nix b/pkgs/applications/maui/mauikit.nix
index 76f2f7db5d73..fcba0fbdf547 100644
--- a/pkgs/applications/maui/mauikit.nix
+++ b/pkgs/applications/maui/mauikit.nix
@@ -6,6 +6,7 @@
, kcoreaddons
, ki18n
, knotifications
+, mauiman
, qtbase
, qtquickcontrols2
, qtx11extras
@@ -24,6 +25,7 @@ mkDerivation {
kcoreaddons
ki18n
knotifications
+ mauiman
qtquickcontrols2
qtx11extras
];
diff --git a/pkgs/applications/maui/mauiman.nix b/pkgs/applications/maui/mauiman.nix
new file mode 100644
index 000000000000..9b54d8d479f7
--- /dev/null
+++ b/pkgs/applications/maui/mauiman.nix
@@ -0,0 +1,27 @@
+{ lib
+, mkDerivation
+, cmake
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, ki18n
+, knotifications
+, qtbase
+, qtquickcontrols2
+, qtx11extras
+}:
+
+mkDerivation {
+ pname = "mauiman";
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ ];
+
+ meta = with lib; {
+ homepage = "https://invent.kde.org/maui/mauiman";
+ description = "Maui Manager Library. Server and public library API";
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix
index a432814d49ec..cf751af9ef34 100644
--- a/pkgs/applications/maui/srcs.nix
+++ b/pkgs/applications/maui/srcs.nix
@@ -3,116 +3,148 @@
{ fetchurl, mirror }:
{
- buho = {
- version = "2.1.2";
+ bonsai = {
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/buho/2.1.2/buho-2.1.2.tar.xz";
- sha256 = "0xc623w1zp0yh929b8h6mf9r4frnfabd30634ba43x4ac12jk7g8";
- name = "buho-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/bonsai/1.0.0/bonsai-2.2.0.tar.xz";
+ sha256 = "0gpqdj30brqv9nsiis93w9lad4xn7d301gxncj04pcpybmbksg4r";
+ name = "bonsai-2.2.0.tar.xz";
+ };
+ };
+ booth = {
+ version = "1.0.0";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/booth/1.0.0/booth-1.0.0.tar.xz";
+ sha256 = "0cdn3vkbf1mlq32akz86mdyjfrq661h4jrfmp1x62ih63930hix2";
+ name = "booth-1.0.0.tar.xz";
+ };
+ };
+ buho = {
+ version = "2.2.0";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/buho/2.2.0/buho-2.2.0.tar.xz";
+ sha256 = "1jj9kygh5b88ksg22969zlsrbgps6z7z2n77g6ldqzvg8mmh2cwr";
+ name = "buho-2.2.0.tar.xz";
};
};
clip = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/clip/2.1.2/clip-2.1.2.tar.xz";
- sha256 = "168lz2qi4y56pwfwyzqnhwz4lgh2763w260l860527aw049crv4z";
- name = "clip-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/clip/2.2.0/clip-2.2.0.tar.xz";
+ sha256 = "0ggymdscd7c942vvii3mswkq84lkygdcbvpg3s2lhqaqxpivy96z";
+ name = "clip-2.2.0.tar.xz";
};
};
communicator = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/communicator/2.1.2/communicator-2.1.2.tar.xz";
- sha256 = "0m7axdjpl7s9cz6fcaj4kwr9wdxybwdb76k9rz5yigyy35vigcfi";
- name = "communicator-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/communicator/2.2.0/communicator-2.2.0.tar.xz";
+ sha256 = "0njyjzf8w2aamrj1yajjw7551dc72db9m0iv14mnb0gcd9pphni7";
+ name = "communicator-2.2.0.tar.xz";
};
};
index-fm = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/index/2.1.2/index-fm-2.1.2.tar.xz";
- sha256 = "1yawnzx51h6yrlnivbwz9d7481k382pzg3jnczrajfjnv7ir29dn";
- name = "index-fm-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/index/2.2.0/index-fm-2.2.0.tar.xz";
+ sha256 = "0v39sfdqb21669cx96nd78vprwaxsvg3cpp3lly43n09nv6gkw41";
+ name = "index-fm-2.2.0.tar.xz";
};
};
mauikit = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit/2.1.2/mauikit-2.1.2.tar.xz";
- sha256 = "1n5p8107lwa4m5gbwlcqmmdlyw15vjaq0dfaz5zal733s6rq2gm7";
- name = "mauikit-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/mauikit/2.2.0/mauikit-2.2.0.tar.xz";
+ sha256 = "05bvgwl1yfbfrlxhl6ngvkdk34rg4y12fsrddm8f19b6dkvjzxq2";
+ name = "mauikit-2.2.0.tar.xz";
};
};
mauikit-accounts = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-accounts/2.1.2/mauikit-accounts-2.1.2.tar.xz";
- sha256 = "00nc54gi34r8z6cwa0h8490gd0w01a245rh2g4d9fvbkrybwg7sk";
- name = "mauikit-accounts-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-accounts/2.2.0/mauikit-accounts-2.2.0.tar.xz";
+ sha256 = "1wc67mhhmxq0dq1g10338zm52kx274yry2ja34kagva3qkbhbb2i";
+ name = "mauikit-accounts-2.2.0.tar.xz";
};
};
mauikit-filebrowsing = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-filebrowsing/2.1.2/mauikit-filebrowsing-2.1.2.tar.xz";
- sha256 = "09pfjr449mkf27ywmwsvflzq0dgaiprw8b2lcms3m5ad7i6jvvyq";
- name = "mauikit-filebrowsing-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.0/mauikit-filebrowsing-2.2.0.tar.xz";
+ sha256 = "1377mgkx1q66jzdlra87airqkmkl9cfj6n5xw1my1nihxcjq9bz1";
+ name = "mauikit-filebrowsing-2.2.0.tar.xz";
};
};
mauikit-imagetools = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-imagetools/2.1.2/mauikit-imagetools-2.1.2.tar.xz";
- sha256 = "1830x8xwyjs7bj0qi63pl1dk5h2qi6f84mki1schviddddq5cv6j";
- name = "mauikit-imagetools-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-imagetools/2.2.0/mauikit-imagetools-2.2.0.tar.xz";
+ sha256 = "07clir651sfi4c9awv0jnq4pck2cfzfv0fdkwcapl6hh0zq9qvpr";
+ name = "mauikit-imagetools-2.2.0.tar.xz";
};
};
mauikit-texteditor = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-texteditor/2.1.2/mauikit-texteditor-2.1.2.tar.xz";
- sha256 = "19z9qry56h2624kdx5xnfjzd3spv5shc87p2m6ix33x9mmrf92p1";
- name = "mauikit-texteditor-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-texteditor/2.2.0/mauikit-texteditor-2.2.0.tar.xz";
+ sha256 = "0x1cblydgqkhcy86x6yd8dipwhy9l5d7xlmk5igh5dllnzvcaicq";
+ name = "mauikit-texteditor-2.2.0.tar.xz";
+ };
+ };
+ mauiman = {
+ version = "1.0.0";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/mauiman/1.0.0/mauiman-1.0.0.tar.xz";
+ sha256 = "1risxzgjg684c8zwmwl03ihfrxx44lbb4j43v8z3wnjkq7p44w82";
+ name = "mauiman-1.0.0.tar.xz";
};
};
nota = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/nota/2.1.2/nota-2.1.2.tar.xz";
- sha256 = "11z1mw6yhwin3wj19gj9495az4p40yjkwrn0nb6i8h9b0nh44pn7";
- name = "nota-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/nota/2.2.0/nota-2.2.0.tar.xz";
+ sha256 = "1nr8craafima1khkcxv47v1868yfwykjzaczlmmqmjha7bm1dlbd";
+ name = "nota-2.2.0.tar.xz";
};
};
pix = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/pix/2.1.2/pix-2.1.2.tar.xz";
- sha256 = "0ycpazi267pl4l178i34lwzc0ssjklp0indz79r7mcfpr1vicz1s";
- name = "pix-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/pix/2.2.0/pix-2.2.0.tar.xz";
+ sha256 = "0nghp69ax73yf0wybd724a3lgbj7jiiznnmwp67n2ls74q8yrwwy";
+ name = "pix-2.2.0.tar.xz";
};
};
shelf = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/shelf/2.1.2/shelf-2.1.2.tar.xz";
- sha256 = "0f3781l8wfbpj0irmri0zkp3ia3qlik4aaq3w6qk97xjv24d98xh";
- name = "shelf-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/shelf/2.2.0/shelf-2.2.0.tar.xz";
+ sha256 = "028ll3pi4h3jxgilsf4s5ic2rq0z9q8kh9pram9dsjvgz24p7g0c";
+ name = "shelf-2.2.0.tar.xz";
};
};
station = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/station/2.1.2/station-2.1.2.tar.xz";
- sha256 = "0lrw7rf8i277nl9bwyx5sc05bswgll00k1jzad1i69rwdfiy9ghg";
- name = "station-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/station/2.2.0/station-2.2.0.tar.xz";
+ sha256 = "0za3jh5clkx8xf436vzs83nrsw5fyna4wcy73ihlf3xbra0358v1";
+ name = "station-2.2.0.tar.xz";
+ };
+ };
+ strike = {
+ version = "2.2.0";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/strike/1.0.0/strike-2.2.0.tar.xz";
+ sha256 = "159l1i0mi3q5avcg45aq5ixz8wjfryhip61h9gynxr1m77qdpfnc";
+ name = "strike-2.2.0.tar.xz";
};
};
vvave = {
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "${mirror}/stable/maui/vvave/2.1.2/vvave-2.1.2.tar.xz";
- sha256 = "14b6b034899vyvvhzl2jqifqq715lb26dnw3d5wxzxhdplfd7pdf";
- name = "vvave-2.1.2.tar.xz";
+ url = "${mirror}/stable/maui/vvave/2.2.0/vvave-2.2.0.tar.xz";
+ sha256 = "0qnwklc875j6g2rg610dmvcizg3m4q80fhjk4c3i1xzn8dybbg5s";
+ name = "vvave-2.2.0.tar.xz";
};
};
}
diff --git a/pkgs/applications/networking/cluster/kfctl/default.nix b/pkgs/applications/networking/cluster/kfctl/default.nix
index 52a049ab1bba..2b2909ff6600 100644
--- a/pkgs/applications/networking/cluster/kfctl/default.nix
+++ b/pkgs/applications/networking/cluster/kfctl/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-FY7o4QULobLY1djfcc2l6awE/v2stN7cc2lffMkjoPc=";
};
- vendorSha256 = "sha256-+6sxXp0LKegZjEFv1CIQ6xYh+hXLn+o9LggRYamCzpI=";
+ vendorSha256 = null; #vendorSha256 = "";
subPackages = [ "cmd/kfctl" ];
@@ -28,5 +28,6 @@ buildGoModule rec {
homepage = "https://github.com/kubeflow/kfctl";
license = licenses.asl20;
maintainers = with maintainers; [ mvnetbiz ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/applications/networking/cluster/kubemqctl/default.nix
index a5ad1ea0a773..1712a018cbe2 100644
--- a/pkgs/applications/networking/cluster/kubemqctl/default.nix
+++ b/pkgs/applications/networking/cluster/kubemqctl/default.nix
@@ -14,12 +14,13 @@ buildGoModule rec {
doCheck = false; # TODO tests are failing
- vendorSha256 = "1agn6i7cnsb5igvvbjzlaa5fgssr5h7h25y440q44bk16jxk6s74";
+ vendorSha256 = null; #vendorSha256 = "";
meta = {
homepage = "https://github.com/kubemq-io/kubemqctl";
description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker.";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ brianmcgee ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index e0ced9e2a8f8..dbf32808f941 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, lib, ... }:
+{ stdenv, fetchFromGitHub, lib, installShellFiles, makeWrapper, kubectl }:
stdenv.mkDerivation rec {
pname = "kubetail";
- version = "1.6.13";
+ version = "1.6.16";
src = fetchFromGitHub {
owner = "johanhaleby";
repo = "kubetail";
rev = version;
- sha256 = "sha256-EkOewNInzEEEgMOffYoRaKwhgYuBXgHaCkVgWg2mIDE=";
+ sha256 = "sha256-kkbhhAaiKP01LR7F5JVMgy6Ujji8JDc+Aaho1vft3XQ=";
};
+ nativeBuildInputs = [ installShellFiles makeWrapper ];
+
installPhase = ''
- install -Dm755 kubetail "$out/bin/kubetail"
- install -Dm755 completion/kubetail.bash "$out/share/bash-completion/completions/kubetail"
- install -Dm755 completion/kubetail.fish "$out/share/fish/vendor_completions.d/kubetail.fish"
- install -Dm755 completion/kubetail.zsh "$out/share/zsh/site-functions/_kubetail"
+ install -Dm755 kubetail "$out/bin/kubetail"
+ wrapProgram $out/bin/kubetail --prefix PATH : ${lib.makeBinPath [ kubectl ]}
+
+ installShellCompletion completion/kubetail.{bash,fish,zsh}
'';
meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix
index 5e6ca3a874eb..d23669bb1f09 100644
--- a/pkgs/applications/networking/cluster/kuttl/default.nix
+++ b/pkgs/applications/networking/cluster/kuttl/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "kuttl";
- version = "0.13.0";
+ version = "0.14.0";
cli = "kubectl-kuttl";
src = fetchFromGitHub {
owner = "kudobuilder";
repo = "kuttl";
rev = "v${version}";
- sha256 = "sha256-liuP8ALcPxbU+hZ54KDFj2r2yZpAbVago0IxIv52N3o=";
+ sha256 = "sha256-xQS7qCUTM3X4SpUZfxKHb08poJ2W52R7+TNe4BFL5sY=";
};
vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY=";
diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index adaf22a8206a..d4f567022c2d 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
- version = "3.22.0";
+ version = "3.22.1";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-idcgBaUOOFsQmId9I8X5ixxGkfrX9NG328DliHNzk6s=";
+ sha256 = "sha256-Lv4ZX8QXRkicPH69kvUAPcgesGvhQkNiwZiNcFbReSU=";
};
- vendorSha256 = "sha256-h3UOFs7pxf9gwVAcjih8Kxr0b+68W1DanYoTpmeirg8=";
+ vendorSha256 = "sha256-gKsYy3izx8i7nOazBF4w1SPUJT9D2hbjOr6LqonVqno=";
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix
index 5482ce12e253..69b0f1642334 100644
--- a/pkgs/applications/networking/hyprspace/default.nix
+++ b/pkgs/applications/networking/hyprspace/default.nix
@@ -21,5 +21,6 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ yusdacra ];
platforms = platforms.linux ++ platforms.darwin;
+ broken = true; # build fails with go > 1.17
};
}
diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix
index af9812e8fca4..bebb16740840 100644
--- a/pkgs/applications/networking/ncgopher/default.nix
+++ b/pkgs/applications/networking/ncgopher/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncgopher";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "jansc";
repo = "ncgopher";
rev = "v${version}";
- sha256 = "sha256-GLt+ByZzQ9v+PPyebTa8LFqySixXw85RjGZ2e3yLRss=";
+ sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE=";
};
- cargoSha256 = "sha256-VI+BTxgocv434wTr7nBeJRdt12wE53fEeqczE3o3768=";
+ cargoSha256 = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
index ec56ed0464ca..2f0ee430b4f9 100644
--- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
+++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
@@ -11,16 +11,16 @@
python3Packages.buildPythonApplication rec {
pname = "nicotine-plus";
- version = "3.2.4";
+ version = "3.2.6";
src = fetchFromGitHub {
owner = "nicotine-plus";
repo = "nicotine-plus";
rev = "refs/tags/${version}";
- sha256 = "sha256-swFNFw2a5PXwBkh0FBrCy5u3m5gErq29ZmWhMP7MpmQ=";
+ sha256 = "sha256-ELpM5hnyHsqTqB0R1JPcbxkw9XR19CnasIYXJCbKBho=";
};
- nativeBuildInputs = [ gettext wrapGAppsHook ];
+ nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ];
propagatedBuildInputs = [
gdk-pixbuf
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index cc749a8a96ea..73c94f7339c6 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -7,11 +7,11 @@
python3Packages.buildPythonApplication rec {
pname = "zim";
- version = "0.74.3";
+ version = "0.75.1";
src = fetchurl {
url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
- sha256 = "sha256-3ehPIkhsf1JnC9Qx3kQ6ilvRaBB7auBm2C1HOuNGzRU=";
+ sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=";
};
buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ];
@@ -23,6 +23,7 @@ python3Packages.buildPythonApplication rec {
preFixup = ''
makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share)
+ makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share)
makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped)
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix
index e93f3eaff508..5ed6cec01aa9 100644
--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -52,10 +52,6 @@ mkDerivation rec {
rust.rustc
]);
- cmakeFlags = [
- "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo"
- ];
-
buildInputs = [
kconfig
kcoreaddons
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 7cbf37fcaf8a..835c66c3251f 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -14,13 +14,15 @@
, libGLU
, mpfr
, proj
-, python3
+# build with Python 3.10 fails, because boost <= 1.78 can't find
+# pythons with double digits in minor versions, like X.YZ
+, python39
, qtxmlpatterns
, qwt
}:
let
- python = python3.withPackages (ps: with ps; [
+ python = python39.withPackages (ps: with ps; [
numpy
]);
boost' = boost.override {
diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix
index 99ddd7b24b69..94e698289297 100644
--- a/pkgs/applications/video/go-chromecast/default.nix
+++ b/pkgs/applications/video/go-chromecast/default.nix
@@ -20,5 +20,6 @@ buildGoModule rec {
description = "CLI for Google Chromecast, Home devices and Cast Groups";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ];
+ broken = true; # build fails with go > 1.17
};
}
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index 9ad13b8768d6..22178fb74b84 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "amazon-ecs-agent";
- version = "1.65.1";
+ version = "1.66.2";
goPackagePath = "github.com/aws/${pname}";
subPackages = [ "agent" ];
@@ -11,12 +11,15 @@ buildGoPackage rec {
rev = "v${version}";
owner = "aws";
repo = pname;
- sha256 = "sha256-IsbY2ZQQq8eOhdT/ws1Yu7YlnQOyjhDaIr1knOHB4Yc=";
+ sha256 = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik=";
};
+ ldflags = [ "-s" "-w" ];
+
meta = with lib; {
description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
homepage = "https://github.com/aws/amazon-ecs-agent";
+ changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ];
diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix
index 60bf018fb3fb..198a2a0b71a5 100644
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-uxy0/Ngzzh96YZDR9whLVYNnQOlj3wkCEuuJTQjT6GE=";
+ sha256 = "sha256-az4DllTkGP80Jf0NeaKrBI0zz56chPizJGu97cqXrJ4=";
};
- cargoSha256 = "sha256-99J4ucjE0yTPQSdM6PDTWEjBltJdIU6yEDqhgSfOaJU=";
+ cargoSha256 = "sha256-ghbJBhoU41yJ3qZBaKzEybNuCLdSqoL30+1h9d56b4A=";
# skip test due FHS dependency
doCheck = false;
diff --git a/pkgs/data/icons/super-tiny-icons/default.nix b/pkgs/data/icons/super-tiny-icons/default.nix
new file mode 100644
index 000000000000..6a7fcb07bc11
--- /dev/null
+++ b/pkgs/data/icons/super-tiny-icons/default.nix
@@ -0,0 +1,34 @@
+{ pkgs, lib, stdenvNoCC, fetchFromGitHub, }:
+
+stdenvNoCC.mkDerivation {
+ pname = "super-tiny-icons";
+ version = "unstable-2022-11-07";
+
+ src = fetchFromGitHub {
+ owner = "edent";
+ repo = "SuperTinyIcons";
+ rev = "b4d5a3be04c99ec0a309ac9e0d0b21207c237c7d";
+ sha256 = "670ndAuBrZBr7YOTQm2zHJfpiBC56aPk+ZKMneREEoI=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/icons/SuperTinyIcons
+ find $src/images -type d -exec cp -r {} $out/share/icons/SuperTinyIcons/ \;
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Miniscule SVG versions of common logos";
+ longDescription = ''
+ Super Tiny Web Icons are minuscule SVG versions of your favourite logos.
+ The average size is under 568 bytes!
+ '';
+ homepage = "https://github.com/edent/SuperTinyIcons";
+ license = licenses.mit;
+ maintainers = [ maintainers.h7x4 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix
index cdc7a978e6bf..f19b666abeab 100644
--- a/pkgs/data/misc/cldr-annotations/default.nix
+++ b/pkgs/data/misc/cldr-annotations/default.nix
@@ -1,18 +1,22 @@
{ lib, fetchzip }:
-let
- version = "41.0";
-in fetchzip rec {
- name = "cldr-annotations-${version}";
+fetchzip rec {
+ pname = "cldr-annotations";
+ version = "42.0";
url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip";
+ stripRoot = false;
postFetch = ''
- mkdir -p $out/share/unicode/cldr
- unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*'
+ mkdir -p $out/share/unicode/cldr/common
+ mv $out/common/annotations{,Derived} -t $out/share/unicode/cldr/common
+
+ shopt -s extglob dotglob
+ rm -rf $out/!(share)
+ shopt -u extglob dotglob
'';
- sha256 = "sha256-3dHVZGx3FmR97fzhlTSx/xp6YTAV+sMExl6gpLzl1MY=";
+ hash = "sha256-9OOd69nBaDSt+ilL3PTGpcQgC60PnHqd8/CYa2LgeI0=";
meta = with lib; {
description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix
index 10f39ef94b4a..7ab30f8aafea 100644
--- a/pkgs/desktops/gnome/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome/apps/gedit/default.nix
@@ -7,12 +7,15 @@
, gtk3
, gtk-mac-integration
, glib
-, adwaita-icon-theme
+, amtk
+, tepl
, libpeas
, libxml2
, gtksourceview4
, gsettings-desktop-schemas
, wrapGAppsHook
+, gtk-doc
+, docbook-xsl-nons
, ninja
, libsoup
, gnome
@@ -25,11 +28,13 @@
stdenv.mkDerivation rec {
pname = "gedit";
- version = "43.alpha";
+ version = "43.1";
+
+ outputs = [ "out" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "K3iOqhbYeeOVdGmS/OdmC5WtIpQ5OgHs0t5CzdWW95o=";
+ url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
+ sha256 = "mDg7Sv0/0eoYzcdP7G4SjneFgvOyP1NgGRQT//jw5qY=";
};
patches = [
@@ -49,10 +54,13 @@ stdenv.mkDerivation rec {
python3
vala
wrapGAppsHook
+ gtk-doc
+ docbook-xsl-nons
];
buildInputs = [
- adwaita-icon-theme
+ amtk
+ tepl
glib
gsettings-desktop-schemas
gspell
diff --git a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix
index 6e0aa78e6fda..92b216ed2c5e 100644
--- a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix
@@ -1,20 +1,43 @@
-{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome, packagekit, polkit
-, gtk3, systemd, wrapGAppsHook, desktop-file-utils }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, meson
+, ninja
+, gettext
+, gnome
+, packagekit
+, polkit
+, gtk3
+, systemd
+, wrapGAppsHook
+, desktop-file-utils
+}:
stdenv.mkDerivation rec {
pname = "gnome-packagekit";
- version = "3.32.0";
+ version = "43.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd";
+ url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.major version}/gnome-packagekit-${version}.tar.xz";
+ sha256 = "zaRVplKpI7LqL3Axa9D92Clve2Lu8/r9nOUMjmbF8ZU=";
};
nativeBuildInputs = [
- pkg-config meson ninja gettext wrapGAppsHook desktop-file-utils
+ pkg-config
+ meson
+ ninja
+ gettext
+ wrapGAppsHook
+ desktop-file-utils
];
- buildInputs = [ gtk3 packagekit systemd polkit ];
+ buildInputs = [
+ gtk3
+ packagekit
+ systemd
+ polkit
+ ];
postPatch = ''
patchShebangs meson_post_install.sh
diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix
deleted file mode 100644
index 77b3fd9d0b91..000000000000
--- a/pkgs/development/compilers/go/1.17.nix
+++ /dev/null
@@ -1,282 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, tzdata
-, iana-etc
-, perl
-, which
-, pkg-config
-, procps
-, pcre
-, cacert
-, Security
-, Foundation
-, xcbuild
-, mailcap
-, runtimeShell
-, buildPackages
-, pkgsBuildTarget
-, threadsCross
-}:
-
-let
- goBootstrap = buildPackages.callPackage ./bootstrap116.nix { };
-
- goarch = platform: {
- "aarch64" = "arm64";
- "arm" = "arm";
- "armv5tel" = "arm";
- "armv6l" = "arm";
- "armv7l" = "arm";
- "i686" = "386";
- "mips" = "mips";
- "mips64el" = "mips64le";
- "mipsel" = "mipsle";
- "powerpc64le" = "ppc64le";
- "riscv64" = "riscv64";
- "s390x" = "s390x";
- "x86_64" = "amd64";
- }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}");
-
- # We need a target compiler which is still runnable at build time,
- # to handle the cross-building case where build != host == target
- targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
-
- isCross = stdenv.buildPlatform != stdenv.targetPlatform;
-in
-stdenv.mkDerivation rec {
- pname = "go";
- version = "1.17.13";
-
- src = fetchurl {
- url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "sha256-oaSLI6+yBvlee7qpuJjZZfkIJvbx0fwMHXhK2gzTAP0=";
- };
-
- strictDeps = true;
- # perl is used for testing go vet
- nativeBuildInputs = [ perl which pkg-config procps ];
- buildInputs = [ cacert pcre ]
- ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
- ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
-
- propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ];
-
- depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ];
-
- depsBuildTarget = lib.optional isCross targetCC;
-
- depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross;
-
- hardeningDisable = [ "all" ];
-
- prePatch = ''
- patchShebangs ./ # replace /bin/bash
-
- # This source produces shell script at run time,
- # and thus it is not corrected by patchShebangs.
- substituteInPlace misc/cgo/testcarchive/carchive_test.go \
- --replace '#!/usr/bin/env bash' '#!${runtimeShell}'
-
- # Patch the mimetype database location which is missing on NixOS.
- # but also allow static binaries built with NixOS to run outside nix
- sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
-
- # Disabling the 'os/http/net' tests (they want files not available in
- # chroot builds)
- rm src/net/{listen,parse}_test.go
- rm src/syscall/exec_linux_test.go
-
- # !!! substituteInPlace does not seems to be effective.
- # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
- sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
- sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
- # Fails on aarch64
- sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go
- # Skip this test since ssl patches mess it up.
- sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
- # Disable another PIE test which breaks.
- sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go
- # Disable the BuildModePie test
- sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go
- # Disable the unix socket test
- sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go
- # Disable the hostname test
- sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go
- # ParseInLocation fails the test
- sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go
- # Remove the api check as it never worked
- sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
- # Remove the coverage test as we have removed this utility
- sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go
- # Remove the timezone naming test
- sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go
- # Remove disable setgid test
- sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go
- # Remove cert tests that conflict with NixOS's cert resolution
- sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
- # TestWritevError hangs sometimes
- sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go
- # TestVariousDeadlines fails sometimes
- sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go
-
- sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
- sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-
- # Disable cgo lookup tests not works, they depend on resolver
- rm src/net/cgo_unix_test.go
-
- # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
- # that run outside a nix server
- sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
-
- '' + lib.optionalString stdenv.isAarch32 ''
- echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
- '' + lib.optionalString stdenv.isDarwin ''
- substituteInPlace src/race.bash --replace \
- "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
- sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
- sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
- sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
-
- sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go
- sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go
- sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go
- sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go
-
- sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go
- sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go
-
- sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go
-
- sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
-
- # TestCurrent fails because Current is not implemented on Darwin
- sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
- sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
-
- touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
- '';
-
- patches = [
- ./remove-tools-1.11.patch
- ./ssl-cert-file-1.16.patch
- ./remove-test-pie-1.15.patch
- ./creds-test.patch
- ./go-1.9-skip-flaky-19608.patch
- ./skip-chown-tests-1.16.patch
- ./skip-external-network-tests-1.16.patch
- ./skip-nohup-tests.patch
- ./skip-cgo-tests-1.15.patch
- ./go_no_vendor_checks-1.16.patch
- ] ++ [
- # breaks under load: https://github.com/golang/go/issues/25628
- (if stdenv.isAarch32
- then ./skip-test-extra-files-on-aarch32-1.14.patch
- else ./skip-test-extra-files-on-386-1.14.patch)
- ];
-
- postPatch = ''
- find . -name '*.orig' -exec rm {} ';'
- '';
-
- GOOS = stdenv.targetPlatform.parsed.kernel.name;
- GOARCH = goarch stdenv.targetPlatform;
- # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
- # Go will nevertheless build a for host system that we will copy over in
- # the install phase.
- GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
- GOHOSTARCH = goarch stdenv.buildPlatform;
-
- # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
- # to be different from CC/CXX
- CC_FOR_TARGET =
- if isCross then
- "${targetCC}/bin/${targetCC.targetPrefix}cc"
- else
- null;
- CXX_FOR_TARGET =
- if isCross then
- "${targetCC}/bin/${targetCC.targetPrefix}c++"
- else
- null;
-
- GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
- GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
- CGO_ENABLED = 1;
- # Hopefully avoids test timeouts on Hydra
- GO_TEST_TIMEOUT_SCALE = 3;
-
- # Indicate that we are running on build infrastructure
- # Some tests assume things like home directories and users exists
- GO_BUILDER_NAME = "nix";
-
- GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
-
- postConfigure = ''
- export GOCACHE=$TMPDIR/go-cache
- # this is compiled into the binary
- export GOROOT_FINAL=$out/share/go
-
- export PATH=$(pwd)/bin:$PATH
-
- ${lib.optionalString isCross ''
- # Independent from host/target, CC should produce code for the building system.
- # We only set it when cross-compiling.
- export CC=${buildPackages.stdenv.cc}/bin/cc
- ''}
- ulimit -a
- '';
-
- postBuild = ''
- (cd src && ./make.bash)
- '';
-
- doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
-
- checkPhase = ''
- runHook preCheck
- (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
- runHook postCheck
- '';
-
- preInstall = ''
- rm -r pkg/obj
- # Contains the wrong perl shebang when cross compiling,
- # since it is not used for anything we can deleted as well.
- rm src/regexp/syntax/make_perl_groups.pl
- '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
- mv bin/*_*/* bin
- rmdir bin/*_*
- ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
- rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
- ''}
- '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
- rm -rf bin/*_*
- ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
- rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
- ''}
- '' else "");
-
- installPhase = ''
- runHook preInstall
- mkdir -p $GOROOT_FINAL
- cp -a bin pkg src lib misc api doc $GOROOT_FINAL
- ln -s $GOROOT_FINAL/bin $out/bin
- runHook postInstall
- '';
-
- disallowedReferences = [ goBootstrap ];
-
- passthru = {
- inherit goBootstrap;
- };
-
- meta = with lib; {
- description = "The Go Programming language";
- homepage = "https://go.dev/";
- license = licenses.bsd3;
- maintainers = teams.golang.members;
- platforms = platforms.darwin ++ platforms.linux;
- };
-}
diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch
deleted file mode 100644
index 6a18e6cc42e8..000000000000
--- a/pkgs/development/compilers/go/creds-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- source.org/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100
-+++ source/src/syscall/creds_test.go 2018-02-22 10:43:47.223615358 +0000
-@@ -76,8 +76,8 @@
- if sys, ok := err.(*os.SyscallError); ok {
- err = sys.Err
- }
-- if err != syscall.EPERM {
-- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
-+ if err != syscall.EPERM && err != syscall.EINVAL {
-+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
- }
- }
-
diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch b/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch
deleted file mode 100644
index a4d9f0674791..000000000000
--- a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
-index 7137599..43cca2e 100644
---- a/src/net/http/serve_test.go
-+++ b/src/net/http/serve_test.go
-@@ -5361,6 +5361,7 @@ func testServerKeepAlivesEnabled(t *testing.T, h2 bool) {
- // the server's doing its 1-byte background read between requests,
- // waiting for the connection to maybe close.
- func TestServerCancelsReadTimeoutWhenIdle(t *testing.T) {
-+ testenv.SkipFlaky(t, 19608)
- setParallel(t)
- defer afterTest(t)
- const timeout = 250 * time.Millisecond
diff --git a/pkgs/development/compilers/go/remove-test-pie-1.15.patch b/pkgs/development/compilers/go/remove-test-pie-1.15.patch
deleted file mode 100644
index f00685feba90..000000000000
--- a/pkgs/development/compilers/go/remove-test-pie-1.15.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
-index e1cd4965c3..66bf980fc6 100644
---- a/src/cmd/dist/test.go
-+++ b/src/cmd/dist/test.go
-@@ -584,29 +584,6 @@ func (t *tester) registerTests() {
- })
- }
-
-- // Test internal linking of PIE binaries where it is supported.
-- if t.internalLinkPIE() {
-- t.tests = append(t.tests, distTest{
-- name: "pie_internal",
-- heading: "internal linking of -buildmode=pie",
-- fn: func(dt *distTest) error {
-- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
-- return nil
-- },
-- })
-- // Also test a cgo package.
-- if t.cgoEnabled && t.internalLink() {
-- t.tests = append(t.tests, distTest{
-- name: "pie_internal_cgo",
-- heading: "internal linking of -buildmode=pie",
-- fn: func(dt *distTest) error {
-- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
-- return nil
-- },
-- })
-- }
-- }
--
- // sync tests
- if goos != "js" { // js doesn't support -cpu=10
- t.tests = append(t.tests, distTest{
diff --git a/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch b/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch
deleted file mode 100644
index 945d3ef8d126..000000000000
--- a/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
-index e1cd4965c3..0980d044df 100644
---- a/src/cmd/dist/test.go
-+++ b/src/cmd/dist/test.go
-@@ -1136,7 +1136,7 @@ func (t *tester) cgoTest(dt *distTest) error {
- t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal")
- }
- t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie")
-- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie")
-+ //t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie")
- }
- }
- }
diff --git a/pkgs/development/compilers/go/skip-chown-tests-1.16.patch b/pkgs/development/compilers/go/skip-chown-tests-1.16.patch
deleted file mode 100644
index 783446cdf317..000000000000
--- a/pkgs/development/compilers/go/skip-chown-tests-1.16.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9a6718a6355d89b73011fbd1eb1bba8dcfa021e6 Mon Sep 17 00:00:00 2001
-From: regnat
-Date: Wed, 3 Nov 2021 10:17:28 +0100
-Subject: [PATCH] Disable the chown tests
-
-See https://github.com/golang/go/issues/42525 and
-https://github.com/NixOS/nix/issues/3245
----
- os/os_unix_test.go | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/os/os_unix_test.go b/os/os_unix_test.go
-index 51693fd..0936542 100644
---- a/src/os/os_unix_test.go
-+++ b/src/os/os_unix_test.go
-@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
- }
-
- func TestChown(t *testing.T) {
-+ t.Skipf("https://github.com/golang/go/issues/42525")
- // Use TempDir() to make sure we're on a local file system,
- // so that the group ids returned by Getgroups will be allowed
- // on the file. On NFS, the Getgroups groups are
-@@ -83,6 +84,7 @@ func TestChown(t *testing.T) {
- }
-
- func TestFileChown(t *testing.T) {
-+ t.Skipf("https://github.com/golang/go/issues/42525")
- // Use TempDir() to make sure we're on a local file system,
- // so that the group ids returned by Getgroups will be allowed
- // on the file. On NFS, the Getgroups groups are
-@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) {
- }
-
- func TestLchown(t *testing.T) {
-+ t.Skipf("https://github.com/golang/go/issues/42525")
- // Use TempDir() to make sure we're on a local file system,
- // so that the group ids returned by Getgroups will be allowed
- // on the file. On NFS, the Getgroups groups are
---
-2.31.1
-
diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch
deleted file mode 100644
index 8f1eb6be7bb8..000000000000
--- a/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go
-index c902b1404f..66016088a2 100644
---- a/src/internal/testenv/testenv.go
-+++ b/src/internal/testenv/testenv.go
-@@ -163,13 +163,15 @@ func MustHaveExecPath(t testing.TB, path string) {
- // HasExternalNetwork reports whether the current system can use
- // external (non-localhost) networks.
- func HasExternalNetwork() bool {
-- return !testing.Short() && runtime.GOOS != "js"
-+ // Nix sandbox does not external network in sandbox
-+ return false
- }
-
- // MustHaveExternalNetwork checks that the current system can use
- // external (non-localhost) networks.
- // If not, MustHaveExternalNetwork calls t.Skip with an explanation.
- func MustHaveExternalNetwork(t testing.TB) {
-+ t.Skipf("Nix sandbox does not have networking")
- if runtime.GOOS == "js" {
- t.Skipf("skipping test: no external network on %s", runtime.GOOS)
- }
-diff --git a/src/net/dial_test.go b/src/net/dial_test.go
-index 57cf5554ad..d00be53b2c 100644
---- a/src/net/dial_test.go
-+++ b/src/net/dial_test.go
-@@ -990,6 +990,7 @@ func TestDialerControl(t *testing.T) {
- // except that it won't skip testing on non-mobile builders.
- func mustHaveExternalNetwork(t *testing.T) {
- t.Helper()
-+ t.Skipf("Nix sandbox does not have networking")
- mobile := runtime.GOOS == "android" || runtime.GOOS == "ios"
- if testenv.Builder() == "" || mobile {
- testenv.MustHaveExternalNetwork(t)
diff --git a/pkgs/development/compilers/go/skip-nohup-tests.patch b/pkgs/development/compilers/go/skip-nohup-tests.patch
deleted file mode 100644
index 1da07407d049..000000000000
--- a/pkgs/development/compilers/go/skip-nohup-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go
-index 3d79c7a..6e0f7b4 100644
---- a/src/os/signal/signal_test.go
-+++ b/src/os/signal/signal_test.go
-@@ -217,6 +217,8 @@ var checkSighupIgnored = flag.Bool("check_sighup_ignored", false, "if true, Test
-
- // Test that Ignored(SIGHUP) correctly detects whether it is being run under nohup.
- func TestDetectNohup(t *testing.T) {
-+ t.Skip("Fails in nix build environment")
-+
- if *checkSighupIgnored {
- if !Ignored(syscall.SIGHUP) {
- t.Fatal("SIGHUP is not ignored.")
-@@ -306,6 +308,8 @@ func TestStop(t *testing.T) {
- // Test that when run under nohup, an uncaught SIGHUP does not kill the program,
- // but a
- func TestNohup(t *testing.T) {
-+ t.Skip("Fails in nix build environment")
-+
- // Ugly: ask for SIGHUP so that child will not have no-hup set
- // even if test is running under nohup environment.
- // We have no intention of reading from c.
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch
deleted file mode 100644
index ab681826499a..000000000000
--- a/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
-index dce66c5c2e..2532224376 100644
---- a/src/os/exec/exec_test.go
-+++ b/src/os/exec/exec_test.go
-@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) {
- t.Skipf("skipping test on %q", runtime.GOOS)
- }
-
-+ if runtime.GOOS == "linux" && runtime.GOARCH == "386" {
-+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
-+ }
-+
- // Force network usage, to verify the epoll (or whatever) fd
- // doesn't leak to the child,
- ln, err := net.Listen("tcp", "127.0.0.1:0")
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch
deleted file mode 100644
index 5251882fce83..000000000000
--- a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
-index dce66c5c2e..2532224376 100644
---- a/src/os/exec/exec_test.go
-+++ b/src/os/exec/exec_test.go
-@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) {
- t.Skipf("skipping test on %q", runtime.GOOS)
- }
-
-+ if runtime.GOOS == "linux" && runtime.GOARCH == "arm" {
-+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
-+ }
-+
- // Force network usage, to verify the epoll (or whatever) fd
- // doesn't leak to the child,
- ln, err := net.Listen("tcp", "127.0.0.1:0")
diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.16.patch b/pkgs/development/compilers/go/ssl-cert-file-1.16.patch
deleted file mode 100644
index f4bc16e5b8cb..000000000000
--- a/pkgs/development/compilers/go/ssl-cert-file-1.16.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/crypto/x509/root.go b/src/crypto/x509/root.go
-index ac92915128..fb1d70c735 100644
---- a/src/crypto/x509/root.go
-+++ b/src/crypto/x509/root.go
-@@ -6,7 +6,11 @@ package x509
-
- //go:generate go run root_ios_gen.go -version 55161.140.3
-
--import "sync"
-+import (
-+ "io/ioutil"
-+ "os"
-+ "sync"
-+)
-
- var (
- once sync.Once
-@@ -20,6 +24,16 @@ func systemRootsPool() *CertPool {
- }
-
- func initSystemRoots() {
-+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+ data, err := ioutil.ReadFile(file)
-+ if err == nil {
-+ roots := NewCertPool()
-+ roots.AppendCertsFromPEM(data)
-+ systemRoots = roots
-+ return
-+ }
-+ }
-+
- systemRoots, systemRootsErr = loadSystemRoots()
- if systemRootsErr != nil {
- systemRoots = nil
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index e4752c7748be..71e32e074c8f 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ ];
- platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 7573da66c0d8..31743a8f6895 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,5 +1,14 @@
-{ fetchurl, lib, stdenv, pkg-config, meson, ninja
-, gobject-introspection, clutter, gtk3, gnome }:
+{ fetchurl
+, lib
+, stdenv
+, pkg-config
+, meson
+, ninja
+, gobject-introspection
+, clutter
+, gtk3
+, gnome
+}:
let
pname = "clutter-gtk";
@@ -19,6 +28,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ clutter gtk3 ];
nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
+ postPatch = ''
+ # ld: malformed 32-bit x.y.z version number: =1
+ substituteInPlace meson.build \
+ --replace "host_system == 'darwin'" "false"
+ '';
+
postBuild = "rm -rf $out/share/gtk-doc";
passthru = {
@@ -33,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.clutter-project.org/";
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ ];
- platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 2bf1162fe192..80c4187c951c 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,6 +1,26 @@
-{ lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
-, gobject-introspection, gtk3, gnome, libinput, libgudev, libxkbcommon
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, libGLU
+, libGL
+, libX11
+, libXext
+, libXfixes
+, libXdamage
+, libXcomposite
+, libXi
+, libxcb
+, cogl
+, pango
+, atk
+, json-glib
+, gobject-introspection
+, gtk3
+, gnome
+, libinput
+, libgudev
+, libxkbcommon
}:
let
@@ -19,12 +39,34 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 ];
nativeBuildInputs = [ pkg-config gobject-introspection ];
- propagatedBuildInputs =
- [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango
- atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon
- ];
+ propagatedBuildInputs = [
+ cogl
+ pango
+ atk
+ json-glib
+ gobject-introspection
+ ] ++ lib.optionals (!stdenv.isDarwin) [
+ libX11
+ libGL
+ libGLU
+ libXext
+ libXfixes
+ libXdamage
+ libXcomposite
+ libXi
+ libxcb
+ libinput
+ libgudev
+ libxkbcommon
+ ];
- configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
+ configureFlags = [
+ "--enable-introspection" # needed by muffin AFAIK
+ ] ++ lib.optionals stdenv.isDarwin [
+ "--without-x"
+ "--enable-x11-backend=no"
+ "--enable-quartz-backend=yes"
+ ];
#doCheck = true; # no tests possible without a display
@@ -57,6 +99,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.clutter-project.org/";
maintainers = with lib.maintainers; [ ];
- platforms = lib.platforms.mesaPlatforms;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 7eef53e4c625..74f09ce29283 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,7 +1,27 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl
-, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome
-, mesa, automake, autoconf
-, gstreamerSupport ? true, gst_all_1 }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, pkg-config
+, libGL
+, glib
+, gdk-pixbuf
+, xorg
+, libintl
+, pangoSupport ? true
+, pango
+, cairo
+, gobject-introspection
+, wayland
+, gnome
+, mesa
+, automake
+, autoconf
+, gstreamerSupport ? true
+, gst_all_1
+, harfbuzz
+, OpenGL
+}:
stdenv.mkDerivation rec {
pname = "cogl";
@@ -35,26 +55,46 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-introspection"
+ ] ++ lib.optionals (!stdenv.isDarwin) [
"--enable-kms-egl-platform"
"--enable-wayland-egl-platform"
"--enable-wayland-egl-server"
- ] ++ lib.optional gstreamerSupport "--enable-cogl-gst"
- ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
+ "--enable-gles1"
+ "--enable-gles2"
+ ] ++ lib.optionals stdenv.isDarwin [
+ "--disable-glx"
+ "--without-x"
+ ] ++ lib.optionals gstreamerSupport [
+ "--enable-cogl-gst"
+ ];
# TODO: this shouldn't propagate so many things
# especially not gobject-introspection
- propagatedBuildInputs = with xorg; [
- glib gdk-pixbuf gobject-introspection wayland mesa
- libGL libXrandr libXfixes libXcomposite libXdamage
- ]
- ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer
- gst_all_1.gst-plugins-base ];
+ propagatedBuildInputs = [
+ glib
+ gdk-pixbuf
+ gobject-introspection
+ ] ++ lib.optionals stdenv.isLinux [
+ wayland
+ mesa
+ libGL
+ xorg.libXrandr
+ xorg.libXfixes
+ xorg.libXcomposite
+ xorg.libXdamage
+ ] ++ lib.optionals gstreamerSupport [
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ ];
- buildInputs = lib.optionals pangoSupport [ pango cairo ];
+ buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ]
+ ++ lib.optionals stdenv.isDarwin [ OpenGL ];
- COGL_PANGO_DEP_CFLAGS
- = lib.optionalString (stdenv.isDarwin && pangoSupport)
- "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
+ COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [
+ "-I${pango.dev}/include/pango-1.0"
+ "-I${cairo.dev}/include/cairo"
+ "-I${harfbuzz.dev}/include/harfbuzz"
+ ]);
#doCheck = true; # all tests fail (no idea why)
@@ -76,7 +116,7 @@ stdenv.mkDerivation rec {
render without stepping on each other's toes.
'';
- platforms = platforms.mesaPlatforms;
+ platforms = platforms.unix;
license = with licenses; [ mit bsd3 publicDomain sgi-b-20 ];
};
}
diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix
index 7dcd20991a26..19c46d4776c4 100644
--- a/pkgs/development/libraries/gssdp/1.6.nix
+++ b/pkgs/development/libraries/gssdp/1.6.nix
@@ -16,14 +16,14 @@
stdenv.mkDerivation rec {
pname = "gssdp";
- version = "1.6.0";
+ version = "1.6.1";
outputs = [ "out" "dev" ]
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "FI7UFijI8XM2osj6SxSrD7rpi2Amvi2s/d6nv0OGZok=";
+ sha256 = "0r4KbiWREJpuQlhRFhpKU7xUtPBqAhTHlwVmMpvVYzA=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 3ec5cea99b04..63fdf01ac5f1 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -16,14 +16,14 @@
stdenv.mkDerivation rec {
pname = "gssdp";
- version = "1.4.0.1";
+ version = "1.4.1";
outputs = [ "out" "dev" ]
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "hnaEnVf7giuHKIVtut6/OGf4nuR6DsR6IARdAR9DFYI=";
+ sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix
index 7054a75d3887..0e4afedc369f 100644
--- a/pkgs/development/libraries/gupnp/1.6.nix
+++ b/pkgs/development/libraries/gupnp/1.6.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "gupnp";
- version = "1.6.0";
+ version = "1.6.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-MsSdrkd4zT74/Zpg9jdenId2ju5sPAWzPYp5+R4Ivcs=";
+ sha256 = "sha256-hTgUUtKvlbjhSyTUqYljPQ2DzYjRJy8nzLJBbMyDbUc=";
};
depsBuildBuild = [
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 07b64064ce63..34634ddf5fb5 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -9,7 +9,7 @@
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_412
-, docbook_xml_dtd_44
+, docbook_xml_dtd_45
, glib
, gssdp
, libsoup
@@ -20,14 +20,14 @@
stdenv.mkDerivation rec {
pname = "gupnp";
- version = "1.4.3";
+ version = "1.4.4";
outputs = [ "out" "dev" ]
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-FO2nd5NNot90PQckiZM72YETMre1v0Fia4Ay77KLM7o=";
+ sha256 = "sha256-N2GxXLBjYh+Efz7/t9djfwMXUA/Ka9oeGQT3OSF1Ch8=";
};
patches = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
gtk-doc
docbook_xsl
docbook_xml_dtd_412
- docbook_xml_dtd_44
+ docbook_xml_dtd_45
];
buildInputs = [
diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index c5c2ecb68bc4..348919554ea0 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/pkgs/development/python-modules/boltons/default.nix
@@ -34,6 +34,9 @@ buildPythonPackage rec {
})
];
+ # Tests bind to localhost
+ __darwinAllowLocalNetworking = true;
+
pythonImportsCheck = [
"boltons"
];
diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix
index 2aebcfb6ddfb..9a3352ca1424 100644
--- a/pkgs/development/python-modules/colored/default.nix
+++ b/pkgs/development/python-modules/colored/default.nix
@@ -1,24 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
+, nose
}:
buildPythonPackage rec {
pname = "colored";
- version = "1.4.3";
+ version = "1.4.4";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "b7b48b9f40e8a65bbb54813d5d79dd008dc8b8c5638d5bbfd30fc5a82e6def7a";
+ sha256 = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA=";
};
- # No proper test suite
- doCheck = false;
+ checkInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ pythonImportsCheck = [
+ "colored"
+ ];
meta = with lib; {
- homepage = "https://gitlab.com/dslackw/colored";
description = "Simple library for color and formatting to terminal";
+ homepage = "https://gitlab.com/dslackw/colored";
+ changelog = "https://gitlab.com/dslackw/colored/-/raw/${version}/CHANGES.md";
+ maintainers = with maintainers; [ ];
license = licenses.mit;
};
-
}
diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index 9167e629d573..ee54e80f3a6b 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -1,41 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytestCheckHook
+, python
+, setuptools
}:
buildPythonPackage rec {
pname = "dill";
- version = "0.3.5.1";
+ version = "0.3.6";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "uqfoundation";
repo = pname;
rev = "refs/tags/dill-${version}";
- sha256 = "sha256-gWE7aQodblgHjUqGAzOJGgxJ4qx9wHo/DU4KRE6JMWo=";
+ hash = "sha256-lh1o/TqnqtYN9xTZom33y1/7ZhMEAFpheLdtalwgObQ=";
};
- checkInputs = [
- pytestCheckHook
+ nativeBuildInputs = [
+ setuptools
];
- # Tests seem to fail because of import pathing and referencing items/classes in modules.
- # Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests.
- disabledTestPaths = [
- "tests/test_diff.py"
- "tests/test_module.py"
- "tests/test_objects.py"
- "tests/test_session.py"
- ];
-
- disabledTests = [
- "test_class_objects"
- "test_importable"
- "test_method_decorator"
- "test_the_rest"
- # test exception catching needs updating, can probably be removed with next update
- "test_recursive_function"
- ];
+ checkPhase = ''
+ runHook preCheck
+ ${python.interpreter} dill/tests/__main__.py
+ runHook postCheck
+ '';
pythonImportsCheck = [ "dill" ];
@@ -43,6 +33,6 @@ buildPythonPackage rec {
description = "Serialize all of python (almost)";
homepage = "https://github.com/uqfoundation/dill/";
license = licenses.bsd3;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ tjni ];
};
}
diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix
index 5a29f75911bf..d11bb0c841a7 100644
--- a/pkgs/development/python-modules/django-reversion/default.nix
+++ b/pkgs/development/python-modules/django-reversion/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "django-reversion";
- version = "5.0.3";
+ version = "5.0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-rLYA+EghRzEqJ71Y5jdmqgODMQGB5IXm6qL0LSZQLJs=";
+ hash = "sha256-wSurRS0x3TwkRFbPHfODrPFLoUfPmUBMXkRBJZbeQvw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index 621c3e827361..f89781988701 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "eve";
- version = "2.0.3";
+ version = "2.0.4";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "Eve";
- sha256 = "sha256-UiOhnJyEy5bPIIRHAhuWo8AqHOCp0OE5d0btujfeq4o=";
+ sha256 = "sha256-RZ6dwekCKA+PomBp2Ht7/0elOLLUs/sO0KgdxxTOjtc=";
};
disabled = pythonOlder "3.7";
diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix
index 0bd151e236af..24b351494303 100644
--- a/pkgs/development/python-modules/heatzypy/default.nix
+++ b/pkgs/development/python-modules/heatzypy/default.nix
@@ -18,15 +18,21 @@ buildPythonPackage rec {
owner = "Cyr-ius";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw=";
+ hash = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw=";
};
+ postPatch = ''
+ # https://github.com/Cyr-ius/heatzypy/issues/7
+ substituteInPlace setup.py \
+ --replace 'version="replace_by_workflow"' 'version="${version}"'
+ '';
+
propagatedBuildInputs = [
aiohttp
requests
];
- # Project has no tests
+ # Module has no tests
doCheck = false;
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 95f988a34951..b4c7d2abf3a9 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
- version = "0.56.0";
+ version = "0.57.0";
disabled = isPy27;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "refs/tags/v${version}";
- hash = "sha256-g1m44hUtD/x7zEe/ELY6zj2hJikSmZB6S8ZHEHPrvz0=";
+ hash = "sha256-plJ+X4RtZT77fWEAXAsyi5YnonjaWfZfKbSNFKE1DKc=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index a367a180807d..64b331db992d 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
- version = "3.1.0";
+ version = "3.2.1";
pname = "pamqp";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "gmr";
repo = "pamqp";
rev = version;
- hash = "sha256-qiYfQsyYvG6pyRFDt3pyYKNNWNP88maj+VAeGD68OmY=";
+ hash = "sha256-zvvRoGMNP4NMy3Etjif5MYUPdRqmQXATbFgxaPp1TaM=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix
index 52a3cbcf91af..ad779eb2ffc4 100644
--- a/pkgs/development/python-modules/pulumi/default.nix
+++ b/pkgs/development/python-modules/pulumi/default.nix
@@ -1,42 +1,22 @@
{ lib
, buildPythonPackage
-, fetchpatch
, fetchFromGitHub
, protobuf
, dill
, grpcio
-, pulumi-bin
+, pulumi
, isPy27
, semver
+, pytestCheckHook
, pyyaml
, six
-
-
-# for tests
-, go
-, pulumictl
-, pylint
-, pytest
-, pytest-timeout
-, wheel
-, pytest-asyncio
-
-, mypy
}:
-let
- data = import ./data.nix {};
-in
buildPythonPackage rec {
- pname = "pulumi";
- version = pulumi-bin.version;
- disabled = isPy27;
+ inherit (pulumi) version src;
- src = fetchFromGitHub {
- owner = "pulumi";
- repo = "pulumi";
- rev = "v${pulumi-bin.version}";
- sha256 = "sha256-vqEZEHTpJV65a3leWwYhyi3dzAsN67BXOvk5hnTPeuI=";
- };
+ pname = "pulumi";
+
+ disabled = isPy27;
propagatedBuildInputs = [
semver
@@ -48,28 +28,35 @@ buildPythonPackage rec {
];
checkInputs = [
- pulumi-bin
- pulumictl
- mypy
- go
- pytest
- pytest-timeout
- pytest-asyncio
- wheel
+ pulumi.pkgs.pulumi-language-python
+ pytestCheckHook
];
- sourceRoot="source/sdk/python/lib";
+ pytestFlagsArray = [
+ "test/"
+ ];
+
+ sourceRoot = "source/sdk/python/lib";
+
# we apply the modifications done in the pulumi/sdk/python/Makefile
# but without the venv code
postPatch = ''
cp ../../README.md .
- sed -i "s/\''${VERSION}/${version}/g" setup.py
+ substituteInPlace setup.py \
+ --replace "3.0.0" "${version}" \
+ --replace "grpcio==1.47" "grpcio"
'';
- # disabled because tests try to fetch go packages from the net
- doCheck = false;
+ # Allow local networking in tests on Darwin
+ __darwinAllowLocalNetworking = true;
- pythonImportsCheck = ["pulumi"];
+ # Verify that the version substitution works
+ preCheck = ''
+ pip show "${pname}" | grep "Version: ${version}" > /dev/null \
+ || (echo "ERROR: Version substitution seems to be broken"; exit 1)
+ '';
+
+ pythonImportsCheck = [ "pulumi" ];
meta = with lib; {
description = "Modern Infrastructure as Code. Any cloud, any language";
diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix
index f17e42b5d46f..a0ce4ea814d3 100644
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@@ -4,30 +4,28 @@
, fetchFromGitHub
, pyaes
, pysocks
-, async-lru
-, tgcrypto
, pytestCheckHook
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "pyrogram";
- version = "2.0.30";
+ version = "2.0.59";
disabled = pythonOlder "3.7";
+ format = "setuptools";
+
src = fetchFromGitHub {
owner = "pyrogram";
repo = "pyrogram";
rev = "v${version}";
- hash = "sha256-EG9LafZHqCC4klYm5gAlShnznGoaDOGsak4cEOh2OA4=";
+ hash = "sha256-vGgtVXvi/zvbU8f+LBQJN8GSxyVqdv/fBYfsBR4BKf4=";
};
propagatedBuildInputs = [
pyaes
pysocks
- async-lru
- tgcrypto
];
checkInputs = [
diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix
index a1188e8f0104..9152bb4b2ac6 100644
--- a/pkgs/development/python-modules/tgcrypto/default.nix
+++ b/pkgs/development/python-modules/tgcrypto/default.nix
@@ -2,22 +2,29 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
+, setuptools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "tgcrypto";
- version = "1.2.4";
+ version = "1.2.5";
disabled = pythonOlder "3.6";
+ format = "pyproject";
+
src = fetchFromGitHub {
owner = "pyrogram";
repo = "tgcrypto";
rev = "refs/tags/v${version}";
- sha256 = "sha256-hifRWVEvNZVFyIJPwYY+CDR04F1I9GyAi3dt2kx+81c=";
+ sha256 = "sha256-u+mXzkmM79NBi4oHnb32RbN9WPnba/cm1q2Ko0uNEZg=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
checkInputs = [
pytestCheckHook
];
diff --git a/pkgs/development/tools/analysis/jacoco/default.nix b/pkgs/development/tools/analysis/jacoco/default.nix
new file mode 100644
index 000000000000..7382933fa3c6
--- /dev/null
+++ b/pkgs/development/tools/analysis/jacoco/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchzip
+, makeWrapper
+, jre
+}:
+
+stdenv.mkDerivation rec {
+ pname = "jacoco";
+ version = "0.8.8";
+
+ src = fetchzip {
+ url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip";
+ stripRoot = false;
+ sha256 = "sha256-NfXkMAFG1yMj1o06Hlhg9+B4RzL0I36fAGjZx3IC+NQ=";
+ };
+
+ outputs = [ "out" "doc" ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $doc/share/doc $out/bin
+
+ cp -r doc $doc/share/doc/jacoco
+ install -Dm444 lib/* -t $out/share/java
+
+ makeWrapper ${jre}/bin/java $out/bin/jacoco \
+ --add-flags "-jar $out/share/java/jacococli.jar"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A free code coverage library for Java";
+ homepage = "https://jacoco.org/jacoco";
+ license = licenses.epl20;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix
index 51cc427ff199..886db356cfa1 100644
--- a/pkgs/development/tools/build-managers/corrosion/default.nix
+++ b/pkgs/development/tools/build-managers/corrosion/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "corrosion";
- version = "0.2.1";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "corrosion-rs";
repo = "corrosion";
rev = "v${version}";
- hash = "sha256-nJ4ercNykECDBqecuL8cdCl4DHgbgIUmbiFBG/jiOaA=";
+ hash = "sha256-HZdKnS0M8q4C42b7J93LZBXJycxYVahy2ywT6rISOzo=";
};
cargoRoot = "generator";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
inherit src;
sourceRoot = "${src.name}/${cargoRoot}";
name = "${pname}-${version}";
- hash = "sha256-4JVbHYlMOKztWPYW7tXQdvdNh/ygfpi0CY6Ly93VxsI=";
+ hash = "sha256-vrAK5BrMSC8FMLvtP0rxw4sHRU9ySbnrZM50oXMJV1Q=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
@@ -36,13 +36,6 @@ stdenv.mkDerivation rec {
rust.rustc
]);
- cmakeFlags = [
- "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo"
-
- # tests cannot find cargo because Rust_CARGO is unset before tests
- "-DCORROSION_BUILD_TESTS=OFF"
- ];
-
meta = with lib; {
description = "Tool for integrating Rust into an existing CMake project";
homepage = "https://github.com/corrosion-rs/corrosion";
diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix
index 63592bb1359b..21b96fbef4e8 100644
--- a/pkgs/development/tools/fblog/default.nix
+++ b/pkgs/development/tools/fblog/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fblog";
- version = "4.1.0";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "brocode";
repo = pname;
rev = "v${version}";
- sha256 = "1lj0cv1rmcqg36rxnnjh1dazn0sdggfc9kigjg3id6h0y8k7d9b3";
+ sha256 = "sha256-A5/TwISGsk9L0Z/ZF9Z/fxiMG+rcPgtAr2BNVJ+1Xfo=";
};
- cargoSha256 = "sha256-xHvnxRPxe09EmxUK9j7+V2AA1xJFP3ibwbkSs3FBgcw=";
+ cargoSha256 = "sha256-BrhYHUx28Sb6eNU3nTMlMewtokyY6+I5ww+bBVshQqk=";
meta = with lib; {
description = "A small command-line JSON log viewer";
diff --git a/pkgs/development/tools/jdt-language-server/default.nix b/pkgs/development/tools/jdt-language-server/default.nix
index 553c4eb7b5ea..1af69700152d 100644
--- a/pkgs/development/tools/jdt-language-server/default.nix
+++ b/pkgs/development/tools/jdt-language-server/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "jdt-language-server";
- version = "1.16.0";
- timestamp = "202209291445";
+ version = "1.17.0";
+ timestamp = "202210271413";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz";
- sha256 = "bf16a0c3a7034260f646206c51fba14b3c10ef68cece23b7a3c681248f5c1f3a";
+ sha256 = "sha256-3NVzL3o/8LXR94/3Yma42XHfwNEFEVrmUijkeMs/vL0=";
};
sourceRoot = ".";
diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix
index fc604a68ceea..605022ffc12d 100644
--- a/pkgs/development/tools/kcli/default.nix
+++ b/pkgs/development/tools/kcli/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls";
};
- vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a";
+ vendorSha256 = null; #vendorSha256 = "";
subPackages = [ "." ];
@@ -20,5 +20,6 @@ buildGoModule rec {
homepage = "https://github.com/cswank/kcli";
license = licenses.mit;
maintainers = with maintainers; [ cswank ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/development/tools/rust/cargo-unused-features/default.nix
new file mode 100644
index 000000000000..c9cd2dfbb5d5
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-unused-features/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, rustPlatform
+, fetchCrate
+, curl
+, pkg-config
+, openssl
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-unused-features";
+ version = "0.1.7";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "sha256-PdSR2nZbRzV2Kg2LNEpI7/Us+r8Gy6XLdUzMLei5r8c=";
+ };
+
+ cargoSha256 = "sha256-Y0U5Qzj+S7zoXWemcSfMn0YS7wCAPj+ER0jao+f2B28=";
+
+ nativeBuildInputs = [
+ curl.dev
+ pkg-config
+ ];
+
+ buildInputs = [
+ curl
+ openssl
+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ CoreFoundation
+ Security
+ ]);
+
+ meta = with lib; {
+ description = "A tool to find potential unused enabled feature flags and prune them";
+ homepage = "https://github.com/timonpost/cargo-unused-features";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ mainProgram = "unused-features";
+ };
+}
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index 8f854fdedf69..7493c5233a27 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
- version = "4.29.2";
+ version = "4.30.1";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
- sha256 = "sha256-ZHl0FTxWdoxHrbWx6mp5qR/l/FtC3bBkzGuR0T2NouA=";
+ sha256 = "sha256-S4O/5iqX7P6oCONLHu/PucATVVJf2lgae1YtZmJCuns=";
};
vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s=";
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 248db620fe11..b20d00a8da4e 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -24,6 +24,7 @@
, Cocoa
, IOKit
, libsamplerate
+, shaderc
}:
let
assets = fetchsvn {
@@ -48,6 +49,8 @@ let
"graphics_engine"
# Internal library of STK, nothing to do about it
"graphics_utils"
+ # Internal library.
+ "simd_wrapper"
# This irrlicht is bundled with cmake
# whereas upstream irrlicht still uses
# archaic Makefiles, too complicated to switch to.
@@ -65,13 +68,13 @@ in
stdenv.mkDerivation rec {
pname = "supertuxkart";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "supertuxkart";
repo = "stk-code";
rev = version;
- sha256 = "1llyxkdc4m9gnjxqaxlpwvv3ayvpw2bfjzfkkrljaxhznq811g0l";
+ hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM=";
};
postPatch = ''
@@ -91,6 +94,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ shaderc
SDL2
glew
libvorbis
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 2ae8bb2dca24..487ad533668f 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "fatrace";
- version = "0.16.3";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "martinpitt";
repo = pname;
rev = version;
- sha256 = "sha256-w7leZPdmiTc+avihP203e6GLvbRzbCtNOJdF8MM2v68=";
+ sha256 = "sha256-MRHM+hyuRevK4L3u6dGw1S3O7w+BJBsprJVcSz6Q9xg=";
};
buildInputs = [ python3 which ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index ea9dbcabd0e9..74addc6c5010 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -127,7 +127,8 @@ let
platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ];
maintainers = with maintainers; [ jonringer ];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
- inherit broken;
+ # proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2
+ broken = broken || (kernel != null && kernel.kernelAtLeast "6.2");
};
};
diff --git a/pkgs/os-specific/linux/pam_ussh/default.nix b/pkgs/os-specific/linux/pam_ussh/default.nix
index 889c8bc6f57c..4d02efa67330 100644
--- a/pkgs/os-specific/linux/pam_ussh/default.nix
+++ b/pkgs/os-specific/linux/pam_ussh/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
inherit prePatch;
});
- vendorSha256 = "0hjifc3kbwmx7kjn858vi05cwwra6q19cqjfd94k726pwhk37qkw";
+ vendorSha256 = null; #vendorSha256 = "";
buildInputs = [
pam
@@ -63,5 +63,6 @@ buildGoModule rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ lukegb ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index 75ef6d943897..a324f64abfb4 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dgraph";
- version = "22.0.0";
+ version = "22.0.1";
src = fetchFromGitHub {
owner = "dgraph-io";
repo = "dgraph";
rev = "v${version}";
- sha256 = "sha256-2ZLZ1emsXmt1RjVq5Pdsbi+ItzxN/fEImOq7VBg5pxA=";
+ sha256 = "sha256-c4gNkT1N1yPotDhRjZvuVvO5TTaL2bqR5I+Z2PcvW10=";
};
vendorSha256 = "sha256-K2Q2QBP6fJ3E2LEmZO2U/0DiQifrJVG0lcs4pO5yqrY=";
diff --git a/pkgs/servers/filtron/default.nix b/pkgs/servers/filtron/default.nix
index 36d64db4e215..6abf5933445c 100644
--- a/pkgs/servers/filtron/default.nix
+++ b/pkgs/servers/filtron/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26";
};
- vendorSha256 = "05q2g591xl08h387mm6njabvki19yih63dfsafgpc9hyk5ydf2n9";
+ vendorSha256 = null; #vendorSha256 = "";
# The upstream test checks are obsolete/unmaintained.
doCheck = false;
@@ -22,5 +22,6 @@ buildGoModule rec {
license = licenses.agpl3;
maintainers = [ maintainers.dasj19 ];
platforms = platforms.linux;
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix
index 9a4fd071338e..d3be7cd4a4fc 100644
--- a/pkgs/servers/geospatial/pg_featureserv/default.nix
+++ b/pkgs/servers/geospatial/pg_featureserv/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0lfsbsgcb7z8ljxn1by37rbx02vaprrpacybk1kja1rjli7ik7m9";
};
- vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r";
+ vendorSha256 = null; #vendorSha256 = "";
ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ];
@@ -21,5 +21,6 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix
index c7beee4a7bf1..224eca352bb9 100644
--- a/pkgs/servers/gobetween/default.nix
+++ b/pkgs/servers/gobetween/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
make -e build${lib.optionalString enableStatic "-static"}
'';
- vendorSha256 = "1nkni9ikpc0wngh5v0qmlpn5s9v85lb2ih22f3h3lih7nc29yv87";
+ vendorSha256 = null; #vendorSha256 = "";
installPhase = ''
mkdir -p $out/bin
@@ -35,5 +35,6 @@ buildGoModule rec {
homepage = "https://gobetween.io";
license = licenses.mit;
maintainers = with maintainers; [ tomberek ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix
index 2d36dcb8e1d5..de12c0336c77 100644
--- a/pkgs/servers/monitoring/alertmanager-bot/default.nix
+++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1hjfkksqb675gabzjc221b33h2m4s6qsanmkm382d3fyzqj71dh9";
};
- vendorSha256 = "1v0fgin8dn81b559zz4lqmrl7hikr46g4gb18sci4riql5qs1isj";
+ vendorSha256 = null; #vendorSha256 = "";
postPatch = ''
sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go
@@ -30,5 +30,6 @@ buildGoModule rec {
homepage = "https://github.com/metalmatze/alertmanager-bot";
license = licenses.mit;
maintainers = with maintainers; [ mmahut ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix
index 90edc3e278ad..2c14a080f9b1 100644
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchzip }:
let
- version = "22.2.7";
+ version = "22.3.1";
platform = if stdenv.isLinux then "linux" else "darwin";
arch = if stdenv.isAarch64 then "arm" else "amd";
sha256s = {
darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g=";
darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4=";
- linux.amd = "sha256-hUChGYimCFXEvSxb49QgPo/LYlef0ZMVhKNy9i3SpVA=";
+ linux.amd = "sha256-liUFM9f7OQocb5j/qvZNVWiJGIf651ULMlRmX67qyoQ=";
linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8=";
};
in stdenv.mkDerivation rec {
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index 553cf937b0ea..98563bda6cd0 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -16,6 +16,10 @@ self = stdenv.mkDerivation rec {
nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
+ patches = [
+ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
+ ];
+
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
postPatch = ''
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
diff --git a/pkgs/servers/sql/mysql/no-force-outline-atomics.patch b/pkgs/servers/sql/mysql/no-force-outline-atomics.patch
new file mode 100644
index 000000000000..a716a4f7f481
--- /dev/null
+++ b/pkgs/servers/sql/mysql/no-force-outline-atomics.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 727d66011f9..acae1aada57 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1338,19 +1338,6 @@ IF(UNIX AND MY_COMPILER_IS_GNU_OR_CLANG
+ ENDIF()
+ ENDIF()
+
+-# For aarch64 some sub-architectures support LSE atomics and some don't. Thus,
+-# compiling for the common denominator (-march=armv8-a) means LSE is not used.
+-# The -moutline-atomics switch enables run-time detection of LSE support.
+-# There are compilers (gcc 9.3.1 for example) which support this switch, but
+-# do not enable it by default, even though it seems to help. So, we force it.
+-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+- MY_CHECK_CXX_COMPILER_FLAG( "-moutline-atomics" HAVE_OUTLINE_ATOMICS)
+- IF(HAVE_OUTLINE_ATOMICS)
+- STRING_APPEND(CMAKE_C_FLAGS " -moutline-atomics")
+- STRING_APPEND(CMAKE_CXX_FLAGS " -moutline-atomics")
+- ENDIF()
+-ENDIF()
+-
+ IF(LINUX)
+ OPTION(LINK_RANDOMIZE "Randomize the order of all symbols in the binary" OFF)
+ SET(LINK_RANDOMIZE_SEED "mysql"
diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/servers/web-apps/invoiceplane/default.nix
index 670d42102f51..a091a10d8890 100644
--- a/pkgs/servers/web-apps/invoiceplane/default.nix
+++ b/pkgs/servers/web-apps/invoiceplane/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "invoiceplane";
- version = "1.6-beta-1";
+ version = "1.6-beta-3";
src = fetchurl {
url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip";
- sha256 = "sha256-hIbk9zzqbwv2kSFClgPfTObB1YHj7KR4swKjGoN2v2E=";
+ sha256 = "sha256-sw5LaU3v4MIdX99WGKOaerVc9m3d8aQVuvrLn7KvcKE=";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index e02162b1f548..4192811b7d50 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bubblewrap";
- version = "0.6.2";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "containers";
repo = "bubblewrap";
rev = "v${version}";
- hash = "sha256-J+VFla3sWO+DfB2IxxrKzbiG+KWFJr9caf8sTHyWXY4=";
+ hash = "sha256-ddxEtBw6JcSsZCN5uKyuBMVkWwSoThfxrcvHZGZzFr4=";
};
postPatch = ''
diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
similarity index 100%
rename from pkgs/tools/admin/pulumi/data.nix
rename to pkgs/tools/admin/pulumi-bin/data.nix
diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix
new file mode 100644
index 000000000000..71c61d7a0543
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-bin/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }:
+
+with lib;
+
+let
+ data = import ./data.nix {};
+in stdenv.mkDerivation {
+ pname = "pulumi";
+ version = data.version;
+
+ postUnpack = ''
+ mv pulumi-* pulumi
+ '';
+
+ srcs = map (x: fetchurl x) data.pulumiPkgs.${stdenv.hostPlatform.system};
+
+ installPhase = ''
+ install -D -t $out/bin/ *
+ '' + optionalString stdenv.isLinux ''
+ wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib"
+ '' + ''
+ installShellCompletion --cmd pulumi \
+ --bash <($out/bin/pulumi completion bash) \
+ --fish <($out/bin/pulumi completion fish) \
+ --zsh <($out/bin/pulumi completion zsh)
+ '';
+
+ nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ];
+
+ meta = {
+ homepage = "https://pulumi.io/";
+ description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
+ sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+ license = with licenses; [ asl20 ];
+ platforms = builtins.attrNames data.pulumiPkgs;
+ maintainers = with maintainers; [
+ ghuntley
+ peterromfeldhk
+ jlesquembre
+ cpcloud
+ ];
+ };
+}
diff --git a/pkgs/tools/admin/pulumi/update-pulumi-shell.nix b/pkgs/tools/admin/pulumi-bin/update-pulumi-shell.nix
similarity index 100%
rename from pkgs/tools/admin/pulumi/update-pulumi-shell.nix
rename to pkgs/tools/admin/pulumi-bin/update-pulumi-shell.nix
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi-bin/update.sh
similarity index 100%
rename from pkgs/tools/admin/pulumi/update.sh
rename to pkgs/tools/admin/pulumi-bin/update.sh
diff --git a/pkgs/tools/admin/pulumi-packages/base.nix b/pkgs/tools/admin/pulumi-packages/base.nix
new file mode 100644
index 000000000000..001a247379bc
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-packages/base.nix
@@ -0,0 +1,128 @@
+{ buildGoModule
+, fetchFromGitHub
+, python3Packages
+}:
+let
+ mkBasePackage =
+ { pname
+ , src
+ , version
+ , vendorHash
+ , cmd
+ , extraLdflags
+ , ...
+ }@args: buildGoModule (rec {
+ inherit pname src vendorHash version;
+
+ sourceRoot = "${src.name}/provider";
+
+ subPackages = [ "cmd/${cmd}" ];
+
+ doCheck = false;
+
+ ldflags = [
+ "-s"
+ "-w"
+ ] ++ extraLdflags;
+ } // args);
+
+ mkPythonPackage =
+ { meta
+ , pname
+ , src
+ , version
+ , ...
+ }: python3Packages.callPackage
+ ({ buildPythonPackage, pythonOlder, parver, pulumi, semver }:
+ buildPythonPackage rec {
+ inherit pname meta src version;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ sourceRoot = "${src.name}/sdk/python";
+
+ propagatedBuildInputs = [
+ parver
+ pulumi
+ semver
+ ];
+
+ postPatch = ''
+ sed -i \
+ -e 's/^VERSION = .*/VERSION = "${version}"/g' \
+ -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \
+ setup.py
+ '';
+
+ # Auto-generated; upstream does not have any tests.
+ # Verify that the version substitution works
+ checkPhase = ''
+ runHook preCheck
+
+ pip show "${pname}" | grep "Version: ${version}" > /dev/null \
+ || (echo "ERROR: Version substitution seems to be broken"; exit 1)
+
+ runHook postCheck
+ '';
+
+ pythonImportsCheck = [
+ (builtins.replaceStrings [ "-" ] [ "_" ] pname)
+ ];
+ })
+ { };
+in
+{ owner
+, repo
+, rev
+, version
+, hash
+, vendorHash
+, cmdGen
+, cmdRes
+, extraLdflags
+, meta
+, fetchSubmodules ? false
+, ...
+}@args:
+let
+ src = fetchFromGitHub {
+ name = "source-${repo}-${rev}";
+ inherit owner repo rev hash fetchSubmodules;
+ };
+
+ pulumi-gen = mkBasePackage rec {
+ inherit src version vendorHash extraLdflags;
+
+ cmd = cmdGen;
+ pname = cmdGen;
+ };
+in
+mkBasePackage ({
+ inherit meta src version vendorHash extraLdflags;
+
+ pname = repo;
+
+ nativeBuildInputs = [
+ pulumi-gen
+ ];
+
+ cmd = cmdRes;
+
+ postConfigure = ''
+ pushd ..
+
+ chmod +w sdk/
+ ${cmdGen} schema
+
+ popd
+
+ VERSION=v${version} go generate cmd/${cmdRes}/main.go
+ '';
+
+ passthru.sdks.python = mkPythonPackage {
+ inherit meta src version;
+
+ pname = repo;
+ };
+} // args)
diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix
new file mode 100644
index 000000000000..f343f9c893ba
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-packages/default.nix
@@ -0,0 +1,11 @@
+{ callPackage }:
+let
+ mkPulumiPackage = callPackage ./base.nix { };
+ callPackage' = p: args: callPackage p (args // { inherit mkPulumiPackage; });
+in
+{
+ pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { };
+ pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { };
+ pulumi-language-python = callPackage ./pulumi-language-python.nix { };
+ pulumi-random = callPackage' ./pulumi-random.nix { };
+}
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix b/pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix
new file mode 100644
index 000000000000..2a0582ecb805
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix
@@ -0,0 +1,34 @@
+{ lib
+, mkPulumiPackage
+}:
+mkPulumiPackage rec {
+ owner = "pulumi";
+ repo = "pulumi-aws-native";
+ version = "0.38.0";
+ rev = "v${version}";
+ hash = "sha256-v7jNPCrjtfi9KYD4RhiphMIpV23g/CBV/sKPBkMulu0=";
+ vendorHash = "sha256-Yu9tNakwXWYdrjzI6/MFRzVBhJAEOjsmq9iBAQlR0AI=";
+ cmdGen = "pulumi-gen-aws-native";
+ cmdRes = "pulumi-resource-aws-native";
+ extraLdflags = [
+ "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}"
+ ];
+
+ fetchSubmodules = true;
+ postConfigure = ''
+ pushd ..
+
+ ${cmdGen} schema aws-cloudformation-schema ${version}
+
+ popd
+ '';
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = with lib; {
+ description = "Native AWS Pulumi Provider";
+ homepage = "https://github.com/pulumi/pulumi-aws-native";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ veehaitch trundle ];
+ };
+}
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix
new file mode 100644
index 000000000000..6d2df0af08f8
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix
@@ -0,0 +1,24 @@
+{ lib
+, mkPulumiPackage
+}:
+mkPulumiPackage rec {
+ owner = "pulumi";
+ repo = "pulumi-azure-native";
+ version = "1.81.0";
+ rev = "v${version}";
+ hash = "sha256-xiifVjvtt4bKi0fBYLU/Gfkx2tziLIq2vddRNWwuyz0=";
+ vendorHash = "sha256-VSwT5I5casJiBpXAcV9vLEWU9XWuDTktmfGqE6H/HX4=";
+ cmdGen = "pulumi-gen-azure-native";
+ cmdRes = "pulumi-resource-azure-native";
+ extraLdflags = [
+ "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}"
+ ];
+ fetchSubmodules = true;
+ __darwinAllowLocalNetworking = true;
+ meta = with lib; {
+ description = "Native Azure Pulumi Provider";
+ homepage = "https://github.com/pulumi/pulumi-azure-native";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ veehaitch trundle ];
+ };
+}
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
new file mode 100644
index 000000000000..658755fcf2f8
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildGoModule
+, pulumi
+, python3
+}:
+buildGoModule rec {
+ inherit (pulumi) version src;
+
+ pname = "pulumi-language-python";
+
+ sourceRoot = "${src.name}/sdk";
+
+ vendorHash = "sha256-IZIdLmNGMFjRdkLPoE9UyON3pX/GBIgz/rv108v8iLY=";
+
+ postPatch = ''
+ # Requires network
+ substituteInPlace python/python_test.go \
+ --replace "TestRunningPipInVirtualEnvironment" \
+ "SkipTestRunningPipInVirtualEnvironment"
+
+ substituteInPlace python/cmd/pulumi-language-python/main_test.go \
+ --replace "TestDeterminePulumiPackages" \
+ "SkipTestDeterminePulumiPackages"
+ '';
+
+ subPackages = [
+ "python/cmd/pulumi-language-python"
+ ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}"
+ ];
+
+ checkInputs = [
+ python3
+ ];
+
+ postInstall = ''
+ cp python/cmd/pulumi-language-python-exec $out/bin
+ cp python/dist/pulumi-resource-pulumi-python $out/bin
+ cp python/dist/pulumi-analyzer-policy-python $out/bin
+ '';
+}
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-random.nix b/pkgs/tools/admin/pulumi-packages/pulumi-random.nix
new file mode 100644
index 000000000000..4248ae73dda7
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-random.nix
@@ -0,0 +1,23 @@
+{ lib
+, mkPulumiPackage
+}:
+mkPulumiPackage rec {
+ owner = "pulumi";
+ repo = "pulumi-random";
+ version = "4.8.2";
+ rev = "v${version}";
+ hash = "sha256-tFEtBgNpl8090RuVMEkyGmdfpZK8wvOD4iog1JRq+GY=";
+ vendorHash = "sha256-H3mpKxb1lt+du3KterYPV6WWs1D0XXlmemMyMiZBnqs=";
+ cmdGen = "pulumi-tfgen-random";
+ cmdRes = "pulumi-resource-random";
+ extraLdflags = [
+ "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}"
+ ];
+ __darwinAllowLocalNetworking = true;
+ meta = with lib; {
+ description = "A Pulumi provider that safely enables randomness for resources";
+ homepage = "https://github.com/pulumi/pulumi-random";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ veehaitch trundle ];
+ };
+}
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 71c61d7a0543..5f0b754e8ddb 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -1,43 +1,108 @@
-{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }:
+{ stdenv
+, lib
+, buildGoModule
+, coreutils
+, fetchFromGitHub
+, installShellFiles
+, git
+ # passthru
+, runCommand
+, makeWrapper
+, pulumi
+, pulumiPackages
+}:
-with lib;
-
-let
- data = import ./data.nix {};
-in stdenv.mkDerivation {
+buildGoModule rec {
pname = "pulumi";
- version = data.version;
+ version = "3.43.1";
- postUnpack = ''
- mv pulumi-* pulumi
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-LbPXCwU6aJp+z5scfej5Reo2X8QUvZpASWkcDBBF1J0=";
+ };
+
+ vendorSha256 = "sha256-APGiCqHdXDRCFx0W8RDeL89sskYZ2vzdpg4ePE7KixA=";
+
+ sourceRoot = "source/pkg";
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ # Bundle release metadata
+ ldflags = [
+ # Omit the symbol table and debug information.
+ "-s"
+ # Omit the DWARF symbol table.
+ "-w"
+ ] ++ importpathFlags;
+
+ importpathFlags = [
+ "-X github.com/pulumi/pulumi/pkg/v3/version.Version=v${version}"
+ ];
+
+ doCheck = true;
+
+ checkInputs = [
+ git
+ ];
+
+ preCheck = ''
+ # The tests require `version.Version` to be unset
+ ldflags=''${ldflags//"$importpathFlags"/}
+
+ # Create some placeholders for plugins used in tests. Otherwise, Pulumi
+ # tries to donwload them and fails, resulting in really long test runs
+ dummyPluginPath=$(mktemp -d)
+ for name in pulumi-{resource-pkg{A,B},-pkgB}; do
+ ln -s ${coreutils}/bin/true "$dummyPluginPath/$name"
+ done
+
+ export PATH=$dummyPluginPath''${PATH:+:}$PATH
+
+ # Code generation tests also download dependencies from network
+ rm codegen/{docs,dotnet,go,nodejs,python,schema}/*_test.go
+ '' + lib.optionalString stdenv.isDarwin ''
+ export PULUMI_HOME=$(mktemp -d)
'';
- srcs = map (x: fetchurl x) data.pulumiPkgs.${stdenv.hostPlatform.system};
+ # Allow tests that bind or connect to localhost on macOS.
+ __darwinAllowLocalNetworking = true;
- installPhase = ''
- install -D -t $out/bin/ *
- '' + optionalString stdenv.isLinux ''
- wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib"
- '' + ''
+ doInstallCheck = true;
+ installCheckPhase = ''
+ PULUMI_SKIP_UPDATE_CHECK=1 $out/bin/pulumi version | grep v${version} > /dev/null
+ '';
+
+ postInstall = ''
installShellCompletion --cmd pulumi \
- --bash <($out/bin/pulumi completion bash) \
- --fish <($out/bin/pulumi completion fish) \
- --zsh <($out/bin/pulumi completion zsh)
+ --bash <($out/bin/pulumi gen-completion bash) \
+ --fish <($out/bin/pulumi gen-completion fish) \
+ --zsh <($out/bin/pulumi gen-completion zsh)
'';
- nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ];
+ passthru = {
+ pkgs = pulumiPackages;
+ withPackages = f: runCommand "${pulumi.name}-with-packages"
+ {
+ nativeBuildInputs = [ makeWrapper ];
+ }
+ ''
+ mkdir -p $out/bin
+ makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \
+ --suffix PATH : ${lib.makeSearchPath "bin" (f pulumiPackages)}
+ '';
+ };
- meta = {
+ meta = with lib; {
homepage = "https://pulumi.io/";
description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
- sourceProvenance = with sourceTypes; [ binaryNativeCode ];
- license = with licenses; [ asl20 ];
- platforms = builtins.attrNames data.pulumiPkgs;
+ sourceProvenance = sourceTypes.fromSource;
+ license = licenses.asl20;
+ platforms = platforms.unix;
maintainers = with maintainers; [
- ghuntley
- peterromfeldhk
- jlesquembre
- cpcloud
+ trundle
+ veehaitch
];
};
}
diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix
index ac976f1416a9..a6100784a6b2 100644
--- a/pkgs/tools/misc/pipe-rename/default.nix
+++ b/pkgs/tools/misc/pipe-rename/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "pipe-rename";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-fAjJDHc6p/+a1RLricpNkww4JLJBAXNMfw1T2HmlxPg=";
+ sha256 = "sha256-95Gj5iy8VYBzpV0kmGhronIR5LSjelfOueBQD/8gbfw=";
};
- cargoSha256 = "sha256-UvYRegfc/+cFx7kLuhQIYZGla5YCrWXKOsTMlV9c874=";
+ cargoSha256 = "sha256-HiElAPgNeICEVbMBfK6syCoQb5smHhBH1MOuo2swci4=";
checkInputs = [ python3 ];
diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix
index ec2362b27009..673d266a41ee 100644
--- a/pkgs/tools/misc/ytfzf/default.nix
+++ b/pkgs/tools/misc/ytfzf/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ytfzf";
- version = "2.5.0";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
- hash = "sha256-P5cEdcbL9f9tJbcfiOLA0lSPW6m2x39Cz4tL1yFFbCg=";
+ hash = "sha256-3GRCvoClV484xoEEa/9HSgIAdqC6bLBDSVkZ6KXEGY0=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix
index a5b0b7c80786..b79df12bfb49 100644
--- a/pkgs/tools/networking/cassowary/default.nix
+++ b/pkgs/tools/networking/cassowary/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cassowary";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "rogerwelin";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-eZ61LIDMv+G7jnSrEFCsm6MP5+BpzJW+OnI9bqAZ5hw=";
+ sha256 = "sha256-wRpITbxtn2sHw7kkQ8rnCPQCU0JS6smdQLq1Z/RyeHo=";
};
- vendorSha256 = "sha256-5U/YqqNfZfLZLEwuRh4mXACr9Gj7iOrLQRSLC/b8ZRw=";
+ vendorSha256 = "sha256-b77Sje5OsysTRRbzgdLnTlLLyLIACjD4c/oS9zyI0d8=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index 96fa955a6b66..0b878a678e65 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "dnsperf";
- version = "2.9.0";
+ version = "2.10.0";
src = fetchFromGitHub {
owner = "DNS-OARC";
repo = "dnsperf";
rev = "v${version}";
- sha256 = "sha256-TWFi3oPTIKjBaw0Rq0AfZgxyVukvL2SWa2qvWw2WAQ4=";
+ sha256 = "sha256-V8wFswGs4p045mOyLA1Zrlz4JtfojHbUir0esS2iUIs=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix
index 9930f1f1fe52..c342ac433b86 100644
--- a/pkgs/tools/networking/opensnitch/daemon.nix
+++ b/pkgs/tools/networking/opensnitch/daemon.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper protoc-gen-go-grpc ];
- vendorSha256 = "sha256-81BKMLuEXA/NeIjO7icBm48ROq6KxAxHtvP0nV5yM5A=";
+ vendorSha256 = null; #vendorSha256 = "";
preBuild = ''
make -C ../proto ../daemon/ui/protocol/ui.pb.go
@@ -71,5 +71,6 @@ buildGoModule rec {
license = licenses.gpl3Only;
maintainers = [ maintainers.raboof ];
platforms = platforms.linux;
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix
index 3577939c8da4..109188d0b1b5 100644
--- a/pkgs/tools/networking/shadowfox/default.nix
+++ b/pkgs/tools/networking/shadowfox/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
};
- vendorSha256 = "sha256-llseW3k8ygTXwkSpnRfQEnX3OVj2zdL8JDpIoRcC9kE=";
+ vendorSha256 = null; #vendorSha256 = "";
doCheck = false;
@@ -27,5 +27,6 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ infinisil ];
mainProgram = "shadowfox-updater";
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix
index 7ef984147a32..bc52bb33e370 100644
--- a/pkgs/tools/networking/waitron/default.nix
+++ b/pkgs/tools/networking/waitron/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE=";
};
- vendorSha256 = "sha256-grQFLo0BIIa/kNKF4vPw/V1WN9sxOucz6+wET2PBU1I=";
+ vendorSha256 = null; #vendorSha256 = "";
subPackages = [ "." ];
@@ -34,5 +34,6 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ guibert ];
platforms = platforms.linux;
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index 7e86b4438a1f..c162ee8036a4 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -11,12 +11,13 @@ buildGoModule rec {
sha256 = "sha256-H0soiKOytchfcFx17az0pGoFbA+hhXLxGJVdaARvnDc=";
};
- vendorSha256 = "sha256-omeAIq8KBYXRnldiGKDF1g+aOKYc+B4grusmfg5wOuA=";
+ vendorSha256 = null; #vendorSha256 = "";
meta = with lib; {
homepage = "https://github.com/asciimoo/wuzz";
description = "Interactive cli tool for HTTP inspection";
license = licenses.agpl3;
maintainers = with maintainers; [ pradeepchhetri ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix
index e351eb7a79d4..bfe004d2d9b1 100644
--- a/pkgs/tools/security/deepsea/default.nix
+++ b/pkgs/tools/security/deepsea/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig";
};
- vendorSha256 = "0vpkzykfg1rq4qi1v5lsa0drpil9i6ccfw96k48ppi9hiwzpq94w";
+ vendorSha256 = null; #vendorSha256 = "";
meta = with lib; {
description = "Phishing tool for red teams and pentesters";
@@ -26,5 +26,6 @@ buildGoModule rec {
homepage = "https://github.com/dsnezhkov/deepsea";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/security/git-hound/default.nix b/pkgs/tools/security/git-hound/default.nix
index 2d13b11d302d..463d550cbcab 100644
--- a/pkgs/tools/security/git-hound/default.nix
+++ b/pkgs/tools/security/git-hound/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E=";
};
- vendorSha256 = "sha256-qnIcjk2mzG/51ouhrAW6R3ZqoUSL6ZzYCOVZvKS7sBQ=";
+ vendorSha256 = null; #vendorSha256 = "";
meta = with lib; {
description = "Reconnaissance tool for GitHub code search";
@@ -26,5 +26,6 @@ buildGoModule rec {
homepage = "https://github.com/tillson/git-hound";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/security/httpdump/default.nix b/pkgs/tools/security/httpdump/default.nix
index c2e5a62969be..0bab990f1741 100644
--- a/pkgs/tools/security/httpdump/default.nix
+++ b/pkgs/tools/security/httpdump/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "0yh8kxy1k23lln09b614limwk9y59r7cn5qhbnzc06ga4mxfczv2";
};
- vendorSha256 = "0lb1p63lzn1ngj54bar9add7w0azvgcq3azhv9c5glk3ykv9c3iy";
+ vendorSha256 = null; #vendorSha256 = "";
propagatedBuildInputs = [ libpcap ];
@@ -25,5 +25,6 @@ buildGoModule rec {
homepage = "https://github.com/hsiafan/httpdump";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ fab ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix
index 2a901a599d49..8d0fe229fc70 100644
--- a/pkgs/tools/security/prs/default.nix
+++ b/pkgs/tools/security/prs/default.nix
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
- version = "0.3.4";
+ version = "0.3.5";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "v${version}";
- hash = "sha256-dfyTaWwV2hNZPZfvM+AqqR1zbChjT6Y/TEkQPEXRtGA=";
+ hash = "sha256-PNmbWynEO8XcE7lLqfjJdCRnvRdCR8+stdwqRIKQfqM=";
};
- cargoHash = "sha256-yf46le0jG4EXo60kGKc0GwSO5vl4Dw0gmYJ4yr+TFdE=";
+ cargoHash = "sha256-DSQDsgx608NUSi/KNwtntav7FTdnXGeIBzCkma5Tjts=";
postPatch = ''
# The GPGME backend is recommended
diff --git a/pkgs/tools/security/shhgit/default.nix b/pkgs/tools/security/shhgit/default.nix
index a05eba1282c1..fa714622fe97 100644
--- a/pkgs/tools/security/shhgit/default.nix
+++ b/pkgs/tools/security/shhgit/default.nix
@@ -15,12 +15,13 @@ buildGoModule rec {
sha256 = "1b7r4ivfplm4crlvx571nyz2rc6djy0xvl14nz7m0ngh6206df9k";
};
- vendorSha256 = "0isa9faaknm8c9mbyj5dvf1dfnyv44d1pjd2nbkyfi6b22hcci3d";
+ vendorSha256 = null; #vendorSha256 = "";
meta = with lib; {
description = "Tool to detect secrets in repositories";
homepage = "https://github.com/eth0izzle/shhgit";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/security/smbscan/default.nix b/pkgs/tools/security/smbscan/default.nix
index a3a2257c065c..f807704005e1 100644
--- a/pkgs/tools/security/smbscan/default.nix
+++ b/pkgs/tools/security/smbscan/default.nix
@@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "smbscan";
version = "unstable-2022-05-26";
- format = "setuptools";
+ format = "other";
src = fetchFromGitHub {
owner = "jeffhacks";
diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/tools/security/ssb/default.nix
index d6305e4cf4a4..a461fad2fd8c 100644
--- a/pkgs/tools/security/ssb/default.nix
+++ b/pkgs/tools/security/ssb/default.nix
@@ -14,12 +14,13 @@ buildGoModule rec {
sha256 = "0dkd02l30461cwn5hsssnjyb9s8ww179wll3l7z5hy1hv3x6h9g1";
};
- vendorSha256 = "1q3dxizyz9bcdfs5j2bzhl2aadhd00cvzhj202wlls0zrlb9pp4f";
+ vendorSha256 = null; #vendorSha256 = "";
meta = with lib; {
description = "Tool to bruteforce SSH server";
homepage = "https://github.com/kitabisa/ssb";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/tools/text/wrap/default.nix
index e228f946a8c8..aeafda70a2d6 100644
--- a/pkgs/tools/text/wrap/default.nix
+++ b/pkgs/tools/text/wrap/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ];
- vendorSha256 = "03q5a5lm8zj1523gxkbc0y6a3mjj1z2h7nrr2qcz8nlghvp4cfaz";
+ vendorSha256 = null; #vendorSha256 = "";
patches = [
(fetchpatch {
@@ -32,5 +32,6 @@ buildGoModule rec {
homepage = "https://github.com/Wraparound/wrap";
license = licenses.gpl3Only;
maintainers = [ maintainers.austinbutler ];
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
};
}
diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix
index f007057222f7..40281e014681 100644
--- a/pkgs/tools/virtualization/google-guest-agent/default.nix
+++ b/pkgs/tools/virtualization/google-guest-agent/default.nix
@@ -4,13 +4,13 @@
buildGoModule rec {
pname = "guest-agent";
- version = "20221104.00";
+ version = "20221109.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = version;
- sha256 = "sha256-JvI0tj6/+iCu+Q5XB3QOrrfBl6n2/bB6pj9lUDZL8DE=";
+ sha256 = "sha256-maVFdsS6upJIAOzSpkwDEGppA4qdTikluEg1Hlu5+U0=";
};
vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94672f66a771..fcb1f666a357 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4143,10 +4143,7 @@ with pkgs;
gdu = callPackage ../tools/system/gdu { };
- go-chromecast = callPackage ../applications/video/go-chromecast {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ go-chromecast = callPackage ../applications/video/go-chromecast { };
go-containerregistry = callPackage ../development/tools/go-containerregistry { };
inherit (go-containerregistry) crane gcrane;
@@ -4786,10 +4783,7 @@ with pkgs;
pixiecore = callPackage ../tools/networking/pixiecore {};
- waitron = callPackage ../tools/networking/waitron {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ waitron = callPackage ../tools/networking/waitron { };
pyCA = python3Packages.callPackage ../applications/video/pyca {};
@@ -7092,10 +7086,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- git-hound = callPackage ../tools/security/git-hound {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ git-hound = callPackage ../tools/security/git-hound { };
git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
@@ -7862,10 +7853,7 @@ with pkgs;
httpdirfs = callPackage ../tools/filesystems/httpdirfs { };
- httpdump = callPackage ../tools/security/httpdump {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ httpdump = callPackage ../tools/security/httpdump { };
httpie = with python3Packages; toPythonApplication httpie;
@@ -8366,10 +8354,7 @@ with pkgs;
jdk = jdk11;
};
- kfctl = callPackage ../applications/networking/cluster/kfctl {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ kfctl = callPackage ../applications/networking/cluster/kfctl { };
kluctl = callPackage ../applications/networking/cluster/kluctl { };
@@ -9868,10 +9853,7 @@ with pkgs;
openfortivpn = callPackage ../tools/networking/openfortivpn { };
- opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { };
opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { };
@@ -10249,7 +10231,13 @@ with pkgs;
prism = callPackage ../applications/video/prism { };
- pulumi-bin = callPackage ../tools/admin/pulumi { };
+ pulumi = callPackage ../tools/admin/pulumi { };
+
+ pulumiPackages = recurseIntoAttrs (
+ callPackage ../tools/admin/pulumi-packages { }
+ );
+
+ pulumi-bin = callPackage ../tools/admin/pulumi-bin { };
p0f = callPackage ../tools/security/p0f { };
@@ -11709,10 +11697,7 @@ with pkgs;
svgcleaner = callPackage ../tools/graphics/svgcleaner { };
- ssb = callPackage ../tools/security/ssb {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ ssb = callPackage ../tools/security/ssb { };
ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { };
@@ -12961,10 +12946,7 @@ with pkgs;
wpgtk = callPackage ../tools/X11/wpgtk { };
- wrap = callPackage ../tools/text/wrap {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ wrap = callPackage ../tools/text/wrap { };
wring = nodePackages.wring;
@@ -12972,10 +12954,7 @@ with pkgs;
wrk2 = callPackage ../tools/networking/wrk2 { };
- wuzz = callPackage ../tools/networking/wuzz {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ wuzz = callPackage ../tools/networking/wuzz { };
wv = callPackage ../tools/misc/wv { };
@@ -15168,6 +15147,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
cargo-ui = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-ui { };
+ cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { };
cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { };
@@ -17214,6 +17194,8 @@ with pkgs;
itstool = callPackage ../development/tools/misc/itstool { };
+ jacoco = callPackage ../development/tools/analysis/jacoco { };
+
inherit (callPackage ../development/tools/build-managers/jam { })
jam
ftjam;
@@ -18480,7 +18462,9 @@ with pkgs;
coercer = callPackage ../tools/security/coercer { };
- cogl = callPackage ../development/libraries/cogl { };
+ cogl = callPackage ../development/libraries/cogl {
+ inherit (darwin.apple_sdk.frameworks) OpenGL;
+ };
coin3d = callPackage ../development/libraries/coin3d { };
@@ -18823,10 +18807,7 @@ with pkgs;
filter-audio = callPackage ../development/libraries/filter-audio {};
- filtron = callPackage ../servers/filtron {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ filtron = callPackage ../servers/filtron { };
flann = callPackage ../development/libraries/flann { };
@@ -22307,10 +22288,7 @@ with pkgs;
sfsexp = callPackage ../development/libraries/sfsexp {};
- shhgit = callPackage ../tools/security/shhgit {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ shhgit = callPackage ../tools/security/shhgit { };
shhmsg = callPackage ../development/libraries/shhmsg { };
@@ -23256,19 +23234,6 @@ with pkgs;
buildGoModule = buildGo119Module;
buildGoPackage = buildGo119Package;
- go_1_17 = callPackage ../development/compilers/go/1.17.nix ({
- inherit (darwin.apple_sdk.frameworks) Foundation Security;
- } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
- stdenv = gcc8Stdenv;
- buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
- });
- buildGo117Module = callPackage ../build-support/go/module.nix {
- go = buildPackages.go_1_17;
- };
- buildGo117Package = callPackage ../build-support/go/package.nix {
- go = buildPackages.go_1_17;
- };
-
# requires a newer Apple SDK
go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
@@ -23694,10 +23659,7 @@ with pkgs;
gerbera = callPackage ../servers/gerbera {};
- gobetween = callPackage ../servers/gobetween {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ gobetween = callPackage ../servers/gobetween { };
gobgpd = callPackage ../servers/misc/gobgpd { };
@@ -23741,8 +23703,6 @@ with pkgs;
hyprspace = callPackage ../applications/networking/hyprspace {
inherit (darwin) iproute2mac;
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
};
ic-keysmith = callPackage ../tools/security/ic-keysmith { };
@@ -24740,10 +24700,7 @@ with pkgs;
mbtileserver = callPackage ../servers/geospatial/mbtileserver { };
- pg_featureserv = callPackage ../servers/geospatial/pg_featureserv {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { };
pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { };
@@ -24773,10 +24730,7 @@ with pkgs;
alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
- alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { };
alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { };
@@ -25645,10 +25599,7 @@ with pkgs;
pam_usb = callPackage ../os-specific/linux/pam_usb { };
- pam_ussh = callPackage ../os-specific/linux/pam_ussh {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ pam_ussh = callPackage ../os-specific/linux/pam_ussh { };
paxctl = callPackage ../os-specific/linux/paxctl { };
@@ -26935,6 +26886,8 @@ with pkgs;
stix-two = callPackage ../data/fonts/stix-two { };
+ super-tiny-icons = callPackage ../data/icons/super-tiny-icons { };
+
inherit (callPackages ../data/fonts/gdouros { })
aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings;
@@ -29886,10 +29839,7 @@ with pkgs;
kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { };
kubectl-convert = kubectl.convert;
- kubemqctl = callPackage ../applications/networking/cluster/kubemqctl {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { };
kubent = callPackage ../applications/networking/cluster/kubent { };
@@ -31838,10 +31788,7 @@ with pkgs;
sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
- shadowfox = callPackage ../tools/networking/shadowfox {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ shadowfox = callPackage ../tools/networking/shadowfox { };
shfmt = callPackage ../tools/text/shfmt { };
@@ -33377,6 +33324,8 @@ with pkgs;
youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light;
+ youtube-music = callPackage ../applications/audio/youtube-music { };
+
yt-dlp = with python3Packages; toPythonApplication yt-dlp;
yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light;
@@ -35292,10 +35241,7 @@ with pkgs;
deepdiff = with python3Packages; toPythonApplication deepdiff;
- deepsea = callPackage ../tools/security/deepsea {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ deepsea = callPackage ../tools/security/deepsea { };
deeptools = callPackage ../applications/science/biology/deeptools { python = python3; };
@@ -37998,10 +37944,7 @@ with pkgs;
kaf = callPackage ../development/tools/kaf { };
- kcli = callPackage ../development/tools/kcli {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ kcli = callPackage ../development/tools/kcli { };
pxlib = callPackage ../development/libraries/pxlib {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 942d31ca956e..92129da8e115 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1074,10 +1074,16 @@ self: super: with self; {
pad4pi = callPackage ../development/python-modules/pad4pi { };
- pulumi = callPackage ../development/python-modules/pulumi { };
+ pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; };
pulumi-aws = callPackage ../development/python-modules/pulumi-aws { };
+ pulumi-aws-native = pkgs.pulumiPackages.pulumi-aws-native.sdks.python;
+
+ pulumi-azure-native = pkgs.pulumiPackages.pulumi-azure-native.sdks.python;
+
+ pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python;
+
backcall = callPackage ../development/python-modules/backcall { };
backoff = callPackage ../development/python-modules/backoff { };