Compare commits
2 commits
main
...
weinturm-p
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6013f06076 | ||
|
|
c9b43c94af |
9 changed files with 810 additions and 796 deletions
101
flake.lock
generated
101
flake.lock
generated
|
|
@ -122,6 +122,27 @@
|
||||||
"type": "github"
|
"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": {
|
"nix-pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
|
@ -197,11 +218,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgsMaster": {
|
"nixpkgsMaster": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701169814,
|
"lastModified": 1701282011,
|
||||||
"narHash": "sha256-JnlK2YhnewouC/zyhVQ60RhmIGgQWWJRaHfZl4wPJ8o=",
|
"narHash": "sha256-8VA8Dgir7gxye7SGJtnkA0s3CokCDDNsKu8miAbRqT8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dd1493df9538f47a7cc36399c29ec3b5fb5b48f2",
|
"rev": "f6a06211e6018028ddaf11fac093ca9b9a13cd7f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -213,11 +234,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701058557,
|
"lastModified": 1701156937,
|
||||||
"narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=",
|
"narHash": "sha256-jpMJOFvOTejx211D8z/gz0ErRtQPy6RXxgD2ZB86mso=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "070b5cf9f70bc7ef2dfd739a1f7d6c563fe64bd1",
|
"rev": "7c4c20509c4363195841faa6c911777a134acdf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -229,11 +250,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701163463,
|
"lastModified": 1701274502,
|
||||||
"narHash": "sha256-lDsJkgxKBzUR5+mzv9s19rbGHSxXiBOfGX0lkEdoeZw=",
|
"narHash": "sha256-0q3S6WSHQp40JLQhs6gWx7B0B1iUHqA2JUfD/s9f40k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "a2f8ce2e744f7d1197118be992caf36f7c39c63f",
|
"rev": "54e5c1183d178322e0dd79ebba7551ccb543b6b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -242,6 +263,32 @@
|
||||||
"type": "github"
|
"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": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
|
|
@ -252,6 +299,7 @@
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgsMaster": "nixpkgsMaster",
|
"nixpkgsMaster": "nixpkgsMaster",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
|
"poetry2nix": "poetry2nix",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -290,6 +338,41 @@
|
||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"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",
|
"root": "root",
|
||||||
|
|
|
||||||
14
flake.nix
14
flake.nix
|
|
@ -37,16 +37,24 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
poetry2nix = {
|
||||||
|
url = "github:nix-community/poetry2nix";
|
||||||
|
inputs = {
|
||||||
|
flake-utils.follows = "flake-utils";
|
||||||
|
nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
{ self
|
{ self
|
||||||
, nixpkgs
|
|
||||||
, flake-utils
|
, flake-utils
|
||||||
, krops
|
|
||||||
, gomod2nix
|
, gomod2nix
|
||||||
, home-manager
|
, home-manager
|
||||||
, nur
|
, krops
|
||||||
, nix-pre-commit-hooks
|
, nix-pre-commit-hooks
|
||||||
|
, nixpkgs
|
||||||
|
, nur
|
||||||
|
, poetry2nix
|
||||||
, ...
|
, ...
|
||||||
}@inputs: flake-utils.lib.eachSystem [
|
}@inputs: flake-utils.lib.eachSystem [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
|
|
|
||||||
|
|
@ -51,5 +51,5 @@
|
||||||
uefi.enable = true;
|
uefi.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "22.11";
|
system.stateVersion = "23.11";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,6 @@ let
|
||||||
ports = import ../ports.nix args;
|
ports = import ../ports.nix args;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
"python3.10-requests-2.28.2"
|
|
||||||
"python3.10-cryptography-40.0.1"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.pretix = {
|
services.pretix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
instanceName = "Weinturm Open Air";
|
instanceName = "Weinturm Open Air";
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
final: prev:
|
final: prev:
|
||||||
let
|
let
|
||||||
inherit (prev) callPackage system;
|
inherit (prev) callPackage system;
|
||||||
|
poetry2nix = callPackage inputs.poetry2nix { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
ariang = callPackage ./ariang { };
|
ariang = callPackage ./ariang { };
|
||||||
|
|
@ -14,7 +15,9 @@ in
|
||||||
fpvout = callPackage ./fpvout { };
|
fpvout = callPackage ./fpvout { };
|
||||||
mute-indicator = callPackage ./mute-indicator { };
|
mute-indicator = callPackage ./mute-indicator { };
|
||||||
myintercom-doorbell = callPackage ./myintercom-doorbell { };
|
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-banktool = callPackage ./pretix/pretix-banktool.nix { };
|
||||||
pretix-static = callPackage ./pretix/pretix-static.nix { };
|
pretix-static = callPackage ./pretix/pretix-static.nix { };
|
||||||
tabbed-box-maker = callPackage ./tabbed-box-maker { };
|
tabbed-box-maker = callPackage ./tabbed-box-maker { };
|
||||||
|
|
|
||||||
1466
pkgs/pretix/poetry.lock
generated
1466
pkgs/pretix/poetry.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -12,7 +12,7 @@ index 2eba88a..7041acd 100644
|
||||||
+ 'fints>=3,<4.1',
|
+ 'fints>=3,<4.1',
|
||||||
'requests',
|
'requests',
|
||||||
- 'mt-940>=4.12*',
|
- 'mt-940>=4.12*',
|
||||||
+ 'mt-940>=4.12,<4.29',
|
+ 'mt-940==4.30.0',
|
||||||
],
|
],
|
||||||
--
|
--
|
||||||
2.38.3
|
2.38.3
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,10 @@ python3Packages.buildPythonApplication rec {
|
||||||
./pretix-banktool-requirements.patch
|
./pretix-banktool-requirements.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildInputs = with python3Packages; [
|
||||||
|
pip
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
click
|
click
|
||||||
fints
|
fints
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,13 @@ poetry2nix.mkPoetryApplication rec {
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
reportlab = super.reportlab.overridePythonAttrs (
|
||||||
|
old: {
|
||||||
|
wrapPython = ''
|
||||||
|
echo "HELLO WORLD"
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue