Attempt to bring weinturm-pretix to 23.05

This commit is contained in:
Jakob Lechner 2023-11-24 22:59:36 +00:00
parent c9b43c94af
commit 6013f06076
No known key found for this signature in database
GPG key ID: 996082EFB5906C10
9 changed files with 801 additions and 787 deletions

83
flake.lock generated
View file

@ -122,6 +122,27 @@
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1698974481,
"narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@ -242,6 +263,32 @@
"type": "github"
}
},
"poetry2nix": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1700836255,
"narHash": "sha256-GMqLhIKOqSG6Rd92d5PjpjGl7f81hHnEcMKc3zhP4nY=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "c819fba7902996cac21a27c9090f3f61457e45f3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
@ -252,6 +299,7 @@
"nixpkgs": "nixpkgs_2",
"nixpkgsMaster": "nixpkgsMaster",
"nur": "nur",
"poetry2nix": "poetry2nix",
"sops-nix": "sops-nix"
}
},
@ -290,6 +338,41 @@
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
}
},
"root": "root",

View file

@ -37,16 +37,24 @@
};
};
poetry2nix = {
url = "github:nix-community/poetry2nix";
inputs = {
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
};
};
};
outputs =
{ self
, nixpkgs
, flake-utils
, krops
, gomod2nix
, home-manager
, nur
, krops
, nix-pre-commit-hooks
, nixpkgs
, nur
, poetry2nix
, ...
}@inputs: flake-utils.lib.eachSystem [
"x86_64-linux"

View file

@ -51,5 +51,5 @@
uefi.enable = true;
};
system.stateVersion = "22.11";
system.stateVersion = "23.11";
}

View file

@ -4,11 +4,6 @@ let
ports = import ../ports.nix args;
in
{
nixpkgs.config.permittedInsecurePackages = [
"python3.10-requests-2.28.2"
"python3.10-cryptography-40.0.1"
];
services.pretix = {
enable = true;
instanceName = "Weinturm Open Air";

View file

@ -3,6 +3,7 @@
final: prev:
let
inherit (prev) callPackage system;
poetry2nix = callPackage inputs.poetry2nix { };
in
{
ariang = callPackage ./ariang { };
@ -14,7 +15,9 @@ in
fpvout = callPackage ./fpvout { };
mute-indicator = callPackage ./mute-indicator { };
myintercom-doorbell = callPackage ./myintercom-doorbell { };
pretix = callPackage ./pretix/pretix.nix { };
pretix = callPackage ./pretix/pretix.nix {
inherit poetry2nix;
};
pretix-banktool = callPackage ./pretix/pretix-banktool.nix { };
pretix-static = callPackage ./pretix/pretix-static.nix { };
tabbed-box-maker = callPackage ./tabbed-box-maker { };

1466
pkgs/pretix/poetry.lock generated

File diff suppressed because it is too large Load diff

View file

@ -12,7 +12,7 @@ index 2eba88a..7041acd 100644
+ 'fints>=3,<4.1',
'requests',
- 'mt-940>=4.12*',
+ 'mt-940>=4.12,<4.29',
+ 'mt-940==4.30.0',
],
--
2.38.3

View file

@ -14,6 +14,10 @@ python3Packages.buildPythonApplication rec {
./pretix-banktool-requirements.patch
];
buildInputs = with python3Packages; [
pip
];
propagatedBuildInputs = with python3Packages; [
click
fints

View file

@ -50,6 +50,13 @@ poetry2nix.mkPoetryApplication rec {
'';
}
);
reportlab = super.reportlab.overridePythonAttrs (
old: {
wrapPython = ''
echo "HELLO WORLD"
'';
}
);
}
);
}