diff --git a/default.nix b/default.nix index 16e5ece..8c18e29 100644 --- a/default.nix +++ b/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 }: diff --git a/flake.lock b/flake.lock index cf87184..a3b88c3 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669833724, - "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", + "lastModified": 1685566663, + "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", + "rev": "4ecab3273592f27479a583fb6d975d4aba3486fe", "type": "github" }, "original": { "owner": "nixos", - "ref": "22.11", + "ref": "23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 07dcf6e..96cbd87 100644 --- a/flake.nix +++ b/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 diff --git a/nur.nix b/nur.nix index bde6c52..a082d40 100644 --- a/nur.nix +++ b/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; }; diff --git a/pkgs/batprotocol/cpp.nix b/pkgs/batprotocol/cpp.nix deleted file mode 100644 index 0f2eea8..0000000 --- a/pkgs/batprotocol/cpp.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchgit -, meson, ninja, pkgconfig -, flatbuffers -, debug ? false -}: - -stdenv.mkDerivation rec { - name = "batprotocol-cpp-${src.rev}"; - - src = fetchgit { - url = "https://framagit.org/batsim/batprotocol.git"; - rev = "baff452b365d471fc7316e1f5ab5ed6a9b5de460"; - sha256 = "0n566w68y11m1s82wq1wf9fgyx5q7xri9nmgn6xr75hr9kpafawr"; - }; - - nativeBuildInputs = [ meson ninja pkgconfig ]; - propagatedBuildInputs = [ flatbuffers ]; - - preConfigure = "cd cpp"; - ninjaFlags = [ "-v" ]; - - mesonBuildType = if debug then "debug" else "release"; - CXXFLAGS = if debug then "-O0" else ""; - hardeningDisable = if debug then [ "fortify" ] else []; - dontStrip = debug; - - meta = with lib; { - description = "C++ library to serialize messages in the batprotocol"; - longDescription = "C++ library to serialize messages in the batprotocol."; - homepage = https://framagit.org/batsim/batprotocol; - platforms = platforms.all; - license = licenses.lgpl3; - broken = false; - }; -} diff --git a/pkgs/enoslib/default.nix b/pkgs/enoslib/default.nix index 1f02a56..785f54f 100644 --- a/pkgs/enoslib/default.nix +++ b/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 ]; diff --git a/pkgs/flatbuffers/2.0.nix b/pkgs/flatbuffers/2.0.nix deleted file mode 100644 index 2b907e7..0000000 --- a/pkgs/flatbuffers/2.0.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage }: - -callPackage ./generic.nix { - version = "2.0.0"; - sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; -} diff --git a/pkgs/flatbuffers/generic.nix b/pkgs/flatbuffers/generic.nix deleted file mode 100644 index 1cdfb4b..0000000 --- a/pkgs/flatbuffers/generic.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, version -, sha256 -, patches ? [ ] -, preConfigure ? null -}: - -stdenv.mkDerivation rec { - pname = "flatbuffers"; - inherit version; - - src = fetchFromGitHub { - owner = "google"; - repo = "flatbuffers"; - rev = "v${version}"; - inherit sha256; - }; - - inherit patches preConfigure; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - ]; - - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - checkTarget = "test"; - - meta = with lib; { - description = "Memory Efficient Serialization Library"; - longDescription = '' - FlatBuffers is an efficient cross platform serialization library for - games and other memory constrained apps. It allows you to directly - access serialized data without unpacking/parsing it first, while still - having great forwards/backwards compatibility. - ''; - maintainers = [ maintainers.teh ]; - license = licenses.asl20; - platforms = platforms.unix; - homepage = "https://google.github.io/flatbuffers/"; - }; -} diff --git a/pkgs/flower/default.nix b/pkgs/flower/default.nix index 6dd338b..fe53d36 100644 --- a/pkgs/flower/default.nix +++ b/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 diff --git a/pkgs/nxc/cluster.nix b/pkgs/nxc/cluster.nix index b311b30..eeeaa2b 100644 --- a/pkgs/nxc/cluster.nix +++ b/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 diff --git a/pkgs/oar/default.nix b/pkgs/oar/default.nix index 4a46604..dc62e98 100644 --- a/pkgs/oar/default.nix +++ b/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; diff --git a/pkgs/oxidisched/default.nix b/pkgs/oxidisched/default.nix index 0f3dddb..29347d3 100644 --- a/pkgs/oxidisched/default.nix +++ b/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; }; } diff --git a/pkgs/pybatsim/core400.nix b/pkgs/pybatsim/core400.nix index 6c50d25..a0e06c8 100644 --- a/pkgs/pybatsim/core400.nix +++ b/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 diff --git a/pkgs/pybatsim/functional400.nix b/pkgs/pybatsim/functional400.nix index 87e6828..a8ae949 100644 --- a/pkgs/pybatsim/functional400.nix +++ b/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 diff --git a/pkgs/pybatsim/pybatsim321.nix b/pkgs/pybatsim/pybatsim321.nix index 0746435..3449add 100644 --- a/pkgs/pybatsim/pybatsim321.nix +++ b/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 diff --git a/pkgs/ring/default.nix b/pkgs/ring/default.nix deleted file mode 100644 index 2df4a80..0000000 --- a/pkgs/ring/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ python3Packages, fetchFromGitHub, wirerope }: - -python3Packages.buildPythonPackage rec { - name = "ring"; - version = "0.9.1"; - src = fetchFromGitHub { - owner = "youknowone"; - repo = name; - rev = "8e4eb90b13d6480e50c63266e041e491c7c41dfe"; - sha256 = "sha256-VmNXfntVFlXmvx9OjZ0VuIlHY5CPS3N+MJlL8YkrKcw="; - }; - propagatedBuildInputs = with python3Packages; [ - attrs - wirerope - ]; - doCheck = false; -} diff --git a/pkgs/scylladb-cpp-driver/default.nix b/pkgs/scylladb-cpp-driver/default.nix index f77ed93..2438748 100644 --- a/pkgs/scylladb-cpp-driver/default.nix +++ b/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; }; }