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

Update nixpkgs input #135

Merged
merged 4 commits into from
Dec 21, 2023
Merged

Update nixpkgs input #135

merged 4 commits into from
Dec 21, 2023

Conversation

lorenzleutgeb
Copy link
Member

No description provided.

Copy link
Contributor

Difference in nix flake show.
--- d59218d main
+++ 8975f1a update
@@ -1,163 +1,163 @@
 ├───checks
 │   └───x86_64-linux
 │       ├───atomic-cli: derivation 'atomic-cli-0.34.5'
 │       ├───atomic-server: derivation 'atomic-server-0.34.5'
 │       ├───euclid3: derivation 'python3.11-euclid3-0.01'
 │       ├───flarum: derivation 'flarum-1.8.0'
-│       ├───flarum-toplevel: derivation 'nixos-system-test-flarum-24.05.20231130.f5c27c6'
+│       ├───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'
 │       ├───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.20231130.f5c27c6'
+│       ├───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'
 │       ├───leaf: derivation 'leaf-unstable-2020-04-28'
 │       ├───libgnunetchat: derivation 'libgnunetchat'
 │       ├───librecast: derivation 'librecast'
 │       ├───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.20231130.f5c27c6'
+│       ├───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.20231130.f5c27c6'
+│       ├───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'
 │       ├───tlspool: derivation 'tlspool-0.9.6'
 │       ├───tlspool-gui: derivation 'tlspool-gui-0.0.6'
 │       └───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.20231130.f5c27c6'
-│   │       ├───kbin: derivation 'nixos-system-nixos-24.05.20231130.f5c27c6'
-│   │       ├───pretalx-mysql: derivation 'nixos-system-server-24.05.20231130.f5c27c6'
-│   │       └───pretalx-postgresql: derivation 'nixos-system-server-24.05.20231130.f5c27c6'
+│   │       ├───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
 │   │       ├───atomic-cli: derivation 'atomic-cli-0.34.5'
 │   │       ├───atomic-server: derivation 'atomic-server-0.34.5'
 │   │       ├───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'
 │   │       ├───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'
 │   │       ├───leaf: derivation 'leaf-unstable-2020-04-28'
 │   │       ├───libgnunetchat: derivation 'libgnunetchat'
 │   │       ├───librecast: derivation 'librecast'
 │   │       ├───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'
 │   │       ├───tlspool: derivation 'tlspool-0.9.6'
 │   │       ├───tlspool-gui: derivation 'tlspool-gui-0.0.6'
 │   │       └───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
         ├───atomic-cli: package 'atomic-cli-0.34.5'
         ├───atomic-server: package 'atomic-server-0.34.5'
         ├───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'
         ├───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'
         ├───leaf: package 'leaf-unstable-2020-04-28'
         ├───libgnunetchat: package 'libgnunetchat'
         ├───librecast: package 'librecast'
         ├───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'
         ├───tlspool: package 'tlspool-0.9.6'
         ├───tlspool-gui: package 'tlspool-gui-0.0.6'
         └───wireguard-rs: package 'wireguard-rs-unstable-2021-01-13'

@lorenzleutgeb
Copy link
Member Author

@alejandrosame please take a look at b7a92d4. I undid your specialization. This is how I intended the function to be used.

@lorenzleutgeb
Copy link
Member Author

lorenzleutgeb commented Dec 21, 2023

Since these are @alejandrosame's changes (with a small tweak and PR opened not from a fork but the main repo), I'll go ahead and "self merge" once CI succeeds.

@lorenzleutgeb lorenzleutgeb merged commit b2b39aa into main Dec 21, 2023
@lorenzleutgeb lorenzleutgeb deleted the update branch December 21, 2023 13:46
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