nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-04-23 00:02:24 +00:00 committed by GitHub
commit cf8e955712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 399 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/editors/android-studio/default.nix
View File

@ -10,17 +10,14 @@ let
inherit tiling_wm; inherit tiling_wm;
}; };
stableVersion = { stableVersion = {
version = "2022.1.1.20"; # "Android Studio Electric Eel (2022.1.1) Patch 1" version = "2022.2.1.18"; # "Android Studio Flamingo (2022.2.1)"
sha256Hash = "sha256-UX7aOpTM23S7NBPNAz/fKEyK/dqWpok0NnpX9wck6p4="; sha256Hash = "sha256-zdhSxEmbX3QC30Tfxp6MpBj/yaaEyqs0BHR2/SyyTvw=";
}; };
betaVersion = { betaVersion = {
version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1" version = "2022.3.1.12"; # "Android Studio Giraffe (2022.3.1) Beta 1"
sha256Hash = "tIgmX9KiRInIupgIXWgg4dMf8bTwkVopOxAO5O1PUAc="; sha256Hash = "sha256-Wy5iifscL1Ko7ZInx/uAvyJyM4cS6LfTYWxdJbZk6po=";
};
latestVersion = { # canary & dev
version = "2022.3.1.1"; # "Android Studio Girrafe (2022.3.1) Canary 1"
sha256Hash = "I7Zc4DDByUB6XOnk7v+91ccpNI7eX/T4d3vH60ih8ec=";
}; };
latestVersion = betaVersion;
in { in {
# Attributes are named by their corresponding release channels # Attributes are named by their corresponding release channels

10
pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix
View File

@ -34,10 +34,10 @@ melpaBuild {
passthru.updateScript = unstableGitUpdater { }; passthru.updateScript = unstableGitUpdater { };
meta = with lib; { meta = {
description = "A blazingly fast LSP client for Emacs"; description = "A major mode for editing LIGO source code";
homepage = "https://github.com/manateelazycat/lsp-bridge"; homepage = "https://gitlab.com/ligolang/ligo";
license = licenses.gpl3Only; license = lib.licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with lib.maintainers; [ ];
}; };
} }

144
pkgs/applications/editors/jetbrains/versions.json
View File

@ -3,34 +3,34 @@
"clion": { "clion": {
"update-channel": "CLion RELEASE", "update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
"version": "2023.1", "version": "2023.1.1",
"sha256": "4b7f431dec981601f4c4e217612f582ffd6c8aa53d03604f518eb1f35357ec6a", "sha256": "19f2f435ff21453f724e16b318a94d19c414fd5863aa08cc73e78c85a20d73c5",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.tar.gz", "url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.tar.gz",
"build_number": "231.8109.174" "build_number": "231.8109.222"
}, },
"datagrip": { "datagrip": {
"update-channel": "DataGrip RELEASE", "update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
"version": "2023.1", "version": "2023.1.1",
"sha256": "0512cef755d7a465a8a525fc88b443a5f8ace062f5aa0598e51e38d2ad34f341", "sha256": "9f1d9bd64352ade881343bd2d0cae63a4f5e9479e1bf822b4ab5f674fc0a8697",
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.tar.gz", "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.1.tar.gz",
"build_number": "231.8109.163" "build_number": "231.8770.3"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
"version": "2022.3.2", "version": "2023.1",
"sha256": "987f6dca9518da262f556ba1a5afe6190cc5c13a6692c194b4f9ee05d4e66318", "sha256": "626314f6d2771e197214981fa2078da5affb4b7b55bcffd5c6960803270dcecd",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.tar.gz", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.tar.gz",
"build_number": "223.8617.56" "build_number": "231.8109.187"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2022.3.4", "version": "2023.1",
"sha256": "f8ff96336c416ab56abea03819cb3637a1d46b80a88e8544f1e9e98746b781ac", "sha256": "f208e2471ef5c4e232ff49434e8c14ce614b7924963ebd28d4c863399dd42d2c",
"url": "https://download.jetbrains.com/go/goland-2022.3.4.tar.gz", "url": "https://download.jetbrains.com/go/goland-2023.1.tar.gz",
"build_number": "223.8836.56" "build_number": "231.8109.199"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
@ -59,10 +59,10 @@
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2022.3.3", "version": "2023.1",
"sha256": "d79a66032dfb85b16cef4ff308eb0161e06a831cee1fa93f2b7ca46fb1dc2ea9", "sha256": "2e1feb9ae691ada21bd5ddc28a693f75a27aedc8f211729370ed03925e63400b",
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.tar.gz", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.tar.gz",
"build_number": "223.8836.42", "build_number": "231.8109.199",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
@ -84,10 +84,10 @@
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2022.3.3", "version": "2023.1",
"sha256": "e4607ae70bd0acf827535aa329e3da73ddf3a3fa78b54b5c8d18eae6ef52919c", "sha256": "494cd8bbb41023ae4a53487e9ac46aacc68f52ee3e14c8621f49e2675d56fa9c",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.tar.gz", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.tar.gz",
"build_number": "223.8836.53" "build_number": "231.8109.212"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
@ -110,34 +110,34 @@
"clion": { "clion": {
"update-channel": "CLion RELEASE", "update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "f3e30a41c183d3ed929324dc2531c07374e59fa12185ced97b9b6800896e4f1e", "sha256": "98e1d907604dcde89b2a5df6a8331894eab03f1fb72e6acbde7da5c279f0043e",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.dmg", "url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.dmg",
"build_number": "231.8109.174" "build_number": "231.8109.222"
}, },
"datagrip": { "datagrip": {
"update-channel": "DataGrip RELEASE", "update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "5de7f381f20c52bd0c96977f9d000033f0decd3912eaf0776eff540ec06c0881", "sha256": "94b2c070b91a45960d50deee5986d63e894dc2a2b3f371a1bcd650521029b66b",
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.dmg", "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.1.dmg",
"build_number": "231.8109.163" "build_number": "231.8770.3"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
"version": "2022.3.2", "version": "2023.1",
"sha256": "26ff68ea27952c1adc651ad5f2fae7ad4ca7b744f70f582bdf1bd4c1d17132f4", "sha256": "323066b6171ca2cb117b667d5b4e626a680bc6ac3f121ad3d6faf0a1b78692c3",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.dmg", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.dmg",
"build_number": "223.8617.56" "build_number": "231.8109.187"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2022.3.4", "version": "2023.1",
"sha256": "c42568393732fd8c25f81167a9e984c79c84095a9d394138c014814738ad5628", "sha256": "b1afadacb4c8d77fb8811abbfb5c4c447ec81ec27af2efef233c9f1164cab9c8",
"url": "https://download.jetbrains.com/go/goland-2022.3.4.dmg", "url": "https://download.jetbrains.com/go/goland-2023.1.dmg",
"build_number": "223.8836.56" "build_number": "231.8109.199"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
@ -166,10 +166,10 @@
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2022.3.3", "version": "2023.1",
"sha256": "79f5857f95452a6f66ba4ddbfd4445290449f21b90e6fd37e6118ac17cc052ed", "sha256": "825c4626f4f4359cb47f2e6f74d8fe23df0fb991f2ac4cbb86b99a6c8dbee5f6",
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.dmg", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.dmg",
"build_number": "223.8836.42", "build_number": "231.8109.199",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
@ -191,10 +191,10 @@
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2022.3.3", "version": "2023.1",
"sha256": "e06189d3170b7005540de82ad4288111007c1231f15598ee9baa392004d31dae", "sha256": "fe6ee0086b3e59eecc7e2816e8f803a702a6b7ea382cb0a2168d08d19dd656d7",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.dmg", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.dmg",
"build_number": "223.8836.53" "build_number": "231.8109.212"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
@ -217,34 +217,34 @@
"clion": { "clion": {
"update-channel": "CLion RELEASE", "update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "83c9fffa1f8890a36db5fed21a49133989cb59bd98f8011ea0a6fdae7e2a7eb3", "sha256": "f18183aa0efd776f2d641c72e61892e2d987f4b1f2a59786b2afb12604c43658",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1-aarch64.dmg", "url": "https://download.jetbrains.com/cpp/CLion-2023.1.1-aarch64.dmg",
"build_number": "231.8109.174" "build_number": "231.8109.222"
}, },
"datagrip": { "datagrip": {
"update-channel": "DataGrip RELEASE", "update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "17a74498378758bd2963e775dea7b77744a7072778a07a5685375b07acbd537b", "sha256": "215ad7898e9a8ef2cf18ec90d342c995bf94a2fe5781fbce537e7166edf90652",
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.1-aarch64.dmg", "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.1-aarch64.dmg",
"build_number": "231.8109.163" "build_number": "231.8770.3"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
"version": "2022.3.2", "version": "2023.1",
"sha256": "776ff0a5f0293cd4b4c29380199757b359e6e195a57b69d2cef73f9cc44ee456", "sha256": "8b9c656cc4b5c6bd8822e888d0b7d93ef9184ace4afc80da55767be3cf3a01ac",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56-aarch64.dmg", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1-aarch64.dmg",
"build_number": "223.8617.56" "build_number": "231.8109.187"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2022.3.4", "version": "2023.1",
"sha256": "279b522a7ee3c22dd0b5eec20b116921209008d4d50d0d5a7a08a13fb98914c9", "sha256": "1774ededcf8dbea93bcd35142bffef5d0fe121b5fb5d2f146ef4b98352375862",
"url": "https://download.jetbrains.com/go/goland-2022.3.4-aarch64.dmg", "url": "https://download.jetbrains.com/go/goland-2023.1-aarch64.dmg",
"build_number": "223.8836.56" "build_number": "231.8109.199"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
@ -273,10 +273,10 @@
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2022.3.3", "version": "2023.1",
"sha256": "23ba3a7ff84216b945327241be759429040bd09bc4269a01b77a2e3745c66132", "sha256": "030d0b8f7ef486fa5dc757fcb2c5c5678d9f9dcc27769f79996c631c299657e7",
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1-aarch64.dmg",
"build_number": "223.8836.42", "build_number": "231.8109.199",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
@ -298,10 +298,10 @@
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2022.3.3", "version": "2023.1",
"sha256": "5284412be4fc781047dda6d0af7bf6bebbc051e6c67bd2cf228ffee83d2d4ccb", "sha256": "dbd708379f2a489add7e87a321297841baf8bfcf83ce2f5549a1ff9f5037cf46",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1-aarch64.dmg",
"build_number": "223.8836.53" "build_number": "231.8109.212"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",

4
pkgs/applications/graphics/drawio/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "drawio"; pname = "drawio";
version = "21.1.2"; version = "21.2.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "sha256-cyw8wfwaFbDxPJn3eqiuQyQebTf7x1wMH9c0zKIGq4c="; sha256 = "sha256-269kMXKGlGig4Dt7cvCTRDGFsBZE5RBoi1ajqT3rIVc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

13
pkgs/applications/misc/fnott/default.nix
View File

@ -5,13 +5,14 @@
, meson , meson
, ninja , ninja
, scdoc , scdoc
, wayland-protocols , wayland-scanner
, tllist
, fontconfig , fontconfig
, freetype , freetype
, pixman , pixman
, libpng , libpng
, tllist
, wayland , wayland
, wayland-protocols
, dbus , dbus
, fcft , fcft
}: }:
@ -28,20 +29,24 @@ stdenv.mkDerivation rec {
sha256 = "sha256-cJ7XmnC4x8lhZ+JRqobeQxTTps4Oz95zYdlFtr3KC1A="; sha256 = "sha256-cJ7XmnC4x8lhZ+JRqobeQxTTps4Oz95zYdlFtr3KC1A=";
}; };
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
meson meson
ninja ninja
scdoc scdoc
wayland-protocols wayland-scanner
tllist
]; ];
buildInputs = [ buildInputs = [
fontconfig fontconfig
freetype freetype
pixman pixman
libpng libpng
tllist
wayland wayland
wayland-protocols
dbus dbus
fcft fcft
]; ];

4
pkgs/applications/misc/lavalauncher/default.nix
View File

@ -5,6 +5,7 @@
, ninja , ninja
, pkg-config , pkg-config
, scdoc , scdoc
, wayland-scanner
, cairo , cairo
, librsvg , librsvg
, libxkbcommon , libxkbcommon
@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM=";
}; };
nativeBuildInputs = [ meson ninja pkg-config scdoc ]; depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ buildInputs = [
cairo cairo
librsvg librsvg

3
pkgs/applications/misc/lswt/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromSourcehut, nixos, wayland }: { lib, stdenv, fetchFromSourcehut, wayland-scanner, wayland }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lswt"; pname = "lswt";
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0="; hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0=";
}; };
nativeBuildInputs = [ wayland-scanner ];
buildInputs = [ wayland ]; buildInputs = [ wayland ];
makeFlags = [ makeFlags = [

1
pkgs/applications/misc/mako/default.nix
View File

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4="; sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4=";
}; };
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ];
buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];

