Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lcrq,lcsync,librecast,sync: name -> pname #150

Merged
merged 1 commit into from
Jan 3, 2024
Merged

Conversation

matusf
Copy link
Member

@matusf matusf commented Dec 31, 2023

AFAIK, name == "{pname}-{version}" in mkDerivation. These projects override the name attribute, which causes the name to be generated without version.

There are still some packages with missing version in nix flake show.

Copy link
Contributor

Difference in nix flake show.
--- d679058 main
+++ 81280e4 fix-package-names
@@ -1,193 +1,193 @@
 ├───checks
 │   └───x86_64-linux
 │       ├───anastasis: derivation 'anastasis-0.4.0'
 │       ├───atomic-cli: derivation 'atomic-cli-0.34.5'
 │       ├───atomic-server: derivation 'atomic-server-0.34.5'
 │       ├───autobase: derivation 'autobase'
 │       ├───corestore: derivation 'corestore-6.15.9'
 │       ├───euclid3: derivation 'python3.11-euclid3-0.01'
 │       ├───flarum: derivation 'flarum-1.8.0'
 │       ├───flarum-toplevel: derivation 'nixos-system-test-flarum-24.05.20231218.886c9ae'
 │       ├───formatting: derivation 'treefmt-check'
 │       ├───freeDiameter: derivation 'freeDiameter-1.5.0'
 │       ├───gnunet-messenger-cli: derivation 'gnunet-messenger-cli-0.1.1'
 │       ├───hyperbeam: derivation 'hyperbeam-3.0.1'
 │       ├───hyperblobs: derivation 'hyperblobs-2.3.3'
 │       ├───hypercore: derivation 'hypercore-10.28.11'
 │       ├───hyperswarm: derivation 'hyperswarm-4.7.3'
 │       ├───kbin: derivation 'kbin'
 │       ├───kbin-backend: derivation 'kbin-0.0.1'
 │       ├───kbin-frontend: derivation 'kbin-frontend-0.0.1'
 │       ├───kbin-toplevel: derivation 'nixos-system-nixos-24.05.20231218.886c9ae'
 │       ├───kikit: derivation 'python3.11-kikit-1.3.0'
 │       ├───kip: derivation 'kip-unstable-2021-07-27'
-│       ├───lcrq: derivation 'lcrq'
-│       ├───lcsync: derivation 'lcsync'
+│       ├───lcrq: derivation 'lcrq-0.1.0'
+│       ├───lcsync: derivation 'lcsync-0.2.1'
 │       ├───leaf: derivation 'leaf-unstable-2020-04-28'
 │       ├───libgnunetchat: derivation 'libgnunetchat'
-│       ├───librecast: derivation 'librecast'
+│       ├───librecast: derivation 'librecast-0.7-RC3'
 │       ├───lillydap: derivation 'lillydap-0.9.2'
 │       ├───mcaptcha: derivation 'mcaptcha-unstable-2023-07-04'
 │       ├───mcaptcha-cache: derivation 'cache-unstable-2023-03-08'
 │       ├───pcbnew-transition: derivation 'python3.11-pcbnewTransition-0.3.4'
 │       ├───pretalx: derivation 'pretalx-2023.1.3'
 │       ├───pretalx-downstream: derivation 'python3.11-pretalx-downstream-1.1.5'
 │       ├───pretalx-frontend: derivation 'pretalx-frontend-2023.1.0'
 │       ├───pretalx-full: derivation 'pretalx-2023.1.3'
 │       ├───pretalx-media-ccc-de: derivation 'python3.11-pretalx-media-ccc-de-1.1.1'
 │       ├───pretalx-mysql-toplevel: derivation 'nixos-system-server-24.05.20231218.886c9ae'
 │       ├───pretalx-pages: derivation 'python3.11-pretalx-pages-1.3.3'
 │       ├───pretalx-postgresql-toplevel: derivation 'nixos-system-server-24.05.20231218.886c9ae'
 │       ├───pretalx-public-voting: derivation 'python3.11-pretalx-public-voting-1.3.0'
 │       ├───pretalx-venueless: derivation 'python3.11-pretalx-venueless-1.3.0'
 │       ├───pybars3: derivation 'python3.11-pybars3-0.9.7'
 │       ├───pymeta3: derivation 'python3.11-pymeta3-0.5.1'
 │       ├───quicksasl: derivation 'quicksasl-0.11.0'
 │       ├───rosenpass: derivation 'rosenpass-unstable-2023-09-28'
 │       ├───rosenpass-tools: derivation 'rosenpass-tools-unstable-2023-09-28'
 │       ├───steamworks: derivation 'steamworks-0.97.2'
 │       ├───steamworks-pulleyback: derivation 'steamworks-pulleyback-0.3.0'
