alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Vladimír Čunát 2022-04-28 18:05:38 +02:00
parent 5891152d70 0cd6f99f95
commit 84de05dba7
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
37 changed files with 654 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -4716,6 +4716,12 @@
githubId = 201997;
name = "Eric Seidel";
};
grindhold = {
name = "grindhold";
email = "grindhold+nix@skarphed.org";
github = "grindhold";
githubId = 2592640;
};
gspia = {
email = "iahogsp@gmail.com";
github = "gspia";

20
pkgs/applications/audio/noise-repellent/default.nix
View file

@ -1,22 +1,24 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }:
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, cmake, libspecbleach, lv2 }:
stdenv.mkDerivation rec {
pname = "noise-repellent";
version = "0.1.5";
version = "0.2.1";
src = fetchFromGitHub {
owner = "lucianodato";
repo = pname;
rev = version;
sha256 = "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE=";
};
mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
mesonFlags = [
"--prefix=${placeholder "out"}/lib/lv2"
"--buildtype=release"
];
nativeBuildInputs = [ meson ninja pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config cmake ];
buildInputs = [
fftwFloat lv2
libspecbleach lv2
];
meta = with lib; {
@ -24,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/lucianodato/noise-repellent";
license = licenses.gpl3;
maintainers = [ maintainers.magnetophon ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];
platforms = platforms.unix;
};
}

9
pkgs/applications/editors/jetbrains/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, callPackage, fetchurl
, jdk, cmake, zlib, python3
, dotnet-sdk_5
, jdk, cmake, gdb, zlib, python3
, dotnet-sdk_6
, maven
, autoPatchelfHook
, libdbusmenu
@ -53,6 +53,9 @@ let
# bundled cmake does not find libc
rm -rf bin/cmake/linux
ln -s ${cmake} bin/cmake/linux
# bundled gdb does not find libcrypto 10
rm -rf bin/gdb/linux
ln -s ${gdb} bin/gdb/linux
autoPatchelf $PWD/bin
@ -207,7 +210,7 @@ let
postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
rm -rf lib/ReSharperHost/linux-x64/dotnet
mkdir -p lib/ReSharperHost/linux-x64/dotnet/
ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
'');
});

216
pkgs/applications/editors/jetbrains/versions.json
View file