3
pkgs/applications/misc/somebar/default.nix
View File

@ -7,6 +7,7 @@
, wayland , wayland
, pango , pango
, wayland-protocols , wayland-protocols
, wayland-scanner
, conf ? null , conf ? null
}: }:
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU="; sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU=";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [ pango wayland wayland-protocols ]; buildInputs = [ pango wayland wayland-protocols ];
prePatch = '' prePatch = ''

8
pkgs/applications/misc/wlclock/default.nix
View File

@ -5,6 +5,7 @@
, ninja , ninja
, cmake , cmake
, pkg-config , pkg-config
, wayland-scanner
, wayland-protocols , wayland-protocols
, wayland , wayland
, cairo , cairo
@ -22,18 +23,23 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aHA4kXHYH+KvAJSep5X3DqsiK6WFpXr3rGQl/KNiUcY="; sha256 = "sha256-aHA4kXHYH+KvAJSep5X3DqsiK6WFpXr3rGQl/KNiUcY=";
}; };
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
cmake cmake
pkg-config pkg-config
scdoc
wayland-scanner
]; ];
buildInputs = [ buildInputs = [
wayland-protocols wayland-protocols
wayland wayland
cairo cairo
scdoc
]; ];
meta = with lib; { meta = with lib; {

15
pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock generated
View File

@ -1049,7 +1049,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat" name = "deltachat"
version = "1.112.7" version = "1.112.8"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
@ -1080,6 +1080,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"mailparse", "mailparse",
"mime",
"num-derive", "num-derive",
"num-traits", "num-traits",
"num_cpus", "num_cpus",
@ -1123,7 +1124,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-jsonrpc" name = "deltachat-jsonrpc"
version = "1.112.7" version = "1.112.8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-channel", "async-channel",
@ -1146,7 +1147,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-repl" name = "deltachat-repl"
version = "1.112.7" version = "1.112.8"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
@ -1161,7 +1162,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-rpc-server" name = "deltachat-rpc-server"
version = "1.112.7" version = "1.112.8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"deltachat", "deltachat",
@ -1185,7 +1186,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat_ffi" name = "deltachat_ffi"
version = "1.112.7" version = "1.112.8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"deltachat", "deltachat",
@ -2591,9 +2592,9 @@ dependencies = [
[[package]] [[package]]
name = "mime" name = "mime"
version = "0.3.16" version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]] [[package]]
name = "minimal-lexical" name = "minimal-lexical"

10
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View File

@ -21,12 +21,12 @@
let let
libdeltachat' = libdeltachat.overrideAttrs (old: rec { libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.112.7"; version = "1.112.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deltachat"; owner = "deltachat";
repo = "deltachat-core-rust"; repo = "deltachat-core-rust";
rev = version; rev = version;
hash = "sha256-zBstNj8IZ8ScwZxzvTxDPwe8R0n2z/EuvjbR+bJepJk="; hash = "sha256-bvXZtgFZx94Sw9Tst620HAhi9kmG8PjtWnghdw2ZF84=";
}; };
cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
@ -52,16 +52,16 @@ let
}; };
in buildNpmPackage rec { in buildNpmPackage rec {
pname = "deltachat-desktop"; pname = "deltachat-desktop";
version = "1.36.3"; version = "1.36.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deltachat"; owner = "deltachat";
repo = "deltachat-desktop"; repo = "deltachat-desktop";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-OmAWABZLTNU8EzXl2Rp/Y4DJcaqXuMt14ReaJbHx/u8="; hash = "sha256-nJF8DPauhEoKC7mibpMJCGsgt9HnwkZp/jiWEEhShBs=";
}; };
npmDepsHash = "sha256-u2hYIhXGMnjAp5T2h4THcTL5Om4Zg8aTO3NpSiphAXc="; npmDepsHash = "sha256-cTvNU4LO74pcw4Ybo9iftEis2yDA2SqGtrs4v+xAi5c=";
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper

2
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
View File

@ -64,7 +64,7 @@ let
ldconfig = writeShellScriptBin "ldconfig" '' ldconfig = writeShellScriptBin "ldconfig" ''
# due to a glibc bug, 64-bit ldconfig complains about patchelf'd 32-bit libraries, so we're using 32-bit ldconfig # due to a glibc bug, 64-bit ldconfig complains about patchelf'd 32-bit libraries, so we're using 32-bit ldconfig
exec ${pkgsi686Linux.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" exec ${if stdenv.isx86_64 && stdenv.isLinux then pkgsi686Linux.glibc.bin else pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@"
''; '';
etcProfile = writeText "profile" '' etcProfile = writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ ' export PS1='${name}-chrootenv:\u@\h:\w\$ '

4
pkgs/build-support/build-fhsenv-bubblewrap/default.nix
View File

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, callPackage , callPackage
, runCommandLocal , runCommandLocal
, writeShellScript , writeShellScript
@ -113,6 +114,7 @@ let
exec ${run} "$@" exec ${run} "$@"
''; '';
indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str)));
bwrapCmd = { initArgs ? "" }: '' bwrapCmd = { initArgs ? "" }: ''
ignored=(/nix /dev /proc /etc) ignored=(/nix /dev /proc /etc)
ro_mounts=() ro_mounts=()
@ -202,11 +204,13 @@ let
--symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \
--ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \
--remount-ro ${glibc}/etc \ --remount-ro ${glibc}/etc \
'' + lib.optionalString (stdenv.isx86_64 && stdenv.isLinux) (indentLines ''
--tmpfs ${pkgsi686Linux.glibc}/etc \ --tmpfs ${pkgsi686Linux.glibc}/etc \
--symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \ --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \
--symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \ --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \
--ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \ --ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \
--remount-ro ${pkgsi686Linux.glibc}/etc \ --remount-ro ${pkgsi686Linux.glibc}/etc \
'') + ''
"''${ro_mounts[@]}" "''${ro_mounts[@]}"
"''${symlinks[@]}" "''${symlinks[@]}"
"''${auto_mounts[@]}" "''${auto_mounts[@]}"

13
pkgs/build-support/trivial-builders.nix
View File

@ -785,12 +785,13 @@ rec {
requireFile = { name ? null requireFile = { name ? null
, sha256 ? null , sha256 ? null
, sha1 ? null , sha1 ? null
, hash ? null
, url ? null , url ? null
, message ? null , message ? null
, hashMode ? "flat" , hashMode ? "flat"
} : } :
assert (message != null) || (url != null); assert (message != null) || (url != null);
assert (sha256 != null) || (sha1 != null); assert (sha256 != null) || (sha1 != null) || (hash != null);
assert (name != null) || (url != null); assert (name != null) || (url != null);
let msg = let msg =
if message != null then message if message != null then message
@ -802,15 +803,19 @@ rec {
or or
nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_} nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_}
''; '';
hashAlgo = if sha256 != null then "sha256" else "sha1"; hashAlgo = if hash != null then ""
hash = if sha256 != null then sha256 else sha1; else if sha256 != null then "sha256"
else "sha1";
hash_ = if hash != null then hash
else if sha256 != null then sha256
else sha1;
name_ = if name == null then baseNameOf (toString url) else name; name_ = if name == null then baseNameOf (toString url) else name;
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
name = name_; name = name_;
outputHashMode = hashMode; outputHashMode = hashMode;
outputHashAlgo = hashAlgo; outputHashAlgo = hashAlgo;
outputHash = hash; outputHash = hash_;
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false; allowSubstitutes = false;
builder = writeScript "restrict-message" '' builder = writeScript "restrict-message" ''