-│       ├───sync: derivation 'sync'
+│       ├───sync: derivation 'sync-0.9.3'
 │       ├───taler-mdb: derivation 'taler-mdb-0.9.3'
 │       ├───tlspool: derivation 'tlspool-0.9.6'
 │       ├───tlspool-gui: derivation 'tlspool-gui-0.0.6'
 │       ├───twister: derivation 'twister-0.9.3'
 │       └───wireguard-rs: derivation 'wireguard-rs-unstable-2021-01-13'
 ├───formatter
 │   └───x86_64-linux: package 'treefmt'
 ├───hydraJobs
 │   ├───nixosConfigurations
 │   │   └───x86_64-linux
 │   │       ├───flarum: derivation 'nixos-system-test-flarum-24.05.20231218.886c9ae'
 │   │       ├───kbin: derivation 'nixos-system-nixos-24.05.20231218.886c9ae'
 │   │       ├───pretalx-mysql: derivation 'nixos-system-server-24.05.20231218.886c9ae'
 │   │       └───pretalx-postgresql: derivation 'nixos-system-server-24.05.20231218.886c9ae'
 │   ├───packages
 │   │   └───x86_64-linux
 │   │       ├───anastasis: derivation 'anastasis-0.4.0'
 │   │       ├───atomic-cli: derivation 'atomic-cli-0.34.5'
 │   │       ├───atomic-server: derivation 'atomic-server-0.34.5'
 │   │       ├───autobase: derivation 'autobase'
 │   │       ├───corestore: derivation 'corestore-6.15.9'
 │   │       ├───euclid3: derivation 'python3.11-euclid3-0.01'
 │   │       ├───flarum: derivation 'flarum-1.8.0'
 │   │       ├───freeDiameter: derivation 'freeDiameter-1.5.0'
 │   │       ├───gnunet-messenger-cli: derivation 'gnunet-messenger-cli-0.1.1'
 │   │       ├───hyperbeam: derivation 'hyperbeam-3.0.1'
 │   │       ├───hyperblobs: derivation 'hyperblobs-2.3.3'
 │   │       ├───hypercore: derivation 'hypercore-10.28.11'
 │   │       ├───hyperswarm: derivation 'hyperswarm-4.7.3'
 │   │       ├───kbin: derivation 'kbin'
 │   │       ├───kbin-backend: derivation 'kbin-0.0.1'
 │   │       ├───kbin-frontend: derivation 'kbin-frontend-0.0.1'
 │   │       ├───kikit: derivation 'python3.11-kikit-1.3.0'
 │   │       ├───kip: derivation 'kip-unstable-2021-07-27'
-│   │       ├───lcrq: derivation 'lcrq'
-│   │       ├───lcsync: derivation 'lcsync'
+│   │       ├───lcrq: derivation 'lcrq-0.1.0'
+│   │       ├───lcsync: derivation 'lcsync-0.2.1'
 │   │       ├───leaf: derivation 'leaf-unstable-2020-04-28'
 │   │       ├───libgnunetchat: derivation 'libgnunetchat'