@ -3,26 +3,26 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
"version": "2021.3.3",
"sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d",
"url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "a8ad8db6362d60a5ce60a7552110887dbd12e8420c839c368b55808b68dea38b",
"url": "https://download.jetbrains.com/cpp/CLion-2022.1.tar.gz",
"version-major-minor": "2022.1"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
"version": "2021.3.4",
"sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325",
"url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1.1",
"sha256": "d4ffcb4371ee6e9f03704fa6282630349fd4ff4759846c02d43bb37e3caeae67",
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.tar.gz",
"version-major-minor": "2022.1.1"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2021.3.3",
"sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3",
"url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "7803f432b62b7b9a9f340fd48375f50d60b0e5412b052b70e175de8edf82a947",
"url": "https://download.jetbrains.com/go/goland-2022.1.tar.gz",
"version-major-minor": "2022.1"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@ -51,76 +51,76 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2021.3.2",
"sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2",
"url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "e30d6991c98addcc02ab05c623d0c42797d605db73c01b7c153bf2246c877395",
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.tar.gz",
"version-major-minor": "2022.1"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
"version": "2021.3.2",
"sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8",
"url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb",
"url": "https://download.jetbrains.com/python/pycharm-community-2022.1.tar.gz",
"version-major-minor": "2022.1"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
"version": "2021.3.2",
"sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67",
"url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "9b160ed74f384be31ff376af73f91924a212e6440ce142a581b22f261e6cf605",
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.tar.gz",
"version-major-minor": "2022.1"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2021.3.3",
"sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "e5d2018bf352f4ff17299d2ee4f286d654946fe4dac2ff47d3dc853820364673",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.tar.gz",
"version-major-minor": "2022.1"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
"version": "2021.3.2",
"sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2",
"url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "495c0d86eb7f3bed0ed692a7ae37e8b3b333c58ae891ca3891a311db6b951401",
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.tar.gz",
"version-major-minor": "2022.1"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
"version": "2021.3.2",
"sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "d9dd5815cc456d74f7dc47533ade3990d0f2f9ce0c4dab3d5ae9b04e01d1746c",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.tar.gz",
"version-major-minor": "2022.1"
}
},
"x86_64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
"version": "2021.3.3",
"sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d",
"url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "4972403e5ed7587ad76dcfb08b975879a2a955e9be9f88344e369cd4006b2d52",
"url": "https://download.jetbrains.com/cpp/CLion-2022.1.dmg",
"version-major-minor": "2022.1"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
"version": "2021.3.4",
"sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52",
"url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg",
"version-major-minor": "2021.3"
"version": "2022.1.1",
"sha256": "6ea0c0c972bad06fd0378a2c1e9a1cb1b3ec50d52cc98d0f9c98327cc7af2a1e",
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.dmg",
"version-major-minor": "2022.1.1"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2021.3.3",
"sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9",
"url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "ec44455e83b8c8d85614b63815245a0dff984796a432e05801787c7f8474900b",
"url": "https://download.jetbrains.com/go/goland-2022.1.dmg",
"version-major-minor": "2022.1"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@ -149,76 +149,76 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2021.3.2",
"sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14",
"url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "daa3c749b3a41e106384ac8e003957a46f38dfc844cebfce8c802c4a223535b8",
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.dmg",
"version-major-minor": "2022.1"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
"version": "2021.3.2",
"sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909",
"url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "99ba20a8b0752ca58e1fc814fb19766fd19c376b42e3cbfa4102c67bc21942ec",
"url": "https://download.jetbrains.com/python/pycharm-community-2022.1.dmg",
"version-major-minor": "2022.1"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
"version": "2021.3.2",
"sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775",
"url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "ab5496370a6145073dbd423e47d6112d9c726a4a286d2528e66711f865d92d56",
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.dmg",
"version-major-minor": "2022.1"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2021.3.3",
"sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "38867fb7ca4b5af013f33b4db3b15994b6e732b121176f98480b5ff1b49ef17e",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.dmg",
"version-major-minor": "2022.1"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
"version": "2021.3.2",
"sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96",
"url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "b33f34b889fde6ebe6348499e2ad15bb85937aba1e2a8a9543c411b2476ec4ff",
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.dmg",
"version-major-minor": "2022.1"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
"version": "2021.3.2",
"sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "0bd2be5ea0ccabfb7a806ca4c46d33f1e9106c2256243c48091ff61d5ac29a08",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.dmg",
"version-major-minor": "2022.1"
}
},
"aarch64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
"version": "2021.3.3",
"sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2",
"url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "333d4ac5757f537ad67863dd6fb03644722ab8fce1596976fa99e5ae9de7991c",
"url": "https://download.jetbrains.com/cpp/CLion-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
"version": "2021.3.4",
"sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a",
"url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1.1",
"sha256": "2ba92ed34366b111a39ba0632d91dbaf232633f5f5557a208dd8ab7696179b6f",
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1-aarch64.dmg",
"version-major-minor": "2022.1.1"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2021.3.3",
"sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db",
"url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "0506a817e35a80d3d776484a88bf4136628b589a8f5754833387a8dec99798d3",
"url": "https://download.jetbrains.com/go/goland-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@ -247,50 +247,50 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2021.3.2",
"sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314",
"url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "d13744e7a70a9716f1b99cb9b77c77e17cb4710466a29db490ef6e707a54ae21",
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
"version": "2021.3.2",
"sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a",
"url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "1873565756716cb0eee23c60068dd5d394413b2b2e54b4b75cbe8b882540a0b7",
"url": "https://download.jetbrains.com/python/pycharm-community-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
"version": "2021.3.2",
"sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db",
"url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "ba0ea4ff52703a53a9c7e14d42c9ae12688b94364ced77a28d4ed0c417c9642f",
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2021.3.3",
"sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "273f40eda119a034ada821db2257e3b5c2bfb835c287365398237f5d9a9daad3",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
"version": "2021.3.2",
"sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e",
"url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "06d932a587adcd25b4e70d0b27c2c229381144deaef90cbcdc345edd822e04ed",
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
"version": "2021.3.2",
"sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg",
"version-major-minor": "2021.3"
"version": "2022.1",
"sha256": "96ec148af1b20ea9d2cb6f8b1f268f96607269e8dd3caf521b48464fe21a7177",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1-aarch64.dmg",
"version-major-minor": "2022.1"
}
}
}