3
pkgs/development/compilers/rust/cargo-auditable.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, makeRustPlatform, rustc, cargo, installShellFiles }: { lib, fetchFromGitHub, makeRustPlatform, rustc, cargo, installShellFiles, stdenv }:
let let
args = rec { args = rec {
@ -25,6 +25,7 @@ let
changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md"; changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md";
license = with licenses; [ mit /* or */ asl20 ]; license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ figsoda ]; maintainers = with maintainers; [ figsoda ];
broken = stdenv.hostPlatform != stdenv.buildPlatform;
}; };
}; };

10
pkgs/development/compilers/rust/cargo.nix
View File

@ -1,14 +1,15 @@
{ lib, stdenv, pkgsBuildHost, pkgsHostHost { lib, stdenv, pkgsBuildHost, pkgsHostHost
, file, curl, pkg-config, python3, openssl, cmake, zlib , file, curl, pkg-config, python3, openssl, cmake, zlib
, installShellFiles, makeWrapper, rustPlatform, rustc , installShellFiles, makeWrapper, rustPlatform, rust, rustc
, CoreFoundation, Security , CoreFoundation, Security
, auditable ? true , auditable ? !cargo-auditable.meta.broken
, cargo-auditable , cargo-auditable
, pkgsBuildBuild
}: }:
rustPlatform.buildRustPackage.override { rustPlatform.buildRustPackage.override {
cargo-auditable = cargo-auditable.bootstrap; cargo-auditable = cargo-auditable.bootstrap;
} { } ({
pname = "cargo"; pname = "cargo";
inherit (rustc) version src; inherit (rustc) version src;
@ -113,3 +114,6 @@ rustPlatform.buildRustPackage.override {
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }
// lib.optionalAttrs (rust.toRustTarget stdenv.buildPlatform != rust.toRustTarget stdenv.hostPlatform) {
HOST_PKG_CONFIG_PATH="${pkgsBuildBuild.pkg-config}/bin/pkg-config";
})

6
pkgs/development/interpreters/guile/setup-hook-3.0.sh
View File

@ -2,9 +2,11 @@ addGuileLibPath () {
if test -d "$1/share/guile/site/3.0"; then if test -d "$1/share/guile/site/3.0"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0" export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0" export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0"
export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/share/guile/site/3.0"
elif test -d "$1/share/guile/site"; then elif test -d "$1/share/guile/site"; then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site" export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site" export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/share/guile/site"
fi fi
if test -d "$1/lib/guile/3.0/ccache"; then if test -d "$1/lib/guile/3.0/ccache"; then
@ -14,6 +16,10 @@ addGuileLibPath () {
if test -d "$1/lib/guile/3.0/site-ccache"; then if test -d "$1/lib/guile/3.0/site-ccache"; then
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/site-ccache" export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/site-ccache"
fi fi
if test -d "$1/lib/guile/3.0/extensions"; then
export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/lib/guile/3.0/extensions"
fi
} }
addEnvHooks "$hostOffset" addGuileLibPath addEnvHooks "$hostOffset" addGuileLibPath

64
pkgs/development/interpreters/snobol4/default.nix Normal file
View File

@ -0,0 +1,64 @@
{ lib
, fetchurl
, stdenv
, bzip2
, gdbm
, gnum4
, gzip
, libffi
, openssl
, readline
, sqlite
, tcl
, xz
, zlib
}:
stdenv.mkDerivation rec {
pname = "snobol4";
version = "2.3.1";
src = fetchurl {
urls = [
"https://ftp.regressive.org/snobol4/snobol4-${version}.tar.gz"
# fallback for when the current version is moved to the old folder
"https://ftp.regressive.org/snobol4/old/snobol4-${version}.tar.gz"
];
hash = "sha256-kSRNZ9TinSqtzlZVvUOC/6tExiSn6krWQRQn86vxdTU=";
};
outputs = [ "out" "man" "doc" ];
# gzip used by Makefile to compress man pages
nativeBuildInputs = [ gnum4 gzip ];
# enable all features (undocumented, based on manual review of configure script)
buildInputs = [ bzip2 libffi openssl readline sqlite tcl xz zlib ]
# ndbm compat library
++ lib.optional stdenv.isLinux gdbm;
configureFlags = lib.optional (tcl != null) "--with-tcl=${tcl}/lib/tclConfig.sh";
# INSTALL says "parallel make will fail"
enableParallelBuilding = false;
patches = [ ./fix-paths.patch ];
# configure does not support --sbindir and the likes (as introduced by multiple-outputs.sh)
# so man, doc outputs must be handled manually
preConfigurePhases = [ "prePreConfigurePhase" ];
prePreConfigurePhase = ''
preConfigureHooks="''${preConfigureHooks//_multioutConfig/}"
prependToVar configureFlags --mandir="$man"/share/man
'';
meta = with lib; {
description = "The Macro Implementation of SNOBOL4 in C";
longDescription = ''
An open source port of Macro SNOBOL4 (The original Bell Telephone Labs implementation, written in SIL macros) by Phil Budne.
Supports full SNOBOL4 language plus SPITBOL, [Blocks](https://www.regressive.org/snobol4/blocks/) and other extensions.
'';
homepage = "https://www.regressive.org/snobol4/csnobol4/";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ xworld21 ];
};
}

23
pkgs/development/interpreters/snobol4/fix-paths.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/configure
+++ b/configure
@@ -327,9 +327,9 @@
SNOLIB_LOCAL="$SNOLIB/local"
SNOLIB_DOC="$SNOLIB"
# XXX use $PREFIX/include/snobol4 ???
-INCLUDE_DIR="$SNOLIB/include"
+INCLUDE_DIR="$PREFIX"/include/snolib4
-DOC_DIR="$PREFIX/share/doc/snobol4-$VERSION"
+DOC_DIR="$doc/share/doc/snobol4-$VERSION"
echo 'BINDIR=$(DESTDIR)'"$BINDIR" >> $CONFIG_M4
echo 'MANDIR=$(DESTDIR)'"$MANDIR" >> $CONFIG_M4
@@ -2110,7 +2110,7 @@
# IRIX /sbin/install
# should always find ./install-sh
-for DIR in /usr/bin /usr/ucb /usr/local/bin /bin .; do
+for DIR in `echo $PATH | tr ':' ' '`; do
for INSTALL in install ginstall scoinst install-sh; do
IPATH=$DIR/$INSTALL
if [ -d $IPATH ]; then

10
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -103,7 +103,6 @@ let
kcalendarcore = callPackage ./kcalendarcore.nix {}; kcalendarcore = callPackage ./kcalendarcore.nix {};
kcodecs = callPackage ./kcodecs.nix {}; kcodecs = callPackage ./kcodecs.nix {};
kconfig = callPackage ./kconfig.nix {}; kconfig = callPackage ./kconfig.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kcoreaddons = callPackage ./kcoreaddons.nix {}; kcoreaddons = callPackage ./kcoreaddons.nix {};
kdbusaddons = callPackage ./kdbusaddons.nix {}; kdbusaddons = callPackage ./kdbusaddons.nix {};
kdnssd = callPackage ./kdnssd.nix {}; kdnssd = callPackage ./kdnssd.nix {};
@ -131,9 +130,9 @@ let
# TIER 2 # TIER 2
kactivities = callPackage ./kactivities.nix {}; kactivities = callPackage ./kactivities.nix {};
kactivities-stats = callPackage ./kactivities-stats.nix {};
kauth = callPackage ./kauth {}; kauth = callPackage ./kauth {};
kcompletion = callPackage ./kcompletion.nix {}; kcompletion = callPackage ./kcompletion.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kcrash = callPackage ./kcrash.nix {}; kcrash = callPackage ./kcrash.nix {};
kdoctools = callPackage ./kdoctools {}; kdoctools = callPackage ./kdoctools {};
kfilemetadata = callPackage ./kfilemetadata {}; kfilemetadata = callPackage ./kfilemetadata {};
@ -141,19 +140,20 @@ let
kjobwidgets = callPackage ./kjobwidgets.nix {}; kjobwidgets = callPackage ./kjobwidgets.nix {};
knotifications = callPackage ./knotifications.nix {}; knotifications = callPackage ./knotifications.nix {};
kpackage = callPackage ./kpackage {}; kpackage = callPackage ./kpackage {};
kpeople = callPackage ./kpeople.nix {};
kpty = callPackage ./kpty.nix {}; kpty = callPackage ./kpty.nix {};
kunitconversion = callPackage ./kunitconversion.nix {}; kunitconversion = callPackage ./kunitconversion.nix {};
syndication = callPackage ./syndication.nix {}; syndication = callPackage ./syndication.nix {};
# TIER 3 # TIER 3
baloo = callPackage ./baloo.nix {}; baloo = callPackage ./baloo.nix {};
kactivities-stats = callPackage ./kactivities-stats.nix {};
kbookmarks = callPackage ./kbookmarks.nix {}; kbookmarks = callPackage ./kbookmarks.nix {};
kcmutils = callPackage ./kcmutils.nix {}; kcmutils = callPackage ./kcmutils.nix {};
kconfigwidgets = callPackage ./kconfigwidgets.nix {}; kconfigwidgets = callPackage ./kconfigwidgets.nix {};
kdav = callPackage ./kdav.nix {}; kdav = callPackage ./kdav.nix {};
kdeclarative = callPackage ./kdeclarative.nix {}; kdeclarative = callPackage ./kdeclarative.nix {};
kded = callPackage ./kded.nix {}; kded = callPackage ./kded.nix {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
kdesu = callPackage ./kdesu {}; kdesu = callPackage ./kdesu {};
kemoticons = callPackage ./kemoticons.nix {}; kemoticons = callPackage ./kemoticons.nix {};
kglobalaccel = callPackage ./kglobalaccel.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {};
@ -163,14 +163,12 @@ let
knewstuff = callPackage ./knewstuff {}; knewstuff = callPackage ./knewstuff {};
knotifyconfig = callPackage ./knotifyconfig.nix {}; knotifyconfig = callPackage ./knotifyconfig.nix {};
kparts = callPackage ./kparts.nix {}; kparts = callPackage ./kparts.nix {};
kpeople = callPackage ./kpeople.nix {};
krunner = callPackage ./krunner.nix {}; krunner = callPackage ./krunner.nix {};
kservice = callPackage ./kservice {}; kservice = callPackage ./kservice {};
ktexteditor = callPackage ./ktexteditor.nix {}; ktexteditor = callPackage ./ktexteditor.nix {};
ktextwidgets = callPackage ./ktextwidgets.nix {}; ktextwidgets = callPackage ./ktextwidgets.nix {};
kwallet = callPackage ./kwallet.nix {}; kwallet = callPackage ./kwallet.nix {};
kxmlgui = callPackage ./kxmlgui.nix {}; kxmlgui = callPackage ./kxmlgui.nix {};
kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
plasma-framework = callPackage ./plasma-framework.nix {}; plasma-framework = callPackage ./plasma-framework.nix {};
kpurpose = callPackage ./purpose.nix {}; kpurpose = callPackage ./purpose.nix {};
@ -179,11 +177,13 @@ let
# PORTING AIDS # PORTING AIDS
kdelibs4support = callPackage ./kdelibs4support {}; kdelibs4support = callPackage ./kdelibs4support {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
khtml = callPackage ./khtml.nix {}; khtml = callPackage ./khtml.nix {};
kjs = callPackage ./kjs.nix {}; kjs = callPackage ./kjs.nix {};
kjsembed = callPackage ./kjsembed.nix {}; kjsembed = callPackage ./kjsembed.nix {};
kmediaplayer = callPackage ./kmediaplayer.nix {}; kmediaplayer = callPackage ./kmediaplayer.nix {};
kross = callPackage ./kross.nix {}; kross = callPackage ./kross.nix {};
kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
}; };

2
pkgs/development/libraries/zookeeper_mt/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
sha512 = "90643aa0ae1b9bf1f5e137dfbcee7e3c53db15e5038d7e406e4a1c345d6a0531bf7afa2b03f99d419ebd0fe892f127a7abfe582f786034ba823e53a0a9246bfb"; sha512 = "sha512-ttYbATvfe+uRYhQWfeG1WGXl5GOztcrITfl/4EQierAzSaDvTmVxSb582hYQOdBpxw2QrVbIdnTm3/Xt4ifecg==";
}; };
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";