-│   │       ├───librecast: derivation 'librecast'
+│   │       ├───librecast: derivation 'librecast-0.7-RC3'
 │   │       ├───lillydap: derivation 'lillydap-0.9.2'
 │   │       ├───mcaptcha: derivation 'mcaptcha-unstable-2023-07-04'
 │   │       ├───mcaptcha-cache: derivation 'cache-unstable-2023-03-08'
 │   │       ├───pcbnew-transition: derivation 'python3.11-pcbnewTransition-0.3.4'
 │   │       ├───pretalx: derivation 'pretalx-2023.1.3'
 │   │       ├───pretalx-downstream: derivation 'python3.11-pretalx-downstream-1.1.5'
 │   │       ├───pretalx-frontend: derivation 'pretalx-frontend-2023.1.0'
 │   │       ├───pretalx-full: derivation 'pretalx-2023.1.3'
 │   │       ├───pretalx-media-ccc-de: derivation 'python3.11-pretalx-media-ccc-de-1.1.1'
 │   │       ├───pretalx-pages: derivation 'python3.11-pretalx-pages-1.3.3'
 │   │       ├───pretalx-public-voting: derivation 'python3.11-pretalx-public-voting-1.3.0'
 │   │       ├───pretalx-venueless: derivation 'python3.11-pretalx-venueless-1.3.0'
 │   │       ├───pybars3: derivation 'python3.11-pybars3-0.9.7'
 │   │       ├───pymeta3: derivation 'python3.11-pymeta3-0.5.1'
 │   │       ├───quicksasl: derivation 'quicksasl-0.11.0'
 │   │       ├───rosenpass: derivation 'rosenpass-unstable-2023-09-28'
 │   │       ├───rosenpass-tools: derivation 'rosenpass-tools-unstable-2023-09-28'
 │   │       ├───steamworks: derivation 'steamworks-0.97.2'
 │   │       ├───steamworks-pulleyback: derivation 'steamworks-pulleyback-0.3.0'
-│   │       ├───sync: derivation 'sync'
+│   │       ├───sync: derivation 'sync-0.9.3'
 │   │       ├───taler-mdb: derivation 'taler-mdb-0.9.3'
 │   │       ├───tlspool: derivation 'tlspool-0.9.6'
 │   │       ├───tlspool-gui: derivation 'tlspool-gui-0.0.6'
 │   │       ├───twister: derivation 'twister-0.9.3'
 │   │       └───wireguard-rs: derivation 'wireguard-rs-unstable-2021-01-13'
 │   └───tests
 │       └───x86_64-linux
 │           ├───kbin
 │           │   └───kbin: derivation 'vm-test-run-kbin'
 │           ├───libgnunetchat
 │           │   └───pkg-config: derivation 'check-meta-pkg-config-modules-for-libgnunetchat'
 │           ├───mcaptcha
 │           │   ├───mcaptcha-bring-your-own-services: derivation 'vm-test-run-test-of-mcaptcha-with-database-and-other-services-running-on-a-different-node'
 │           │   └───mcaptcha-create-locally: derivation 'vm-test-run-test-of-mcaptcha-with-database-and-other-services-all-running-on-the-same-node'
 │           ├───pretalx
 │           │   └───pretalx: derivation 'vm-test-run-pretalx-tests'
 │           ├───pretalx-full
 │           │   └───pretalx: derivation 'vm-test-run-pretalx-tests'
 │           └───rosenpass
 │               └───rosenpass: derivation 'vm-test-run-rosenpass'
 ├───nixosConfigurations
 │   ├───flarum: NixOS configuration
 │   ├───kbin: NixOS configuration
 │   ├───pretalx-mysql: NixOS configuration
 │   └───pretalx-postgresql: NixOS configuration
 ├───nixosModules
 │   ├───default: NixOS module
 │   ├───flarum: NixOS module
 │   ├───kbin: NixOS module
 │   ├───mcaptcha: NixOS module
 │   ├───pretalx: NixOS module
 │   └───unbootable: NixOS module
 ├───overlays
 │   └───default: Nixpkgs overlay
 └───packages
     └───x86_64-linux
         ├───anastasis: package 'anastasis-0.4.0'
         ├───atomic-cli: package 'atomic-cli-0.34.5'
         ├───atomic-server: package 'atomic-server-0.34.5'
         ├───autobase: package 'autobase'
         ├───corestore: package 'corestore-6.15.9'
         ├───euclid3: package 'python3.11-euclid3-0.01'
         ├───flarum: package 'flarum-1.8.0'
         ├───freeDiameter: package 'freeDiameter-1.5.0'
         ├───gnunet-messenger-cli: package 'gnunet-messenger-cli-0.1.1'
         ├───hyperbeam: package 'hyperbeam-3.0.1'
         ├───hyperblobs: package 'hyperblobs-2.3.3'
         ├───hypercore: package 'hypercore-10.28.11'
         ├───hyperswarm: package 'hyperswarm-4.7.3'
         ├───kbin: package 'kbin'
         ├───kbin-backend: package 'kbin-0.0.1'
         ├───kbin-frontend: package 'kbin-frontend-0.0.1'
         ├───kikit: package 'python3.11-kikit-1.3.0'
         ├───kip: package 'kip-unstable-2021-07-27'
