diff --git a/flake.lock b/flake.lock index ab162150..74347e14 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728647136, - "narHash": "sha256-7iuFuYszo17nNin969zd1oIHnXrgGwunJdHSyfrx/P8=", + "lastModified": 1729995417, + "narHash": "sha256-e1Ho4xHa3/WzuESbnjRgI3tgI9s+HGRv/LE2cmX139Q=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "f67a5abd71cb11f82b8767fa953e6cbee3da7240", + "rev": "40ebafad5eb99a9e78b84156925d4fcc2e94f064", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1728585693, - "narHash": "sha256-rhx5SYpIkPu7d+rjF9FGGBVxS0BwAEkmYIsJg2a3E20=", + "lastModified": 1729932741, + "narHash": "sha256-Ko3a3hWt7CbVn9Db0/Tj9zln3bB/CMIhlQsP92mUejU=", "owner": "nix-community", "repo": "dream2nix", - "rev": "c6935471f7e1a9e190aaa9ac9823dca34e00d92a", + "rev": "7acdae705dcc79f307e752f749a9f513a0ed9b83", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1730149028, + "narHash": "sha256-Df1b2GjtJ9Fw7BL0dI5rGOvbNSjm5kH9YsOwcRs0sb8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "e1264f94d8e3d5579097e7aa78a212dbd4324f35", "type": "github" }, "original": { @@ -156,16 +156,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -205,11 +205,11 @@ "slimlock": "slimlock" }, "locked": { - "lastModified": 1724504251, - "narHash": "sha256-TIw+sac0NX0FeAneud+sQZT+ql1G/WEb7/Vb436rUXM=", + "lastModified": 1728546539, + "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", "owner": "thomashoneyman", "repo": "purescript-overlay", - "rev": "988b09676c2a0e6a46dfa3589aa6763c90476b8a", + "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", "type": "github" }, "original": { @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1729394972, - "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 66b43cb3..c469d2ed 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ inputs.dream2nix.url = "github:nix-community/dream2nix"; inputs.flake-utils.inputs.systems.follows = "systems"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; + inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.pre-commit-hooks.inputs.nixpkgs-stable.follows = "nixpkgs-stable"; inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/pkgs/by-name/atomic-browser/package.nix b/pkgs/by-name/atomic-browser/package.nix index 3708129a..d0f65ca9 100644 --- a/pkgs/by-name/atomic-browser/package.nix +++ b/pkgs/by-name/atomic-browser/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm.fetchDeps { inherit src pname; - hash = "sha256-du+frFmNV1A4PE8iCRHETEqL0jVhtcxgOA+DhQnnRXg="; + hash = "sha256-t+82kY815j53WWM4dOHNU1rv6BEVkQ/p+F0myGzjAZk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vula/package.nix b/pkgs/by-name/vula/package.nix index 52df5bd6..e98c36d5 100644 --- a/pkgs/by-name/vula/package.nix +++ b/pkgs/by-name/vula/package.nix @@ -16,7 +16,7 @@ in python3.pkgs.buildPythonApplication { pname = "vula"; - version = "unstable-2024-05-17"; + version = "0.2-unstable-2024-05-17"; src = fetchgit { url = "https://codeberg.org/vula/vula"; @@ -45,6 +45,7 @@ in pyyaml qrcode schema + setuptools tkinter zeroconf ]) diff --git a/projects/Pretalx/examples/mysql.nix b/projects/Pretalx/examples/mysql.nix index c23118d5..74021803 100644 --- a/projects/Pretalx/examples/mysql.nix +++ b/projects/Pretalx/examples/mysql.nix @@ -12,7 +12,7 @@ mysql = { enable = true; - package = pkgs.mysql; + package = pkgs.mariadb; ensureUsers = [ { name = config.services.ngi-pretalx.database.user;