6
pkgs/development/python-modules/cdcs/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cdcs"; pname = "cdcs";
version = "0.1.9"; version = "0.2.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -23,8 +23,8 @@ buildPythonPackage rec {
owner = "usnistgov"; owner = "usnistgov";
repo = "pycdcs"; repo = "pycdcs";
# https://github.com/usnistgov/pycdcs/issues/1 # https://github.com/usnistgov/pycdcs/issues/1
rev = "0a770b752301c27e227ca40a4752f305b55dee20"; rev = "3aeaeb4782054a220e916c189ffe440d113b571d";
hash = "sha256-AUrVEFea4VtBJXWWgECqdBFCqKuHWAlh07Dljp+HBa0="; hash = "sha256-OsabgO2B2PRhU3DVvkK+f9VLOMqctl4nyCETxLtzwNs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

9
pkgs/development/python-modules/django-taggit/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, pythonOlder , pythonOlder
, fetchPypi , fetchPypi
, fetchpatch
, django , django
, djangorestframework , djangorestframework
, python , python
@ -19,6 +20,14 @@ buildPythonPackage rec {
hash = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg="; hash = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg=";
}; };
patches = [
(fetchpatch {
# Django 4.2 support; https://github.com/jazzband/django-taggit/pull/850
url = "https://github.com/jazzband/django-taggit/commit/5f19cfbaa14e8d6d4d1679529eb168a87ca97908.patch";
hash = "sha256-KcsiACLy3+1JoFquu//Kz+iAySZQAVIuBEKzNZaaR9s=";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
django django
]; ];

4
pkgs/development/python-modules/google-cloud-container/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-container"; pname = "google-cloud-container";
version = "2.20.0"; version = "2.21.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-l/ENHQVW35pGuSkLsFDM5BRCAoD6KTmJgs+djuR6SM0="; hash = "sha256-iFwf+qj/xqebEA+CWC9SDi3iEsfPiLcFLwUmnoxaxjg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-error-reporting/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-error-reporting"; pname = "google-cloud-error-reporting";
version = "1.9.0"; version = "1.9.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-5URk8yZy5ld17p7UXf5y+kciM2bH8NmgEvJ1SqwYJ9o="; hash = "sha256-3N7LtFKvTdV0zBGIyUgi6tCVZX7+rbJD5Lb+xZafJNw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-resource-manager/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-resource-manager"; pname = "google-cloud-resource-manager";
version = "1.9.1"; version = "1.10.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-XomRFXDBStCFPh7vYyUXeToWfm+u21WwqzvDs0zIPrE="; hash = "sha256-v8PmDrkuJaxWKpJIu4/BfpvvBMPcnwMf++Df4o2Rkoc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-spanner/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-spanner"; pname = "google-cloud-spanner";
version = "3.30.0"; version = "3.31.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-GwQtIivEho0/nuDABMdAlOQLc2zstGQ/9xJCeHMQX60="; hash = "sha256-gVQL0boXV/4vaYBpSM8Qli8do3YC7X5ULJeepE2LDUo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-translate/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-translate"; pname = "google-cloud-translate";
version = "3.11.0"; version = "3.11.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-phwMOu6YEndLOOvXDnoYvShXGMMR+O/CfUyp5+gMdKM="; hash = "sha256-keQK0Lc34yphEQZFEU6T/7rfXS/9clwSreE0frWO+s8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ibm-cloud-sdk-core"; pname = "ibm-cloud-sdk-core";
version = "3.16.2"; version = "3.16.5";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-fPYl9cz9GIDAKZYEH+8g+omRtGMU+abBx16If7H5i3I="; hash = "sha256-wEBD1AILyVGK+ofQf/zZTu7keBUphVZ5HyOMbugvA+Y=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/marshmallow-dataclass/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "marshmallow-dataclass"; pname = "marshmallow-dataclass";
version = "8.5.12"; version = "8.5.13";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "lovasoa"; owner = "lovasoa";
repo = "marshmallow_dataclass"; repo = "marshmallow_dataclass";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-vU3UZVX9J7nkHGfGUWoCOmsvkpe7p8cqQJd+YhkxeSw="; hash = "sha256-zLJMUbiGu+ewY4+IbHKBGWav6UY62aqXQSqLT+oIeI0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mypy-boto3-s3"; pname = "mypy-boto3-s3";
version = "1.26.104"; version = "1.26.116";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-pY00LXLVj++i7NJNkm28kq6LlyBcWcMUTRhoV9XzCBQ="; hash = "sha256-WXqsWLssli0WZAPQvcEM36YqyCxhsC+vaaRhxaUQcIc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/peewee/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "peewee"; pname = "peewee";
version = "3.15.4"; version = "3.16.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "coleifer"; owner = "coleifer";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-UbhJWooZuZOm1AUbM+66Qm76zar+sBOvuUnAc1vLvOU="; hash = "sha256-eHTbVhgVqxMR3ZuaC6FPyYbxRpRBi53EfDqERpPBjVQ=";
}; };
buildInputs = [ buildInputs = [

4
pkgs/development/python-modules/potentials/default.nix
View File

@ -20,7 +20,7 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.3.5"; version = "0.3.6";
pname = "potentials"; pname = "potentials";
format = "setuptools"; format = "setuptools";
@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-e2+Yrgpj6Cy76qzw9/NhDq9ogsNQAJcKi9kvY2fZE+k="; hash = "sha256-VEPGa3Wp+B3KterfA5XGjaDf6sIAkSST0GWdeqaJcE0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/py3status/default.nix
View File

@ -23,11 +23,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "py3status"; pname = "py3status";
version = "3.49"; version = "3.50";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-aTQ3hYDMyXSTcEiCVtdU3XQ4xO7mN5dZ0S94ZWbSGo4="; hash = "sha256-LUFLc7GNEoPIAsTQDhVTt0/NqhwaZHBRLoHF+2nqTUg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/sepaxml/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sepaxml"; pname = "sepaxml";
version = "2.5.0"; version = "2.6.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "raphaelm"; owner = "raphaelm";
repo = "python-sepaxml"; repo = "python-sepaxml";
rev = version; rev = version;
hash = "sha256-9gPUAZ60q5o11eAnkzTBrFCpBUGxw3MGuKY4MtPxoSA="; hash = "sha256-l5UMy0M3Ovzb6rcSAteGOnKdmBPHn4L9ZWY+YGOCn40=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/siobrultech-protocols/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "siobrultech-protocols"; pname = "siobrultech-protocols";
version = "0.7.0"; version = "0.9.0";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "sdwilsh"; owner = "sdwilsh";
repo = "siobrultech-protocols"; repo = "siobrultech-protocols";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-t8is68WrvLj57tNeM5AKuuvpn7kWbhbvoRnCI3+q4uE="; hash = "sha256-8qhg7PX4u4vN2+hWXzFjC1ZzgCEhkSr9Fn58Lc4E76c=";
}; };
nativeCheckInputs = [ nativeCheckInputs = [

4
pkgs/development/python-modules/types-python-dateutil/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-python-dateutil"; pname = "types-python-dateutil";
version = "2.8.19.10"; version = "2.8.19.12";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-xkDy63G0uUqdO/2kwEJQ0pok5RuLrW4S/d7Az26W96M="; hash = "sha256-NVssuCsx5Vb9GOewdN58NQxoCrgGCPDMVbpncNmG1n0=";
}; };
# Modules doesn't have tests # Modules doesn't have tests