-        ├───lcrq: package 'lcrq'
-        ├───lcsync: package 'lcsync'
+        ├───lcrq: package 'lcrq-0.1.0'
+        ├───lcsync: package 'lcsync-0.2.1'
         ├───leaf: package 'leaf-unstable-2020-04-28'
         ├───libgnunetchat: package 'libgnunetchat'
-        ├───librecast: package 'librecast'
+        ├───librecast: package 'librecast-0.7-RC3'
         ├───lillydap: package 'lillydap-0.9.2'
         ├───mcaptcha: package 'mcaptcha-unstable-2023-07-04'
         ├───mcaptcha-cache: package 'cache-unstable-2023-03-08'
         ├───pcbnew-transition: package 'python3.11-pcbnewTransition-0.3.4'
         ├───pretalx: package 'pretalx-2023.1.3'
         ├───pretalx-downstream: package 'python3.11-pretalx-downstream-1.1.5'
         ├───pretalx-frontend: package 'pretalx-frontend-2023.1.0'
         ├───pretalx-full: package 'pretalx-2023.1.3'
         ├───pretalx-media-ccc-de: package 'python3.11-pretalx-media-ccc-de-1.1.1'
         ├───pretalx-pages: package 'python3.11-pretalx-pages-1.3.3'
         ├───pretalx-public-voting: package 'python3.11-pretalx-public-voting-1.3.0'
         ├───pretalx-venueless: package 'python3.11-pretalx-venueless-1.3.0'
         ├───pybars3: package 'python3.11-pybars3-0.9.7'
         ├───pymeta3: package 'python3.11-pymeta3-0.5.1'
         ├───quicksasl: package 'quicksasl-0.11.0'
         ├───rosenpass: package 'rosenpass-unstable-2023-09-28'
         ├───rosenpass-tools: package 'rosenpass-tools-unstable-2023-09-28'
         ├───steamworks: package 'steamworks-0.97.2'
         ├───steamworks-pulleyback: package 'steamworks-pulleyback-0.3.0'
-        ├───sync: package 'sync'
+        ├───sync: package 'sync-0.9.3'
         ├───taler-mdb: package 'taler-mdb-0.9.3'
         ├───tlspool: package 'tlspool-0.9.6'
         ├───tlspool-gui: package 'tlspool-gui-0.0.6'
         ├───twister: package 'twister-0.9.3'
         └───wireguard-rs: package 'wireguard-rs-unstable-2021-01-13'

@matusf matusf requested a review from mightyiam January 2, 2024 17:43
@matusf matusf merged commit 7c20b94 into main Jan 3, 2024
2 checks passed
@matusf matusf deleted the fix-package-names branch January 3, 2024 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants