Merge branch 'nixpkgs-23.05'

default.nix

@@ -1,7 +1,7 @@
 # If called without explicitly setting the 'pkgs' arg, a pinned nixpkgs version is used by default.
 { pkgs ? import (fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/22.11.tar.gz";
-    sha256 = "sha256:11w3wn2yjhaa5pv20gbfbirvjq6i3m7pqrq2msf0g7cv44vijwgw";
+    url = "https://github.com/NixOS/nixpkgs/archive/23.05.tar.gz";
+    sha256 = "sha256:10wn0l08j9lgqcw8177nh2ljrnxdrpri7bp0g7nvrsn9rkawvlbf";
   }) {}
 , debug ? false
 }:

flake.nix

@@ -2,7 +2,7 @@
   description = " My personal NUR repository";
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nixos/nixpkgs?ref=22.11";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=23.05";
   };
   outputs = { self, nixpkgs, flake-utils }:
     let

nur.nix

@@ -35,8 +35,6 @@ rec {
 
   batexpe = pkgs.callPackage ./pkgs/batexpe { };
 
-  batprotocol-cpp = pkgs.callPackage ./pkgs/batprotocol/cpp.nix { inherit flatbuffers debug; };
-
   batsim-410 = pkgs.callPackage ./pkgs/batsim/batsim410.nix { inherit redox debug; simgrid = simgrid-332light; intervalset = intervalsetlight; };
   batsim = batsim-410;
   batsim-docker = pkgs.callPackage ./pkgs/batsim/batsim-docker.nix { inherit batsim; };
@@ -67,14 +65,12 @@ rec {
 
   ear =  pkgs.callPackage ./pkgs/ear { };
 
-  enoslib = pkgs.callPackage ./pkgs/enoslib { inherit execo ring iotlabsshcli distem python-grid5000; };
+  enoslib = pkgs.callPackage ./pkgs/enoslib { inherit execo iotlabsshcli distem python-grid5000; };
 
   evalys = pkgs.callPackage ./pkgs/evalys { inherit procset; };
 
   execo = pkgs.callPackage ./pkgs/execo { };
 
-  flatbuffers = pkgs.callPackage ./pkgs/flatbuffers/2.0.nix { };
-
   flower = pkgs.callPackage ./pkgs/flower { inherit iterators; };
 
   iotlabcli = pkgs.callPackage ./pkgs/iotlabcli { };
@@ -135,8 +131,6 @@ rec {
 
   oar3 = oar;
 
-  ring = pkgs.callPackage ./pkgs/ring { inherit wirerope; };
-
   simgrid-327 = pkgs.callPackage ./pkgs/simgrid/simgrid327.nix { inherit debug; };
   simgrid-328 = pkgs.callPackage ./pkgs/simgrid/simgrid328.nix { inherit debug; };
   simgrid-329 = pkgs.callPackage ./pkgs/simgrid/simgrid329.nix { inherit debug; };

pkgs/enoslib/default.nix

@@ -1,18 +1,24 @@
-{ python3Packages, fetchFromGitLab, execo, ansible, ring, iotlabsshcli, distem, python-grid5000 }:
+{ python3Packages, fetchFromGitLab, execo, ansible, iotlabsshcli, distem, python-grid5000 }:
 
 python3Packages.buildPythonPackage rec {
   pname = "enoslib";
-  version = "v8.1.3";
+  version = "v8.1.4";
   src = fetchFromGitLab {
     domain = "gitlab.inria.fr";
     owner = "discovery";
     repo = pname;
     rev = "${version}";
-    sha256 = "sha256-QopX4YyYef9YkWmlm1wLg7DcXWUCpG+bdE3LxN7udtk=";
+    sha256 = "sha256-hGDneTQUexCBmZhnmZyIIeIlM87IzGCrIWWjC7plXk4=";
   };
+
   # We do the following because nix cannot yet access the extra builds of poetry
   patchPhase = ''
+    substituteInPlace setup.cfg --replace "importlib_resources>=5,<6" ""
+    substituteInPlace setup.cfg --replace "importlib_metadata>=6,<7" ""
     substituteInPlace setup.cfg --replace "rich[jupyter]~=12.0.0" "rich>=12.0.0"
+    substituteInPlace setup.cfg --replace "packaging~=21.3" "packaging>=21.3"
+    substituteInPlace setup.cfg --replace "pytz~=2022.1" "pytz>=2022.1"
+    substituteInPlace setup.cfg --replace "ansible>=2.9,<7.2" "ansible>=2.9"
   '';
   propagatedBuildInputs = [
     python3Packages.cryptography
@@ -22,12 +28,13 @@ python3Packages.buildPythonPackage rec {
     python3Packages.ipywidgets
     python3Packages.rich
     python3Packages.jsonschema
+    python3Packages.packaging
+    python3Packages.pytz
 
     ansible
 
     distem
     iotlabsshcli
-    ring
     execo
     python-grid5000
   ];

pkgs/flower/default.nix

@@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec {
     ./0001-loosen-protobuf-version-requirement.patch
   ];
 
-  nativeBuildInputs = [ python3Packages.poetry ];
+  nativeBuildInputs = [ python3Packages.poetry-core ];
   propagatedBuildInputs = with python3Packages; [
     numpy
     protobuf

pkgs/nxc/cluster.nix

@@ -14,8 +14,9 @@ python3Packages.buildPythonPackage rec {
   };
   patches = [ ./0001-bs-loosen-tomlkit-dep-version-constraint.patch ];
 
-  buildInputs = with python3Packages; [
+  buildInputs = [
     poetry
+    python3Packages.poetry-core
   ];
   propagatedBuildInputs = with python3Packages; [
     halo

pkgs/oar/default.nix

@@ -13,7 +13,10 @@ python3Packages.buildPythonPackage rec {
   };
   patches = [ ./0001-bs-loosen-pyzmq-version-constraint.patch ];
 
-  nativeBuildInputs = [ poetry ];
+  nativeBuildInputs = [
+    poetry
+    python3Packages.poetry-core
+  ];
 
   propagatedBuildInputs = with python3Packages; [
     pyzmq
@@ -45,7 +48,7 @@ python3Packages.buildPythonPackage rec {
   '';
 
   meta = {
-    broken = false;
+    broken = true;
     homepage = "https://github.com/oar-team/oar3";
     description = "OAR: a Versatile Resource and Job Manager";
     license = lib.licenses.lgpl21;

pkgs/oxidisched/default.nix

@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
     homepage = https://gitlab.inria.fr/batsim/oxidisched;
     description = "Batsim-compatible schedulers mostly meant to test Batsim. Written in Rust.";
     license = licenses.lgpl3;
-    broken = false;
+    broken = true;
   };
 }

pkgs/pybatsim/core400.nix

@@ -1,4 +1,4 @@
-{ lib, python3Packages, poetry, procset, callPackage }:
+{ lib, python3Packages, procset, callPackage }:
 
 python3Packages.buildPythonPackage rec {
   pname = "pybatsim-core";
@@ -10,7 +10,7 @@ python3Packages.buildPythonPackage rec {
   src = "${pybatsim-src}/${pname}";
 
   buildInputs = with python3Packages; [
-    poetry
+    poetry-core
   ];
   propagatedBuildInputs = with python3Packages; [
     docopt

pkgs/pybatsim/functional400.nix

@@ -1,4 +1,4 @@
-{ lib, python3Packages, poetry, pybatsim-core, callPackage }:
+{ lib, python3Packages, pybatsim-core, callPackage }:
 
 python3Packages.buildPythonPackage rec {
   pname = "pybatsim-functional";
@@ -10,7 +10,7 @@ python3Packages.buildPythonPackage rec {
   src = "${pybatsim-src}/${pname}";
 
   buildInputs = with python3Packages; [
-    poetry
+    poetry-core
   ];
   propagatedBuildInputs = with python3Packages; [
     pybatsim-core

pkgs/pybatsim/pybatsim321.nix

@@ -1,4 +1,4 @@
-{ lib, python3Packages, poetry, procset }:
+{ lib, python3Packages, procset }:
 
 python3Packages.buildPythonPackage rec {
   pname = "pybatsim";
@@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec {
   patches = [ ./321-0001-bs-loosen-pyzmq-version-constraint.patch ];
 
   buildInputs = with python3Packages; [
-    poetry
+    poetry-core
   ];
   propagatedBuildInputs = with python3Packages; [
     docopt

pkgs/scylladb-cpp-driver/default.nix

@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     description = "DataStax C/C++ Driver for Apache Cassandra® and DataStax Products";
     license = licenses.asl20;
     platforms = platforms.linux;
+    broken = true;
   };
 }