4
pkgs/applications/graphics/graphicsmagick/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "graphicsmagick";
version = "1.3.37";
version = "1.3.38";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "sha256-kNwi8ae9JA5MkGWpQJYr8T2kPJm8w2yxEcw8Gg10d9Q=";
sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU=";
};
patches = [

11
pkgs/applications/networking/cluster/istioctl/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.13.2";
version = "1.13.3";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-7YtszdwauTz9LfZ77d13fDU6vQm5hiJrIOiqpqIginQ=";
sha256 = "sha256-XvV6OlGHW/eB0EUrmyTlFVbDjbxUpVo6WvrEnh6Q68I=";
};
vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k=";
vendorSha256 = "sha256-Ex86yLMTqqiSkJns/eeodmGswAzPVQAQOf8Wqi7DRaE=";
nativeBuildInputs = [ installShellFiles ];
@ -26,6 +26,11 @@ buildGoModule rec {
subPackages = [ "istioctl/cmd/istioctl" ];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/istioctl version --remote=false | grep ${version} > /dev/null
'';
postInstall = ''
$out/bin/istioctl collateral --man --bash --zsh
installManPage *.1

6
pkgs/applications/networking/termius/default.nix
View file

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "termius";
version = "7.37.0";
version = "7.39.0";
src = fetchurl {
# find the latest version with
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
# and the sha512 with
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_108.snap";
sha512 = "05c4a0baeee8c1ff9547017288d099a9ef7b3049647ef0318ca4b1112df26f9f3a844bbae5f9ada59adaf07838987e2a685aee21ea494945202009236fe5f6bc";
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_111.snap";
sha512 = "1c90f249fd1802d4ed032b85ee835ca04e84e673caff339b6ce9b35188fec65a3ccce0e2a8a9afef46354ed5886ab17c612468ad7281c660c904b180753a1729";
};
desktopItem = makeDesktopItem {

10
pkgs/applications/radio/kalibrate-rtl/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "kalibrate-rtl";
version = "unstable-2013-12-14";
version = "unstable-2022-02-02";
src = fetchFromGitHub {
owner = "steve-m";
repo = "kalibrate-rtl";
rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38";
sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn";
rev = "340003eb0846b069c3edef19ed3363b8ac7b5215";
sha256 = "n9mfu8H2OS8dKPNhtJxBfMDp8aHEIcxg/R+kcRNOBpk=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
@ -26,7 +26,7 @@ stdenv.mkDerivation {
'';
homepage = "https://github.com/steve-m/kalibrate-rtl";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ bjornfor viraptor ];
};
}

4
pkgs/development/interpreters/sollya/default.nix
View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "sollya";
version = "7.0";
version = "8.0";
src = fetchurl {
url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz";
sha256 = "0amrxg7567yy5xqpgchxggjpfr11xyl27vy29c7vlh7v8a17nj1h";
sha256 = "sha256-WNc0+aL8jmczwR+W0t+aslvvJNccQBIw4p8KEzmoEZI=";
};
buildInputs = [ gmp mpfr mpfi libxml2 fplll ];

26
pkgs/development/libraries/audio/libspecbleach/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat}:
stdenv.mkDerivation rec {
pname = "libspecbleach";
version = "0.1.2";
src = fetchFromGitHub {
owner = "lucianodato";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WmUl8rA/+V+hv7FPG/5Or6aAQVqt1rIJtdb53KhSmuo=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [
fftwFloat
];
meta = with lib; {
description = "C library for audio noise reduction";
homepage = "https://github.com/lucianodato/libspecbleach";
license = licenses.lgpl2;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.unix;
};
}

6
pkgs/development/python-modules/aioqsw/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioqsw";
version = "0.0.5";
version = "0.0.7";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Noltari";
repo = pname;
rev = version;
hash = "sha256-2MuJrWrjcRkdeVkKfv/nUVfHyBtKKsq1sC5ISSEtyEE=";
rev = "refs/tags/${version}";
hash = "sha256-EEgEpil6/pa3gihiLZ5RrtTxP63H24VmMc8Nf1Vsrw8=";
};
propagatedBuildInputs = [

35
pkgs/development/python-modules/codepy/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytools
, appdirs
, six
, cgen
}:
buildPythonPackage rec {
pname = "codepy";
version = "2019.1";
src = fetchFromGitHub {
owner = "inducer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM=";
};
buildInputs = [ pytools six cgen ];
propagatedBuildInputs = [ appdirs ];
pythonImportsCheck = [ "codepy" ];
# Tests are broken
doCheck = false;
meta = with lib; {
homepage = "https://github.com/inducer/codepy";
description = "Generate and execute native code at run time, from Python";
license = licenses.mit;
maintainers = with maintainers; [ atila ];
};
}

6
pkgs/development/python-modules/connexion/default.nix
View file

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "connexion";
version = "2.13.0";
version = "2.13.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -30,8 +30,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "spec-first";
repo = pname;
rev = version;
hash = "sha256-QOxvs2z8AAxQ2oSM/PQ6QTD9G4JomviauLSDjay8HyQ=";
rev = "refs/tags/${version}";
hash = "sha256-nWhrb2oyBue/Q/dAdSgk3K/JXdgLg1xAEbOtCTRYs/M=";
};
propagatedBuildInputs = [

42
pkgs/development/python-modules/contexttimer/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, fetchpatch
, python
}:
buildPythonPackage rec {
pname = "contexttimer";
version = "unstable-2019-03-30";
src = fetchFromGitHub {
owner = "brouberol";
repo = "contexttimer";
rev = "a866f420ed4c10f29abf252c58b11f9db6706100";
sha256 = "sha256-Fc1vK1KSZWgBPtBf5dVydF6dLHEGAOslWMV0FLRdj8w=";
};
patches = [
# https://github.com/brouberol/contexttimer/pull/16
(fetchpatch {
url = "https://github.com/brouberol/contexttimer/commit/dd65871f3f25a523a47a74f2f5306c57048592b0.patch";
hash = "sha256-vNBuFXvuvb6hWPzg4W4iyKbd4N+vofhxsKydEkc25E4=";
})
];
pythonImportCheck = [ "contexttimer" ];
checkInputs = [ mock ];
checkPhase = ''
${python.interpreter} -m unittest tests/test_timer.py
'';
meta = with lib; {
homepage = "https://github.com/brouberol/contexttimer";
description = "A timer as a context manager";
license = licenses.gpl3Only;
maintainers = with maintainers; [ atila ];
};
}

47
pkgs/development/python-modules/dask-yarn/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, distributed
, dask
, grpcio
, skein
}:
buildPythonPackage rec {
pname = "dask-yarn";
version = "0.9";
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
hash = "sha256-/BTsxQSiVQrihrCa9DE7pueyg3aPAdjd/Dt4dpUwdtM=";
};
propagatedBuildInputs = [
distributed
dask
grpcio
skein
];
checkInputs = [ pytestCheckHook ];
preCheck = ''
export HOME=$TMPDIR
'';
pythonImportsCheck = [ "dask_yarn" ];
meta = with lib; {
description = "Deploy dask on YARN clusters";
longDescription = ''Dask-Yarn deploys Dask on YARN clusters,
such as are found in traditional Hadoop installations.
Dask-Yarn provides an easy interface to quickly start,
stop, and scale Dask clusters natively from Python.
'';
homepage = "https://yarn.dask.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ illustris ];
};
}

100
pkgs/development/python-modules/devito/default.nix Normal file
View file

@ -0,0 +1,100 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, anytree
, nbval
, sympy
, scipy
, cached-property
, psutil
, py-cpuinfo
, cgen
, click
, multidict
, distributed
, pyrevolve
, codepy
, pytestCheckHook
, matplotlib
, pytest-xdist
}:
buildPythonPackage rec {
pname = "devito";
version = "unstable-2022-04-22";
src = fetchFromGitHub {
owner = "devitocodes";
repo = "devito";
rev = "7cb52eded4038c1a0ee92cfd04d3412c48f2fb7c";
sha256 = "sha256-QdQRCGmXaubPPnmyJo2ha0mW5P1akRZhXZVW2TNM5yY=";
};
postPatch = ''
# Removing unecessary dependencies
sed -e "s/flake8.*//g" \
-e "s/codecov.*//g" \
-e "s/pytest.*//g" \
-e "s/pytest-runner.*//g" \
-e "s/pytest-cov.*//g" \
-i requirements.txt
# Relaxing dependencies requirements
sed -e "s/>.*//g" \
-e "s/<.*//g" \
-i requirements.txt
'';
checkInputs = [ pytestCheckHook pytest-xdist matplotlib ];
# I've had to disable the following tests since they fail while using nix-build, but they do pass
# outside the build. They mostly related to the usage of MPI in a sandboxed environment.
disabledTests = [
"test_assign_parallel"
"test_gs_parallel"
"test_if_parallel"
"test_if_halo_mpi"
"test_cache_blocking_structure_distributed"
"test_mpi"
"test_codegen_quality0"
"test_new_distributor"
"test_subdomainset_mpi"
"test_init_omp_env_w_mpi"
"test_mpi_nocomms"
];
disabledTestPaths = [
"tests/test_pickle.py"
"tests/test_benchmark.py"
"tests/test_mpi.py"
"tests/test_autotuner.py"
"tests/test_data.py"
"tests/test_dse.py"
"tests/test_gradient.py"
];
propagatedBuildInputs = [
anytree
cached-property
cgen
click
codepy
distributed
nbval
multidict
psutil
py-cpuinfo
pyrevolve
scipy
sympy
];
pythonImportsCheck = [ "devito" ];
meta = with lib; {
homepage = "https://www.devitoproject.org/";
description = "Code generation framework for automated finite difference computation";
license = licenses.mit;
maintainers = with maintainers; [ atila ];
};
}

28
pkgs/development/python-modules/durus/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "Durus";
version = "4.2";
src = fetchPypi {
inherit version pname;
sha256 = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c";
};
# Checks disabled due to missing python unittest framework 'sancho' in nixpkgs
doCheck = false;
pythonImportsCheck = [
"durus.connection"
"durus.file_storage"
"durus.client_storage"
"durus.sqlite_storage"
];
meta = with lib; {
description = "Object persistence layer";
homepage = "https://github.com/nascheme/durus";
license = licenses.mit;
maintainers = with maintainers; [ grindhold ];
};
}

4
pkgs/development/python-modules/jc/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.18.7";
version = "1.18.8";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1fnkeyfvFHy9/COpFtPdvj8ptUIVxfoBrOFw9Ikf47w=";
sha256 = "sha256-tZrvWMt0qdOFTNeL99mZGFl8bVDGCqj25zVl7QvXQLw=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

