From 76d733bf2c8420ec23efd3d62123ad3b40d7e921 Mon Sep 17 00:00:00 2001
From: fricklerhandwerk <fricklerhandwerk@users.noreply.github.com>
Date: Sat, 23 Jan 2021 17:53:29 +0100
Subject: [PATCH 01/29] gnunet-gtk: fix build
gnunet: 0.14.0 -> 0.14.1
gnunet-gtk: 0.13.1 -> 0.14.0 (there is no 0.14.1 release)
build with correct `gnunet` location. otherwise `gnunet-setup` will not pick up plugins. See:
https://git.gnunet.org/gnunet-gtk.git/tree/README?id=5034ca084258d6653b2986b00167c736a9cd93ed#n19
add libsodium to pass configure check for GNUnet util library.
---
pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++--
pkgs/applications/networking/p2p/gnunet/gtk.nix | 10 ++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index af290fc1cc5..61ff1642978 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
- sha256 = "sha256-2u9gO9Mu0dM1yixcaqOnZcDfGcp69dc5CH5tkl6vRas=";
+ sha256 = "1hhqv994akymf4s593mc1wpsjy6hccd0zbdim3qmc1y3f32hacja";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 2532671bc25..3711d5a3c1e 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -5,6 +5,7 @@
, gtk3
, libextractor
, libgcrypt
+, libsodium
, libxml2
, pkg-config
, wrapGAppsHook
@@ -12,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnunet-gtk";
- version = "0.13.1";
+ version = "0.14.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
- sha256 = "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j";
+ sha256 = "18rc7mb45y17d5nrlpf2p4ixp7ir67gcgjf4hlj4r95ic5zi54wa";
};
nativeBuildInputs= [
@@ -31,15 +32,16 @@ stdenv.mkDerivation rec {
gtk3
libextractor
libgcrypt
+ libsodium
libxml2
];
+ configureFlags = [ "--with-gnunet=${gnunet}" ];
+
patchPhase = "patchShebangs pixmaps/icon-theme-installer";
meta = gnunet.meta // {
description = "GNUnet GTK User Interface";
homepage = "https://git.gnunet.org/gnunet-gtk.git";
- # configure: error: compiling gnunet-gtk requires GNUnet core headers
- broken = true;
};
}
From fdc157bc3fa68e0bef222e5801f5cb611890695b Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Mon, 19 Apr 2021 00:57:12 +0100
Subject: [PATCH 02/29] seren: init at 0.0.21
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
.../instant-messengers/seren/default.nix | 37 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 39 insertions(+)
create mode 100644 pkgs/applications/networking/instant-messengers/seren/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/applications/networking/instant-messengers/seren/default.nix
new file mode 100644
index 00000000000..63cefbd2ffd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/seren/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchurl
+, alsaLib
+, libopus
+, libogg
+, gmp
+, ncurses
+}:
+
+stdenv.mkDerivation rec {
+ pname = "seren";
+ version = "0.0.21";
+
+ buildInputs = [ alsaLib libopus libogg gmp ncurses ];
+
+ src = fetchurl {
+ url = "http://holdenc.altervista.org/seren/downloads/${pname}-${version}.tar.gz";
+ sha256 = "sha256-adI365McrJkvTexvnWjMzpHcJkLY3S/uWfE8u4yuqho=";
+ };
+
+ meta = with lib; {
+ description = "A simple ncurses VoIP program based on the Opus codec";
+ longDescription = ''
+ Seren is a simple VoIP program based on the Opus codec
+ that allows you to create a voice conference from the terminal, with up to 10
+ participants, without having to register accounts, exchange emails, or add
+ people to contact lists. All you need to join an existing conference is the
+ host name or IP address of one of the participants.
+ '';
+ homepage = "http://holdenc.altervista.org/seren/";
+ changelog = "http://holdenc.altervista.org/seren/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ matthewcroughan nixinator ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdf28b9782c..0a4e3d99940 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11420,6 +11420,8 @@ in
gputils = null;
};
+ seren = callPackage ../applications/networking/instant-messengers/seren { };
+
serialdv = callPackage ../development/libraries/serialdv { };
serpent = callPackage ../development/compilers/serpent { };
From 29d94a7abefea244ffcca2df219c4067d17965cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Apr 2021 07:23:39 +0000
Subject: [PATCH 03/29] charliecloud: 0.22 -> 0.23
---
pkgs/applications/virtualization/charliecloud/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix
index 3e9029cce0a..23677dddd7f 100644
--- a/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/pkgs/applications/virtualization/charliecloud/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
- version = "0.22";
+ version = "0.23";
pname = "charliecloud";
src = fetchFromGitHub {
owner = "hpc";
repo = "charliecloud";
rev = "v${version}";
- sha256 = "sha256-+9u7WRKAJ9F70+I68xNRck5Q22XzgLKTCnjGbIcsyW8=";
+ sha256 = "sha256-JQNidKqJROFVm+O1exTDon1fwU91zONqgKJIpe9gspY=";
};
nativeBuildInputs = [ autoreconfHook makeWrapper ];
From c357fbeb5176c233aa0b36426800ab632eddf217 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sat, 24 Apr 2021 17:01:05 +0200
Subject: [PATCH 04/29] doc: add instructions for creating package tests
---
.../coding-conventions.chapter.md | 70 +++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md
index eccf4f7436e..8e35e45f61d 100644
--- a/doc/contributing/coding-conventions.chapter.md
+++ b/doc/contributing/coding-conventions.chapter.md
@@ -512,3 +512,73 @@ If you do need to do create this sort of patch file, one way to do so is with gi
```ShellSession
$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch
```
+
+## Package tests {#sec-package-tests}
+
+Tests are important to ensure quality and make reviews and automatic updates easy.
+
+Nix package tests are a lightweight alternative to [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). They can be used to create simple integration tests for packages while the module tests are used to test services or programs with a graphical user interface on a NixOS VM. Unittests that are included in the source code of a package should be executed in the `checkPhase`.
+
+### Writing package tests {#ssec-package-tests-writing}
+
+This is an example using the `phoronix-test-suite` package with the current best practices.
+
+Add the tests in `passthru.tests` to the package definition like this:
+
+```nix
+{ stdenv, lib, fetchurl, callPackage }:
+
+stdenv.mkDerivation {
+ …
+
+ passthru.tests = {
+ simple-execution = callPackage ./tests.nix { };
+ };
+
+ meta = { … };
+}
+```
+
+Create `tests.nix` in the package directory:
+
+```nix
+{ runCommand, phoronix-test-suite }:
+
+let
+ inherit (phoronix-test-suite) pname version;
+in
+
+runCommand "${pname}-tests" { meta.timeout = 3; }
+ ''
+ # automatic initial setup to prevent interactive questions
+ ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null
+ # get version of installed program and compare with package version
+ if [[ `${phoronix-test-suite}/bin/phoronix-test-suite version` != *"${version}"* ]]; then
+ echo "Error: program version does not match package version"
+ exit 1
+ fi
+ # run dummy command
+ ${phoronix-test-suite}/bin/phoronix-test-suite dummy_module.dummy-command >/dev/null
+ # needed for Nix to register the command as successful
+ touch $out
+ ''
+```
+
+### Running package tests {#ssec-package-tests-running}
+
+You can run these tests with:
+
+```ShellSession
+$ cd path/to/nixpkgs
+$ nix-build -A phoronix-test-suite.tests
+```
+
+### Examples of package tests {#ssec-package-tests-examples}
+
+Here are examples of package tests:
+
+- [Jasmin compile test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix)
+- [Lobster compile test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/compilers/lobster/test-can-run-hello-world.nix)
+- [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix)
+- [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix)
+- [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix)
From c8232cbac1bd4c58a4371c8565de4bf90b3c4f76 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 30 Apr 2021 04:20:00 +0000
Subject: [PATCH 05/29] grpc: 1.37.0 -> 1.37.1
https://github.com/grpc/grpc/releases/tag/v1.37.1
---
pkgs/development/libraries/grpc/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 9dd5150f17d..cb2c0e79dd5 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- version = "1.37.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+ version = "1.37.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- sha256 = "0q3hcnq351j0qm0gsbaxbsnz1gd9w3bk4cazkvq4l2lfmmiw7z56";
+ sha256 = "0mjlz2cax5v37g7xnrbf5px88bm7xzl4a5pds112yk096d7wmxm5";
fetchSubmodules = true;
};
patches = [
From 731d66855241dc8c56d1c6663e4110da5ec774b6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 30 Apr 2021 04:20:00 +0000
Subject: [PATCH 06/29] python38Packages.grpcio-tools: 1.37.0 -> 1.37.1
---
pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 2f4ee5de8d2..0ad0b960ee4 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.37.0";
+ version = "1.37.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3ec510c1b6bfc32effc639acf9a055e72dab7a7b6757bf72f2132790d6a7cf1c";
+ sha256 = "d775fb07cc6561174d6c86d11727a156c4ade969f7bf5edf623ffe2a428bee4e";
};
outputs = [ "out" "dev" ];
From 7c9c3c88e3ccd40e3c4875e0c99b774b8c1cf3da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 30 Apr 2021 11:51:51 +0200
Subject: [PATCH 07/29] postfix: 3.5.10 -> 3.6.0
http://www.postfix.org/announcements/postfix-3.6.0.html
---
pkgs/servers/mail/postfix/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 579ce383319..ad704ca792b 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
pname = "postfix";
- version = "3.5.10";
+ version = "3.6.0";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
- sha256 = "sha256-W7TX1y11ErWPOjFCbcvTlP01TgpD3iHaiUZrBXoCKPg=";
+ sha256 = "sha256-d0YolNdnHWPL5fwnM/lBCIUVptZxCLnxgIt9rjfoPC4=";
};
nativeBuildInputs = [ makeWrapper m4 ];
From 02c3bd218740e38f1b0f2a2573464903e3873757 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Apr 2021 19:47:38 +0200
Subject: [PATCH 08/29] nixos/gitea: set umask for secret creation
This ensures that newly created secrets will have the permissions
`0640`. With this change it's ensured that no sensitive information will
be word-readable at any time.
Related to #121293.
Strictly speaking this is a breaking change since each new directory
(including data-files) aren't world-readable anymore, but actually these
shouldn't be, unless there's a good reason for it.
---
nixos/modules/services/misc/gitea.nix | 72 ++++++++++++++-------------
1 file changed, 37 insertions(+), 35 deletions(-)
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 434e2d2429b..95369ff7ee4 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -477,47 +477,49 @@ in
in ''
# copy custom configuration and generate a random secret key if needed
${optionalString (cfg.useWizard == false) ''
- cp -f ${configFile} ${runConfig}
+ function gitea_setup {
+ cp -f ${configFile} ${runConfig}
- if [ ! -e ${secretKey} ]; then
- ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}
- fi
+ if [ ! -e ${secretKey} ]; then
+ ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}
+ fi
- # Migrate LFS_JWT_SECRET filename
- if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then
- mv ${oldLfsJwtSecret} ${lfsJwtSecret}
- fi
+ # Migrate LFS_JWT_SECRET filename
+ if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then
+ mv ${oldLfsJwtSecret} ${lfsJwtSecret}
+ fi
- if [ ! -e ${oauth2JwtSecret} ]; then
- ${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret}
- fi
+ if [ ! -e ${oauth2JwtSecret} ]; then
+ ${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret}
+ fi
- if [ ! -e ${lfsJwtSecret} ]; then
- ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret}
- fi
+ if [ ! -e ${lfsJwtSecret} ]; then
+ ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret}
+ fi
- if [ ! -e ${internalToken} ]; then
- ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken}
- fi
+ if [ ! -e ${internalToken} ]; then
+ ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken}
+ fi
- SECRETKEY="$(head -n1 ${secretKey})"
- DBPASS="$(head -n1 ${cfg.database.passwordFile})"
- OAUTH2JWTSECRET="$(head -n1 ${oauth2JwtSecret})"
- LFSJWTSECRET="$(head -n1 ${lfsJwtSecret})"
- INTERNALTOKEN="$(head -n1 ${internalToken})"
- ${if (cfg.mailerPasswordFile == null) then ''
- MAILERPASSWORD="#mailerpass#"
- '' else ''
- MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)"
- ''}
- sed -e "s,#secretkey#,$SECRETKEY,g" \
- -e "s,#dbpass#,$DBPASS,g" \
- -e "s,#oauth2jwtsecret#,$OAUTH2JWTSECRET,g" \
- -e "s,#lfsjwtsecret#,$LFSJWTSECRET,g" \
- -e "s,#internaltoken#,$INTERNALTOKEN,g" \
- -e "s,#mailerpass#,$MAILERPASSWORD,g" \
- -i ${runConfig}
- chmod 640 ${runConfig} ${secretKey} ${oauth2JwtSecret} ${lfsJwtSecret} ${internalToken}
+ SECRETKEY="$(head -n1 ${secretKey})"
+ DBPASS="$(head -n1 ${cfg.database.passwordFile})"
+ OAUTH2JWTSECRET="$(head -n1 ${oauth2JwtSecret})"
+ LFSJWTSECRET="$(head -n1 ${lfsJwtSecret})"
+ INTERNALTOKEN="$(head -n1 ${internalToken})"
+ ${if (cfg.mailerPasswordFile == null) then ''
+ MAILERPASSWORD="#mailerpass#"
+ '' else ''
+ MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)"
+ ''}
+ sed -e "s,#secretkey#,$SECRETKEY,g" \
+ -e "s,#dbpass#,$DBPASS,g" \
+ -e "s,#oauth2jwtsecret#,$OAUTH2JWTSECRET,g" \
+ -e "s,#lfsjwtsecret#,$LFSJWTSECRET,g" \
+ -e "s,#internaltoken#,$INTERNALTOKEN,g" \
+ -e "s,#mailerpass#,$MAILERPASSWORD,g" \
+ -i ${runConfig}
+ }
+ (umask 027; gitea_setup)
''}
# update all hooks' binary paths
From ac1ce993bedd4c9c5be73e367dfab9ded7eff76a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Apr 2021 22:06:45 +0200
Subject: [PATCH 09/29] vagrant: 2.2.15 -> 2.2.16
ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.2.16/CHANGELOG.md#2216-april-29-2021
---
pkgs/development/tools/vagrant/default.nix | 4 ++--
pkgs/development/tools/vagrant/gemset.nix | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 1ea172ae137..db807bda0a7 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -5,9 +5,9 @@
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
- version = "2.2.15";
+ version = "2.2.16";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
- sha256 = "sha256-mMnHJtXLfkZ5O0UF89kHsqBnPg9uQ5l8IYoL5TMMyD8=";
+ sha256 = "sha256-qzxguxKy2pFv0HMZKEnytdPyJPlf6/NTghIkfEzeKNY=";
deps = bundlerEnv rec {
name = "${pname}-${version}";
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index 89555490492..27ebf31c32c 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -64,10 +64,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23";
+ sha256 = "19g5nvkycnkzqq4mqn1zjznq9adrlv2jz0dr9w10cbn42hhqpiz7";
type = "gem";
};
- version = "0.79.0";
+ version = "0.81.0";
};
ffi = {
groups = ["default"];
@@ -274,10 +274,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14mhzrhs2j43vj36i1qq4z29nd860shrslfik015f4kf1jiaqcrw";
+ sha256 = "1rmm9ym3qxysrmvgnrad28llnzj6wj9ljir8zaw9myas7m8vhvsq";
type = "gem";
};
- version = "0.2.5";
+ version = "0.2.6";
};
rubyntlm = {
groups = ["default"];
From 3b18aacd1f8b434294bcd74581615f91db0b6ad5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 1 May 2021 14:03:04 +0000
Subject: [PATCH 10/29] facter: 3.14.16 -> 3.14.17
---
pkgs/tools/system/facter/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 906ca618e46..d1d18809a5b 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "facter";
- version = "3.14.16";
+ version = "3.14.17";
src = fetchFromGitHub {
- sha256 = "sha256-VZIeyLJBlh5/r0EHinSiPiQyCNUBFBYjDZ6nTVnZBbE=";
+ sha256 = "sha256-RvsUt1DyN8Xr+Xtz84mbKlDwxLewgK6qklYVdQHu6q0=";
rev = version;
repo = pname;
owner = "puppetlabs";
From 64042dc2c6c075fa4b537729afa7ed84e1e6e35e Mon Sep 17 00:00:00 2001
From: Riey <creeper844@gmail.com>
Date: Sun, 2 May 2021 01:58:06 +0900
Subject: [PATCH 11/29] kime: 2.5.2 -> 2.5.3
---
pkgs/tools/inputmethods/kime/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/tools/inputmethods/kime/default.nix
index 35ed99b5a42..33df3f53e67 100644
--- a/pkgs/tools/inputmethods/kime/default.nix
+++ b/pkgs/tools/inputmethods/kime/default.nix
@@ -16,18 +16,18 @@ let
in
stdenv.mkDerivation rec {
pname = "kime";
- version = "2.5.2";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = "Riey";
repo = pname;
rev = "v${version}";
- sha256 = "10zd4yrqxzxf4nj3b5bsblcmlbqssxqq9pac0misa1g61jdbszj8";
+ sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
- sha256 = "1bimi7020m7v287bh7via7zm9m7y13d13kqpd772xmpdbwrj8nrl";
+ sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk";
};
# Replace autostart path
From b63002b223e3bbb7be97563e857539ea1d562956 Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Sun, 2 May 2021 01:42:47 +0800
Subject: [PATCH 12/29] papirus-icon-theme: 20210401 -> 20210501
---
pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index ff18baf75f4..bd9ab1bb77b 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
- version = "20210401";
+ version = "20210501";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
- sha256 = "sha256-t0zoeIpj+0QVH1wmbEIJdqzEDOGzpclePv+bcZgtnwo=";
+ sha256 = "sha256-3KH0oLeCev7WuoIOh4KBTiHTn2/aQlVrW5dpO+LSRT4=";
};
nativeBuildInputs = [
From c02b4629530fbf61398720fdadd6f746df9bd36d Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sat, 1 May 2021 18:09:53 +0000
Subject: [PATCH 13/29] charliecloud: remove unused python3Packages argument
---
pkgs/applications/virtualization/charliecloud/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix
index 23677dddd7f..f6d7ce3d619 100644
--- a/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/pkgs/applications/virtualization/charliecloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }:
+{ lib, stdenv, fetchFromGitHub, python3, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }:
stdenv.mkDerivation rec {
From 039101ad945b1b3b90a3e6a592f6200770518a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 1 May 2021 11:40:48 +0200
Subject: [PATCH 14/29] libtorch-bin: 1.8.0 -> 1.8.1
Changelog:
https://github.com/pytorch/pytorch/releases/tag/v1.8.1
---
pkgs/development/libraries/science/math/libtorch/bin.nix | 2 +-
.../libraries/science/math/libtorch/binary-hashes.nix | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index 481836a4e11..87b5835aa9e 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -18,7 +18,7 @@ let
# this derivation. However, we should ensure on version bumps
# that the CUDA toolkit for `passthru.tests` is still
# up-to-date.
- version = "1.8.0";
+ version = "1.8.1";
device = if cudaSupport then "cuda" else "cpu";
srcs = import ./binary-hashes.nix version;
unavailable = throw "libtorch is not available for this platform";
diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index 208e0b7adab..ec4522a7559 100644
--- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -1,14 +1,14 @@
version: {
x86_64-darwin-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip";
- hash = "sha256-V1lbztMB09wyWjdiJrwVwJ00DT8Kihy/TC2cKmdBLIE=";
+ hash = "sha256-FYgnd5zlycjCYnP5bZcjpMdGYXrRERwhFFBYo/SJgzs=";
};
x86_64-linux-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip";
- hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc=";
+ hash = "sha256-xneCcVrY25Whgbs/kPbwdS1Lc0e6RxsDRpA5lHTZigc=";
};
x86_64-linux-cuda = {
url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip";
- hash = "sha256-uQ7ptOuzowJ0JSPIvJHyNotBfpsqAnxpMDLq7Vl6L00=";
+ hash = "sha256-VW+TW00nD49GBztCyxHE4dTyy81aN/kfYE3hKQOIm50=";
};
}
From 303977634c10e495cdb4855ffe00fc02ac9801c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 1 May 2021 11:41:47 +0200
Subject: [PATCH 15/29] libtorch-bin: fix false CUDA dependency in passthru
test
The passthru test used the CUDA toolkit for the CUDA stub
unconditionally, also requiring the cudatoolkit derivation when
cudaSupport = false.
---
.../libraries/science/math/libtorch/test/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix
index 60f9b5ad884..eaea649d434 100644
--- a/pkgs/development/libraries/science/math/libtorch/test/default.nix
+++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix
@@ -42,8 +42,9 @@ in stdenv.mkDerivation {
touch $out
'';
- checkPhase = ''
+ checkPhase = lib.optionalString cudaSupport ''
LD_LIBRARY_PATH=${cudaStub}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \
- ./test
+ '' + ''
+ ./test
'';
}
From 4226837368068600e6afd11b5cbc6d586c7b5fa9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 1 May 2021 12:16:29 +0200
Subject: [PATCH 16/29] python3Packages.python-language-server: disable when
python>=3.9
The package is not supported on anything newer than 3.8 yet.
---
.../python-modules/python-language-server/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index b776a784c8e..daab437c979 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27
, backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8
, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
@@ -22,6 +22,8 @@ in
buildPythonPackage rec {
pname = "python-language-server";
version = "0.36.2";
+ # https://github.com/palantir/python-language-server/issues/896#issuecomment-752790868
+ disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "palantir";
From e6cc77ea8d16f47282eb5c5f14b8bb10b5c48640 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 1 May 2021 14:49:50 -0400
Subject: [PATCH 17/29] starship: 0.52.1 -> 0.53.0
---
pkgs/tools/misc/starship/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 1e3eae78701..40913193163 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.52.1";
+ version = "0.53.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-BX+NUF7mgZyrloj3h9YcG2r6ZZWO20hXQYbBvaK34JQ=";
+ sha256 = "sha256-g4w14fktJB8TItgm3nSgG+lpdXdNTpX52J+FsIbU+YY=";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
done
'';
- cargoSha256 = "sha256-8xqbPkdIVfAkeG1WZFq56N0rcF+uh2FeMKzz4FgMFYs=";
+ cargoSha256 = "sha256-9wpr1gs9EehmFzCW2kKDx+LKoDUC27fmhjpcH/fIcyY=";
preCheck = ''
HOME=$TMPDIR
From 38499a3b086fa47f87410a754e4d8efc7a0fcae6 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Sat, 1 May 2021 21:58:31 +0200
Subject: [PATCH 18/29] j: 901f -> 902b
---
pkgs/development/interpreters/j/default.nix | 6 +++---
pkgs/top-level/all-packages.nix | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 8875a9cf55e..e41d71ef960 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "j";
- version = "901";
- jtype = "release-f";
+ version = "902";
+ jtype = "release-b";
src = fetchFromGitHub {
owner = "jsoftware";
repo = "jsource";
rev = "j${version}-${jtype}";
- sha256 = "1776021m0j1aanzwg60by83n53pw7i6afd5wplfzczwk8bywax4p";
+ sha256 = "0j67vgikqflwjqacsdicasvyv1k54s2c8vjgwmf0ix7l41p4xqz0";
name = "jsource";
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd038c72939..675b553cc59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11808,7 +11808,9 @@ in
io = callPackage ../development/interpreters/io { };
- j = callPackage ../development/interpreters/j {};
+ j = callPackage ../development/interpreters/j {
+ stdenv = clangStdenv;
+ };
janet = callPackage ../development/interpreters/janet {};
From 38033cd97147467834a3555e4b9cda5a59e489f0 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Sat, 1 May 2021 22:06:01 +0200
Subject: [PATCH 19/29] neofetch: set meta.mainProgram
---
pkgs/tools/misc/neofetch/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index d9287003084..68cebca4bc3 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -34,5 +34,6 @@ stdenvNoCC.mkDerivation rec {
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ alibabzo konimex ];
+ mainProgram = "neofetch";
};
}
From 510fc9cd8f97f6c7fc04f0346089a87b1000f71f Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sat, 1 May 2021 18:52:56 +0000
Subject: [PATCH 20/29] jetbrains: update
jetbrains.clion: 2021.1 -> 2021.1.1
jetbrains.datagrip: 2021.1 -> 2021.1.1
jetbrains.goland: 2021.1 -> 2021.1.1
jetbrains.idea-community: 2021.1 -> 2021.1.1
jetbrains.idea-ultimate: 2021.1 -> 2021.1.1
jetbrains.phpstorm: 2021.1 -> 2021.1.2
jetbrains.pycharm-community: 2021.1 -> 2021.1.1
jetbrains.pycharm-professional: 2021.1 -> 2021.1.1
jetbrains.rider: 2021.1.1 -> 2021.1.2
jetbrains.ruby-mine: 2021.1 -> 2021.1.1
jetbrains.webstorm: 2021.1 -> 2021.1.1
---
.../editors/jetbrains/default.nix | 44 +++++++++----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 16d7bf7dd16..32159e3ebd2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -242,12 +242,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "1qq2k14pf2qy93y1xchlv08vvx99zcml8bdcx3h6jnjz6d7gz0px"; /* updated by script */
+ sha256 = "0xzlkf3gq6fcb0q9mcj8k39880l8h21pb1lz0xl2dqj8cfwpws9h"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -255,12 +255,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "11am11lkrhgfianr1apkkl4mn8gcsf6p1vz47y7lz4rfm05ac4gj"; /* updated by script */
+ sha256 = "0smg0qbk3mnm2543w0nlvnyvbwmprf0p3z2spwrmcmfagv50crrx"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@@ -268,12 +268,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "Up and Coming Go IDE";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "1hxid7k5b26hiwwdxbvhi1fzhlrvm1xsd5gb0vj0g5zw658y2lzz"; /* updated by script */
+ sha256 = "02fyrq4px9w34amincgjgm6maxpxn445j5h4nfbskx7z428ynx25"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -281,12 +281,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "1d7m39rzdgh2fyx50rpifqfsdmvfpi04hjp52pl76m35gyb5hsvs"; /* updated by script */
+ sha256 = "1say19p7kgx4b2ccs9bv61phllzhl8gmrd1fp1a5cnagya7vl1c5"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@@ -294,12 +294,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
- sha256 = "062kaph42xs5hc01sbmry4cm7nkyjks43qr5m7pbj5a2bgd7zzgx"; /* updated by script */
+ sha256 = "19zi4njz79z8gi458kz1m0sia79y3rhbayix4rmh93mwfc0npkii"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@@ -320,12 +320,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "052m7mqa1s548my0gda9y2mysi2ijq27c9b3bskrwqsf1pm5ry63"; /* updated by script */
+ sha256 = "02s75fqd9hfh302zha4jw6qynpgm9nkrlq7s78nk3fc3d3hw8v5y"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -333,12 +333,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "PyCharm Community Edition";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1iiglh7s2zm37kj6hzlzxb1jnzh2p0j1f2zzhg3nqyrrakfbyq3h"; /* updated by script */
+ sha256 = "04bs9sz872b0h1zzax23irvj6q5wxnzp6fl4f177j94kh4116cqh"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -346,12 +346,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "PyCharm Professional Edition";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1n3b4mdygzal7w88gwka5wh5jp09bh2zmm4n5rz9s7hr2srz71mz"; /* updated by script */
+ sha256 = "0wc9j7nilakmm7scf7a71zb3k9vixgih05ni3n3pp4iznvwb3nxg"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -359,12 +359,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2021.1.1"; /* updated by script */
+ version = "2021.1.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "00kdbsjw9hmq7x94pjscslv0b412g8l0jbvyi7jiyay8xc6wiaaj"; /* updated by script */
+ sha256 = "1a28pi18j0cb2wxhw1vnfg9gqsgf2kyfg0hl4xgqp50gzv7i3aam"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -372,12 +372,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "12mkb51x1w5wbx436pfnfzcad10qd53y43n0p4l2zg9yx985gm7v"; /* updated by script */
+ sha256 = "05sfjf5523idsl7byc7400r4xqv1d65gpmkh5x0lbgf1k3bx2wlm"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@@ -385,12 +385,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2021.1"; /* updated by script */
+ version = "2021.1.1"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "15i521qj2b0y1viqr0xx815ckpq359j6nars4xxq8xvy7cg729yc"; /* updated by script */
+ sha256 = "1hici40qsxj2fw29g68i6hr1vhr0h7xrlhkialy74ah53wi7myz1"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
From 4df002c43283952f4ffc434153b3d5efa3024fa8 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 17 Apr 2021 16:27:25 +0200
Subject: [PATCH 21/29] grub2_efi: fix cross-compilation
---
pkgs/tools/misc/grub/2.0x.nix | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index ad7a74e8137..3bae26c3fe7 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config
-, pkgsBuildBuild
+, buildPackages
, nixosTests
, fuse # only needed for grub-mount
, runtimeShell
@@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in
'';
- nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext freetype ];
buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ]
++ optional doCheck qemu
++ optional zfsSupport zfs;
@@ -105,9 +106,18 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-grub-mount" # dep of os-prober
- "BUILD_CC=${pkgsBuildBuild.stdenv.cc}/bin/cc"
- ]
- ++ optional zfsSupport "--enable-libzfs"
+ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ # grub doesn't do cross-compilation as usual and tries to use unprefixed
+ # tools to target the host. Provide toolchain information explicitly for
+ # cross builds.
+ #
+ # Ref: # https://github.com/buildroot/buildroot/blob/master/boot/grub2/grub2.mk#L108
+ "TARGET_CC=${stdenv.cc.targetPrefix}cc"
+ "TARGET_NM=${stdenv.cc.targetPrefix}nm"
+ "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+ "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib"
+ "TARGET_STRIP=${stdenv.cc.targetPrefix}strip"
+ ] ++ optional zfsSupport "--enable-libzfs"
++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ]
++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"];
From 7326c917e4152df8e7c95e3045c663ede73a87b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 1 May 2021 22:46:06 +0000
Subject: [PATCH 22/29] lxcfs: 4.0.7 -> 4.0.8
---
pkgs/os-specific/linux/lxcfs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index bcc86b72de0..440e81266c8 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -5,13 +5,13 @@
with lib;
stdenv.mkDerivation rec {
pname = "lxcfs";
- version = "4.0.7";
+ version = "4.0.8";
src = fetchFromGitHub {
owner = "lxc";
repo = "lxcfs";
rev = "lxcfs-${version}";
- sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI=";
+ sha256 = "sha256-8Tack2gM3AU3coGXs5hEbAaBCo5ss1sGUFFEjZDn5Lg=";
};
nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ];
From 6866364f837cee54ee9dc86218dea80b752186b4 Mon Sep 17 00:00:00 2001
From: Simonas Kazlauskas <git@kazlauskas.me>
Date: Sun, 2 May 2021 01:59:06 +0300
Subject: [PATCH 23/29] firefox-bin: rpath pipewire
Fixes screensharing on Wayland via pipewire/xdp infrastructure.
---
pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 93b89e9031e..ffba1096d1d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -33,6 +33,7 @@
, nspr
, nss
, pango
+, pipewire
, pciutils
, libheimdal
, libpulseaudio
@@ -126,6 +127,7 @@ stdenv.mkDerivation {
nspr
nss
pango
+ pipewire
pciutils
libheimdal
libpulseaudio
From 370300758a9d8ee92d5d90659371f75f9448c83d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Sep 2019 13:02:14 -0700
Subject: [PATCH 24/29] netcdfcxx4: 4.3.0 -> 4.3.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/netcdf-cxx4/versions
---
pkgs/development/libraries/netcdf-cxx4/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index b594a672140..d37979a07fc 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, netcdf, hdf5, curl }:
stdenv.mkDerivation rec {
pname = "netcdf-cxx4";
- version = "4.3.0";
+ version = "4.3.1";
src = fetchurl {
url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";
- sha256 = "13zi8cbk18gggx1c12a580wdsbl714lw68a1wg7c86x0sybirni5";
+ sha256 = "1p4fjxxbrc0ra8kbs13d33p5zaqa4a6j1wavamr2f73cq0p3vzp3";
};
buildInputs = [ netcdf hdf5 curl ];
From 56858c2b92bcd038aa5718fa6e0ad72e7c8c9bb9 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Fri, 18 Oct 2019 18:21:45 +0200
Subject: [PATCH 25/29] netcdfcxx4: use fetchzip
Github archives are not stable over time so
fetchzip should be used instead of fetchurl
---
pkgs/development/libraries/netcdf-cxx4/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index d37979a07fc..d0a69b202fe 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, fetchurl, netcdf, hdf5, curl }:
+{ lib, stdenv, fetchzip, netcdf, hdf5, curl }:
stdenv.mkDerivation rec {
pname = "netcdf-cxx4";
version = "4.3.1";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";
- sha256 = "1p4fjxxbrc0ra8kbs13d33p5zaqa4a6j1wavamr2f73cq0p3vzp3";
+ sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr";
};
buildInputs = [ netcdf hdf5 curl ];
From dfe5071b8233700daf163ade1792f8e62b45902b Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Fri, 18 Oct 2019 19:33:16 +0200
Subject: [PATCH 26/29] netcdfcxx4: fix linking on Darwin
---
pkgs/development/libraries/netcdf-cxx4/default.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index d0a69b202fe..4c9d294b784 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr";
};
+ configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+ "--without-nc-config"
+ ]; # prevent linking failure on Darwin
+
buildInputs = [ netcdf hdf5 curl ];
doCheck = true;
From 147a5cda7299be628f34a336c5f2ade1c8b725b2 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 2 May 2021 00:46:35 +0100
Subject: [PATCH 27/29] netcdfcxx4: switch to CMake
This resolves the Darwin linking issues Once and For All.
Also, this makes the build parallel, which is nice too.
---
pkgs/development/libraries/netcdf-cxx4/default.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index 4c9d294b784..494f4bf7157 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, netcdf, hdf5, curl }:
+{ lib, stdenv, fetchzip, netcdf, hdf5, curl, cmake, ninja }:
stdenv.mkDerivation rec {
pname = "netcdf-cxx4";
version = "4.3.1";
@@ -8,12 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr";
};
- configureFlags = stdenv.lib.optionals stdenv.isDarwin [
- "--without-nc-config"
- ]; # prevent linking failure on Darwin
+ preConfigure = ''
+ cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)"
+ '';
+ nativeBuildInputs = [ cmake ninja ];
buildInputs = [ netcdf hdf5 curl ];
+
doCheck = true;
+ enableParallelChecking = false;
meta = {
description = "C++ API to manipulate netcdf files";
From 99f8bc3e0303bd58ed823937ad5e76791b5cb2f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 5 Sep 2020 19:05:36 +0000
Subject: [PATCH 28/29] sumorobot-manager: 0.9.0 -> 1.0.0
---
.../science/robotics/sumorobot-manager/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index 0b4b807a481..bfc74e72649 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }:
+{ lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial, dos2unix }:
stdenv.mkDerivation rec {
pname = "sumorobot-manager";
- version = "0.9.0";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "robokoding";
repo = pname;
rev = "v${version}";
- sha256 = "03zhb54c259a66hsahmv2ajbzwcjnfjj050wbjhw51zqzxinlgqr";
+ sha256 = "07snhwmqqp52vdgr66vx50zxx0nmpmns5cdjgh50hzlhji2z1fl9";
};
buildInputs = [ python3 ];
From ebf371726d47a0cd434ba2b6a8ec606f97efed83 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 2 May 2021 00:12:19 +0000
Subject: [PATCH 29/29] sumorobot-manager: fix compilation
---
.../science/robotics/sumorobot-manager/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index bfc74e72649..c0f619b9592 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ python3 ];
pythonPath = [
- pyqt5 pyserial
+ pyqt5.dev pyserial
];
- nativeBuildInputs = [ wrapPython qt5.wrapQtAppsHook ];
+ nativeBuildInputs = [ wrapPython qt5.wrapQtAppsHook dos2unix ];
buildPhase = "true";
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
cp -r main.py lib res $out/opt/sumorobot-manager
chmod -R 644 $out/opt/sumorobot-manager/lib/*
mkdir $out/bin
+ dos2unix $out/opt/sumorobot-manager/main.py
makeQtWrapper $out/opt/sumorobot-manager/main.py $out/bin/sumorobot-manager \
--run "cd $out/opt/sumorobot-manager"
'';