4
pkgs/development/python-modules/types-redis/default.nix
View File

@ -7,12 +7,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-redis"; pname = "types-redis";
version = "4.5.1.4"; version = "4.5.4.1";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-dmAXh1TWCkz6z1sz7gY6oGJTEXkcYgdc2TYTZiej978="; hash = "sha256-vwQZL0FbK0Ls79cLtLkesDUuSPJxaiE+A441wJamOcI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/yabadaba/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yabadaba"; pname = "yabadaba";
version = "0.1.3"; version = "0.2.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "usnistgov"; owner = "usnistgov";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0Rwo2d3vEfXmeZvZA1udbGKxUERymeVhvyu+okqQDJk="; hash = "sha256-PXmkRbCFag2WAtodwgb3kX+hRDZdCKKi/YwAMSQePxQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

2
pkgs/development/tools/language-servers/helm-ls/default.nix
View File

@ -29,7 +29,7 @@ buildGoModule rec {
postInstall = '' postInstall = ''
mv $out/bin/helm-ls $out/bin/helm_ls mv $out/bin/helm-ls $out/bin/helm_ls
installShellCompletion --cmd roxctl \ installShellCompletion --cmd helm_ls \
--bash <($out/bin/helm_ls completion bash) \ --bash <($out/bin/helm_ls completion bash) \
--fish <($out/bin/helm_ls completion fish) \ --fish <($out/bin/helm_ls completion fish) \
--zsh <($out/bin/helm_ls completion zsh) --zsh <($out/bin/helm_ls completion zsh)

4
pkgs/development/tools/misc/nix-build-uncached/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "nix-build-uncached"; pname = "nix-build-uncached";
version = "1.1.1"; version = "1.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mic92"; owner = "Mic92";
repo = "nix-build-uncached"; repo = "nix-build-uncached";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9oc5zoOlwV02cY3ek+qYLgZaFQk4dPE9xgF8mAePGBI="; sha256 = "sha256-n9Koi01Te77bpYbRX46UThyD2FhCu9OGHd/6xDQLqjQ=";
}; };
vendorSha256 = null; vendorSha256 = null;