2
pkgs/development/python-modules/pyradios/default.nix
View file

@ -3,6 +3,7 @@
, fetchPypi
, appdirs
, requests
, setuptools
, pythonOlder
}:
@ -21,6 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
appdirs
requests
setuptools
];
# Tests and pythonImportsCheck require network access

41
pkgs/development/python-modules/pyrevolve/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, contexttimer
, versioneer
, cython
, numpy
, pytest
}:
buildPythonPackage rec {
pname = "pyrevolve";
version = "2.2";
src = fetchFromGitHub {
owner = "devitocodes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5a4zvyf2vfz8aI6vFMI2vxekYrcUi/YuPFvZnUOx+Zs=";
};
nativeBuildInputs = [ versioneer cython ];
propagatedBuildInputs = [ contexttimer numpy ];
checkInputs = [ pytest ];
# Using approach bellow bcs the tests fail with the pytestCheckHook, throwing the following error
# ImportError: cannot import name 'crevolve' from partially initialized module 'pyrevolve'
# (most likely due to a circular import)
checkPhase = ''
pytest
'';
pythonImportsCheck = [ "pyrevolve" ];
meta = with lib; {
homepage = "https://github.com/devitocodes/pyrevolve";
description = "Python library to manage checkpointing for adjoints";
license = licenses.epl10;
maintainers = with maintainers; [ atila ];
};
}

47
pkgs/development/python-modules/skein/default.nix
View file

@ -2,26 +2,29 @@
, callPackage
, fetchPypi
, isPy27
, jre
, lib
, pythonPackages
, cryptography
, grpcio
, pyyaml
, grpcio-tools
, hadoop
, pytestCheckHook
, python
}:
let
buildPythonPackage rec {
pname = "skein";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "04208b4be9df2dc68ac5b3e3ae51fd9b589add95ea1b67222a8de754d17b1efa";
};
skeinJar = callPackage ./skeinjar.nix { inherit src version; };
in
buildPythonPackage rec {
inherit pname version src;
disabled = isPy27;
# Update this hash if bumping versions
jarHash = "sha256-UGiEoTZ17IhLG72FZ18Zb+Ej4T8z9rMIMDUxzSZGZyY=";
skeinJar = callPackage ./skeinjar.nix { inherit pname version jarHash; };
propagatedBuildInputs = with pythonPackages; [ cryptography grpcio grpcio-tools jupyter pytest pyyaml requests jre ];
propagatedBuildInputs = [ cryptography grpcio pyyaml ];
buildInputs = [ grpcio-tools ];
preBuild = ''
# Ensure skein.jar exists skips the maven build in setup.py
@ -29,12 +32,30 @@ buildPythonPackage rec {
ln -s ${skeinJar} skein/java/skein.jar
'';
postPatch = ''
substituteInPlace skein/core.py --replace "'yarn'" "'${hadoop}/bin/yarn'" \
--replace "else 'java'" "else '${hadoop.jdk}/bin/java'"
'';
pythonImportsCheck = [ "skein" ];
checkInputs = [ pytestCheckHook ];
# These tests require connecting to a YARN cluster. They could be done through NixOS tests later.
disabledTests = [
"test_ui"
"test_tornado"
"test_kv"
"test_core"
"test_cli"
];
meta = with lib; {
homepage = "https://jcristharif.com/skein";
description = "A tool and library for easily deploying applications on Apache YARN";
license = licenses.bsd3;
maintainers = with maintainers; [ alexbiehl ];
broken = true; # maven repo src isn't stable
maintainers = with maintainers; [ alexbiehl illustris ];
# https://github.com/NixOS/nixpkgs/issues/48663#issuecomment-1083031627
# replace with https://github.com/NixOS/nixpkgs/pull/140325 once it is merged
broken = lib.traceIf isPy27 "${pname} not supported on ${python.executable}" isPy27;
};
}

23
pkgs/development/python-modules/skein/skeinjar.nix
View file

@ -1,21 +1,20 @@
{ callPackage, stdenv, maven, src, version }:
{ fetchPypi, unzip, stdenv, pname, version, jarHash }:
let
skeinRepo = callPackage ./skeinrepo.nix { inherit src version; };
in
stdenv.mkDerivation rec {
pname = "skein.jar";
inherit pname version;
inherit version src;
src = fetchPypi {
inherit pname version;
format = "wheel";
hash = jarHash;
};
nativeBuildInputs = [ maven ];
dontUnpack = true;
buildPhase = ''
mvn --offline -f java/pom.xml package -Dmaven.repo.local="${skeinRepo}" -Dskein.version=${version} -Dversion=${version}
'';
nativeBuildInputs = [ unzip ];
installPhase = ''
# Making sure skein.jar exists skips the maven build in setup.py
mv java/target/skein-*.jar $out
unzip ${src}
mv ./skein/java/skein.jar $out
'';
}

44
pkgs/development/python-modules/skein/skeinrepo.nix
View file

@ -1,44 +0,0 @@
{ autoPatchelfHook, lib, maven, stdenv, src, version }:
stdenv.mkDerivation rec {
pname = "skein-maven-repo";
inherit version src;
nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
installPhase = ''
mkdir -p $out
archs="${
if stdenv.isLinux
then "linux-x86_32 linux-x86_64"
else "osx-x86_64"
}"
for arch in $archs
do
mvn -Dmaven.repo.local=$out dependency:get -Dartifact=com.google.protobuf:protoc:3.0.0:exe:$arch
mvn -Dmaven.repo.local=$out dependency:get -Dartifact=io.grpc:protoc-gen-grpc-java:1.16.0:exe:$arch
done
if ${ lib.boolToString stdenv.isLinux }
then
autoPatchelf $out
fi
# We have to use maven package here as dependency:go-offline doesn't
# fetch every required jar.
mvn -f java/pom.xml -Dmaven.repo.local=$out package
rm $(find $out -name _remote.repositories)
rm $(find $out -name resolver-status.properties)
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = if stdenv.isLinux
then "12f0q3444qw6y4f6qsa9540a0fz4cgi844zzi8z1phqn3k4dnl6v"
else "0bjbwiv17cary1isxca0m2hsvgs1i5fh18z247h1hky73lnhbrz8";
} // lib.optionalAttrs stdenv.isLinux { dontAutoPatchelf = true; }

