From 94d837e3cbad9fdb230463c010e40f97adf0e655 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 05:42:44 +0000 Subject: go-tools: 2021.1 -> 2021.1.1 --- pkgs/development/tools/go-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 69059578e273..38ed470cbe90 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2021.1"; + version = "2021.1.1"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-QhTjzrERhbhCSkPzyLQwFyxrktNoGL9ris+XfE7n5nQ="; + sha256 = "sha256-Vj5C+PIzZUSD16U4KFO3jR/Gq11P8v3my5eODWb//4c="; }; vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY="; -- cgit 1.4.1 From d5b697b1a47a46caa9b815d5bbe86f1febf147d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 23:11:35 +0000 Subject: sentry-cli: 1.66.0 -> 1.68.0 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 884c0edfb735..25a9d60bd8cb 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.66.0"; + version = "1.68.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y="; + sha256 = "sha256-JhKRfeAaSs4KwfcI88UbqIXNw0aZytPkIxkwrg1d2xM="; }; doCheck = false; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk="; + cargoSha256 = "sha256-iV3D4ka8Sg1FMRne3A6npmZm3hFP9Qi/NdmT62BtO+8="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; -- cgit 1.4.1 From c149e8f22af796980e663bb575e8a6261b01f8bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 08:38:34 +0000 Subject: python38Packages.elasticsearch-dsl: 7.3.0 -> 7.4.0 --- pkgs/development/python-modules/elasticsearch-dsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index a2f2ff038db0..5f55a3ac4733 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.3.0"; + version = "7.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ed75f6ff037e36b2397a8e92cae0ddde79b83adc70a154b8946064cb62f7301"; + sha256 = "c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] -- cgit 1.4.1 From 1ecaf6d1619fb14be3c630c12328a383507ad50b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 07:12:15 +0000 Subject: joker: 0.17.1 -> 0.17.2 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 8a2130050bfa..652e828eb5f4 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-3OimYXcQ3KPav44sClbC60220/YK4Jhq+l5UfRFYoJI="; + sha256 = "sha256-rboyRancRTyrSY+13Blrz7OsIzclDS4X4hkHGD6cpyk="; }; vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA="; -- cgit 1.4.1 From b0483dff7550760e072f760d4053310cca6723f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 08:10:08 +0000 Subject: libquotient: 0.6.7 -> 0.6.8 --- pkgs/development/libraries/libquotient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 7c89e98576af..6264a9de3691 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-fAzYv9OsanXqocEvbSB3OA9OVicwcZ0xT9uYbrFPEHc="; + sha256 = "sha256-CrAK0yq1upB1+C2z6mqKkSArCmzI+TDEEHTIBWB29Go="; }; buildInputs = [ qtbase qtmultimedia ]; -- cgit 1.4.1 From d90ad10b3b069a030d21005972a4ea42c37ec925 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 02:09:58 +0000 Subject: cjson: 1.7.14 -> 1.7.15 --- pkgs/development/libraries/cjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/development/libraries/cjson/default.nix index b75b91508cbe..ccf3311317aa 100644 --- a/pkgs/development/libraries/cjson/default.nix +++ b/pkgs/development/libraries/cjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjson"; - version = "1.7.14"; + version = "1.7.15"; src = fetchFromGitHub { owner = "DaveGamble"; repo = "cJSON"; rev = "v${version}"; - sha256 = "1a3i9ydl65dgwgmlg79n5q8qilmjkaakq56sam1w25zcrd8jy11q"; + sha256 = "sha256-PpUVsLklcs5hCCsQcsXw0oEVIWecKnQO16Hy0Ba8ov8="; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 50968f23415a656a127502a55aaa732ed585f99a Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Wed, 25 Aug 2021 19:32:08 -0700 Subject: libdeltachat: 1.56.0 -> 1.59.0 https://github.com/deltachat/deltachat-core-rust/blob/1.59.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 6a0a6ae5c874..c61636bfb95f 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.56.0"; + version = "1.59.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "sha256-ZyVEI6q+GzHLEFH01TxS7NqwT7zqVgg0vduyf/fibB8="; + sha256 = "1lwck5gb2kys7wxg08q3pnb8cqhzwwqy6nxcf2yc030gmnwm4sya"; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8"; + sha256 = "13zzc8c50cy6fknrxzw5gf6rcclsn5bcb2bi3z9mmzsl29ga32gx"; }; nativeBuildInputs = [ -- cgit 1.4.1 From cd0fa6156f486c583988d334202946ffa4b9ebe8 Mon Sep 17 00:00:00 2001 From: urlordjames Date: Thu, 26 Aug 2021 00:05:13 -0400 Subject: drogon: 1.7.1 -> 1.7.2 --- pkgs/development/libraries/drogon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 2b418ee4c6a9..f669d663379e 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "0rhwbz3m5x3vy5zllfs8r347wqprg29pff5q7i53f25bh8y0n49i"; + sha256 = "0g2fm8xb2gi7qaib6mxvg6k6y4g2d0a2jg4k5qvsjbd0n7j8746j"; fetchSubmodules = true; }; -- cgit 1.4.1 From 41564319a1ee3b2a0ff009c4fe5d300d621e0f9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 03:26:46 +0000 Subject: python38Packages.dropbox: 11.16.0 -> 11.18.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 73b0b87b0108..7406e6dc21b3 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.16.0"; + version = "11.18.0"; src = fetchPypi { inherit pname version; - sha256 = "99e84367d5b983815a3680eea2c7e67bff14637c4702010c5c58611eb714dfe2"; + sha256 = "fa512c87521809e93502fc6a27b1d57ffbcef2281468c8f93575eab6a9ad5f05"; }; postPatch = '' -- cgit 1.4.1 From 6642509bac4ca9d85f9c6a9fe0f41379e2dbc24b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 22:18:04 +0000 Subject: stm32flash: 0.5 -> 0.6 --- pkgs/development/embedded/stm32/stm32flash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/embedded/stm32/stm32flash/default.nix b/pkgs/development/embedded/stm32/stm32flash/default.nix index bc33d417f885..52b301154993 100644 --- a/pkgs/development/embedded/stm32/stm32flash/default.nix +++ b/pkgs/development/embedded/stm32/stm32flash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stm32flash"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; + sha256 = "sha256-7ptA1NPlzSi5k+CK4qLDxVm2vqhzDNfh1Acn3tsd2gk="; }; buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; -- cgit 1.4.1 From 7a9526d433c35e515b7692904f51a3e733842374 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: sentry-cli: fix build on Darwin --- pkgs/development/tools/sentry-cli/default.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 25a9d60bd8cb..32f362a834b8 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -2,13 +2,10 @@ , fetchFromGitHub , lib , openssl -, file -, rpm , pkg-config , stdenv -, curl , Security -, runCommand +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; @@ -25,7 +22,7 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; cargoSha256 = "sha256-iV3D4ka8Sg1FMRne3A6npmZm3hFP9Qi/NdmT62BtO+8="; @@ -33,8 +30,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://docs.sentry.io/cli/"; license = licenses.bsd3; - description = "A command line utility to work with Sentry."; + description = "A command line utility to work with Sentry"; + changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; maintainers = with maintainers; [ rizary ]; - platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c22f05c298e..c63049c8b352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9883,7 +9883,7 @@ with pkgs; }; sentry-cli = callPackage ../development/tools/sentry-cli { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; sentry-native = callPackage ../development/libraries/sentry-native { }; -- cgit 1.4.1 From ff3aa121fdcb16c29374a924714f03e32f56181d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 00:22:39 +0000 Subject: simgear: 2020.3.8 -> 2020.3.11 --- pkgs/development/libraries/simgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index b5df83a0b90c..6167d63544f4 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.8"; + version = "2020.3.11"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UXcWV9MPu7c+QlFjrhxtQ6ruAcxuKtewwphu4tt5dWc="; + sha256 = "sha256-u438vCo7AUPR/88B0alh5WbvId0z2cx2jW2apYcdTzw="; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From f108efaa01d5fd6b7c984c46f7e82aa0fa67b4a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 05:18:39 +0000 Subject: python38Packages.internetarchive: 2.0.3 -> 2.1.0 --- pkgs/development/python-modules/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 20e7986188c5..60a946291ad9 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "2.0.3"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2ce0ab89fea37e5b2311bc7d163955e84f73f6beeac3942e17e9d51ad7cc9ffa"; + sha256 = "72094f05df39bb1463f61f928f3a7fa0dd236cab185cb8b7e8eb6c85e09acdc4"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 86632bc0eae73f3023b2fdd5d1f45f3749246e4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 06:16:35 +0000 Subject: python38Packages.django-haystack: 3.0 -> 3.1.1 --- pkgs/development/python-modules/django-haystack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 14e66a159c18..c207a37ebf15 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-haystack"; - version = "3.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be"; + sha256 = "6d05756b95d7d5ec1dbd4668eb999ced1504b47f588e2e54be53b1404c516a82"; }; checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ]; -- cgit 1.4.1 From 8d9814b4d082a42b33dcdd46deeed46ba98379e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Aug 2021 09:34:15 +0200 Subject: python3Packages.tldextract: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index d5b257abedf5..09f35a4c64f8 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea"; + sha256 = "sha256-HViDxJbaOoqnHR9NpIYs43TcfM9F5Ltn3rIBbsNPjTM="; }; nativeBuildInputs = [ setuptools-scm ]; -- cgit 1.4.1 From 4e04f84aacea7760d97a244a03c999d379081875 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Aug 2021 09:48:57 +0200 Subject: tfsec: 0.58.4 -> 0.58.5 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 2ea5ce3090e5..5c4f07482c90 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.4"; + version = "0.58.5"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gnipQyjisi1iY1SSmESrwNvxyacq9fsva8IY3W6Gpd8="; + sha256 = "sha256-awTRECHHNGebzV08Qy2I6rX4eS2z07NZLsQFPoA0UXA="; }; goPackagePath = "github.com/aquasecurity/tfsec"; -- cgit 1.4.1 From c7cccc55fe2fb39761ce6427294a102af865971a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 10:12:03 +0000 Subject: python38Packages.ntc-templates: 2.2.2 -> 2.3.0 --- pkgs/development/python-modules/ntc-templates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 33921406fe1d..67c6783a4649 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.2.2"; + version = "2.3.0"; format = "pyproject"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "1f2hmayj95j3fzkyh9qvl58z0l9j9mlsi8b2r9aa2fy753y5a73b"; + sha256 = "1a9v2j9s7niyacglhgp58zg1wcynakacz9zg4zcv2q85hb87m2m9"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 420ae3f0410b836e922bced1e9f1808be07c6727 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Mon, 23 Aug 2021 10:28:41 -0700 Subject: racket: 8.1 -> 8.2 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 0b5084d43584..5737241bb7e5 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.1"; # always change at once with ./minimal.nix + version = "8.2"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0wlgp9dlibhv1d181arz309fszz31l5gb5gl94bqzfcav014g3k8"; + sha256 = "10kl9xxl9swz8hdpycpy1vjc8biah5h07dzaygsf0ylfjdrczwx0"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 4cfb178d42de..cf3f322b4e7e 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "1q54n16s0hmnry8q381wd7zfpyjndfjswn97vsbd4isngwz3w12k"; + sha256 = "1iw4z962vp287q6wwvky36iqmwg1mqyxxpbk96aqr2ckfjqwnkbg"; }; meta = oldAttrs.meta // { -- cgit 1.4.1 From 33359f518b3e9254889fdbebca3be5509541f140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 03:50:49 +0000 Subject: esbuild: 0.12.23 -> 0.12.24 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index bd080d235bc7..ad88f368e8ad 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.23"; + version = "0.12.24"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-WS3Vy//5lL7xnMOgSeLh6RHAlonQDPQ3K2L+MIK+j7A="; + sha256 = "sha256-oD8QjjolEfmfxs+Q4duVUCbEp74HzIWaPrmH8Vn1H+o="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; -- cgit 1.4.1 From 2784f1bd6908b37ed0d686778f347e63692c0f84 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 15:12:42 +0200 Subject: pkgsMusl.python*: disable LTO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LTO fails to build with musl with the following linker error: ``` rm -f libpython3.9.a if test libpython3.9.so.1.0 != libpython3.9.so; then \ gcc -shared -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none -g -Wl,-hlibpython3.9.so.1.0 -o libpython3.9.so.1.0 Modules/getbuildinfo.o Parser/acceler.o Parser/grammar1.o Parser/listnode.o Parser/node.o Parser/parser.o Parser/token.o Parser/pegen/pegen.o Parser/pegen/parse.o Parser/pegen/parse_string.o Parser/pegen/peg_api.o Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o Objects/abstract.o Objects/accu.o Objects/boolobject.o Objects/bytes_methods.o Objects/bytearrayobject.o Objects/bytesobject.o Objects/call.o Objects/capsule.o Objects/cellobject.o Objects/classobject.o Objects/codeobject.o Objects/complexobject.o Objects/descrobject.o Objects/enumobject.o Objects/exceptions.o Objects/genericaliasobject.o Objects/genobject.o Objects/fileobject.o Objects/floatobject.o Objects/frameobject.o Objects/funcobject.o Objects/interpreteridobject.o Objects/iterobject.o Objects/listobject.o Objects/longobject.o Objects/dictobject.o Objects/odictobject.o Objects/memoryobject.o Objects/methodobject.o Objects/moduleobject.o Objects/namespaceobject.o Objects/object.o Objects/obmalloc.o Objects/picklebufobject.o Objects/rangeobject.o Objects/setobject.o Objects/sliceobject.o Objects/structseq.o Objects/tupleobject.o Objects/typeobject.o Objects/unicodeobject.o Objects/unicodectype.o Objects/weakrefobject.o Python/_warnings.o Python/Python-ast.o Python/asdl.o Python/ast.o Python/ast_opt.o Python/ast_unparse.o Python/bltinmodule.o Python/ceval.o Python/codecs.o Python/compile.o Python/context.o Python/dynamic_annotations.o Python/errors.o Python/frozenmain.o Python/future.o Python/getargs.o Python/getcompiler.o Python/getcopyright.o Python/getplatform.o Python/getversion.o Python/graminit.o Python/hamt.o Python/hashtable.o Python/import.o Python/importdl.o Python/initconfig.o Python/marshal.o Python/modsupport.o Python/mysnprintf.o Python/mystrtoul.o Python/pathconfig.o Python/peephole.o Python/preconfig.o Python/pyarena.o Python/pyctype.o Python/pyfpe.o Python/pyhash.o Python/pylifecycle.o Python/pymath.o Python/pystate.o Python/pythonrun.o Python/pytime.o Python/bootstrap_hash.o Python/structmember.o Python/symtable.o Python/sysmodule.o Python/thread.o Python/traceback.o Python/getopt.o Python/pystrcmp.o Python/pystrtod.o Python/pystrhex.o Python/dtoa.o Python/formatter_unicode.o Python/fileutils.o Python/dynload_shlib.o Modules/config.o Modules/getpath.o Modules/main.o Modules/gcmodule.o Modules/posixmodule.o Modules/errnomodule.o Modules/pwdmodule.o Modules/_sre.o Modules/_codecsmodule.o Modules/_weakref.o Modules/_functoolsmodule.o Modules/_operator.o Modules/_collectionsmodule.o Modules/_abc.o Modules/itertoolsmodule.o Modules/atexitmodule.o Modules/signalmodule.o Modules/_stat.o Modules/timemodule.o Modules/_threadmodule.o Modules/_localemodule.o Modules/_iomodule.o Modules/iobase.o Modules/fileio.o Modules/bytesio.o Modules/bufferedio.o Modules/textio.o Modules/stringio.o Modules/faulthandler.o Modules/_tracemalloc.o Modules/_peg_parser.o Modules/symtablemodule.o Modules/xxsubtype.o Python/frozen.o -ldl -lcrypt -lncurses -lm -lm; \ ln -f libpython3.9.so.1.0 libpython3.9.so; \ else \ gcc -shared -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none -g -o libpython3.9.so Modules/getbuildinfo.o Parser/acceler.o Parser/grammar1.o Parser/listnode.o Parser/node.o Parser/parser.o Parser/token.o Parser/pegen/pegen.o Parser/pegen/parse.o Parser/pegen/parse_string.o Parser/pegen/peg_api.o Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o Objects/abstract.o Objects/accu.o Objects/boolobject.o Objects/bytes_methods.o Objects/bytearrayobject.o Objects/bytesobject.o Objects/call.o Objects/capsule.o Objects/cellobject.o Objects/classobject.o Objects/codeobject.o Objects/complexobject.o Objects/descrobject.o Objects/enumobject.o Objects/exceptions.o Objects/genericaliasobject.o Objects/genobject.o Objects/fileobject.o Objects/floatobject.o Objects/frameobject.o Objects/funcobject.o Objects/interpreteridobject.o Objects/iterobject.o Objects/listobject.o Objects/longobject.o Objects/dictobject.o Objects/odictobject.o Objects/memoryobject.o Objects/methodobject.o Objects/moduleobject.o Objects/namespaceobject.o Objects/object.o Objects/obmalloc.o Objects/picklebufobject.o Objects/rangeobject.o Objects/setobject.o Objects/sliceobject.o Objects/structseq.o Objects/tupleobject.o Objects/typeobject.o Objects/unicodeobject.o Objects/unicodectype.o Objects/weakrefobject.o Python/_warnings.o Python/Python-ast.o Python/asdl.o Python/ast.o Python/ast_opt.o Python/ast_unparse.o Python/bltinmodule.o Python/ceval.o Python/codecs.o Python/compile.o Python/context.o Python/dynamic_annotations.o Python/errors.o Python/frozenmain.o Python/future.o Python/getargs.o Python/getcompiler.o Python/getcopyright.o Python/getplatform.o Python/getversion.o Python/graminit.o Python/hamt.o Python/hashtable.o Python/import.o Python/importdl.o Python/initconfig.o Python/marshal.o Python/modsupport.o Python/mysnprintf.o Python/mystrtoul.o Python/pathconfig.o Python/peephole.o Python/preconfig.o Python/pyarena.o Python/pyctype.o Python/pyfpe.o Python/pyhash.o Python/pylifecycle.o Python/pymath.o Python/pystate.o Python/pythonrun.o Python/pytime.o Python/bootstrap_hash.o Python/structmember.o Python/symtable.o Python/sysmodule.o Python/thread.o Python/traceback.o Python/getopt.o Python/pystrcmp.o Python/pystrtod.o Python/pystrhex.o Python/dtoa.o Python/formatter_unicode.o Python/fileutils.o Python/dynload_shlib.o Modules/config.o Modules/getpath.o Modules/main.o Modules/gcmodule.o Modules/posixmodule.o Modules/errnomodule.o Modules/pwdmodule.o Modules/_sre.o Modules/_codecsmodule.o Modules/_weakref.o Modules/_functoolsmodule.o Modules/_operator.o Modules/_collectionsmodule.o Modules/_abc.o Modules/itertoolsmodule.o Modules/atexitmodule.o Modules/signalmodule.o Modules/_stat.o Modules/timemodule.o Modules/_threadmodule.o Modules/_localemodule.o Modules/_iomodule.o Modules/iobase.o Modules/fileio.o Modules/bytesio.o Modules/bufferedio.o Modules/textio.o Modules/stringio.o Modules/faulthandler.o Modules/_tracemalloc.o Modules/_peg_parser.o Modules/symtablemodule.o Modules/xxsubtype.o Python/frozen.o -ldl -lcrypt -lncurses -lm -lm; \ fi ar rcs libpython3.9.a Modules/getbuildinfo.o Parser/acceler.o Parser/grammar1.o Parser/listnode.o Parser/node.o Parser/parser.o Parser/token.o Parser/pegen/pegen.o Parser/pegen/parse.o Parser/pegen/parse_string.o Parser/pegen/peg_api.o Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o Objects/abstract.o Objects/accu.o Objects/boolobject.o Objects/bytes_methods.o Objects/bytearrayobject.o Objects/bytesobject.o Objects/call.o Objects/capsule.o Objects/cellobject.o Objects/classobject.o Objects/codeobject.o Objects/complexobject.o Objects/descrobject.o Objects/enumobject.o Objects/exceptions.o Objects/genericaliasobject.o Objects/genobject.o Objects/fileobject.o Objects/floatobject.o Objects/frameobject.o Objects/funcobject.o Objects/interpreteridobject.o Objects/iterobject.o Objects/listobject.o Objects/longobject.o Objects/dictobject.o Objects/odictobject.o Objects/memoryobject.o Objects/methodobject.o Objects/moduleobject.o Objects/namespaceobject.o Objects/object.o Objects/obmalloc.o Objects/picklebufobject.o Objects/rangeobject.o Objects/setobject.o Objects/sliceobject.o Objects/structseq.o Objects/tupleobject.o Objects/typeobject.o Objects/unicodeobject.o Objects/unicodectype.o Objects/weakrefobject.o Python/_warnings.o Python/Python-ast.o Python/asdl.o Python/ast.o Python/ast_opt.o Python/ast_unparse.o Python/bltinmodule.o Python/ceval.o Python/codecs.o Python/compile.o Python/context.o Python/dynamic_annotations.o Python/errors.o Python/frozenmain.o Python/future.o Python/getargs.o Python/getcompiler.o Python/getcopyright.o Python/getplatform.o Python/getversion.o Python/graminit.o Python/hamt.o Python/hashtable.o Python/import.o Python/importdl.o Python/initconfig.o Python/marshal.o Python/modsupport.o Python/mysnprintf.o Python/mystrtoul.o Python/pathconfig.o Python/peephole.o Python/preconfig.o Python/pyarena.o Python/pyctype.o Python/pyfpe.o Python/pyhash.o Python/pylifecycle.o Python/pymath.o Python/pystate.o Python/pythonrun.o Python/pytime.o Python/bootstrap_hash.o Python/structmember.o Python/symtable.o Python/sysmodule.o Python/thread.o Python/traceback.o Python/getopt.o Python/pystrcmp.o Python/pystrtod.o Python/pystrhex.o Python/dtoa.o Python/formatter_unicode.o Python/fileutils.o Python/dynload_shlib.o Modules/config.o Modules/getpath.o Modules/main.o Modules/gcmodule.o Modules/posixmodule.o Modules/errnomodule.o Modules/pwdmodule.o Modules/_sre.o Modules/_codecsmodule.o Modules/_weakref.o Modules/_functoolsmodule.o Modules/_operator.o Modules/_collectionsmodule.o Modules/_abc.o Modules/itertoolsmodule.o Modules/atexitmodule.o Modules/signalmodule.o Modules/_stat.o Modules/timemodule.o Modules/_threadmodule.o Modules/_localemodule.o Modules/_iomodule.o Modules/iobase.o Modules/fileio.o Modules/bytesio.o Modules/bufferedio.o Modules/textio.o Modules/stringio.o Modules/faulthandler.o Modules/_tracemalloc.o Modules/_peg_parser.o Modules/symtablemodule.o Modules/xxsubtype.o Python/frozen.o In function ‘assemble_lnotab’, inlined from ‘assemble_emit’ at Python/compile.c:5717:0, inlined from ‘assemble’ at Python/compile.c:6056:0: Python/compile.c:5671: warning: writing 1 byte into a region of size 0 [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wstringop-overflow=-Wstringop-overflow=8;;] 5671 | *lnotab++ = k; | /nix/store/vf20zcyqr3qzcjhdidzk377qankcqsqa-binutils-2.35.1/bin/ld: libpython3.9.so.1.0.lto.o: warning: relocation against `PyDictValues_Type' in read-only section `.text' /nix/store/vf20zcyqr3qzcjhdidzk377qankcqsqa-binutils-2.35.1/bin/ld: libpython3.9.so.1.0.lto.o: relocation R_X86_64_PC32 against symbol `PyBool_Type' can not be used when making a shared object; recompile with -fPIC /nix/store/vf20zcyqr3qzcjhdidzk377qankcqsqa-binutils-2.35.1/bin/ld: final link failed: bad value collect2: error: ld returned 1 exit status ln: failed to access 'libpython3.9.so.1.0': No such file or directory ``` This should be investigated (since it should be possible), but disabling it for now seems better than having a significant percentage of pkgsMusl broken. Ref https://github.com/NixOS/nixpkgs/issues/131557. --- pkgs/development/interpreters/python/cpython/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index f52255f4748b..5b5060b58842 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -45,7 +45,9 @@ # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility. # enabling LTO on 32bit arch causes downstream packages to fail when linking # enabling LTO on *-darwin causes python3 to fail when linking. -, enableLTO ? stdenv.is64bit && stdenv.isLinux +# enabling LTO with musl and dynamic linking fails with a linker error although it should +# be possible as alpine is doing it: https://github.com/alpinelinux/aports/blob/a8ccb04668c7729e0f0db6c6ff5f25d7519e779b/main/python3/APKBUILD#L82 +, enableLTO ? stdenv.is64bit && stdenv.isLinux && !(stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isStatic) , reproducibleBuild ? true , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: -- cgit 1.4.1 From 934622990298da37d08e89f62094e4c747cb1037 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 27 Aug 2021 09:54:40 -0400 Subject: inferno: init at 0.10.6 --- pkgs/development/tools/inferno/default.nix | 31 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/inferno/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix new file mode 100644 index 000000000000..ce12a72dc979 --- /dev/null +++ b/pkgs/development/tools/inferno/default.nix @@ -0,0 +1,31 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "inferno"; + version = "0.10.6"; + + # github version doesn't have a Cargo.lock + src = fetchCrate { + inherit pname version; + sha256 = "1pn3ask36mv8byd62xhm8bjv59k12i1s533jgb5syml64w1cnn12"; + }; + + cargoSha256 = "0w5w9pyv34x0iy9knr79491kb9bgbcagh6251pq72mv4pvx0axip"; + + # these tests depend on a patched version of flamegraph which is included in + # the github repository as a submodule, but absent from the crates version + checkFlags = [ + "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace" + "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple" + "--skip=collapse::perf::tests::test_collapse_multi_perf" + "--skip=collapse::perf::tests::test_collapse_multi_perf_simple" + ]; + + meta = with lib; { + description = "A port of parts of the flamegraph toolkit to Rust"; + homepage = "https://github.com/jonhoo/inferno"; + changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md"; + license = licenses.cddl; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b777ba8f7b14..bebdc797d2e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6086,6 +6086,8 @@ with pkgs; inetutils = callPackage ../tools/networking/inetutils { }; + inferno = callPackage ../development/tools/inferno { }; + inform6 = callPackage ../development/compilers/inform6 { }; inform7 = callPackage ../development/compilers/inform7 { }; -- cgit 1.4.1 From 3d245b3a377b0a91f1be6f819b77cc04cbf24a7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 16:58:44 +0200 Subject: Revert "Revert "openssl: 1.1.1k -> 1.1.1l" (#135999)" This reverts commit b2b0115e70003e0070a50a1e0217a43c7e081588. --- .../openssl/1.1/macos-yosemite-compat.patch | 56 ++++++++++++++++++++++ pkgs/development/libraries/openssl/default.nix | 6 ++- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch b/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch new file mode 100644 index 000000000000..b0e37e325611 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch @@ -0,0 +1,56 @@ +From cef404f1e7a598166cbc2fd2e0048f7e2d752ad5 Mon Sep 17 00:00:00 2001 +From: David Carlier +Date: Tue, 24 Aug 2021 22:40:14 +0100 +Subject: [PATCH] Darwin platform allows to build on releases before + Yosemite/ios 8. + +issue #16407 #16408 +--- + crypto/rand/rand_unix.c | 5 +---- + include/crypto/rand.h | 10 ++++++++++ + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c +index 43f1069d151d..0f4525106af7 100644 +--- a/crypto/rand/rand_unix.c ++++ b/crypto/rand/rand_unix.c +@@ -34,9 +34,6 @@ + #if defined(__OpenBSD__) + # include + #endif +-#if defined(__APPLE__) +-# include +-#endif + + #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) + # include +@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen) + if (errno != ENOSYS) + return -1; + } +-# elif defined(__APPLE__) ++# elif defined(OPENSSL_APPLE_CRYPTO_RANDOM) + if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess) + return (ssize_t)buflen; + +diff --git a/include/crypto/rand.h b/include/crypto/rand.h +index 5350d3a93119..674f840fd13c 100644 +--- a/include/crypto/rand.h ++++ b/include/crypto/rand.h +@@ -20,6 +20,16 @@ + + # include + ++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM) ++# include ++# if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \ ++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) ++# define OPENSSL_APPLE_CRYPTO_RANDOM 1 ++# include ++# include ++# endif ++# endif ++ + /* forward declaration */ + typedef struct rand_pool_st RAND_POOL; + diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index fc2c2fad1959..2d3f1c313caa 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -192,14 +192,16 @@ in { }; openssl_1_1 = common { - version = "1.1.1k"; - sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"; + version = "1.1.1l"; + sha256 = "sha256-C3o+XlnDSCf+DDp0t+yLrvMCuY+oAIjX+RU6oW+na9E="; patches = [ ./1.1/nix-ssl-cert-file.patch (if stdenv.hostPlatform.isDarwin then ./1.1/use-etc-ssl-certs-darwin.patch else ./1.1/use-etc-ssl-certs.patch) + ] ++ lib.optionals (stdenv.isDarwin) [ + ./1.1/macos-yosemite-compat.patch ]; withDocs = true; }; -- cgit 1.4.1 From ca20a96b5ff3318eb136c93b44d4996e2a88fb61 Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Sat, 28 Aug 2021 11:18:03 -0400 Subject: treewide: concatStrings (intersperse ...) -> concatStringsSep ... Update all usage of lib.concatStrings (lib.intersperse ...) to lib.concatStringsSep. This produces the same result as per https://github.com/NixOS/nixpkgs/pull/135843, however it yields a performance benefit on Nix versions that support the builtins.concatStringsSep primop. --- pkgs/applications/misc/keepass/default.nix | 2 +- pkgs/applications/video/vdr/wrapper.nix | 2 +- pkgs/desktops/xfce/core/thunar/wrapper.nix | 2 +- pkgs/development/compilers/gcc/common/configure-flags.nix | 3 +-- pkgs/misc/emulators/retroarch/wrapper.nix | 2 +- pkgs/tools/graphics/diagrams-builder/default.nix | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 336bd5a7f64d..f2846de37d3f 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -84,7 +84,7 @@ with builtins; buildDotnetPackage rec { # after loading. It is brought into plugins bin/ directory using # buildEnv in the plugin derivation. Wrapper below makes sure it # is found and does not pollute output path. - binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); + binPaths = lib.concatStringsSep ":" (map (x: x + "/bin") plugins); dynlibPath = lib.makeLibraryPath [ gtk2 ]; diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix index 50d3b9d65a8d..04984212b249 100644 --- a/pkgs/applications/video/vdr/wrapper.nix +++ b/pkgs/applications/video/vdr/wrapper.nix @@ -24,7 +24,7 @@ in symlinkJoin { inherit license homepage; description = description + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) + + lib.concatStringsSep ", " (map (x: ""+x.name) plugins) + ")"; }; } diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 4e9732ce1c4a..5381dceae4a4 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -36,6 +36,6 @@ symlinkJoin { description = thunar.meta.description + optionalString (0 != length thunarPlugins) - " (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})"; + " (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})"; }; } diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 4686a387712f..6744ad8b0bfe 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -133,7 +133,7 @@ let "--with-system-zlib" "--enable-static" "--enable-languages=${ - lib.concatStrings (lib.intersperse "," + lib.concatStringsSep "," ( lib.optional langC "c" ++ lib.optional langCC "c++" ++ lib.optional langD "d" @@ -146,7 +146,6 @@ let ++ lib.optionals crossDarwin [ "objc" "obj-c++" ] ++ lib.optional langJit "jit" ) - ) }" ] diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index 40d9f07846b7..4cc7ad404be0 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { inherit license homepage platforms maintainers; description = description + " (with cores: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores)) + + lib.concatStringsSep ", " (map (x: ""+x.name) cores) + ")"; }; } diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 9337d5cca23b..85f4fdc83efa 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildCommand = with lib; - concatStrings (intersperse "\n" (map exeWrapper backends)); + concatStringsSep "\n" (map exeWrapper backends); # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; -- cgit 1.4.1 From a544b2b3782b4b30d626ed0d7870d4339808257a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 28 Aug 2021 19:24:43 +0000 Subject: electron_13: 13.2.2 -> 13.2.3 https://github.com/electron/electron/releases/tag/v13.2.3 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 7bef2cb4ef7f..0e5b67bbe18d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "0sg8ybnrmx11xm7yc0lj8yy0g57ln48gvqhrr9g725zimzza9v3l"; }; - electron_13 = mkElectron "13.2.2" { - x86_64-linux = "3d64bc0eab8dc1fd162693a5492ad694bb65b110fc846293faa3e8ed5c7b6a4b"; - x86_64-darwin = "276916b97960d9e49944b9c6dcd35746feb3b55e86747b4ed0e0eb569c47ec0f"; - i686-linux = "b4bcb41473d240d2078b9ca1d71fd879f5e89a8e6cafd13fa8bdcc615b77fe68"; - armv7l-linux = "fd5fab50764f50dcf4b77c7617fe69895ea177d787fe58a54cc0adb5de026801"; - aarch64-linux = "c4f112945d41304c796a7460018721df4598114cc087c1114c72f1e41d985d11"; - aarch64-darwin = "1bc30f12cf6ff3cedde5f90e138b604cd610176be63bb87a9f023146c2f7c81d"; - headers = "1992ss04078drjybh7pn0lmfmk2kcg9y2jdq9z24caf2xlabfb2d"; + electron_13 = mkElectron "13.2.3" { + x86_64-linux = "495b0c96427c63f6f4d08c5b58d6379f9ee3c6c81148fbbe8a7a6a872127df6d"; + x86_64-darwin = "c02f116484a5e1495d9f7451638bc0d3dea8fa2fde2e4c9c88a17cff98192ddc"; + i686-linux = "03fb8cad91fcbb578027b814119b09cd1ddd414f159c9012850655f9171847c1"; + armv7l-linux = "d8aaf2b49b9ab0a46caa31ed7d4358a3223efeaf90941d3d5e272532718ed754"; + aarch64-linux = "cbbf9f98b1cfbee3fcd0869632a03542408dfd35f2e4d5b72cd823ce9448f659"; + aarch64-darwin = "ef375063e30bc51bbcbe16fb7e5d85933eb60888ccc159c391aefc4f6d616faa"; + headers = "0ayiklr84x7xhh5nz2dfzq2fkqivb9y9axfy7q9n4ps08xbqycyr"; }; } -- cgit 1.4.1 From f3840694a6673dfbe964427b4d77fd028c7e982c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 28 Aug 2021 19:25:35 +0000 Subject: electron_12: 12.0.17 -> 12.0.18 https://github.com/electron/electron/releases/tag/v12.0.18 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 0e5b67bbe18d..1262819fbc2d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "0gb56pxdkn8970z141l3p30lkizqca6kqj1cvgbp685xmb231hzq"; }; - electron_12 = mkElectron "12.0.17" { - x86_64-linux = "00c05d20372a14b84984f1c30e4c6f293480ef0c35c63949468e9d1ab4918db7"; - x86_64-darwin = "3600d64945474c7a7f7ef5ac9cbc7241432bf778096004d13fe05603a43407c2"; - i686-linux = "3ee6c565f74492b658b5fd4c648dbd0b5d556c8a193125e5f7ee840b088823d7"; - armv7l-linux = "fa1cde8a59c1118baf0f98c1a22b9c99ffac51fd40c65a9fef490c938106ad96"; - aarch64-linux = "92c129b50c17f8a7977c2c61eb721f0c8b831201d3fa1bdcc7d93f63df705ee0"; - aarch64-darwin = "58cdcefa89d4d3d8e669290fd8caced636f969e327d6c772444fda2482df3244"; - headers = "0sg8ybnrmx11xm7yc0lj8yy0g57ln48gvqhrr9g725zimzza9v3l"; + electron_12 = mkElectron "12.0.18" { + x86_64-linux = "09a7908b98a1783bd3840fa289f0ce8d2badada698ddc9daff4398a969292ef2"; + x86_64-darwin = "ab5071568614998adc3b12c93966f82b27da2f13a7317433a32252dd83593d08"; + i686-linux = "0fbf1cb8cd3e5581ee80f49453c86673b4e91c7f599fdcb53af040c6d1992cb8"; + armv7l-linux = "da064a1b86f42a5091ee1162fcad55b1a1f8a8168534a86e37dabd056b54ecbd"; + aarch64-linux = "7197e1ae54af3cc20f312b01a200c75f6a6e0a1b38d0ca48492ead178a607edc"; + aarch64-darwin = "aed2fbafb955f879c65099aebef504fd8076a452d25ccd1cd38d4d1b8758770e"; + headers = "1m1ycv1ysr3aram1d3rj7b4w5dy63irq67x3ff355h33n6dhi4cf"; }; electron_13 = mkElectron "13.2.3" { -- cgit 1.4.1 From 680c2e60c9cf5d0bbeb81a31cfec2ca0c77b903a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 27 Aug 2021 16:44:00 +0200 Subject: llvm/update-git.py: Automatically commit the changes --- pkgs/development/compilers/llvm/update-git.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py index 880cad1c72b1..488f415f4394 100755 --- a/pkgs/development/compilers/llvm/update-git.py +++ b/pkgs/development/compilers/llvm/update-git.py @@ -79,8 +79,14 @@ hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit[" print('Updating default.nix...') with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f: for line in f: + if match := re.search(r'^ rev-version = "unstable-(.+)";', line): + old_date = match.group(1) result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) result = re.sub(r'^ rev-version = ".+";', f' rev-version = "{version}";', result) result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result) print(result, end='') +# Commit the result: +commit_message = f"llvmPackages_git: {old_date} -> {date}" +subprocess.run(['git', 'add', DEFAULT_NIX], check=True) +subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) -- cgit 1.4.1 From 00e380f1be5f393b7ea8ec9848d89284dd5254ce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 27 Aug 2021 16:56:21 +0200 Subject: llvmPackages/update.sh: Support LLVM 13+ --- pkgs/development/compilers/llvm/update.sh | 33 +++++++++++++++++++------------ 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/llvm/update.sh b/pkgs/development/compilers/llvm/update.sh index 8f28d34073cd..603c603f275b 100755 --- a/pkgs/development/compilers/llvm/update.sh +++ b/pkgs/development/compilers/llvm/update.sh @@ -19,19 +19,26 @@ sed -Ei \ "$FILE" readonly ATTRSET="llvmPackages_$VERSION_MAJOR" -readonly SOURCES=( - "clang-unwrapped.src" - "compiler-rt.src" - "clang-unwrapped.clang-tools-extra_src" - "libcxx.src" - "libcxxabi.src" - "libunwind.src" - "lld.src" - "lldb.src" - "llvm.src" - "llvm.polly_src" - "openmp.src" -) + +if [ "$VERSION_MAJOR" -ge "13" ]; then + readonly SOURCES=( + "llvm.src" + ) +else + readonly SOURCES=( + "clang-unwrapped.src" + "compiler-rt.src" + "clang-unwrapped.clang-tools-extra_src" + "libcxx.src" + "libcxxabi.src" + "libunwind.src" + "lld.src" + "lldb.src" + "llvm.src" + "llvm.polly_src" + "openmp.src" + ) +fi for SOURCE in "${SOURCES[@]}"; do echo "Updating the hash of $SOURCE:" -- cgit 1.4.1 From 22a588bca25e6dd6f9edf41041ac22509f7c696b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Aug 2021 03:52:51 +0000 Subject: python38Packages.portalocker: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/portalocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 11016043ce11..abe7ce698208 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "2.3.1"; + version = "2.3.2"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "5ff2e494eccd3ff1cbaba8e4defd45bc7edb8eea3908c74f6de5d40641a1ed92"; + sha256 = "75cfe02f702737f1726d83e04eedfa0bda2cc5b974b1ceafb8d6b42377efbd5f"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 1025f271896570f8110368dfddb64fc26b7cbfb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Aug 2021 08:38:08 +0000 Subject: python38Packages.vyper: 0.2.15 -> 0.2.16 --- pkgs/development/compilers/vyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 6d1f7a374dae..431afe5ec205 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -14,11 +14,11 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.2.15"; + version = "0.2.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cNnKHVKwIx0miC2VhGYBzcSckTnyWYmjNzW0bEzP4bU="; + sha256 = "6cf347440716964012d46686faefc9c689f01872f19736287a63aa8652ac3ddd"; }; nativeBuildInputs = [ pytest-runner ]; -- cgit 1.4.1 From c33c7c3d5fa99fb13d39fd9af265b38a161abaf1 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 29 Aug 2021 19:31:30 -0400 Subject: clang_11: Fix RISC-V builds for compiler-rt. (#135718) Closes: #135628 --- pkgs/development/compilers/llvm/11/compiler-rt/default.nix | 3 +++ pkgs/development/compilers/llvm/11/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index 89b47df405fe..e5b79692ae24 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -112,5 +112,8 @@ stdenv.mkDerivation { # "All of the code in the compiler-rt project is dual licensed under the MIT # license and the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; + # compiler-rt requires a Clang stdenv on 32-bit RISC-V: + # https://reviews.llvm.org/D43106#1019077 + broken = stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.is32bit && !stdenv.cc.isClang; }; } diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 661e60e24b18..9834ce30cdd2 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -227,7 +227,7 @@ let compiler-rt-libc = callPackage ./compiler-rt { inherit llvm_meta; - stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.is32bit) then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; }; @@ -240,7 +240,7 @@ let }; # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.libc == "newlib") then libraries.compiler-rt-libc else libraries.compiler-rt-no-libc; -- cgit 1.4.1 From 2c4c91c248e83f17dd68d5a1a2bdece188305b84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Aug 2021 04:07:26 +0000 Subject: python38Packages.gensim: 4.0.1 -> 4.1.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 548dd1214fa7..8972b356805a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.0.1"; + version = "4.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b4d0b9562796968684028e06635e0f7aff39ffb33719057fd1667754ea09a6e4"; + sha256 = "0b09983048a97c7915ab50500bc53eeec438d26366041598709ec156db3eef1f"; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; -- cgit 1.4.1 From 39067594f5d668caa701fc3e014a8b4bf73a9ac0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 26 Aug 2021 12:06:13 +0200 Subject: ocaml-ng.ocamlPackages_4_13.ocaml: 4.13.0-α2 → 4.13.0-β1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.13.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/ocaml/4.13.nix b/pkgs/development/compilers/ocaml/4.13.nix index 008d2cd6d075..723b597b88dc 100644 --- a/pkgs/development/compilers/ocaml/4.13.nix +++ b/pkgs/development/compilers/ocaml/4.13.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "13"; - patch_version = "0-alpha2"; + patch_version = "0-beta1"; src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz"; - sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~beta1.tar.xz"; + sha256 = "0dbz69p1kqabjvzaasy2malfdfn4b93s504x2xs0dl5l3fa3p6c3"; }; } -- cgit 1.4.1 From 78d20f22007a9e615c8bf1a7bf12afea518e1d39 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 27 Aug 2021 12:16:30 +0000 Subject: pkgsMusl.libiscsi: fix build --- pkgs/development/libraries/libiscsi/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index adc721bc6d07..6dd23d219d95 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -13,8 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + # This can be removed after >=1.20.0, or if the build suceeds with + # pie enabled (default on Musl). + hardeningDisable = [ "pie" ]; + # This problem is gone on libiscsi master. - NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null; + NIX_CFLAGS_COMPILE = + lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"; meta = with lib; { description = "iscsi client library and utilities"; -- cgit 1.4.1 From a850ed0be80728fba3bc2c482f7714ba2df5a906 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Mon, 30 Aug 2021 09:12:52 +0100 Subject: portaudio: remove Werror (#136060) --- pkgs/development/libraries/portaudio/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 4666850c5849..9a43d5a921e5 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays"; + postConfigure = '' + substituteInPlace Makefile --replace "-Werror" "" + ''; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; -- cgit 1.4.1 From 87e5bc2cc2222a4e63ae2699be805725103db904 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Aug 2021 07:39:32 +0200 Subject: ocamlPackages.ocsigen-toolkit: 2.7.0 → 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index eccdcf80d7cc..0e430e2ba291 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,27 +5,27 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.7.0"; + version = "2.12.2"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; buildInputs = [ ocaml findlib opaline ]; - installPhase = - '' + installPhase = '' + runHook preInstall + mkdir -p $OCAMLFIND_DESTDIR export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH make install opaline -prefix $out + runHook postInstall ''; src = fetchFromGitHub { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk"; + sha256 = "1fqrh7wrzs76qj3nvmxqy76pzqvsja2dwzqxyl8rkh5jg676vmqy"; }; - createFindlibDestdir = true; - meta = { homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; -- cgit 1.4.1 From ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:07:44 +0000 Subject: lttng-ust: 2.10.5 -> 2.13.0; clarify license Also enable parallel building; tested at -j48. --- pkgs/development/tools/misc/lttng-ust/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 94d2e4a33f29..244d6442c15f 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, liburcu, python3 }: +{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }: # NOTE: # ./configure ... @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { pname = "lttng-ust"; - version = "2.10.5"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; - sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; + sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l"; }; - buildInputs = [ python3 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ numactl python3 ]; preConfigure = '' patchShebangs . @@ -28,10 +29,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ liburcu ]; + enableParallelBuilding = true; + meta = with lib; { description = "LTTng Userspace Tracer libraries"; homepage = "https://lttng.org/"; - license = licenses.lgpl21Plus; + license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; -- cgit 1.4.1 From 0f5094de5d1fc6c0438916b8cfa7318e7c64454c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:08:48 +0000 Subject: lttng-tools: 2.11.0 -> 2.13.0; clarify license Also enable parallel building; tested at -j48. --- pkgs/development/tools/misc/lttng-tools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 223e10d04ab5..71485a2da3da 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.11.0"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; + sha256 = "1ri93h45q5z6l3qmg4dakm9aj0ghfmf38i63q51yjh58lzwr9j4d"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; + enableParallelBuilding = true; + meta = with lib; { description = "Tracing tools (kernel + user space) for Linux"; homepage = "https://lttng.org/"; - license = licenses.lgpl21; + license = with licenses; [ lgpl21Only gpl2Only ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; -- cgit 1.4.1 From bf6c90bd91545013f2fc7128de83fb22a98305b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 Aug 2021 16:04:47 +0200 Subject: ocamlPackages.ppx_optcomp: 0.14.1 → 0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index e348c5d9325a..5717dd07b423 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -545,8 +545,8 @@ with self; ppx_optcomp = janePackage { pname = "ppx_optcomp"; - version = "0.14.1"; - hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4"; + version = "0.14.3"; + hash = "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw"; minimumOCamlVersion = "4.04.2"; meta.description = "Optional compilation for OCaml"; propagatedBuildInputs = [ ppxlib ]; -- cgit 1.4.1