6
pkgs/development/tools/zed/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "zed"; pname = "zed";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brimdata"; owner = "brimdata";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+GVcYkzcVNa62595c4tLRBLTGh+qvdyFtQtFlfMarLs="; sha256 = "sha256-laqHFrRp83IE75RgAmxxTsq7c48RDapAJQFXWI1NO2o=";
}; };
vendorHash = "sha256-pxe3l93fBBKuVPBSGCB7ORiwQ+YCNIN9BQDxBM7QCHQ="; vendorHash = "sha256-Uy8GR+mNVElx+MOu8IxHjBhp1GT5nLqqizQH9q1s0wA=";
subPackages = [ "cmd/zed" "cmd/zq" ]; subPackages = [ "cmd/zed" "cmd/zq" ];

7
pkgs/games/steam/default.nix
View File

@ -1,5 +1,5 @@
{ makeScopeWithSplicing, generateSplicesForMkScope { makeScopeWithSplicing, generateSplicesForMkScope
, stdenv, buildFHSEnv, pkgsi686Linux , stdenv, buildFHSEnv, pkgsi686Linux, glxinfo
}: }:
let let
@ -14,7 +14,10 @@ let
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
steam = callPackage ./steam.nix { }; steam = callPackage ./steam.nix { };
steam-fhsenv = callPackage ./fhsenv.nix { steam-fhsenv = callPackage ./fhsenv.nix {
glxinfo-i686 = pkgsi686Linux.glxinfo; glxinfo-i686 =
if self.steamArch == "amd64"
then pkgsi686Linux.glxinfo
else glxinfo;
steam-runtime-wrapped-i686 = steam-runtime-wrapped-i686 =
if self.steamArch == "amd64" if self.steamArch == "amd64"
then pkgsi686Linux.steamPackages.steam-runtime-wrapped then pkgsi686Linux.steamPackages.steam-runtime-wrapped

10
pkgs/os-specific/linux/kernel/zen-kernels.nix
View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script # comments with variant added for update script
# ./update-zen.py zen # ./update-zen.py zen
zenVariant = { zenVariant = {
version = "6.2.11"; #zen version = "6.2.12"; #zen
suffix = "zen1"; #zen suffix = "zen1"; #zen
sha256 = "0qf9fdmv0ffpq7lym4gbxlnaz8i05kxqb9b7m5k3vggc24xrwsmn"; #zen sha256 = "0y1gs7yyijgwhdcxznj6l1frlqsnpjr0r5xk43dqnckz0f1ml3by"; #zen
isLqx = false; isLqx = false;
}; };
# ./update-zen.py lqx # ./update-zen.py lqx
lqxVariant = { lqxVariant = {
version = "6.2.11"; #lqx version = "6.2.12"; #lqx
suffix = "lqx3"; #lqx suffix = "lqx1"; #lqx
sha256 = "0lmjjpxxl31g33ynwwfj0s3q4vwgdqlyak80c67m72234w43a5xj"; #lqx sha256 = "1gjg4ln42p6c5qk2067irjx4czwr8sl2klnzw68nk9cdppf3w4z5"; #lqx
isLqx = true; isLqx = true;
}; };
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

4
pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mod_auth_mellon"; pname = "mod_auth_mellon";
version = "0.18.0"; version = "0.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "latchset"; owner = "latchset";
repo = "mod_auth_mellon"; repo = "mod_auth_mellon";
rev = "v${version}"; rev = "v${version}";
sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn"; sha256 = "sha256-LIzJP+OAcrgNIo9KU2kMfZ8kjHC5qUg96kJw3qhqbvc=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ]; nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ];