6
pkgs/development/tools/analysis/tfsec/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.19.0";
version = "1.19.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-W08EyKSMz0ZCqvPBB9xQ4WHxsK2FjgwC/GvEqOwGGQ4=";
sha256 = "sha256-xeAMwYpi9WvKALzOPLjVItHYzFJW+O++5jgqRSC7awk=";
};
ldflags = [
@ -21,7 +21,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-wEsWnmCv3hoQ1QkOQfo4ShmSgf27yEc8FKC7SC4gs8k=";
vendorSha256 = "sha256-xDK40Vc2tHZ7apfKznt7EEz1vR6UhqtXHgYXR2mISiI=";
subPackages = [
"cmd/tfsec"

4
pkgs/os-specific/linux/kernel/linux-zen.nix
View file

@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
modDirVersion = "5.17.2-zen3";
modDirVersion = "5.17.5-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@ -20,7 +20,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
inherit rev;
sha256 = "sha256-q6Cc3wQHDXzyt2hx3+CS8N74myC6ra/Y+8IHQxTkoLo=";
sha256 = "sha256-DWkdnSG+4qMAFdGDmtEItaQZnIiorxLYMqdq5eBqQfs=";
};
structuredExtraConfig = with lib.kernel; {

2
pkgs/os-specific/linux/kernel/update-zen.sh
View file

@ -18,4 +18,4 @@ sed -i -e "s!modDirVersion = \".*\"!modDirVersion = \"${new}\"!" "$path"
checksum=$(nix-prefetch "(import ${nixpkgs} {}).linuxPackages_zen.kernel")
sed -i -e "s!sha256 = \".*\"!sha256 = \"${checksum}\"!" "$path"
git commit -m "linux_zen: ${old} -> ${new}" $path
git commit -m "linuxKernel.kernels.linux_zen: ${old} -> ${new}" $path

8
pkgs/servers/tailscale/default.nix
View file

@ -1,21 +1,21 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }:
let z = lib.fakeSha256; in
buildGoModule rec {
pname = "tailscale";
version = "1.24.0";
version = "1.24.1";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "12dn2dkk86ni7wqpl7zaxb8n840fnvg8kcjsg1lvf9k432dqhksn";
sha256 = "sha256-BO0OBnszKA6EPTa6dqGrmYfVv2sbbQhg8Lf64uVfCqA=V";
};
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
CGO_ENABLED = 0;
vendorSha256 = "01hh8v3mvl7fgv4w4y78jg50b383lgxfy876lkn7wg0sgg336dc8";
vendorSha256 = "sha256-iDUzxnsaPH7spOYg7/qjA40FypPoeMLJfu7QXcdGEAY=";
doCheck = false;

2
pkgs/tools/graphics/pfstools/default.nix
View file

@ -36,7 +36,7 @@ mkDerivation rec {
libGLU libGL freeglut
]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; });
patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ];
patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ];
meta = with lib; {
homepage = "http://pfstools.sourceforge.net/";

12
pkgs/tools/graphics/pfstools/glut.patch Normal file
View file

@ -0,0 +1,12 @@
--- a/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:11.164016369 +0300
+++ b/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:32.757878750 +0300
@@ -11,8 +11,7 @@
add_executable(pfsglview pfsglview.cpp picture_io.cpp module.cpp m_histogram.cpp m_status.cpp m_on_screen_display.cpp)
-# TODO: Use ${GLUT_LIBRARY} instead.
-target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} pfs)
+target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} pfs)
install (TARGETS pfsglview DESTINATION bin)
install (FILES pfsglview.1 DESTINATION ${MAN_DIR})

