From 9099628a8cd7826c1998cb6359002ffea6797dc8 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Sat, 11 Jan 2025 19:02:23 +0000 Subject: [PATCH 1/3] maintainers: add reivilibre Signed-off-by: Olivier 'reivilibre --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9081a1f9ca61a..43c3465d25bc6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19161,6 +19161,12 @@ githubId = 337811; name = "Rehno Lindeque"; }; + reivilibre = { + email = "nixpkgs.contact@librepush.net"; + github = "reivilibre"; + githubId = 38398653; + name = "Olivier 'reivilibre'"; + }; relrod = { email = "ricky@elrod.me"; github = "relrod"; From 380c7975fd0d6038b65b95474b027c1cf35c78cb Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Sat, 11 Jan 2025 19:02:42 +0000 Subject: [PATCH 2/3] probe-rs-udev-rules: init at 0-unstable-2024-02-25 Signed-off-by: Olivier 'reivilibre --- .../pr/probe-rs-udev-rules/package.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/pr/probe-rs-udev-rules/package.nix diff --git a/pkgs/by-name/pr/probe-rs-udev-rules/package.nix b/pkgs/by-name/pr/probe-rs-udev-rules/package.nix new file mode 100644 index 0000000000000..14ad3c7f4f440 --- /dev/null +++ b/pkgs/by-name/pr/probe-rs-udev-rules/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchurl, +}: + +## Usage +# In NixOS, simply add this package to services.udev.packages: +# services.udev.packages = [ pkgs.probe-rs-udev-rules ]; + +stdenv.mkDerivation rec { + pname = "probe-rs-udev-rules"; + + # There is no versioning scheme upstream, so we set this to the date of the commit that most + # recently changed the udev rules. + version = "0-unstable-2024-02-25"; + + src = fetchurl { + url = "https://github.com/probe-rs/webpage/raw/c8dbcf00cef641117578aa3eccd26541b0e259f6/src/static/files/69-probe-rs.rules"; + sha256 = "sha256-SdwESnOuvOKMsTvxyA5c4UwtcS3kU33SlNttepMm7HY="; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D $src $out/lib/udev/rules.d/69-probe-rs.rules + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://probe.rs/docs/getting-started/probe-setup/#udev-rules"; + description = "probe-rs udev rules list, granting users in the plugdev group access to use compatible USB debug probes"; + platforms = platforms.linux; + license = licenses.gpl2Only; # As noted in licence header for the file itself + maintainers = with maintainers; [ reivilibre ]; + }; +} From de648fe0a5e7624d5b48f6de1ba7888dd27edf63 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Sat, 11 Jan 2025 19:03:13 +0000 Subject: [PATCH 3/3] picoprobe-udev-rules: remove as it is subsumed by probe-rs-udev-rules Signed-off-by: Olivier 'reivilibre --- .../pi/picoprobe-udev-rules/package.nix | 36 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/by-name/pi/picoprobe-udev-rules/package.nix diff --git a/pkgs/by-name/pi/picoprobe-udev-rules/package.nix b/pkgs/by-name/pi/picoprobe-udev-rules/package.nix deleted file mode 100644 index 4f4c16a5fd1f2..0000000000000 --- a/pkgs/by-name/pi/picoprobe-udev-rules/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -## Usage -# In NixOS, simply add this package to services.udev.packages: -# services.udev.packages = [ pkgs.picoprobe-udev-rules ]; - -stdenv.mkDerivation rec { - pname = "picoprobe-udev-rules"; - version = "unstable-2023-01-31"; - - src = fetchurl { - url = "https://raw.githubusercontent.com/probe-rs/webpage/1cba61acc6ecb5ff96f74641269844ad88ad8ad5/static/files/69-probe-rs.rules"; - sha256 = "sha256-vQMPX3Amttja0u03KWGnPDAVTGM9ekJ+IBTjW+xlJS0="; - }; - - dontUnpack = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D $src $out/lib/udev/rules.d/69-probe-rs.rules - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://probe.rs/docs/getting-started/probe-setup/#udev-rules"; - description = "Picoprobe udev rules list"; - platforms = platforms.linux; - license = licenses.gpl2Only; - maintainers = with maintainers; [ mglolenstine ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 26d96c09662b1..8236152bee289 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1049,6 +1049,7 @@ mapAliases { pgadmin = pgadmin4; pharo-spur64 = pharo; # Added 2022-08-03 picom-next = picom; # Added 2024-02-13 + picoprobe-udev-rules = lib.warn "'picoprobe-udev-rules' has been renamed to 'probe-rs-udev-rules' to reflect that it includes all probe-rs-supported devices." probe-rs-udev-rules; # Added 2025-01-11 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28