6
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "telegraf"; pname = "telegraf";
version = "1.26.0"; version = "1.26.1";
excludedPackages = "test"; excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata"; owner = "influxdata";
repo = "telegraf"; repo = "telegraf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Huyjgo6UC9l6DVWBaKvN7ETxzsLDSaDC5Qx+gCR4LU4="; sha256 = "sha256-wEmQOnpuJJtjcqw9HLV31wIFjcP48Ojo6bUnyrG3mYA=";
}; };
vendorHash = "sha256-Z1xmtQ/Cs+7gdipEip/nkxARtuCYG1lZ59bGNhPjTcA="; vendorHash = "sha256-Tt0ZY5gmT40x1cg/XseCKu10Ol3tE+yVv+7EczPRI6s=";
proxyVendor = true; proxyVendor = true;
ldflags = [ ldflags = [

4
pkgs/servers/zookeeper/default.nix
View File

@ -6,11 +6,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zookeeper"; pname = "zookeeper";
version = "3.6.3"; version = "3.7.1";
src = fetchurl { src = fetchurl {
url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz"; url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
sha512 = "3f7b1b7d9cf5647d52ad0076c922e108fa956e986b5624667c493cf6d8ff09d3ca88f623c79a799fe49c72e868cb3c9d0f77cb69608de74a183b2cbad10bc827"; sha512 = "sha512-kQNiilB0X6GiibymZv2kqcCOwXxVzxPmaIfnunbpPbrmCh8f/WwQeYvjoWBpNE7LwAzrspvwPZzXCWzNCY7QEQ==";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

1
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -112,6 +112,7 @@ in stdenv.mkDerivation rec {
passthru = { passthru = {
inherit components withExtraComponents; inherit components withExtraComponents;
updateScript = ./update.sh;
}; };
meta = with lib; { meta = with lib; {

12
pkgs/tools/admin/google-cloud-sdk/update.sh
View File

@ -1,12 +1,12 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -i bash -p nix #! nix-shell -i bash -p nix jq curl
CHANNEL_URL="https://dl.google.com/dl/cloudsdk/channels/rapid" CHANNEL_URL="https://dl.google.com/dl/cloudsdk/channels/rapid"
BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk" BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk"
# Version of Google Cloud SDK from PACKAGE_DIR=$(dirname -- "$0")
# https://cloud.google.com/sdk/docs/release-notes
VERSION="426.0.0" VERSION=$(curl "https://storage.googleapis.com/storage/v1/b/cloud-sdk-release/o?delimiter=/&startOffset=google-cloud-sdk-${UPDATE_NIX_OLD_VERSION}&endOffset=google-cloud-sdk-9" | jq --raw-output '.items[-1].name | scan("\\d+\\.\\d+\\.\\d+")')
function genMainSrc() { function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
@ -45,6 +45,6 @@ EOF
echo " };" echo " };"
echo "}" echo "}"
} >data.nix } > "${PACKAGE_DIR}/data.nix"
curl "${CHANNEL_URL}/components-v${VERSION}.json" -w "\n" > components.json curl "${CHANNEL_URL}/components-v${VERSION}.json" -w "\n" > "${PACKAGE_DIR}/components.json"

6
pkgs/tools/misc/mongodb-tools/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "mongo-tools"; pname = "mongo-tools";
version = "100.6.0"; version = "100.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mongodb"; owner = "mongodb";
repo = "mongo-tools"; repo = "mongo-tools";
rev = version; rev = version;
sha256 = "sha256-JSQ8TNStx7rKgmy4cu0C7hVuCG6wA7gpRJru34FJaOo="; sha256 = "sha256-m7Xn8RHCmnvT6S1694O+k8ZYSR9opN+/oYUG2yaZIMg=";
}; };
vendorSha256 = null; vendorHash = null;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl libpcap ]; buildInputs = [ openssl libpcap ];

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -15,7 +15,7 @@ let
python pytest nose cryptography pyyaml requests mock requests-mock python pytest nose cryptography pyyaml requests mock requests-mock
python-dateutil setuptools; python-dateutil setuptools;
version = "4.19"; version = "4.20";
in in
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "spaam"; owner = "spaam";
repo = "svtplay-dl"; repo = "svtplay-dl";
rev = version; rev = version;
hash = "sha256-m6Hhg/Ve/JskwRr4l4x/bwD+XswH+XgHQtou95QSWzI="; hash = "sha256-nG4ErqQC7GZDLClqcE3cliXxowzCku/SnB39AVIqkNw=";
}; };
pythonPaths = [ cryptography pyyaml requests ]; pythonPaths = [ cryptography pyyaml requests ];

4
pkgs/tools/networking/urlwatch/default.nix
View File

@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "urlwatch"; pname = "urlwatch";
version = "2.25"; version = "2.26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thp"; owner = "thp";
repo = "urlwatch"; repo = "urlwatch";
rev = version; rev = version;
hash = "sha256-+ayHMY0gEAVhOgDDh+RfRrUpV0tSX8mMmfPzyg+YSv4="; hash = "sha256-EdRHwUHnAwum7UIgzmETeuQSyisb4zrmWGPgo7RewWQ=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

31
pkgs/tools/security/udpx/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "udpx";
version = "1.0.7";
src = fetchFromGitHub {
owner = "nullt3r";
repo = "udpx";
rev = "refs/tags/v${version}";
hash = "sha256-IRnGi3TmCyxmJKAd8ZVRoSHDao+3Xt4F5QfHvNahvGo=";
};
vendorHash = null;
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "Single-packet UDP scanner";
homepage = "https://github.com/nullt3r/udpx";
changelog = "https://github.com/nullt3r/udpx/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

33
pkgs/tools/text/mdbook-d2/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "mdbook-d2";
version = "unstable-2023-03-30";
src = fetchFromGitHub {
owner = "danieleades";
repo = "mdbook-d2";
rev = "93f3037ad9730d134c929cfc90d9bd592a48a1a9";
hash = "sha256-cmmOmJHARIBCQQEsffnBh4nc2XEDPBzLPcCrOwfTKS8=";
};
cargoHash = "sha256-ACwEWK5upeRLo7HU+1kKunecnEeZm0ufUaQjJkXM/4I=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreServices
];
meta = with lib; {
description = "D2 diagram generator plugin for MdBook";
homepage = "https://github.com/danieleades/mdbook-d2";
changelog = "https://github.com/danieleades/mdbook-d2/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ blaggacao ];
};
}

6
pkgs/tools/text/mdcat/default.nix
View File

@ -12,20 +12,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mdcat"; pname = "mdcat";
version = "2.0.1"; version = "2.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lunaryorn"; owner = "lunaryorn";
repo = "mdcat"; repo = "mdcat";
rev = "mdcat-${version}"; rev = "mdcat-${version}";
sha256 = "sha256-EIi3OFoYoDON8wmOXzXvnTKepzlkKG8w7oPADQ/fNx8="; sha256 = "sha256-JevndaSGeIzLV/h4ljUwx6vL60aKWYzmKWOgQDPMAaA=";
}; };
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security; ++ lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-OQaNzC0iCWuo2OteQAqvTikDFVXhMkc+Ldh5apDJhk0="; cargoSha256 = "sha256-SCgffumT6g8YIHmjUfgc43ATMAQPd2wJBsN9Ax5cqHk=";
nativeCheckInputs = [ ansi2html ]; nativeCheckInputs = [ ansi2html ];
# Skip tests that use the network and that include files. # Skip tests that use the network and that include files.

3
pkgs/tools/wayland/swayimg/default.nix
View File

@ -4,6 +4,7 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, wayland-scanner
, wayland , wayland
, wayland-protocols , wayland-protocols
, json_c , json_c
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
]; ];
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [ buildInputs = [
bash-completion bash-completion

6
pkgs/top-level/all-packages.nix
View File

@ -9239,6 +9239,8 @@ with pkgs;
mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { };
mdbook-d2 = callPackage ../tools/text/mdbook-d2 { };
mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { }; mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { };
mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz {
@ -12289,6 +12291,8 @@ with pkgs;
sniffglue = callPackage ../tools/networking/sniffglue { }; sniffglue = callPackage ../tools/networking/sniffglue { };
snobol4 = callPackage ../development/interpreters/snobol4 { };
snort = callPackage ../applications/networking/ids/snort { }; snort = callPackage ../applications/networking/ids/snort { };
so = callPackage ../development/tools/so { so = callPackage ../development/tools/so {
@ -13160,6 +13164,8 @@ with pkgs;
udptunnel = callPackage ../tools/networking/udptunnel { }; udptunnel = callPackage ../tools/networking/udptunnel { };
udpx = callPackage ../tools/security/udpx { };
uftrace = callPackage ../development/tools/uftrace { }; uftrace = callPackage ../development/tools/uftrace { };
uget = callPackage ../tools/networking/uget { }; uget = callPackage ../tools/networking/uget { };