53
pkgs/tools/misc/dsq/default.nix
View file

@ -4,8 +4,12 @@
, buildGoModule
, runCommand
, nix-update-script
, dsq
, fetchurl
, testers
, python3
, curl
, jq
, dsq
}:
buildGoModule rec {
@ -23,31 +27,34 @@ buildGoModule rec {
ldflags = [ "-X" "main.Version=${version}" ];
checkInputs = [ python3 curl jq ];
preCheck =
let
taxiCsv = fetchurl {
url = "https://s3.amazonaws.com/nyc-tlc/trip+data/yellow_tripdata_2021-04.csv";
hash = "sha256-CXJPraOYAy5tViDcBi9gxI/rJ3ZXqOa/nJ/d+aREV+M=";
};
in
''
substituteInPlace scripts/test.py \
--replace '${taxiCsv.url}' file://${taxiCsv} \
--replace 'dsq latest' 'dsq ${version}'
'';
checkPhase = ''
runHook preCheck
cp "$GOPATH/bin/dsq" .
python3 scripts/test.py
runHook postCheck
'';
passthru = {
updateScript = nix-update-script { attrPath = pname; };
tests = {
version = testers.testVersion { package = dsq; };
pretty-csv = runCommand "${pname}-test" { } ''
mkdir "$out"
cat <<EOF > "$out/input.csv"
first,second
1,a
2,b
EOF
cat <<EOF > "$out/expected.txt"
+-------+--------+
| first | second |
+-------+--------+
| 1 | a |
| 2 | b |
+-------+--------+
EOF
${dsq}/bin/dsq --pretty "$out/input.csv" 'select first, second from {}' > "$out/actual.txt"
diff "$out/expected.txt" "$out/actual.txt"
'';
};
tests.version = testers.testVersion { package = dsq; };
};
meta = with lib; {

20
pkgs/tools/misc/topgrade/default.nix
View file

@ -1,19 +1,26 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation, installShellFiles }:
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, Cocoa
, Foundation
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "8.3.0";
version = "8.3.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iFS8Bf2IF0GoW168DwfBbkiPd7IGJhGShofFnBESpUc=";
sha256 = "sha256-EsC17VUQDgrhCU26fsqf2zXOTKa/WeKHiWG0Zn1Qao4=";
};
cargoSha256 = "sha256-8Ag4rDXnDZgxdwFpiWnYNjDeau9vr9EIfbJzeQlqSDM=";
cargoSha256 = "sha256-e5QJw5yY+ZkijqoqRauA5ncvLWiRlalYZCwSG5U7uDk=";
buildInputs = lib.optional stdenv.isDarwin Foundation;
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ];
nativeBuildInputs = [ installShellFiles ];
@ -25,6 +32,7 @@ rustPlatform.buildRustPackage rec {
description = "Upgrade all the things";
homepage = "https://github.com/r-darwish/topgrade";
license = licenses.gpl3Only;
maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ];
maintainers = with maintainers; [ SuperSandro2000 ];
broken = stdenv.isDarwin;
};
}

12
pkgs/tools/package-management/packagekit/default.nix
View file

