From dc1813ff77c467d6e04d0023f93b748ebca0eefa Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Sat, 13 May 2023 11:47:52 +0200 Subject: [PATCH 1/6] nordic: unstable-2022-06-21 -> unstable-2023-05-12 --- pkgs/data/themes/nordic/default.nix | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index c29bb69bf7b1..8d977671fe7d 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -7,70 +7,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2022-06-21"; + version = "unstable-2023-05-12"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "bb5e31ec1488b1fd5641aa10f65f36d8714b5dba"; - sha256 = "sha256-wTWHdao/1RLqUmqh/9gEyhERGymFWHqiC97JD28LSgk="; + rev = "399246cdcbdb1a714c5bb294857cd5a6494b6006"; + sha256 = "sha256-0yZ4QYcdcGHEw6tdcXAKZ4e+mhNNmvihBxp2sLgTuu8="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "e1fb044a14b5c7fe1f6c2de42bfb5fdfb1448415"; - sha256 = "sha256-oWwc+bzeAf0NoYfA2r2oGpeciVUWFC7yJzlUAYfpdTY="; + rev = "3599ddb6f8b7de936cf106bddd4f929ddfe88b1c"; + sha256 = "sha256-ft5UbBnjP0xNFFVwk5Elvrpcj273OupjM+MGJVlvJZQ="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "4c7c9f2d670a6f0c9cff1ec31fab67c826fdcc0f"; - sha256 = "sha256-txKClsygX2IUGF8oOG6gDY6Y3v28kJthjdPrPEOZarQ="; + rev = "b03b66d5badadc2e5ff27b8745a2308b8fafaa61"; + sha256 = "sha256-6dORsGfYi7q8z7JWA3Y9oqVs9bhT/gbdSrcgJcebGP8="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "8abe28ff07c190b8c343aacb6a0ce58e62abbd74"; - sha256 = "sha256-tk9VZtwpIuBcWu1ERJLnlhM71pkrNEUzu8PDb+IEnpw="; + rev = "e19b75f56e5c328352c183fc960a0be54e99836e"; + sha256 = "sha256-deKHT0dE5tsUo7+vkzxQ/eRon7COrOAWolw17VtKhiE="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "9764e0f1af100731f77bf7f15792639d0032e5ed"; - sha256 = "sha256-3vxrbxUhPj6PKWpjyCruhFxYz9nPfo1DHferYUD7enU="; + rev = "b134b4a1299b3c4a2d9543707ec2b5a0fc97987c"; + sha256 = "sha256-XSDwc0/59sUHkS0holvujmr/p6vX79648l9cxJqunuM="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "407316a3fd5e07d183474aea4cae28bb958afa6c"; - sha256 = "sha256-SvLTqDXjy8c4rZo0cZ83kfuiGd2+hyGvwILxVCz65jQ="; + rev = "a4efbc09470b36f4cf6af60b5fdfeb8e09282fb3"; + sha256 = "sha256-Qgrl6p0AhbhK0+aM8hu85Kz/Lz/b2Nn8uWS+WpTGjU4="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "1ffa167c4807e4b22e0934aee41403721877bc56"; - sha256 = "sha256-Xat5YWnxTBnvnUfs1o5EhdmDezmOXtqry97Yc8O+WYM="; + rev = "0d44fb16d0f07ef8615fd7740317a518d2b9411f"; + sha256 = "sha256-388251/Tg4jyn7c8zkrUxVFooN9O67xk2NTSeYa0VvI="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "9bc68223edf7ad9dc83032d7d51ccc53f9440337"; - sha256 = "sha256-XjGjijBky/iPcoUGDRrwwoZ5f2gbLchmQizkQN+Opjg="; + rev = "0eea9185946fee20b6d7472548226a3652dea7ae"; + sha256 = "sha256-8JFrmGKn8cl1x3TeDPee1zbMmtypJ9kALv/PRqRHGAU="; name = "Nordic-Polar-standard-buttons"; }) ]; From a83a3597cd17386067a99331a86e38151d52e1ff Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Fri, 27 Jan 2023 00:49:32 +0000 Subject: [PATCH 2/6] python3Packages.ipyxact: init at 0.3.2 --- .../python-modules/ipyxact/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/ipyxact/default.nix diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix new file mode 100644 index 000000000000..7ddaf432d128 --- /dev/null +++ b/pkgs/development/python-modules/ipyxact/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pyyaml +, six +, lxml +}: + +buildPythonPackage rec { + pname = "ipyxact"; + version = "0.3.2"; + + propagatedBuildInputs = [ pyyaml ]; + checkInputs = [ six lxml ]; + + src = fetchFromGitHub { + owner = "olofk"; + repo = pname; + rev = "v${version}"; + hash = "sha256-myD+NnqcxxaSAV7qZa8xqeciaiFqFePqIzd7sb/2GXA="; + }; + + pythonImportsCheck = [ "ipyxact" ]; + + meta = with lib; { + homepage = "https://github.com/olofk/ipyxact"; + description = "IP-XACT parser"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ace7eaf4044e..988f10e789f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4959,6 +4959,8 @@ self: super: with self; { ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + ipyxact = callPackage ../development/python-modules/ipyxact { }; + irc = callPackage ../development/python-modules/irc { }; ircrobots = callPackage ../development/python-modules/ircrobots { }; From 82a7b2717ffa362d6f84921e4f146e368f2fb402 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Fri, 27 Jan 2023 00:50:04 +0000 Subject: [PATCH 3/6] python3Packages.zipfile2: init at 0.0.12 --- .../python-modules/zipfile2/default.nix | 27 +++++++++++++++++++ .../python-modules/zipfile2/no-setuid.patch | 15 +++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/zipfile2/default.nix create mode 100644 pkgs/development/python-modules/zipfile2/no-setuid.patch diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix new file mode 100644 index 000000000000..fc733e6cdbd4 --- /dev/null +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: + +buildPythonPackage rec { + pname = "zipfile2"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "cournape"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BwcEgW4XrQqz0Jmtbyxf8q0mWTJXv2dL3Tk7N/IYuMI="; + }; + + patches = [ ./no-setuid.patch ]; + + pythonImportsCheck = [ "zipfile2" ]; + + meta = with lib; { + homepage = "https://github.com/cournape/zipfile2"; + description = "A backwards-compatible improved zipfile class"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/zipfile2/no-setuid.patch b/pkgs/development/python-modules/zipfile2/no-setuid.patch new file mode 100644 index 000000000000..951358585a77 --- /dev/null +++ b/pkgs/development/python-modules/zipfile2/no-setuid.patch @@ -0,0 +1,15 @@ +diff --git a/zipfile2/tests/test__zipfile.py b/zipfile2/tests/test__zipfile.py +index 60f2ed2..db6e5bc 100644 +--- a/zipfile2/tests/test__zipfile.py ++++ b/zipfile2/tests/test__zipfile.py +@@ -585,8 +585,8 @@ class TestsPermissionExtraction(unittest.TestCase): + if index & 1 << order: + mode |= permissions[permgroup][order] + for order in range(3): +- if specialindex & 1 << order: +- mode |= permissions['special'][order] ++ if specialindex & 1 << order and order == 0: ++ raise unittest.SkipTest("The nix build process doesn't allow you to use the setuid bit") + os.chmod(path, mode) + real_permission = os.stat(path).st_mode & 0xFFF + self.files.append((path, real_permission)) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 988f10e789f4..7fd56a26d331 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13244,6 +13244,8 @@ self: super: with self; { zimports = callPackage ../development/python-modules/zimports { }; + zipfile2 = callPackage ../development/python-modules/zipfile2 { }; + zipp = callPackage ../development/python-modules/zipp { }; zipstream = callPackage ../development/python-modules/zipstream { }; From 601006e6ba3f985cd15cafa471d676f9831e13f0 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Fri, 27 Jan 2023 00:50:32 +0000 Subject: [PATCH 4/6] python3Pacakges.okonomiyaki: init at 1.3.2 --- .../python-modules/okonomiyaki/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/okonomiyaki/default.nix diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix new file mode 100644 index 000000000000..f1699e209666 --- /dev/null +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -0,0 +1,47 @@ +{ buildPythonPackage +, stdenv +, fetchFromGitHub +, lib +, attrs +, distro +, jsonschema +, six +, zipfile2 +, hypothesis +, mock +, packaging +, testfixtures +}: + +buildPythonPackage rec { + pname = "okonomiyaki"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "enthought"; + repo = pname; + rev = version; + hash = "sha256-eWCOuGtdjBGThAyu15aerclkSWC593VGDPHJ98l30iY="; + }; + + propagatedBuildInputs = [ distro attrs jsonschema six zipfile2 ]; + + preCheck = '' + substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \ + --replace 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \ + --replace 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' + ''; + + checkInputs = [ hypothesis mock packaging testfixtures ]; + + pythonImportsCheck = [ "okonomiyaki" ]; + + meta = with lib; { + homepage = "https://github.com/enthought/okonomiyaki"; + description = "An experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7fd56a26d331..7ed420c1405d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6911,6 +6911,8 @@ self: super: with self; { oemthermostat = callPackage ../development/python-modules/oemthermostat { }; + okonomiyaki = callPackage ../development/python-modules/okonomiyaki { }; + okta = callPackage ../development/python-modules/okta { }; olefile = callPackage ../development/python-modules/olefile { }; From 286e27c139acae6d3d6bd723fa17203fad50cf3b Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Fri, 27 Jan 2023 00:50:58 +0000 Subject: [PATCH 5/6] python3Packages.simplesat: init at 0.8.2 --- .../python-modules/simplesat/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/simplesat/default.nix diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix new file mode 100644 index 000000000000..406283fc8b09 --- /dev/null +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, fetchFromGitHub +, writeText +, lib +, attrs +, six +, okonomiyaki +}: + +let + version = "0.8.2"; + + versionFile = writeText "simplesat_ver" '' + version = '${version}' + full_version = '${version}' + git_revision = '0000000000000000000000000000000000000000' + is_released = True + msi_version = '${version}.000' + version_info = (${lib.versions.major version}, ${lib.versions.minor version}, ${lib.versions.patch version}, 'final', 0) + ''; + +in buildPythonPackage rec { + pname = "simplesat"; + inherit version; + + propagatedBuildInputs = [ attrs six okonomiyaki ]; + + src = fetchFromGitHub { + owner = "enthought"; + repo = "sat-solver"; + rev = "v${version}"; + hash = "sha256-6BQn1W2JGrMmNqgxi+sXx06XzNMcvwqYGMkpD0SSpT8="; + }; + + preConfigure = '' + cp ${versionFile} simplesat/_version.py + ''; + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "simplesat" ]; + + meta = with lib; { + homepage = "https://github.com/enthought/sat-solver"; + description = "Prototype for SAT-based dependency handling"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ed420c1405d..ec18d1dfd37c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11039,6 +11039,8 @@ self: super: with self; { simplenote = callPackage ../development/python-modules/simplenote { }; + simplesat = callPackage ../development/python-modules/simplesat { }; + simple-di = callPackage ../development/python-modules/simple-di { }; simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; From 1ff2248885837a712a931dc00f6380ccef832ae0 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Fri, 27 Jan 2023 00:51:15 +0000 Subject: [PATCH 6/6] fusesoc: init at 2.2.1 --- .../package-management/fusesoc/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/package-management/fusesoc/default.nix diff --git a/pkgs/tools/package-management/fusesoc/default.nix b/pkgs/tools/package-management/fusesoc/default.nix new file mode 100644 index 000000000000..92a8dc1807b9 --- /dev/null +++ b/pkgs/tools/package-management/fusesoc/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, fetchPypi +, lib +, verilog +, verilator +, gnumake +, gcc +, edalize +, fastjsonschema +, pyparsing +, pyyaml +, simplesat +, ipyxact +, setuptools-scm +}: +buildPythonPackage rec { + pname = "fusesoc"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ edalize fastjsonschema pyparsing pyyaml simplesat ipyxact ]; + + pythonImportsCheck = [ "fusesoc" ]; + + makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ verilog verilator gnumake ]}"]; + + meta = with lib; { + homepage = "https://github.com/olofk/fusesoc"; + description = "A package manager and build tools for HDL code"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab50b431497e..8342c8544698 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2256,6 +2256,8 @@ with pkgs; fuse-emulator = callPackage ../applications/emulators/fuse-emulator { }; + fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { }; + fw = callPackage ../tools/misc/fw { inherit (darwin.apple_sdk.frameworks) Security; };