@ -11,7 +11,6 @@
, vala
, gtk-doc
, nix
, nlohmann_json ? null
, boost
, meson
, ninja
@ -27,12 +26,6 @@
, enableSystemd ? stdenv.isLinux
, systemd
}:
let
nix_version = lib.removeSuffix nix.VERSION_SUFFIX nix.version;
useNlohmann = lib.versionAtLeast "2.7" nix_version;
in
assert useNlohmann -> nlohmann_json != null;
stdenv.mkDerivation rec {
pname = "packagekit";
@ -43,8 +36,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "PackageKit";
repo = "PackageKit";
rev = "33b847c49b4a42499e3c0f10fef62830c874e086";
sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw=";
rev = "30bb82da8d4161330a6d7a20c9989149303421a1";
sha256 = "k2osc2v0OuGrNjwxdqn785RsbHEJP3p79PG9YqnVE3U=";
};
buildInputs = [
@ -59,7 +52,6 @@ stdenv.mkDerivation rec {
nix
boost
] ++ lib.optional enableSystemd systemd
++ lib.optional useNlohmann nlohmann_json
++ lib.optional enableBashCompletion bash-completion;
nativeBuildInputs = [
vala

4
pkgs/tools/security/gitleaks/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.8.2";
version = "8.8.4";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WEVlddqG7t01yl05EujxH/XXBYZxePSKY6IQwkKUkws=";
sha256 = "sha256-EW5skmSnnQiMCMqyh51t1q4F5JVYWLSuj1qTqfWp/ok=";
};
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";

21
pkgs/tools/system/envconsul/default.nix
View file

@ -1,19 +1,24 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "envconsul";
version = "0.7.3";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/envconsul";
version = "0.12.1";
src = fetchFromGitHub {
inherit rev;
owner = "hashicorp";
repo = "envconsul";
sha256 = "03cgxkyyynr067dg5b0lhvaxn60318fj9fh55p1n43vj5nrzgnbc";
rev = "v${version}";
sha256 = "sha256-oV+dGenyNYdVLFn43p+J9TgIbliYOppAKr1ePlMF0d4=";
};
vendorSha256 = "sha256-kal1HR9zRVhQKR/ql63hju7XIHU1KRNDTAlOEqzYR4o=";
ldflags = [
"-s"
"-w"
"-X github.com/hashicorp/envconsul/version.Name=envconsul"
];
meta = with lib; {
homepage = "https://github.com/hashicorp/envconsul/";
description = "Read and set environmental variables for processes from Consul";

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

@ -9056,7 +9056,7 @@ with pkgs;
p7zip = callPackage ../tools/archivers/p7zip { };
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_6; };
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_8; };
packetdrill = callPackage ../tools/networking/packetdrill { };
@ -10855,7 +10855,7 @@ with pkgs;
toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { };
topgrade = callPackage ../tools/misc/topgrade {
inherit (darwin.apple_sdk.frameworks) Foundation;
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
};
top-git = callPackage ../applications/version-management/git-and-tools/topgit { };
@ -18733,6 +18733,8 @@ with pkgs;
libspectre = callPackage ../development/libraries/libspectre { };
libspecbleach = callPackage ../development/libraries/audio/libspecbleach { };
libspnav = callPackage ../development/libraries/libspnav { };
libgsf = callPackage ../development/libraries/libgsf { };

28
pkgs/top-level/perl-packages.nix
View file

@ -11851,6 +11851,19 @@ let
};
};
LexicalSealRequireHints = buildPerlModule {
pname = "Lexical-SealRequireHints";
version = "0.0011";
src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz";
sha256 = "sha256-npGO0RjvaF1uCdqxzW5m7gox13b+JLumPlJDkG9WATo=";
};
meta = {
description = "Prevent leakage of lexical hints";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
libapreq2 = buildPerlPackage {
pname = "libapreq2";
version = "2.16";
@ -20558,6 +20571,21 @@ let
};
};
SubStrictDecl = buildPerlModule {
pname = "Sub-StrictDecl";
version = "0.005";
src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Sub-StrictDecl-0.005.tar.gz";
sha256 = "sha256-oSfa52RcGpVwzZopcMbcST1SL/BzGKNKOeQJCY9pESU=";
};
propagatedBuildInputs = [ LexicalSealRequireHints ];
perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC";
meta = {
description = "Detect undeclared subroutines in compilation";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
SubUplevel = buildPerlPackage {
pname = "Sub-Uplevel";
version = "0.2800";

16
pkgs/top-level/python-packages.nix
View file

@ -1779,6 +1779,8 @@ in {
codecov = callPackage ../development/python-modules/codecov { };
codepy = callPackage ../development/python-modules/codepy { };
codespell = callPackage ../development/python-modules/codespell { };
cogapp = callPackage ../development/python-modules/cogapp { };
@ -1865,6 +1867,8 @@ in {
contextvars = callPackage ../development/python-modules/contextvars { };
contexttimer = callPackage ../development/python-modules/contexttimer { };
convertdate = callPackage ../development/python-modules/convertdate { };
cookiecutter = callPackage ../development/python-modules/cookiecutter { };
@ -2049,6 +2053,8 @@ in {
dask-xgboost = callPackage ../development/python-modules/dask-xgboost { };
dask-yarn = callPackage ../development/python-modules/dask-yarn { };
databases = callPackage ../development/python-modules/databases { };
databricks-cli = callPackage ../development/python-modules/databricks-cli { };
@ -2177,6 +2183,8 @@ in {
detect-secrets = callPackage ../development/python-modules/detect-secrets { };
devito = callPackage ../development/python-modules/devito { };
devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
devolo-plc-api = callPackage ../development/python-modules/devolo-plc-api { };
@ -2534,6 +2542,8 @@ in {
dungeon-eos = callPackage ../development/python-modules/dungeon-eos { };
durus = callPackage ../development/python-modules/durus { };
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
dyn = callPackage ../development/python-modules/dyn { };
@ -6357,6 +6367,8 @@ in {
pypoolstation = callPackage ../development/python-modules/pypoolstation { };
pyrevolve = callPackage ../development/python-modules/pyrevolve { };
pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { };
pyrogram = callPackage ../development/python-modules/pyrogram { };
@ -9404,9 +9416,7 @@ in {
six = callPackage ../development/python-modules/six { };
skein = callPackage ../development/python-modules/skein {
jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
skein = callPackage ../development/python-modules/skein { };
skidl = callPackage ../development/python-modules/skidl { };